Merge branch 'adafruit:main' into main

Author: PaintYourDragon

BLE_Colorific/colorific.py

@@ -29,9 +29,9 @@
 
 # Get bulb address from command parameters.
 if len(sys.argv) != 2:
-    print 'Error must specify bulb address as parameter!'
-    print 'Usage: sudo python colorific.py <bulb address>'
-    print 'Example: sudo python colorific.py 5C:31:3E:F2:16:13'
+    print ('Error must specify bulb address as parameter!')
+    print ('Usage: sudo python colorific.py <bulb address>')
+    print ('Example: sudo python colorific.py 5C:31:3E:F2:16:13')
     sys.exit(1)
 bulb = sys.argv[1]
 
@@ -47,7 +47,7 @@
 hue = hue_min
 
 # Enter main loop.
-print 'Press Ctrl-C to quit.'
+print ('Press Ctrl-C to quit.')
 last = time.time()
 while True:
     # Get amount of time elapsed since last update, then compute hue delta.

BLE_Colorific/flux.py

@@ -30,9 +30,9 @@
 
 # Get bulb address from command parameters.
 if len(sys.argv) != 2:
-    print 'Error must specify bulb address as parameter!'
-    print 'Usage: sudo python colorific.py <bulb address>'
-    print 'Example: sudo python colorific.py 5C:31:3E:F2:16:13'
+    print ('Error must specify bulb address as parameter!')
+    print ('Usage: sudo python colorific.py <bulb address>')
+    print ('Example: sudo python colorific.py 5C:31:3E:F2:16:13')
     sys.exit(1)
 bulb = sys.argv[1]
 
@@ -48,7 +48,7 @@
 hue = hue_min
 
 # Enter main loop.
-print 'Press Ctrl-C to quit.'
+print ('Press Ctrl-C to quit.')
 last = time.time()
 while True:
     # Get amount of time elapsed since last update, then compute hue delta.
@@ -64,7 +64,7 @@
     # Set light color by sending color change packet over BLE.
     # 56RRGGBB00f0aa
     line = 'char-write-cmd 0x002e 56{0:02X}{1:02X}{2:02X}00f0aa'.format(r, g, b)
-    print line
+    print (line)
     gatt.sendline(line)
     # Wait a short period of time and setup for the next loop iteration.
     time.sleep(SLEEP_SEC)

CircuitPython_Templates/audio_find_pins/code.py

@@ -31,7 +31,7 @@ def get_unique_pins():
             "DOTSTAR_DATA",
             "APA102_SCK",
             "APA102_MOSI",
-            "L",
+            "LED",
             "SWITCH",
             "BUTTON",
         ]

CircuitPython_Templates/cap_touch_pin_script/.circuitpython.skip

@@ -17,7 +17,7 @@ def is_touch_capable(pin_name):
         else:
             return False  # Otherwise, the pins are invalid.
     except TypeError:  # Error returned when checking a non-pin object in dir(board).
-        pass  # Passes over non-pin objects in dir(board).
+        return False  # Invalid if non-pin objects in dir(board).
 
 
 def get_pin_names():

CircuitPython_Templates/cap_touch_pin_script/code.py

@@ -16,10 +16,27 @@ def is_hardware_i2c(scl, sda):
 
 
 def get_unique_pins():
-    exclude = ['NEOPIXEL', 'APA102_MOSI', 'APA102_SCK']
-    pins = [pin for pin in [
-        getattr(board, p) for p in dir(board) if p not in exclude]
-            if isinstance(pin, Pin)]
+    exclude = [
+        getattr(board, p)
+        for p in [
+            # This is not an exhaustive list of unexposed pins. Your results
+            # may include other pins that you cannot easily connect to.
+            "NEOPIXEL",
+            "DOTSTAR_CLOCK",
+            "DOTSTAR_DATA",
+            "APA102_SCK",
+            "APA102_MOSI",
+            "LED",
+            "SWITCH",
+            "BUTTON",
+        ]
+        if p in dir(board)
+    ]
+    pins = [
+        pin
+        for pin in [getattr(board, p) for p in dir(board)]
+        if isinstance(pin, Pin) and pin not in exclude
+    ]
     unique = []
     for p in pins:
         if p not in unique:

CircuitPython_Templates/i2c_find_pins/code.py

@@ -0,0 +1,57 @@
+"""
+CircuitPython I2S Pin Combination Identification Script
+"""
+import board
+import audiobusio
+from microcontroller import Pin
+
+
+def is_hardware_i2s(bit_clock, word_select, data):
+    try:
+        p = audiobusio.I2SOut(bit_clock, word_select, data)
+        p.deinit()
+        return True
+    except ValueError:
+        return False
+
+
+def get_unique_pins():
+    exclude = [
+        getattr(board, p)
+        for p in [
+            # This is not an exhaustive list of unexposed pins. Your results
+            # may include other pins that you cannot easily connect to.
+            "NEOPIXEL",
+            "DOTSTAR_CLOCK",
+            "DOTSTAR_DATA",
+            "APA102_SCK",
+            "APA102_MOSI",
+            "LED",
+            "SWITCH",
+            "BUTTON",
+        ]
+        if p in dir(board)
+    ]
+    pins = [
+        pin
+        for pin in [getattr(board, p) for p in dir(board)]
+        if isinstance(pin, Pin) and pin not in exclude
+    ]
+    unique = []
+    for p in pins:
+        if p not in unique:
+            unique.append(p)
+    return unique
+
+
+for bit_clock_pin in get_unique_pins():
+    for word_select_pin in get_unique_pins():
+        for data_pin in get_unique_pins():
+            if bit_clock_pin is word_select_pin or bit_clock_pin is data_pin or word_select_pin \
+                    is data_pin:
+                continue
+            if is_hardware_i2s(bit_clock_pin, word_select_pin, data_pin):
+                print("Bit clock pin:", bit_clock_pin, "\t Word select pin:", word_select_pin,
+                      "\t Data pin:", data_pin)
+            else:
+                pass

CircuitPython_Templates/i2s_find_pins/code.py

@@ -0,0 +1,28 @@
+"""
+CircuitPython I2S MP3 playback example.
+Plays an MP3 once.
+
+Remove this line and all of the following docstring content before submitting to the Learn repo.
+
+Update the three I2S pins to match the wiring chosen for the microcontroller. If you are unsure of
+a proper I2S pin combination, run the pin combination script found here:
+https://adafru.it/i2s-pin-combo-finder
+
+Update the following pin names to a viable pin combination:
+* BIT_CLOCK_PIN
+* WORD_SELECT_PIN
+* DATA_PIN
+"""
+import board
+import audiomp3
+import audiobusio
+
+audio = audiobusio.I2SOut(board.BIT_CLOCK_PIN, board.WORD_SELECT_PIN, board.DATA_PIN)
+
+mp3 = audiomp3.MP3Decoder(open("slow.mp3", "rb"))
+
+audio.play(mp3)
+while audio.playing:
+    pass
+
+print("Done playing!")

CircuitPython_Templates/i2s_mp3_playback/code.py

@@ -0,0 +1,38 @@
+"""
+CircuitPython I2S Tone playback example.
+Plays a tone for one second on, one
+second off, in a loop.
+
+Remove this line and all of the following docstring content before submitting to the Learn repo.
+
+Update the three I2S pins to match the wiring chosen for the microcontroller. If you are unsure of
+a proper I2S pin combination, run the pin combination script found here:
+https://adafru.it/i2s-pin-combo-finder
+
+Update the following pin names to a viable pin combination:
+* BIT_CLOCK_PIN
+* WORD_SELECT_PIN
+* DATA_PIN
+"""
+import time
+import array
+import math
+import audiocore
+import board
+import audiobusio
+
+audio = audiobusio.I2SOut(board.BIT_CLOCK_PIN, board.WORD_SELECT_PIN, board.DATA_PIN)
+
+tone_volume = 0.1  # Increase this to increase the volume of the tone.
+frequency = 440  # Set this to the Hz of the tone you want to generate.
+length = 8000 // frequency
+sine_wave = array.array("h", [0] * length)
+for i in range(length):
+    sine_wave[i] = int((math.sin(math.pi * 2 * i / length)) * tone_volume * (2 ** 15 - 1))
+sine_wave_sample = audiocore.RawSample(sine_wave)
+
+while True:
+    audio.play(sine_wave_sample, loop=True)
+    time.sleep(1)
+    audio.stop()
+    time.sleep(1)