Merge pull request #2 from trevorwslee/develop

Develop

Author: trevorwslee

.gitignore

@@ -7,7 +7,6 @@ MicroPythonDumbDisplay.iml
 
 dumbdisplay_experimental
 
-/_my_secret.py
 /_test.py
 /_dd.py
 /_test.ipynb

README.md

@@ -1,10 +1,10 @@
 # DumbDisplay MicroPython Library (v0.3.0)
 
-DumbDisplay MicroPython Library is a port of the Arduino DumbDisplay Library (https://github.com/trevorwslee/Arduino-DumbDisplay)
-for the DumbDisplay Android app -- https://play.google.com/store/apps/details?id=nobody.trevorlee.dumbdisplay
+DumbDisplay MicroPython Library is a port of the [DumbDisplay Arduino Library](https://github.com/trevorwslee/Arduino-DumbDisplay)
+for the [DumbDisplay Android app](https://play.google.com/store/apps/details?id=nobody.trevorlee.dumbdisplay)
 
-For a video introduction, please watch the YouTube video: Introducing DumbDisplay MicroPython Library -- 
-with ESP32, Raspberry Pi Pico, and Raspberry Pi Zero -- https://www.youtube.com/watch?v=KVU26FyXs5M
+For a video introduction, please watch the YouTube video: [Introducing DumbDisplay MicroPython Library -- 
+with ESP32, Raspberry Pi Pico, and Raspberry Pi Zero](https://www.youtube.com/watch?v=KVU26FyXs5M)
 
 Although the porting is not complete, nevertheless, a large portion of DumbDisplay functionalities have been ported.
 Hopefully, this should already be helpful for friends that develop programs for microcontroller boards in Micro-Python.

_my_secret.py

@@ -0,0 +1,3 @@
+
+WIFI_SSID="your wifi router ssid"
+WIFI_PWD="your wifi router password"

dumbdisplay/_ddimpl.py

@@ -58,19 +58,21 @@ def setReconnectRCId(self, rc_id: str):
     self.reconnect_keep_alive_ms = 0
   def validateConnection(self) -> bool:
     #print("validateConnection")
-    diff_ms = -1
+    keep_alive_diff_ms = None
     need_reconnect = False
     if self.last_keep_alive_ms > 0:
       now = time.ticks_ms()
-      diff_ms = now - self.last_keep_alive_ms
-      if diff_ms > _RECONNECT_NO_KEEP_ALIVE_MS:
+      keep_alive_diff_ms = now - self.last_keep_alive_ms
+      if keep_alive_diff_ms > _RECONNECT_NO_KEEP_ALIVE_MS:
         need_reconnect = True
     if True:
       if need_reconnect:
         if self.reconnect_enabled:
-          print("disconnected ... reconnecting ... ", self.reconnect_RC_id, diff_ms)
+          # reconnecting not working yet
+          print(f"disconnected {self.reconnect_RC_id} ... for {keep_alive_diff_ms} ms")
+          #print("disconnected ... reconnecting ... ", self.reconnect_RC_id, diff_ms)
         else:
-          print("disconnected")
+          print(f"disconnected ... for {keep_alive_diff_ms} ms")
     if need_reconnect:
       self.reconnecting = True
     if need_reconnect and self.reconnect_enabled:
@@ -88,7 +90,7 @@ def validateConnection(self) -> bool:
       #_ConnectVersion = _ConnectVersion + 1;
       self.reconnect_keep_alive_ms = 0
       self.last_keep_alive_ms = time.ticks_ms()
-    return not need_reconnect
+    return (need_reconnect, keep_alive_diff_ms)
   def isReconnecting(self) -> bool:
     return self.reconnecting;
 
@@ -152,7 +154,7 @@ def release(self):
   #   pass
   # def switchDebugLed(self, on):
   #   pass
-  def onDetectedDisconnect(self):
+  def onDetectedDisconnect(self, for_ms: int):
     pass
   def onSendCommandException(self, error):
     pass
@@ -327,8 +329,9 @@ def _checkForFeedback(self):
             except:
               pass
   def _readFeedback(self) -> str:
-    if not self._validateConnection():
-      self.onDetectedDisconnect()
+    (need_reconnect, keep_alive_diff_ms) = self._validateConnection()
+    if need_reconnect:
+      self.onDetectedDisconnect(keep_alive_diff_ms)
     if not self._connected_iop.available():
       return None
     feedback = self._connected_iop.read()
@@ -343,11 +346,11 @@ def _validateConnection(self):
       now = time.ticks_ms()
       diff_ms = now - self.last_validate_ms
       if diff_ms >= validate_gap:
-        res = self._connected_iop.validateConnection()
+        (need_reconnect, keep_alive_diff_ms) = self._connected_iop.validateConnection()
         self.last_validate_ms = now
       else:
-        res = True
-      return res
+        (need_reconnect, keep_alive_diff_ms) = (None, None)
+      return (need_reconnect, keep_alive_diff_ms)
   def _setReconnectRCId(self, rc_id: str):
     if self._connected_iop:
         self._connected_iop.setReconnectRCId(rc_id)

dumbdisplay/_dumbdisplay.py

@@ -46,11 +46,11 @@ class DumbDisplay(DumbDisplayImpl):
   @staticmethod
   def runningWithMicropython():
     return hasattr(sys, 'implementation') and sys.implementation.name == 'micropython'
-  def __init__(self, io: DDInputOutput, reset_machine_when_failed_to_send_command: bool = True, reset_machine_if_detected_disconnect: bool = False):
+  def __init__(self, io: DDInputOutput, reset_machine_when_failed_to_send_command: bool = True, reset_machine_if_detected_disconnect_for_s: int = 15):
     super().__init__(io)
     #self.debug_led = None
     self.reset_machine_when_failed_to_send_command = reset_machine_when_failed_to_send_command
-    self.reset_machine_if_detected_disconnect = reset_machine_if_detected_disconnect # _DD_HAS_LED and len(sys.argv) != 0
+    self.reset_machine_if_detected_disconnect_for_s = reset_machine_if_detected_disconnect_for_s # _DD_HAS_LED and len(sys.argv) != 0
 
   # def debugSetup(self, debug_led_pin):
   #   '''setup debug use flashing LED pin number'''
@@ -133,8 +133,8 @@ def notone(self):
   #       self.debug_led.on()
   #     else:
   #       self.debug_led.off()
-  def onDetectedDisconnect(self):
-    if self.reset_machine_if_detected_disconnect:
+  def onDetectedDisconnect(self, for_ms: int):
+    if self.reset_machine_if_detected_disconnect_for_s and for_ms >= (1000 * self.reset_machine_if_detected_disconnect_for_s):
       print("xxxxxxxxx")
       print("xxx detected disconnection ==>")
       try:

experiments/picopio/pio_do_re-mi.py

@@ -0,0 +1,37 @@
+
+import machine
+from machine import Pin
+@rp2.asm_pio(
+    set_init=rp2.PIO.OUT_LOW,
+    in_shiftdir=rp2.PIO.SHIFT_LEFT,
+    out_shiftdir=rp2.PIO.SHIFT_LEFT,
+)
+def wave_prog():
+    pull(block)
+    mov(x, osr)     # waveCount
+    pull(block)
+    label("loop")
+    mov(y, osr)    # halfWaveNumCycles
+    set(pins, 1)   # high
+    label("high")
+    jmp(y_dec, "high")
+    mov(y, osr)    # halfWaveNumCycles
+    set(pins, 0)   # low
+    label("low")
+    jmp(y_dec, "low")
+    jmp(x_dec, "loop")
+sm = rp2.StateMachine(0, wave_prog, freq=1953125, set_base=Pin(5))  # the clock frequency of Raspberry Pi Pico is 125MHz; 1953125 is 125MHz / 64
+sm.active(1)
+def HWPlayTone(freq: int, duration: int):
+    halfWaveNumCycles = round(1953125.0 / freq / 2)  # count 1 cycle for jmp() ==> 1 cycle per half wave ==> 2 cycles per wave
+    waveCount = round(duration * freq / 1000.0)
+    sm.put(waveCount)
+    sm.put(halfWaveNumCycles)
+
+import time
+HWPlayTone(262, 1000) # Do
+time.sleep(1)
+HWPlayTone(294, 1000) # Re
+time.sleep(1)
+HWPlayTone(330, 1000) # Mi
+time.sleep(1)

experiments/picopio/pio_pin_onoff.py

@@ -0,0 +1,20 @@
+
+import time
+import rp2
+from machine import Pin
+@rp2.asm_pio(set_init=rp2.PIO.OUT_LOW)
+def pin_onoff():
+    wrap_target()
+    set(pins, 1)   # high
+    set(pins, 0)   # low
+    wrap()
+sm = rp2.StateMachine(0, pin_onoff, freq=4000, set_base=Pin(5))
+sm.active(1)
+time.sleep(1)
+sm.active(0)
+
+# import machine
+# speaker = machine.Pin(5)
+# while True:
+#   speaker.on()
+#   speaker.off()

samples/melody/main.py

@@ -4,11 +4,8 @@
 from dumbdisplay.layer_lcd import LayerLcd
 
 try:
-    # https://docs.micropython.org/en/latest/library/rp2.html
-    import machine
-    if machine.unique_id() == b'\xe6aA\x04\x03,D+':  # unique_id() is unique to my board 
-        SPEAKER_PIN = 5
-    import time
+    # REFERENCE: https://docs.micropython.org/en/latest/library/rp2.html
+    SPEAKER_PIN = 5
     import rp2
     from machine import Pin
     @rp2.asm_pio(
@@ -18,7 +15,7 @@
     )
     def wave_prog():
         pull(block)
-        mov(x, osr)    # waveCount
+        mov(x, osr)     # waveCount
         pull(block)
         label("loop")
         mov(y, osr)    # halfWaveNumCycles
@@ -30,16 +27,13 @@ def wave_prog():
         label("low")
         jmp(y_dec, "low")
         jmp(x_dec, "loop")
-        # set(x, 1)
-        # mov(isr, x)
-        # push()
-    sm = rp2.StateMachine(0, wave_prog, freq=100000, set_base=Pin(SPEAKER_PIN))
+    sm = rp2.StateMachine(0, wave_prog, freq=1953125, set_base=Pin(SPEAKER_PIN))  # the clock frequency of Raspberry Pi Pico is 125MHz; 1953125 is 125MHz / 64
     sm.active(1)
     def HWPlayTone(freq: int, duration: int):
-        halfWaveNumCycles = round((100000.0 / 2) / freq)  # 2 is the number of cycles per half wave
+        halfWaveNumCycles = round(1953125.0 / freq / 2)  # count 1 cycle for jmp() ==> 1 cycle per half wave ==> 2 cycles per wave
         waveCount = round(duration * freq / 1000.0)
         sm.put(waveCount)
-        sm.put(halfWaveNumCycles) # 2 * (x / 10) == blink time
+        sm.put(halfWaveNumCycles)
 except:
     print("*****")
     print("* No HWPlayTone")
@@ -183,7 +177,7 @@ def __init__(self):
 
         dd.pinAutoPinLayers(
             AutoPin("V",
-        AutoPin("H", self.playLayer, self.restartLayer, self.targetLayer),
+                AutoPin("H", self.playLayer, self.restartLayer, self.targetLayer),
                 self.lyricLayer).build(),
             0, 0, 9 * KEY_WIDTH, TOP_HEIGHT)