fixed parse FB bug

Author: trevorwslee

dumbdisplay/ddimpl.py

@@ -83,7 +83,9 @@ def available(self):
       done = '\n' in s
     return done
   def read(self) -> str:
-    #print(self.data)
+    # if True:  # TODO: disable printing of received data
+    #   data = self.data[:-1]
+    #   print(data)
     idx = self.data.index('\n')
     s = self.data[0:idx]
     self.data = self.data[idx + 1:]  
@@ -461,7 +463,7 @@ def _checkForFeedback(self):
             pass
             #self._onFeedbackKeepAlive()
           else:
-            #print(feedback)####
+            #print(feedback)  # TODO: disable debug
             if feedback.startswith('<lt.'):
               try:
                 feedback = feedback[4:]
@@ -492,6 +494,7 @@ def _checkForFeedback(self):
                 pass
         else:
           idx = feedback.find('.')
+          #print("** FEEDBACK: " + feedback)  # TODO: disable debug
           if idx != -1:
             try:
               lid = feedback[0:idx]
@@ -525,14 +528,13 @@ def _checkForFeedback(self):
                   x_str = feedback[0:idx]
                   if x_str != "":
                     x = int(x_str)
-                    idx += 1
                   else:
                     x = 0
                   if idx2 == -1:
-                    y_str = feedback[idx:]
+                    y_str = feedback[idx + 1:]
                     text = None
                   else:
-                    y_str = feedback[idx:idx2]
+                    y_str = feedback[idx + 1:idx2]
                     text = feedback[idx2 + 1:]
                   if y_str != "":
                     y = int(y_str)
@@ -550,8 +552,10 @@ def _checkForFeedback(self):
                   layer._handleAck(ack_seq, x, y, text)
                 else:
                   layer._handleFeedback(fb_type, x, y)  # TODO: set text as feedback text
-            except:
-              pass
+            except Exception as e:
+              #print("** EXCEPT: " + feedback)
+              if True:
+                raise e
   def _readFeedback(self) -> str:
     validate_res = self._validateConnection()
     if validate_res is None:

dumbdisplay/ddlayer_multilevel.py

@@ -71,18 +71,20 @@ def setLevelAnchor(self, x: float, y: float, reach_in_millis: int = 0):
         """
         set the anchor of the level; note that level anchor is the top-left corner of the level "opening"
         """
+        command = "setlevelanchor" if self.dd._compatibility < 15 else "SLA"
         if reach_in_millis > 0:
-            self.dd._sendCommand(self.layer_id, "setlevelanchor", _DD_FLOAT_ARG(x), _DD_FLOAT_ARG(y), _DD_INT_ARG(reach_in_millis))
+            self.dd._sendCommand(self.layer_id, command, _DD_FLOAT_ARG(x), _DD_FLOAT_ARG(y), _DD_INT_ARG(reach_in_millis))
         else:
-            self.dd._sendCommand(self.layer_id, "setlevelanchor", _DD_FLOAT_ARG(x), _DD_FLOAT_ARG(y))
+            self.dd._sendCommand(self.layer_id, command, _DD_FLOAT_ARG(x), _DD_FLOAT_ARG(y))
     def moveLevelAnchorBy(self, by_x: float, by_y: float, reach_in_millis: int = 0):
         """
         move the level anchor
         """
+        command = "movelevelanchorby" if self.dd._compatibility < 15 else "MLAB"
         if reach_in_millis > 0:
-            self.dd._sendCommand(self.layer_id, "movelevelanchorby", _DD_FLOAT_ARG(by_x), _DD_FLOAT_ARG(by_y), _DD_INT_ARG(reach_in_millis));
+            self.dd._sendCommand(self.layer_id, command, _DD_FLOAT_ARG(by_x), _DD_FLOAT_ARG(by_y), _DD_INT_ARG(reach_in_millis));
         else:
-            self.dd._sendCommand(self.layer_id, "movelevelanchorby", _DD_FLOAT_ARG(by_x), _DD_FLOAT_ARG(by_y));
+            self.dd._sendCommand(self.layer_id, command, _DD_FLOAT_ARG(by_x), _DD_FLOAT_ARG(by_y));
     def registerLevelBackground(self, background_id: str, background_image_name: str, draw_background_options: str = ""):
         """
         register an image for setting as level's background

dumbdisplay_examples/tetris/tetris_common.py

@@ -70,6 +70,7 @@ def move_left(self, grid: Grid) -> bool:
         if _check_block_grid_placement(self.block_grid, self.x - 1, self.y, grid=grid):
             return False
         self.x -= 1
+        #print(f"* left ==> x={self.x}")
         self.sync_image()
         return True
 

dumbdisplay_examples/tetris/tetris_two_block.py

@@ -277,6 +277,7 @@ def moveBlockDown(self) -> bool:
         # return False
 
     def moveBlockLeft(self) -> bool:
+        #print("$ move left")
         if self.shape is None:
             self.startGame()
             return False