Merge pull request #2358 from adafruit/weather_updates

Refactoring code dot py

Author: BlitzCityDIY

NeoPixel_Sprite_Weather_Display/code.py

@@ -14,7 +14,7 @@
 from adafruit_bitmap_font import bitmap_font
 from displayio import Bitmap
 from rainbowio import colorwheel
-
+from adafruit_ticks import ticks_ms, ticks_add, ticks_diff
 import adafruit_requests
 from weather_codes import weather_codes
 
@@ -48,26 +48,29 @@
 pool = socketpool.SocketPool(wifi.radio)
 requests = adafruit_requests.Session(pool, ssl.create_default_context())
 
-# make the API request
-response = requests.get(weather_url)
-# packs the response into a JSON
-response_as_json = response.json()
-print()
-# prints the entire JSON
-print(response_as_json)
-print()
-# gets current weather code
-weather = int(response_as_json['current_weather']['weathercode'])
-print(weather)
-# gets temperature
-temp = response_as_json['current_weather']['temperature']
-temp_int = int(temp)
-print("%s°%s" % (temp, temp_unit))
-# gets time
-json_time = response_as_json['current_weather']['time']
-new_time = json_time.rsplit("T", 1)[-1]
-new_time = int(new_time[:2])
-print(new_time)
+def get_the_weather():
+    # make the API request
+    response = requests.get(weather_url)
+    # packs the response into a JSON
+    response_as_json = response.json()
+    print()
+    # prints the entire JSON
+    print(response_as_json)
+    print()
+    # gets current weather code
+    w = int(response_as_json['current_weather']['weathercode'])
+    # gets temperature
+    t = response_as_json['current_weather']['temperature']
+    temp_int = int(t)
+    t_c = simpleio.map_range(temp_int, min_temp, max_temp, 255, 0)
+    # gets time
+    json_time = response_as_json['current_weather']['time']
+    n_t = json_time.rsplit("T", 1)[-1]
+    n_t = int(n_t[:2])
+    return w, t, t_c, n_t
+
+# initial API call
+weather, temp, temp_color, new_time = get_the_weather()
 
 # font edit code by Jeff Epler
 tom_thumb = bitmap_font.load_font("tom-thumb.pcf", Bitmap)
@@ -102,10 +105,11 @@ def get_bounding_box(self):
         105: {'dx': 0, 'shift_x': 2},
         33: {'dx': 0, 'shift_x': 2},
     })
+# thank you Jeff for this PatchedFont() function!
 
 # temperature for scrolling text
 label = Label(text="   %s°%s   " % (temp, temp_unit), font=font)
-bitmap = label.bitmap
+text = label.bitmap
 
 # create 5x5 neopixels
 pixels = neopixel.NeoPixel(board.A3, 5*5, brightness=.08, auto_write=False)
@@ -114,70 +118,69 @@ def get_bounding_box(self):
 # arrays to pack assets from weather_codes helper
 # weather condition code
 codes = []
-# bitmap for daytime
+# bitmaps for daytime
 day_images = []
-# bitmap for nighttime
+# bitmaps for nighttime
 night_images = []
 
 for i in weather_codes:
     codes.append(i['code'])
     day_images.append(i['day_img'])
     night_images.append(i['night_img'])
 
-clock = time.monotonic()
-
-# display current weather sprite & scroll temperature
-while True:
-    # check every hour
-    if (time.monotonic() - clock) > 3600:
-        # make the API request
-        response = requests.get(weather_url)
-        # packs the response into a JSON
-        response_as_json = response.json()
-        print()
-        #  prints the entire JSON
-        print(response_as_json)
-        print()
-        # current weather code
-        weather = int(response_as_json['current_weather']['weathercode'])
-        print(weather)
-        # temperature
-        temp = response_as_json['current_weather']['temperature']
-        temp_int = int(temp)
-        print("%s°%s" % (temp, temp_unit))
-        # update scrolling text
-        label.text = "   %s°%s   " % (temp, temp_unit)
-        json_time = response_as_json['current_weather']['time']
-        new_time = json_time.rsplit("T", 1)[-1]
-        new_time = int(new_time[:2])
-        print(new_time)
-        clock = time.monotonic()
-    # map color to temp range. colder temps are cool colors, warmer temps warm colors
-    temp_color = simpleio.map_range(temp_int, min_temp, max_temp, 255, 0)
-    # checks if it's day or night based on hour
-    if new_time in range(daytime_min, daytime_max):
-        img = day_images[weather]
+# checks if it's day or night based on hour
+def day_or_night(t):
+    if t in range(daytime_min, daytime_max):
+        z = day_images[weather]
     else:
-        img = night_images[weather]
-    # draw bitmap sprite
+        z = night_images[weather]
+    return z
+
+# initial sprite selection
+img = day_or_night(new_time)
+
+# draw bitmap sprite
+def draw_sprite(c):
     for pixel in img:
-        pixels[count] = pixel
+        pixels[c] = pixel
         pixels.show()
-        count+=1
+        c += 1
         time.sleep(0.001)
+    c = 0
+
+# ticks time tracker
+clock = ticks_ms()
+
+# 15 minutes in milliseconds
+weather_check = 900000
+
+# display current weather sprite & scroll temperature
+while True:
+    # checks the time
+    if ticks_diff(ticks_ms(), clock) > weather_check:
+        print("pinging Open-Meteo")
+        # make the API request with function
+        # return weather ID, temp, temp color & hour
+        weather, temp, temp_color, new_time = get_the_weather()
+        # checks if it's day or night based on hour
+        # & returns day or night version of sprite
+        img = day_or_night(new_time)
+        # reset clock
+        clock = ticks_add(clock, weather_check)
+    # draw bitmap sprite
+    draw_sprite(count)
+    # blocking delay to hold the sprite on the display
     time.sleep(5)
-    hue = 0
-    count = 0
     # draw scrolling text
     for v in range(2):
-        for i in range(bitmap.width):
+        for i in range(text.width):
             # Scoot the old text left by 1 pixel
             pixels[:20] = pixels[5:]
             # adjust color based on temperature
             color = colorwheel(temp_color)
             # Draw in the next line of text
             for y in range(5):
                 # Select black or color depending on the bitmap pixel
-                pixels[20+y] = color * bitmap[i,y]
+                pixels[20+y] = color * text[i,y]
             pixels.show()
             time.sleep(.1)