going for v0.3.0

trevorwslee · trevorwslee · commit bef6622e1050 · 2023-09-10T00:22:28.000+08:00
diff --git a/dumbdisplay/_ddimpl.py b/dumbdisplay/_ddimpl.py
@@ -15,11 +15,20 @@
 
 _HS_GAP: int = 1000
 
+_RECONNECT_NO_KEEP_ALIVE_MS: int = 5000
+_VALIDATE_GAP: int = 1000
+_RECONNECTING_VALIDATE_GAP: int = 500
+
 
 class IOProxy:
   def __init__(self, io):
     self._io = io
     self.data: str = ''
+    self.last_keep_alive_ms = 0
+    self.reconnect_keep_alive_ms = 0
+    self.reconnecting = False
+    self.reconnect_enabled = False
+    self.reconnect_RC_id = None
   def available(self):
     done = '\n' in self.data
     while (not done) and self._io.available():
@@ -40,6 +49,46 @@ def read(self) -> str:
   #  self.data = ''
   def print(self, s):
     self._io.print(s)
+  def keepAlive(self):
+    self.last_keep_alive_ms = time.ticks_ms()
+  def setReconnectRCId(self, rc_id: str):
+    ### reconnect not working yet
+    self.reconnect_RC_id = rc_id
+    self.reconnect_enabled = True
+    self.reconnect_keep_alive_ms = 0
+  def validateConnection(self):
+    #print("validateConnection")
+    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:
+        need_reconnect = True
+    if True:
+      if need_reconnect:
+        if self.reconnect_enabled:
+          print("disconnected ... reconnecting ... ", self.reconnect_RC_id)
+        else:
+          print("disconnected")
+    if need_reconnect:
+      self.reconnecting = True
+    if need_reconnect and self.reconnect_enabled:
+      try:
+        self._io.print("%%>RECON>")
+        self._io.print(_DD_SID)
+        self._io.print(":")
+        self._io.print(self.reconnect_RC_id)
+        self._io.print("\n")
+      except:
+        pass
+      self.reconnect_keep_alive_ms = self.last_keep_alive_ms
+    elif self.reconnect_keep_alive_ms > 0:
+      self.reconnecting = False
+      #_ConnectVersion = _ConnectVersion + 1;
+      self.reconnect_keep_alive_ms = 0
+      self.last_keep_alive_ms = time.ticks_ms()
+  def isReconnecting(self) -> bool:
+    return self.reconnecting;
 
 _NextLayerNid: int = 0
 def _AllocLayerNid():
@@ -57,7 +106,8 @@ def __init__(self, io: DDInputOutput):
     self._connected_iop: IOProxy = None
     self._layers: dict[DDLayer] = {}
     self._tunnels: dict = {}
-    
+    self.last_validate_ms = 0
+
   def timeslice(self):
     self._checkForFeedback()
 
@@ -100,7 +150,7 @@ def toggleDebugLed(self):
     pass
   def switchDebugLed(self, on):
     pass
-  def onSendCommandException(self, os_error):
+  def onSendCommandException(self, error):
     pass
 
   def _allocLayerNid(self):
@@ -115,9 +165,8 @@ def _createLayer(self, layer_type: str, *params) -> str:
     layer_id = str(self._allocLayerNid())
     self._sendCommand(layer_id, "SU", layer_type, *params)
     return layer_id
-  def _reorderLayer(self, layer_id: str, how: str): {
+  def _reorderLayer(self, layer_id: str, how: str):
     self._sendCommand(layer_id, "REORD", how)
-  }   
   def _deleteLayer(self, layer_id: str):
     self._sendCommand(layer_id, "DEL")
   def _onCreatedLayer(self, layer: DDLayer):
@@ -208,11 +257,12 @@ def _sendCommand(self, layer_id: str, command: str, *params):
         else:
           self._io.print(',')
         self._io.print(params[i])
-    except OSError as e:
-      self.switchDebugLed(False)
+      self._io.print('\n')
+    except Exception as e:
+      #self.switchDebugLed(False)
       self.onSendCommandException(e)
-    self._io.print('\n')
-    self.switchDebugLed(False)
+    #self._io.print('\n')
+    #self.switchDebugLed(False)
 
 
 
@@ -221,8 +271,10 @@ def _checkForFeedback(self):
     if feedback != None:
       if len(feedback) > 0:
         if feedback[0:1] == '<':
+          self._onFeedbackKeepAlive()
           if len(feedback) == 1:
-            self._onFeedbackKeepAlive()
+            pass
+            #self._onFeedbackKeepAlive()
           else:
             #print(feedback)####
             if feedback.startswith('<lt.'):
@@ -271,19 +323,26 @@ def _checkForFeedback(self):
             except:
               pass
   def _readFeedback(self) -> str:
+    self._validateConnection()
     if not self._connected_iop.available():
       return None
     feedback = self._connected_iop.read()
     #self._connected_iop.clear()
     return feedback
   def _onFeedbackKeepAlive(self):
-    pass
-  # def _onFeedback(self, lid, type, x, y):
-  #   layer = self.layers.get(lid)
-  #   if layer != None:
-  #     layer._handleFeedback(type, x, y)
-  #     #print("FB: " + layer.layer_id + '.' + type + ':' + str(x) + ',' + str(y))
-
+    if self._connected_iop:
+      self._connected_iop.keepAlive()
+  def _validateConnection(self):
+    if self._connected_iop:
+      validate_gap = _RECONNECTING_VALIDATE_GAP if self._connected_iop.isReconnecting() else _VALIDATE_GAP
+      now = time.ticks_ms()
+      diff_ms = now - self.last_validate_ms
+      if diff_ms >= validate_gap:
+        self._connected_iop.validateConnection()
+        self.last_validate_ms = now
+  def _setReconnectRCId(self, rc_id: str):
+    if self._connected_iop:
+        self._connected_iop.setReconnectRCId(rc_id)
   def _createTunnel(self, end_point):
     tunnel_id = str(self._allocTunnelNid())
     self._sendSpecial("lt", tunnel_id, "connect", end_point)
diff --git a/dumbdisplay/_ddio_socket.py b/dumbdisplay/_ddio_socket.py
@@ -44,11 +44,13 @@ def print(self, s):
     while all > count:
       try:
         count = self.conn.send(data[count:])
-      except OSError as e:
-        if e.args[0] == 11:
-          pass
-        else:
-          raise e
+      except Exception as e:
+        raise e
+      # except OSError as e:
+      #   if e.args[0] == 11:
+      #     pass
+      #   else:
+      #     raise e
     #self.conn.sendall(data)
   def close(self):
     if self.conn != None:
diff --git a/dumbdisplay/_dumbdisplay.py b/dumbdisplay/_dumbdisplay.py
@@ -5,11 +5,11 @@
 
 import sys
 
-try:
-  from machine import Pin
-  _DD_HAS_LED = True
-except:
-  _DD_HAS_LED = False
+# try:
+#   from machine import Pin
+#   _DD_HAS_LED = True
+# except:
+#   _DD_HAS_LED = False
 
 
 class DDAutoPin:
@@ -46,15 +46,15 @@ class DumbDisplay(DumbDisplayImpl):
   @staticmethod
   def runningWithMicropython():
     return hasattr(sys, 'implementation') and sys.implementation.name == 'micropython'
-  def __init__(self, io: DDInputOutput):
+  def __init__(self, io: DDInputOutput, reset_machine_on_connection_error: bool = True):
     super().__init__(io)
-    self.debug_led = None
-    self.reset_machine_on_connection_error = False # _DD_HAS_LED and len(sys.argv) != 0
+    #self.debug_led = None
+    self.reset_machine_on_connection_error = reset_machine_on_connection_error # _DD_HAS_LED and len(sys.argv) != 0
 
-  def debugSetup(self, debug_led_pin):
-    '''setup debug use flashing LED pin number'''
-    if _DD_HAS_LED:
-      self.debug_led = Pin(debug_led_pin, Pin.OUT)
+  # def debugSetup(self, debug_led_pin):
+  #   '''setup debug use flashing LED pin number'''
+  #   if _DD_HAS_LED:
+  #     self.debug_led = Pin(debug_led_pin, Pin.OUT)
   def connect(self):
     '''explicit connect'''
     self._connect()
@@ -88,6 +88,7 @@ def recordLayerSetupCommands(self):
   def playbackLayerSetupCommands(self, layerSetupPersistId: str):
     self._sendCommand(None, "SAVEC", layerSetupPersistId, _DD_BOOL_ARG(True))
     self._sendCommand(None, "PLAYC")
+    self._setReconnectRCId(layerSetupPersistId)
   def backgroundColor(self, color: str):
     '''set DD background color with common "color name"'''
     self._connect()
@@ -117,24 +118,34 @@ def notone(self):
 
 
 
-  def toggleDebugLed(self):
-      if self.debug_led != None:
-        self.debug_led.value(not self.debug_led.value())
-  def switchDebugLed(self, on):
-    if self.debug_led != None:
-      if on:
-        self.debug_led.on()
-      else:
-        self.debug_led.off()
-  def onSendCommandException(self, os_error):
-    print("xxxxxxxxx")
-    print("xxx OsError -- " + str(os_error) )
-    print("xxxxxxxxx")
-    if _DD_HAS_LED and self.reset_machine_on_connection_error:
-      import machine
-      machine.reset()
-    else:
-      sys.exit()
+  # def toggleDebugLed(self):
+  #     if self.debug_led != None:
+  #       self.debug_led.value(not self.debug_led.value())
+  # def switchDebugLed(self, on):
+  #   if self.debug_led != None:
+  #     if on:
+  #       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))
+      print("xxxxxxxxx")
+      try:
+        import machine
+        machine.reset()
+      except:
+        sys.exit()
+    # if _DD_HAS_LED and self.reset_machine_on_connection_error:
+    #   import machine
+    #   machine.reset()
+    # else:
+    #   sys.exit()
 
 
 
diff --git a/samples/graphical/main.py b/samples/graphical/main.py
@@ -16,7 +16,10 @@
     from dumbdisplay.io_inet import *
     dd = DumbDisplay(io4Inet())
     
-import time    
+import time
+
+
+dd.recordLayerSetupCommands()
 
 # create 4 graphical [LCD] layers
 l1 = LayerGraphical(dd, 150, 101)
@@ -27,6 +30,8 @@
 # "auto pin" the 4 layers -- 2 by 2
 AutoPin('H', AutoPin('V', l1, l2), AutoPin('V', l3, l4)).pin(dd)
 
+dd.playbackLayerSetupCommands("ugraphical")
+
 
 while True:
     dd.writeComment("start ...")
diff --git a/samples/ledgrid_onoff/_my_secret.py b/samples/ledgrid_onoff/_my_secret.py
@@ -0,0 +1,3 @@
+
+WIFI_SSID="your wifi router ssid"
+WIFI_PWD="your wifi router password"
diff --git a/samples/ledgrid_onoff/main.py b/samples/ledgrid_onoff/main.py
@@ -1,9 +1,23 @@
 
 from dumbdisplay.core import *
-from dumbdisplay.io_inet import *
 from dumbdisplay.layer_ledgrid import *
 
-dd = DumbDisplay(io4Inet())
+
+# create DumbDisplay
+if DumbDisplay.runningWithMicropython():
+    # connect using WIFI:
+    # assume a _my_secret.py Python script containing
+    #   WIFI_SSID="SSID"
+    #   WIFI_PWD="PASSWORD"
+    from _my_secret import *
+    from dumbdisplay.io_wifi import *
+    dd = DumbDisplay(io4Wifi(WIFI_SSID, WIFI_PWD))
+else:
+    # connect using Inet (Python Internet connection)
+    from dumbdisplay.io_inet import *
+    dd = DumbDisplay(io4Inet())
+
+
 l = LayerLedGrid(dd, 20, 20)
 l.enableFeedback("fa")
 l.offColor(RGB_COLOR(0xcc, 0xcc, 0xcc))
diff --git a/samples/melody/main.py b/samples/melody/main.py
@@ -153,7 +153,7 @@ def __init__(self):
 
         dd.pinAutoPinLayers(AutoPin("H", self.playLayer, self.restartLayer, self.targetLayer).build(), 0, 0, 9 * WIDTH, TOP_HEIGHT)
 
-        dd.playbackLayerSetupCommands("ddmelody")
+        dd.playbackLayerSetupCommands("uddmelody")
 
     def run(self):
         while True:
diff --git a/samples/run_test.py b/samples/run_test.py
@@ -1,6 +1,6 @@
 
 
 if __name__ == "__main__":
-    import melody.main
-    #import graphical.main
+    #import melody.main
+    import graphical.main
     #import doodle.main

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+`
	`2`	`+WIFI_SSID="your wifi router ssid"`
	`3`	`+WIFI_PWD="your wifi router password"`