Cosmetic changes, setting delay to off-testing mode (30s), erased large font

Author: Alvaro Figueroa

PyPortal_Electioncal_US/code.py PyPortal_Electioncal_US/electioncal.pyPyPortal_Electioncal_US/code.py renamed to PyPortal_Electioncal_US/electioncal.py

@@ -6,22 +6,16 @@
 sys.path.append(cwd)
 import electioncal_graphics  # pylint: disable=wrong-import-position
 
-# Optional, to take a screenshot to SD card
-#from adafruit_bitmapsaver import save_pixels
-#import storage
-#import busio
-
 # Get wifi details and more from a secrets.py file
 try:
     from secrets import secrets
 except ImportError:
     print("WiFi secrets are kept in secrets.py, please add them there!")
     raise
 
-#STATE="puerto_rico"
-#COUNTY="aguada"
-STATE="texas"
-COUNTY="andrews"
+# Change this to your state and county, replacing spaces for underscores and in lowercase
+STATE="new_york"
+COUNTY="new_york"
 
 DATA_SOURCE = "https://electioncal.us/en/" + STATE +"/" + COUNTY + "/voter.json"
 DATA_LOCATION = []
@@ -58,12 +52,4 @@
         gfx.elections_cycle()
     except RuntimeError as e:
         print("Some error ocurred, retrying! -", e)
-        continue
-
-    # Optional: to take screenshot to SD card
-    #storage.remount("/", False)
-    #print('Taking Screenshot...')
-    #save_pixels('/screenshot.bmp')
-    #print('Screenshot taken')
-
-    #time.sleep(60)  # wait 60 seconds before updating anything again
+        continue

PyPortal_Electioncal_US/electioncal_graphics.py

@@ -29,47 +29,47 @@ def __init__(self, root_group, *, am_pm=True):
         self.small_font.load_glyphs(glyphs)
         self.medium_font.load_glyphs(glyphs)
 
+        self.date_text = Label(self.small_font, max_glyphs=21)
+        self.date_text.x = 15
+        self.date_text.y = 195
+        self.date_text.color = 0xFFFFFF
+        self._text_group.append(self.date_text)
+
         self.url_text = Label(self.small_font, max_glyphs=35)
-        self.url_text.x = 10
-        self.url_text.y = 195
+        self.url_text.x = 15
+        self.url_text.y = 220
         self.url_text.color = 0xFFFFFF
         self._text_group.append(self.url_text)
         self.url_text.text = "Visit us at https://electioncal.us"
 
-        self.date_text = Label(self.small_font, max_glyphs=21)
-        self.date_text.x = 10
-        self.date_text.y = 220
-        self.date_text.color = 0xFFFFFF
-        self._text_group.append(self.date_text)
-
         self.state_text = Label(self.small_font, max_glyphs=60)
-        self.state_text.x = 10
+        self.state_text.x = 15
         self.state_text.y = 10
         self.state_text.color = 0xFFFFFF
         self._text_group.append(self.state_text)
 
         self.election_date_text = Label(self.medium_font, max_glyphs=11)
-        self.election_date_text.x = 10
+        self.election_date_text.x = 15
         self.election_date_text.y = 60
         self.election_date_text.color = 0xFFFFFF
         self._text_group.append(self.election_date_text)
 
         self.election_name_text = Label(self.small_font, max_glyphs=60)
-        self.election_name_text.x = 10
+        self.election_name_text.x = 15
         self.election_name_text.y = 95
         self.election_name_text.color = 0xFFFFFF
         self._text_group.append(self.election_name_text)
 
         self.election_name_text_line2 = Label(self.small_font, max_glyphs=60)
-        self.election_name_text_line2.x = 10
+        self.election_name_text_line2.x = 15
         self.election_name_text_line2.y = 120
         self.election_name_text_line2.color = 0xFFFFFF
         self._text_group.append(self.election_name_text_line2)
 
 
     def load_data(self, election_data):
         self.electioncal = json.loads(election_data)
-        self.state_text.text = self.electioncal["dates"][0]["state"] + " State, " + self.electioncal["dates"][1]["county"]
+        self.state_text.text = self.electioncal["dates"][1]["county"] + ", " + self.electioncal["dates"][0]["state"]
 
     def elections_cycle(self):
         self.update_time()
@@ -80,7 +80,7 @@ def elections_cycle(self):
                 self.election_date_text.text = self.electioncal["dates"][i]["date"]
                 # splitting the line at around 40 chars seems ok for regular PyPortal
                 self.election_name_text_line2.text, self.election_name_text.text = self.paragrapher(self.electioncal["dates"][i]["name"], 40)
-                time.sleep(4)
+                time.sleep(30)
 
     def update_time(self):
         """Fetch the time.localtime(), parse it out and update the display text"""