Merge remote-tracking branch 'adafruit/master'

Author: dastels

CircuitPython_Simple_Wordclock/README.md

@@ -4,11 +4,17 @@ Make a timekeeping vertical wordclock with Adafruit Feather M4, a RTC FeatherWin
 
 Follow the Adafruit learn guide here: https://learn.adafruit.com/vertical-wordclock/ !
 
+**set_clock.py** is a run once program to set the time. You will need to edit the code as seen in the comments for the exact date and time (without daylight savings time, please). If you move time zones, you will have to reset the time using this code.
+
+**code.py** is the code that will run to display the time. It reads the time previously set. A backup battery in the RTC FeatherWing keeps the time even when power is removed.
+
+Use the slide switch added to the Adafruit Feather M4 to add one hour to the time for daylight savings.
+
 Adafruit invests time and resources providing this open source code,
 please support Adafruit and open-source hardware by purchasing
 products from [Adafruit](https://www.adafruit.com)!
 
-MIT license, designed and written by Dano Wall, code by Mike Barela
+MIT license, designed and guide written by Dano Wall, code by Mike Barela
 
 All text above, and the splash screen below must be included in any redistribution
 

CircuitPython_Simple_Wordclock/code.py

@@ -13,36 +13,42 @@
 # Create the RTC instance:
 rtc = adafruit_ds3231.DS3231(i2c)
 
+# Set up Feather M4 onboard LED for output
 LED13 = digitalio.DigitalInOut(board.D13)
 LED13.direction = digitalio.Direction.OUTPUT
 
+# Set digital 6 as an input for slide switch
+Slide_Switch = digitalio.DigitalInOut(board.D6)
+Slide_Switch.switch_to_input(pull=digitalio.Pull.UP)
+
 pixel_pin = board.D5
 num_pixels = 21
-pixels = neopixel.NeoPixel(pixel_pin, num_pixels, brightness=1.0)
-pixels.fill((0, 0, 0))
-COLOR = (0, 200, 0)  # Green
+pixels = neopixel.NeoPixel(pixel_pin, num_pixels, brightness=1.0,
+                           auto_write=False)
+pixels.fill((0, 0, 0))  # Blanking Display
+COLOR = (0, 200, 0)     # Green for time later in code
 
 # Bitmap values for each value. These can be OR'ed together
 THREE = 1
-EIGHT = 1<<1
-ELEVEN = 1<<2
-TWO = 1<<3
-SIX = 1<<4
-FOUR = 1<<5
-SEVEN = 1<<6
-NOON = 1<<7
-TEN = 1<<8
-ONE = 1<<9
-FIVE = 1<<10
-MIDNIGHT = 1<<11
-NINE = 1<<12
-PAST = 1<<13
-TO = 1<<14
-FIVEMIN = 1<<15
-QUARTER = 1<<16
-TENMIN = 1<<17
-HALF = 1<<18
-TWENTY = 1<<19
+EIGHT = 1 << 1
+ELEVEN = 1 << 2
+TWO = 1 << 3
+SIX = 1 << 4
+FOUR = 1 << 5
+SEVEN = 1 << 6
+NOON = 1 << 7
+TEN = 1 << 8
+ONE = 1 << 9
+FIVE = 1 << 10
+MIDNIGHT = 1 << 11
+NINE = 1 << 12
+PAST = 1 << 13
+TO = 1 << 14
+FIVEMIN = 1 << 15
+QUARTER = 1 << 16
+TENMIN = 1 << 17
+HALF = 1 << 18
+TWENTY = 1 << 19
 
 # Pass in hour and minute, return LED bitmask
 # pylint: disable=too-many-branches
@@ -118,17 +124,24 @@ def writetime(the_hr, the_min):
 
 # Main loop
 LEDstate = 0
-FirstLoop = True
+Write_Now = True
 
 while True:
     t = rtc.datetime
     # print("The date is {} {}/{}/{}".format(days[int(t.tm_wday)],
     #        t.tm_mday, t.tm_mon, t.tm_year))
     # print("The time is {}:{:02}:{:02}".format(t.tm_hour, t.tm_min, t.tm_sec))
     hour = t.tm_hour
+    if not Slide_Switch.value:  # Slide switch activate = Daylight savings
+        # print("Switch detected for daylight savings")
+        if hour == 24:
+            hour = 1
+        else:
+            hour += 1
+        Write_Now = True  # Trigger a write
     minute = t.tm_min
     second = t.tm_sec
-    if second == 59 or FirstLoop:
+    if second == 59 or Write_Now:
         # print("The time is {}:{:02}".format(t.tm_hour, t.tm_min))
         pixels.fill((0, 0, 0))       # blank all pixels for change
         the_time = writetime(hour, minute)
@@ -142,5 +155,5 @@ def writetime(the_hr, the_min):
     else:
         LED13.value = False
         LEDstate = 0
-    Firstloop = False
+    Write_Now = False
     time.sleep(1)  # wait a second

CircuitPython_Simple_Wordclock/set_clock.py

@@ -0,0 +1,31 @@
+# Write the time for the Adafruit DS3231 real-time clock.
+# Limor Fried/Mike Barela for Adafruit Industries
+
+import time
+import board
+import busio as io
+import digitalio
+import adafruit_ds3231
+
+i2c = io.I2C(board.SCL, board.SDA)
+
+# Create the RTC instance:
+rtc = adafruit_ds3231.DS3231(i2c)
+
+LED13 = digitalio.DigitalInOut(board.D13)
+LED13.direction = digitalio.Direction.OUTPUT
+
+# pylint: disable-msg=bad-whitespace
+# pylint: disable-msg=using-constant-test
+if True:
+    #                     year, mon, date, hour, min, sec, wday, yday, isdst
+    t = time.struct_time((2019,   7,    10,   17,  00,   0,    0,   -1,    -1))
+    # you must set year, mon, date, hour, min, sec and weekday
+    # yearday is not supported
+    # isdst can be set but we don't do anything with it at this time
+    print("Setting time to:", t)     # uncomment for debugging
+    rtc.datetime = t
+    print("Done!")
+    LED13.value = True
+# pylint: enable-msg=using-constant-test
+# pylint: enable-msg=bad-whitespace

Large-Pi-Based-Thermometer-Clock/README.md

@@ -0,0 +1,4 @@
+# Large-Pi-Based-Thermometer-Clock
+
+Code to accompany this tutorial:
+https://learn.adafruit.com/large-pi-based-thermometer-and-clock

Large-Pi-Based-Thermometer-Clock/thermo-clock.fzz

@@ -0,0 +1,85 @@
+import glob
+import time
+import datetime
+from Adafruit_LED_Backpack import SevenSegment
+import board
+import digitalio
+
+switch_pin = digitalio.DigitalInOut(board.D18)
+switch_pin.direction = digitalio.Direction.INPUT
+switch_pin.pull = digitalio.Pull.UP
+
+segment = SevenSegment.SevenSegment(address=0x70)
+# Initialize the display. Must be called once before using the display.
+segment.begin()
+
+base_dir = '/sys/bus/w1/devices/'
+device_folder = glob.glob(base_dir + '28*')[0]
+device_file = device_folder + '/w1_slave'
+
+def read_temp_raw():
+    f = open(device_file, 'r')
+    lines = f.readlines()
+    f.close()
+    return lines
+
+def read_temp():
+    lines = read_temp_raw()
+    while lines[0].strip()[-3:] != 'YES':
+        time.sleep(0.2)
+        lines = read_temp_raw()
+    equals_pos = lines[1].find('t=')
+    if equals_pos != -1:
+        temp_string = lines[1][equals_pos+2:]
+        temp_c = float(temp_string) / 1000.0
+        temp_f = temp_c * 9.0 / 5.0 + 32.0
+        return temp_c, temp_f
+
+def display_temp():
+    segment.set_colon(False)
+    temp = int(read_temp()[1]) # F
+#   temp = int(read_temp()[0]) # C
+    sign = (temp < 0)
+    temp = abs(temp)
+    digit_1 = int(temp % 10)
+    temp = temp / 10
+    digit_2 = int(temp % 10)
+    temp = temp / 10
+    digit_3 = int(temp % 10)
+    if sign :
+        segment.set_digit_raw(0, 0x40)      # - sign
+    if digit_3 > 0 :
+        segment.set_digit(0, digit_3)       # Hundreds
+    else:
+        segment.set_digit_raw(0, 0)
+    if digit_2 > 0 :
+        segment.set_digit(1, digit_2)       # Tens
+    else:
+        segment.set_digit_raw(1, 0)
+    segment.set_digit(2, digit_1)           # Ones
+    segment.set_digit_raw(3, 0x71) #F       # Temp units letter
+#   segment.set_digit_raw(3, 0x39) #C
+
+def display_time():
+    now = datetime.datetime.now()
+    hour = now.hour
+    minute = now.minute
+    second = now.second
+    # Set hours
+    segment.set_digit(0, int(hour / 10))        # Tens
+    segment.set_digit(1, hour % 10)             # Ones
+    # Set minutes
+    segment.set_digit(2, int(minute / 10))      # Tens
+    segment.set_digit(3, minute % 10)           # Ones
+    # Toggle colon
+    segment.set_colon(second % 2)               # Toggle colon at 1Hz
+
+
+while True:
+    segment.clear()
+    if not switch_pin.value:
+        display_temp()
+    else :
+        display_time()
+    segment.write_display()
+    time.sleep(0.5)

Large-Pi-Based-Thermometer-Clock/thermo_clock.py

@@ -23,6 +23,12 @@ def __init__(self, calc_display, clear_button, label_offset):
         self._operand = None
         self._all_clear()
 
+    def get_current_operator(self):
+        operator = self._operator
+        if operator == "*":
+            operator = "x"
+        return operator
+
     def _all_clear(self):
         self._accumulator = "0"
         self._operator = None
@@ -36,6 +42,7 @@ def _clear_entry(self):
         self._set_text("0")
 
     def _set_button_ce(self, entry_only):
+        self._clear_button.selected = False
         if entry_only:
             self._clear_button.label = "CE"
         else:

PyPortal_Calculator/calculator.py

@@ -46,12 +46,12 @@
 font = bitmap_font.load_font("/fonts/Arial-12.bdf")
 buttons = []
 
-# Some button placement functions
+# Some button functions
 def button_grid(row, col):
     return Coords(BUTTON_MARGIN * (row + 1) + BUTTON_WIDTH * row + 20,
                   BUTTON_MARGIN * (col + 1) + BUTTON_HEIGHT * col + 40)
 
-def make_button(row, col, label, width=1, color=WHITE, text_color=BLACK):
+def add_button(row, col, label, width=1, color=WHITE, text_color=BLACK):
     pos = button_grid(row, col)
     new_button = Button(x=pos.x, y=pos.y,
                         width=BUTTON_WIDTH * width + BUTTON_MARGIN * (width - 1),
@@ -60,29 +60,36 @@ def make_button(row, col, label, width=1, color=WHITE, text_color=BLACK):
     buttons.append(new_button)
     return new_button
 
+def find_button(label):
+    result = None
+    for _, btn in enumerate(buttons):
+        if btn.label == label:
+            result = btn
+    return result
+
 border = Rect(20, 8, 280, 35, fill=WHITE, outline=BLACK, stroke=2)
 calc_display = Label(font, text="0", color=BLACK, max_glyphs=MAX_DIGITS)
 calc_display.y = 25
 
-clear_button = make_button(0, 0, "AC")
-make_button(1, 0, "+/-")
-make_button(2, 0, "%")
-make_button(3, 0, "/", 1, ORANGE, WHITE)
-make_button(0, 1, "7")
-make_button(1, 1, "8")
-make_button(2, 1, "9")
-make_button(3, 1, "x", 1, ORANGE, WHITE)
-make_button(0, 2, "4")
-make_button(1, 2, "5")
-make_button(2, 2, "6")
-make_button(3, 2, "-", 1, ORANGE, WHITE)
-make_button(0, 3, "1")
-make_button(1, 3, "2")
-make_button(2, 3, "3")
-make_button(3, 3, "+", 1, ORANGE, WHITE)
-make_button(0, 4, "0", 2)
-make_button(2, 4, ".")
-make_button(3, 4, "=", 1, ORANGE, WHITE)
+clear_button = add_button(0, 0, "AC")
+add_button(1, 0, "+/-")
+add_button(2, 0, "%")
+add_button(3, 0, "/", 1, ORANGE, WHITE)
+add_button(0, 1, "7")
+add_button(1, 1, "8")
+add_button(2, 1, "9")
+add_button(3, 1, "x", 1, ORANGE, WHITE)
+add_button(0, 2, "4")
+add_button(1, 2, "5")
+add_button(2, 2, "6")
+add_button(3, 2, "-", 1, ORANGE, WHITE)
+add_button(0, 3, "1")
+add_button(1, 3, "2")
+add_button(2, 3, "3")
+add_button(3, 3, "+", 1, ORANGE, WHITE)
+add_button(0, 4, "0", 2)
+add_button(2, 4, ".")
+add_button(3, 4, "=", 1, ORANGE, WHITE)
 
 # Add the display and buttons to the main calc group
 calc_group.append(border)
@@ -96,15 +103,25 @@ def make_button(row, col, label, width=1, color=WHITE, text_color=BLACK):
 while True:
     point = ts.touch_point
     if point is not None:
-        for i, b in enumerate(buttons):
+        # Button Down Events
+        for _, b in enumerate(buttons):
             if b.contains(point) and button == "":
                 b.selected = True
                 button = b.label
-                time.sleep(0.1)
+    elif button != "":
+        # Button Up Events
+        last_op = calculator.get_current_operator()
+        op_button = find_button(last_op)
+        # Deselect the last operation when certain buttons are pressed
+        if op_button is not None:
+            if button in ('=', 'AC', 'CE'):
+                op_button.selected = False
+            elif button in ('+', '-', 'x', '/') and button != last_op:
+                op_button.selected = False
+        calculator.add_input(button)
+        b = find_button(button)
+        if b is not None:
+            if button not in ('+', '-', 'x', '/') or button != calculator.get_current_operator():
                 b.selected = False
-                break
-    else:
-        if button != "":
-            calculator.add_input(button)
-            button = ""
+        button = ""
     time.sleep(0.05)