going for v0.3.0

Author: trevorwslee

dumbdisplay/_ddimpl.py

@@ -56,7 +56,7 @@ def setReconnectRCId(self, rc_id: str):
     self.reconnect_RC_id = rc_id
     self.reconnect_enabled = True
     self.reconnect_keep_alive_ms = 0
-  def validateConnection(self):
+  def validateConnection(self) -> bool:
     #print("validateConnection")
     need_reconnect = False
     if self.last_keep_alive_ms > 0:
@@ -87,6 +87,7 @@ def validateConnection(self):
       #_ConnectVersion = _ConnectVersion + 1;
       self.reconnect_keep_alive_ms = 0
       self.last_keep_alive_ms = time.ticks_ms()
+    return not need_reconnect
   def isReconnecting(self) -> bool:
     return self.reconnecting;
 
@@ -146,9 +147,11 @@ def release(self):
     self._connected = False
     self._connected_iop = None
 
-  def toggleDebugLed(self):
-    pass
-  def switchDebugLed(self, on):
+  # def toggleDebugLed(self):
+  #   pass
+  # def switchDebugLed(self, on):
+  #   pass
+  def onDetectedDisconnect(self):
     pass
   def onSendCommandException(self, error):
     pass
@@ -184,7 +187,7 @@ def _connect(self):
     if self._connected:
       return
 
-    self.switchDebugLed(True)
+    #self.switchDebugLed(True)
     self._io.preconnect()
 
     # > ddhello and < ddhello
@@ -194,7 +197,7 @@ def _connect(self):
       now = time.ticks_ms()
       if now > next_time:
         iop.print('ddhello\n')
-        self.toggleDebugLed()
+        #self.toggleDebugLed()
         next_time = now + _HS_GAP
       if iop.available():
         data = iop.read()
@@ -211,7 +214,7 @@ def _connect(self):
       now = time.ticks_ms()
       if now > next_time:
           iop.print('>init>:' + _DD_SID + '\n')
-          self.toggleDebugLed()
+          #self.toggleDebugLed()
           next_time = now + _HS_GAP
       if iop.available():
         data = iop.read()
@@ -225,12 +228,12 @@ def _connect(self):
 
     self._connected = True  
     self._compatibility = compatibility
-    self.switchDebugLed(False)
+    #self.switchDebugLed(False)
     #print('connected:' + str(compatibility))
 
   def _sendSpecial(self, special_type: str, special_id: str, special_command: str, special_data: str):
     ##print("lt:" + str(special_command) + ":" + str(special_data))#####
-    self.switchDebugLed(True)
+    #self.switchDebugLed(True)
     self._io.print('%%>')
     self._io.print(special_type)
     self._io.print('.')
@@ -242,10 +245,10 @@ def _sendSpecial(self, special_type: str, special_id: str, special_command: str,
     if special_data != None:
       self._io.print(special_data)
     self._io.print('\n')
-    self.switchDebugLed(False)
+    #self.switchDebugLed(False)
   def _sendCommand(self, layer_id: str, command: str, *params):
     self._checkForFeedback()
-    self.switchDebugLed(True)
+    #self.switchDebugLed(True)
     try:
       if layer_id != None:
         self._io.print(layer_id)
@@ -323,7 +326,8 @@ def _checkForFeedback(self):
             except:
               pass
   def _readFeedback(self) -> str:
-    self._validateConnection()
+    if not self._validateConnection():
+      self.onDetectedDisconnect()
     if not self._connected_iop.available():
       return None
     feedback = self._connected_iop.read()
@@ -338,8 +342,11 @@ def _validateConnection(self):
       now = time.ticks_ms()
       diff_ms = now - self.last_validate_ms
       if diff_ms >= validate_gap:
-        self._connected_iop.validateConnection()
+        res = self._connected_iop.validateConnection()
         self.last_validate_ms = now
+      else:
+        res = True
+      return res
   def _setReconnectRCId(self, rc_id: str):
     if self._connected_iop:
         self._connected_iop.setReconnectRCId(rc_id)

dumbdisplay/_dumbdisplay.py

@@ -46,10 +46,10 @@ class DumbDisplay(DumbDisplayImpl):
   @staticmethod
   def runningWithMicropython():
     return hasattr(sys, 'implementation') and sys.implementation.name == 'micropython'
-  def __init__(self, io: DDInputOutput, reset_machine_on_connection_error: bool = True):
+  def __init__(self, io: DDInputOutput, reset_machine_if_detected_disconnect: bool = True):
     super().__init__(io)
     #self.debug_led = None
-    self.reset_machine_on_connection_error = reset_machine_on_connection_error # _DD_HAS_LED and len(sys.argv) != 0
+    self.reset_machine_if_detected_disconnect = reset_machine_if_detected_disconnect # _DD_HAS_LED and len(sys.argv) != 0
 
   # def debugSetup(self, debug_led_pin):
   #   '''setup debug use flashing LED pin number'''
@@ -127,20 +127,30 @@ def notone(self):
   #       self.debug_led.on()
   #     else:
   #       self.debug_led.off()
-  def onSendCommandException(self, error):
-    if False:
-      print("xxxxxxxxx")
-      print("xxx Error (send command) -- " + str(error) )
-      print("xxxxxxxxx")
-    if self.reset_machine_on_connection_error:
-      print("xxxxxxxxx")
-      print("xxx Error (send command) -- {}".format(error))
+  def onDetectedDisconnect(self):
+    if self.reset_machine_if_detected_disconnect:
       print("xxxxxxxxx")
+      print("xxx detected disconnection ==>")
       try:
+        print("xxx x reset machine")
         import machine
         machine.reset()
       except:
+        print("xxx x exit system")
         sys.exit()
+  def onSendCommandException(self, error):
+    print("xxx Error (send command) -- " + str(error) )
+    # if self.reset_machine_on_connection_error:
+    #   print("xxxxxxxxx")
+    #   print("xxx Error (send command) -- {}".format(error))
+    #   print("xxxxxxxxx")
+    #   try:
+    #     print("xxx reset machine")
+    #     import machine
+    #     machine.reset()
+    #   except:
+    #     print("xxx exit system")
+    #     sys.exit()
     # if _DD_HAS_LED and self.reset_machine_on_connection_error:
     #   import machine
     #   machine.reset()

samples/melody/main.py

@@ -5,7 +5,9 @@
 
 try:
     # https://docs.micropython.org/en/latest/library/rp2.html
-    SPEAKER_PIN = 5
+    import machine
+    if machine.unique_id() == b'\xe6aA\x04\x03,D+':  # unique_id() is unique to my board 
+        SPEAKER_PIN = 5
     import time
     import rp2
     from machine import Pin