Merge branch 'master' into pyportal-wakeup-light

Author: ladyada

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

@@ -1,17 +1,21 @@
 import glob
 import time
 import datetime
-from Adafruit_LED_Backpack import SevenSegment
+from adafruit_ht16k33 import segments
 import board
+import busio
 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()
+# Create the I2C interface.
+i2c = busio.I2C(board.SCL, board.SDA)
+
+# Create the LED segment class.
+# This creates a 7 segment 4 character display:
+display = segments.Seg7x4(i2c)
 
 base_dir = '/sys/bus/w1/devices/'
 device_folder = glob.glob(base_dir + '28*')[0]
@@ -36,50 +40,29 @@ def read_temp():
         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
+    temp = read_temp()[1] # F
+#   temp = read_temp()[0] # C
+    display.print(int(temp))
 
 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
+    clock = int('%i%i' % (hour,minute))          # concat hour + minute
+    display.print(clock)
 
+    # Toggle colon when displaying time
+    if second % 2:
+        display.print(':')                      # Enable colon every other second
+    else:
+        display.print(';')                      # Turn off colon
+
+display.fill(0)
 
 while True:
-    segment.clear()
     if not switch_pin.value:
         display_temp()
-    else :
+    else:
         display_time()
-    segment.write_display()
     time.sleep(0.5)

Neopixel_Badge_Lanyard/code.py

@@ -10,6 +10,7 @@
 """
 
 import time
+import random
 import digitalio
 import audioio
 import busio
@@ -19,24 +20,24 @@
 
 # CUSTOMISE COLORS HERE:
 COLOR = (0, 120, 120)      # Default idle is light blue
-ALT_COLOR = (255, 255, 255)  # hit color is bright white
+ALT_COLOR = (255, 50, 0)  # hit color is orange
 
 # CUSTOMISE IDLE PULSE SPEED HERE: 0 is fast, above 0 slows down
-IDLE_PULSE_SPEED = 0.05  # Default is 0.1 seconds
-SWING_BLAST_SPEED = 0.01
+IDLE_PULSE_SPEED = 0  # Default is 0 seconds
+SWING_BLAST_SPEED = 0.007
 
 # CUSTOMISE BRIGHTNESS HERE: must be a number between 0 and 1
-IDLE_PULSE_BRIGHTNESS_MIN = 0.3  # Default minimum idle pulse brightness
-IDLE_PULSE_BRIGHTNESS_MAX = 0.6  # Default maximum idle pulse brightness
+IDLE_PULSE_BRIGHTNESS_MIN = 0.2  # Default minimum idle pulse brightness
+IDLE_PULSE_BRIGHTNESS_MAX = 1  # Default maximum idle pulse brightness
 
 # CUSTOMISE SENSITIVITY HERE: smaller numbers = more sensitive to motion
-HIT_THRESHOLD = 500
-SWING_THRESHOLD = 125
+HIT_THRESHOLD = 250
+SWING_THRESHOLD = 150
 
 # Set to the length in seconds of the "on.wav" file
 POWER_ON_SOUND_DURATION = 1.7
 
-NUM_PIXELS = 30  # Number of pixels used in project
+NUM_PIXELS = 83  # Number of pixels used in project
 NEOPIXEL_PIN = board.D5
 POWER_PIN = board.D10
 
@@ -120,6 +121,22 @@ def mix(color_1, color_2, weight_2):
             int(color_1[1] * weight_1 + color_2[1] * weight_2),
             int(color_1[2] * weight_1 + color_2[2] * weight_2))
 
+# List of swing wav files without the .wav in the name for use with play_wav()
+swing_sounds = [
+    'swing1',
+    'swing2',
+    'swing3',
+    'swing4',
+]
+
+# List of hit wav files without the .wav in the name for use with play_wav()
+hit_sounds = [
+    'hit1',
+    'hit2',
+    'hit3',
+    'hit4',
+]
+
 
 mode = 0  # Initial mode = OFF
 
@@ -150,12 +167,12 @@ def mix(color_1, color_2, weight_2):
         # comparing thresholds...use squared values instead.)
         if accel_total > HIT_THRESHOLD:  # Large acceleration = HIT
             TRIGGER_TIME = time.monotonic()  # Save initial time of hit
-            play_wav('hit')  # Start playing 'hit' sound
+            play_wav(random.choice(hit_sounds))  # Start playing 'hit' sound
             COLOR_ACTIVE = COLOR_HIT  # Set color to fade from
             mode = 3  # HIT mode
         elif mode == 1 and accel_total > SWING_THRESHOLD:  # Mild = SWING
             TRIGGER_TIME = time.monotonic()  # Save initial time of swing
-            play_wav('swing')  # Start playing 'swing' sound
+            play_wav(random.choice(swing_sounds))  # Randomly choose from available swing sounds
             # make a larson scanner animation_time
             strip_backup = strip[0:-1]
             for p in range(-1, len(strip)):