Merge pull request #1 from adafruit/master

updating my local fork

Author: andydoro

BLE_MIDI_Robot_Xylophone/code.py

@@ -0,0 +1,118 @@
+import time
+import board
+import busio
+from adafruit_mcp230xx.mcp23017 import MCP23017
+from digitalio import Direction
+import adafruit_ble
+from adafruit_ble.advertising.standard import ProvideServicesAdvertisement
+import adafruit_ble_midi
+
+# These import auto-register the message type with the MIDI machinery.
+# pylint: disable=unused-import
+import adafruit_midi
+from adafruit_midi.control_change import ControlChange
+from adafruit_midi.midi_message import MIDIUnknownEvent
+from adafruit_midi.note_off import NoteOff
+from adafruit_midi.note_on import NoteOn
+from adafruit_midi.pitch_bend import PitchBend
+
+#  i2c setup
+i2c = busio.I2C(board.SCL, board.SDA)
+
+#  i2c addresses for muxes
+mcp1 = MCP23017(i2c, address=0x20)
+mcp2 = MCP23017(i2c, address=0x21)
+
+#  1st solenoid array, corresponds with 1st mux
+noids0 = []
+
+for pin in range(16):
+    noids0.append(mcp1.get_pin(pin))
+for n in noids0:
+    n.direction = Direction.OUTPUT
+
+#  2nd solenoid array, corresponds with 2nd mux
+noids1 = []
+
+for pin in range(16):
+    noids1.append(mcp2.get_pin(pin))
+for n in noids1:
+    n.direction = Direction.OUTPUT
+
+#  MIDI note arrays. notes0 = noids0; notes1 = noids1
+notes0 = [55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70]
+notes1 = [71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86]
+
+#  setup MIDI BLE service
+midi_service = adafruit_ble_midi.MIDIService()
+advertisement = ProvideServicesAdvertisement(midi_service)
+
+#  BLE connection setup
+ble = adafruit_ble.BLERadio()
+if ble.connected:
+    for c in ble.connections:
+        c.disconnect()
+
+#  MIDI in setup
+midi = adafruit_midi.MIDI(midi_in=midi_service, in_channel=0)
+
+#  start BLE advertising
+print("advertising")
+ble.start_advertising(advertisement)
+
+#  delay for solenoids
+speed = 0.01
+
+while True:
+
+	#  waiting for BLE connection
+    print("Waiting for connection")
+    while not ble.connected:
+        pass
+    print("Connected")
+	#  delay after connection established
+    time.sleep(1.0)
+
+    while ble.connected:
+
+		#  msg holds MIDI messages
+        msg = midi.receive()
+
+        for i in range(16):
+			#  states for solenoid on/off
+			#  noid0 = mux1
+			#  noid1 = mux2
+            noid0_output = noids0[i]
+            noid1_output = noids1[i]
+
+			#  states for MIDI note recieved
+			#  notes0 = mux1
+			#  notes1 = mux2
+            notes0_played = notes0[i]
+            notes1_played = notes1[i]
+
+			#  if NoteOn msg comes in and the MIDI note # matches with predefined notes:
+            if isinstance(msg, NoteOn) and msg.note is notes0_played:
+                print(time.monotonic(), msg.note)
+
+				#  solenoid is triggered
+                noid0_output.value = True
+				#  quick delay
+                time.sleep(speed)
+				#  solenoid retracts
+                noid0_output.value = False
+
+			#  identical to above if statement but for mux2
+            if isinstance(msg, NoteOn) and msg.note is notes1_played:
+                print(time.monotonic(), msg.note)
+
+                noid1_output.value = True
+
+                time.sleep(speed)
+
+                noid1_output.value = False
+
+	#  if BLE disconnects try reconnecting
+    print("Disconnected")
+    print()
+    ble.start_advertising(advertisement)

CircuitPython_Essentials/CircuitPython_PWM_Piezo.py

@@ -11,7 +11,7 @@
 while True:
     for f in (262, 294, 330, 349, 392, 440, 494, 523):
         piezo.frequency = f
-        piezo.duty_cycle = 65536 // 2  # On 50%
+        piezo.duty_cycle = 65535 // 2  # On 50%
         time.sleep(0.25)  # On for 1/4 second
         piezo.duty_cycle = 0  # Off
         time.sleep(0.05)  # Pause between notes

CircuitPython_JEplayer_mp3/code.py

@@ -72,10 +72,10 @@ def __init__(self):
         self.group = displayio.Group(max_size=4)
         self.glyph_width, self.glyph_height = font.get_bounding_box()[:2]
         self.pbar = ProgressBar(0, 0, board.DISPLAY.width,
-                                self.glyph_height, bar_color=0x0000ff,
+                                self.glyph_height*2, bar_color=0x0000ff,
                                 outline_color=0x333333, stroke=1)
         self.iconbar = icons.IconBar()
-        self.iconbar.group.y = 112
+        self.iconbar.group.y = 1000
         for i in range(5, 8):
             self.iconbar.icons[i].x += 32
         self.label = adafruit_display_text.label.Label(font, line_spacing=1.0,
@@ -471,6 +471,7 @@ def play_all(playlist, *, folder='', trim=0, location='/sd'):
     'folder' is a display name for the user."""
     i = 0
     board.DISPLAY.show(playback_display.group)
+    playback_display.iconbar.group.y = 112
     while 0 <= i < len(playlist):
         filename = playlist[i]
         i = play_one_file(i, join(location, filename), folder, filename[trim:-4], len(playlist))

CircuitPython_JEplayer_mp3/rsrc/background.bmp

@@ -36,7 +36,7 @@ class Wheel(displayio.TileGrid):
     def __init__(self):
         # Portions of up to 3 tiles are visible.
         super().__init__(bitmap=bitmap, pixel_shader=displayio.ColorConverter(),
-                         width=1, height=3, tile_width=20)
+                         width=1, height=3, tile_width=20, tile_height=24)
         self.order = shuffled(range(20))
         self.state = STOPPED
         self.pos = 0

CircuitPython_RGBMatrix/fruit.py

@@ -1,8 +1,10 @@
+# pylint: disable=unused-import
 import time
 import board
 import busio
 import digitalio
 from adafruit_fona.adafruit_fona import FONA
+from adafruit_fona.fona_3g import FONA3G
 import adafruit_bme280
 
 print("FONA SMS Sensor")
@@ -11,9 +13,12 @@
 uart = busio.UART(board.TX, board.RX)
 rst = digitalio.DigitalInOut(board.D4)
 
-# Initialize FONA module (this may take a few seconds)
+# Use this for FONA800 and FONA808
 fona = FONA(uart, rst)
 
+# Use this for FONA3G
+# fona = FONA3G(uart, rst)
+
 # Initialize BME280 Sensor
 i2c = busio.I2C(board.SCL, board.SDA)
 bme280 = adafruit_bme280.Adafruit_BME280_I2C(i2c)
@@ -28,23 +33,11 @@
 # Enable FONA SMS notification
 fona.enable_sms_notification = True
 
-# store incoming notification info
-notification_buf = bytearray(64)
-
-print("FONA Ready!")
+print("Listening for messages...")
 while True:
-    if fona.in_waiting: # data is available from FONA
-        notification_buf = fona.read_line()[1]
-        # Split out the sms notification slot num.
-        notification_buf = notification_buf.decode()
-        if "+CMTI:" not in notification_buf:
-            continue
-        sms_slot = notification_buf.split(",")[1]
-
-        print("NEW SMS!\n\t Slot: ", sms_slot)
-
-        # Get SMS message and address
-        sender, message = fona.read_sms(sms_slot)
+    sender, message = fona.receive_sms()
+    if message:
+        print("New Message!")
         print("FROM: ", sender)
         print("MSG: ", message)
 
@@ -57,16 +50,17 @@
         message = message.lower()
         message = message.strip()
 
-        if message in ['temp', 'temperature', 't']:
+        if message in ["temp", "temperature", "t"]:
             response = "Temperature: %0.1f C" % temp
-        elif message in ['humid', 'humidity', 'h']:
+        elif message in ["humid", "humidity", "h"]:
             response = "Humidity: %0.1f %%" % humid
-        elif message in ['pres', 'pressure', 'p']:
+        elif message in ["pres", "pressure", "p"]:
             response = "Pressure: %0.1f hPa" % pres
-        elif message in ['status', 's']:
-            response = "Temperature: {0:.2f}C\nHumidity: {1:.1f}% \
-                     Pressure: {2:.1f}hPa".format(temp, humid, pres)
-        elif message in ['help']:
+        elif message in ["status", "s"]:
+            response = "Temperature: {0:.2f}C\nHumidity: {1:.1f}%Pressure: {2:.1f}hPa".format(
+                temp, humid, pres
+            )
+        elif message in ["help"]:
             response = "I'm a SMS Sensor - txt me with a command:\
                         TEMP - Read temperature\
                         HUMID - Read humidity\
@@ -82,8 +76,3 @@
         if not fona.send_sms(int(sender), response):
             print("SMS Send Failed")
         print("SMS Sent!")
-
-        # Delete the original message
-        if not fona.delete_sms(sms_slot):
-            print("Could not delete SMS in slot", sms_slot)
-        print("OK!")

FONA_SMS_Sensor/code.py

@@ -4,8 +4,10 @@
 
 import board
 import neopixel
-from adafruit_led_animation.animation import Comet, Sparkle, AnimationGroup,\
-    AnimationSequence
+from adafruit_led_animation.animation.comet import Comet
+from adafruit_led_animation.animation.sparkle import Sparkle
+from adafruit_led_animation.group import AnimationGroup
+from adafruit_led_animation.sequence import AnimationSequence
 import adafruit_led_animation.color as color
 
 from adafruit_ble import BLERadio