Merge branch 'master' into TheKitty-patch-103

Author: TheKitty

CircuitPython_OLED_Watch/CircuitPython_OLED_Watch.py

@@ -0,0 +1,69 @@
+import board
+import displayio
+import adafruit_displayio_ssd1306
+import terminalio
+import adafruit_ds3231
+from adafruit_display_text import label
+
+displayio.release_displays()
+
+i2c = board.I2C()
+display_bus = displayio.I2CDisplay(i2c, device_address=0x3c)
+oled = adafruit_displayio_ssd1306.SSD1306(display_bus, width=128, height=32)
+
+rtc = adafruit_ds3231.DS3231(i2c)
+
+
+# The first time you run this code, you must set the time!
+# You must set year, month, date, hour, minute, second and weekday.
+# struct_time order: year, month, day (date), hour, minute, second, weekday , yearday, isdst
+# yearday is not supported, isdst can be set but we don't do anything with it at this time
+
+# UNCOMMENT THE FOLLOWING FOUR LINES THE FIRST TIME YOU RUN THE CODE TO SET THE TIME!
+# import time
+# set_time = time.struct_time((2019, 8, 16, 23, 59, 45, 4, -1, -1))
+# print("Setting time to:", set_time)
+# rtc.datetime = set_time
+
+# Comment out the above four lines again after setting the time!
+
+
+font = terminalio.FONT
+
+while True:
+    current = rtc.datetime
+
+    hour = current.tm_hour % 12
+    if hour == 0:
+        hour = 12
+
+    am_pm = "AM"
+    if current.tm_hour / 12 >= 1:
+        am_pm = "PM"
+
+    time_display = "%d:%02d:%02d %s" % (hour, current.tm_min, current.tm_sec, am_pm)
+    date_display = "%d/%d/%d" % (current.tm_mon, current.tm_mday, current.tm_year)
+    text_display = "CircuitPython Time"
+
+    clock = label.Label(font, text=time_display)
+    date = label.Label(font, text=date_display)
+    text = label.Label(font, text=text_display)
+
+    (_, _, width, _) = clock.bounding_box
+    clock.x = 128 // 2 - width // 2
+    clock.y = 5
+
+    (_, _, width, _) = date.bounding_box
+    date.x = 128 // 2 - width // 2
+    date.y = 15
+
+    (_, _, width, _) = text.bounding_box
+    text.x = 128 // 2 - width // 2
+    text.y = 25
+
+    watch_group = displayio.Group()
+    watch_group.append(clock)
+    watch_group.append(date)
+    watch_group.append(text)
+
+    oled.show(watch_group)

M4_Eyes/DMAbuddy.h

@@ -0,0 +1,16 @@
+// Very infrequently the jobStatus member in Adafruit_ZeroDMA gets out of
+// sync and the screen DMA updates lock up. This is a hacky workaround.
+// jobStatus is a protected member of Adafruit_ZeroDMA, we can't reset it
+// directly in the sketch, but a subclass can. So we have this minimal
+// subclass with a DMA-channel-toggle-off-on-and-jobStatus-reset function.
+
+class DMAbuddy : public Adafruit_ZeroDMA {
+ public:
+  // Call this function when a DMA stall is detected:
+  void fix(void) {
+    // We literally just switch the channel off and on again to fix it...
+    DMAC->Channel[channel].CHCTRLA.bit.ENABLE = 0; // Disable channel
+    DMAC->Channel[channel].CHCTRLA.bit.ENABLE = 1; // Enable channel
+    jobStatus = DMA_STATUS_OK; // Back in business!
+  }
+};