Merge pull request #1090 from OpenC3/python_cmd

Handle bad string types and rescue AttributeError

Author: jmthomas

openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST/cmd_tlm/inst_cmds.txt

@@ -40,7 +40,7 @@ COMMAND <%= target_name %> ASCIICMD BIG_ENDIAN "Enumerated ASCII command"
     STATE "ARM LASER" "ARM LASER" HAZARDOUS "Arming the laser poses an eye safety hazard."
     STATE "FIRE LASER" "FIRE LASER" HAZARDOUS "WARNING Laser will be fired!"
     STATE "NOOP" "NOOP" DISABLE_MESSAGES
-  APPEND_PARAMETER BINARY 32 STRING 0xDEADBEEF "Binary string"
+  APPEND_PARAMETER BINARY 32 BLOCK 0xDEADBEEF "Binary string"
   APPEND_PARAMETER ASCII 80 STRING "0xDEADBEEF" "ASCII string"
   RELATED_ITEM <%= target_name %> HEALTH_STATUS ASCIICMD
 

openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/cmd_tlm/inst_cmds.txt

@@ -38,7 +38,7 @@ COMMAND <%= target_name %> ASCIICMD BIG_ENDIAN "Enumerated ASCII command"
     STATE "ARM LASER" "ARM LASER" HAZARDOUS "Arming the laser poses an eye safety hazard."
     STATE "FIRE LASER" "FIRE LASER" HAZARDOUS "WARNING Laser will be fired!"
     STATE "NOOP" "NOOP" DISABLE_MESSAGES
-  APPEND_PARAMETER BINARY 32 STRING 0xDEADBEEF "Binary string"
+  APPEND_PARAMETER BINARY 32 BLOCK 0xDEADBEEF "Binary string"
   APPEND_PARAMETER ASCII 80 STRING "0xDEADBEEF" "ASCII string"
   RELATED_ITEM <%= target_name %> HEALTH_STATUS ASCIICMD
 

openc3/python/openc3/accessors/binary_accessor.py

@@ -192,11 +192,18 @@ def read(cls, bit_offset, bit_size, data_type, buffer, endianness):
 
             if cls.byte_aligned(bit_offset):
                 if data_type == "STRING":
-                    buffer = buffer[lower_bound : (upper_bound + 1)]
                     try:
-                        return buffer[: buffer.index(b"\00")].decode(encoding="utf-8")
-                    except ValueError:
-                        return buffer.decode(encoding="utf-8")
+                        buffer = buffer[lower_bound : (upper_bound + 1)]
+                        try:
+                            return buffer[: buffer.index(b"\00")].decode(
+                                encoding="utf-8"
+                            )
+                        except ValueError:
+                            return buffer.decode(encoding="utf-8")
+                    # If this 'STRING' contains binary buffer.decode will fail
+                    # Instead of blowing up return the original buffer
+                    except UnicodeDecodeError:
+                        return buffer
                 else:  # BLOCK
                     return buffer[lower_bound : upper_bound + 1]
 

openc3/python/openc3/microservices/interface_microservice.py

@@ -218,7 +218,7 @@ def process_cmd(self, topic, msg_id, msg_hash, redis):
                 else:
                     raise RuntimeError(f"Invalid command received:\n{msg_hash}")
                 command.received_time = datetime.now(timezone.utc)
-            except RuntimeError as error:
+            except (AttributeError, RuntimeError) as error:
                 self.logger.error(f"{self.interface.name}: {msg_hash}")
                 self.logger.error(f"{self.interface.name}: {repr(error)}")
                 return repr(error)