Merge pull request #15 from RI-SE/feature_addAllClearCommand

Added all clear command
RI-SE · Oct 6, 2021 · a3e6114 · a3e6114
2 parents 2473caf + a7a4f56
commit a3e6114
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/iso22133.c b/iso22133.c
@@ -2475,7 +2475,8 @@ ssize_t encodeOSTMMessage(const ObjectCommandType command, char *ostmDataBuffer,
 	// Check vs allowed commands
 	if (!
 		(command == OBJECT_COMMAND_ARM || command == OBJECT_COMMAND_DISARM
-		 || command == OBJECT_COMMAND_REMOTE_CONTROL)) {
+		 || command == OBJECT_COMMAND_REMOTE_CONTROL
+		 || command == OBJECT_COMMAND_ALL_CLEAR)) {
 		fprintf(stderr, "OSTM does not support command %u\n", (uint8_t) command);
 		return -1;
 	}

diff --git a/iso22133.h b/iso22133.h
@@ -69,7 +69,8 @@ typedef struct {
 typedef enum {
 	OBJECT_COMMAND_ARM = 0x02,				//!< Request to arm the target object
 	OBJECT_COMMAND_DISARM = 0x03,			//!< Request to disarm the target object
-	OBJECT_COMMAND_REMOTE_CONTROL = 0x06	//!< Request for remote control of the target object
+    OBJECT_COMMAND_REMOTE_CONTROL = 0x06,	//!< Request for remote control of the target object
+    OBJECT_COMMAND_ALL_CLEAR = 0x0A         //!< Signal that abort no longer necessary
 } ObjectCommandType;
 
 
@@ -81,7 +82,7 @@ typedef enum {
 	CONTROL_CENTER_STATUS_ABORT = 0x02,			//!<
 	CONTROL_CENTER_STATUS_RUNNING = 0x03,		//!<
 	CONTROL_CENTER_STATUS_TEST_DONE = 0x04,		//!<
-	CONTROL_CENTER_STATUS_NORMAL_STOP = 0x05	//!<
+    CONTROL_CENTER_STATUS_NORMAL_STOP = 0x05	//!<
 } ControlCenterStatusType;
 
 #define MONR_EXPECTED_FREQUENCY_HZ 100

diff --git a/positioning.h b/positioning.h
@@ -65,8 +65,10 @@ typedef enum {
 	OBJECT_STATE_RUNNING,
 	OBJECT_STATE_POSTRUN,
 	OBJECT_STATE_ABORTING,
-	OBJECT_STATE_REMOTE_CONTROL
-} ObjectStateType;
+    OBJECT_STATE_REMOTE_CONTROL,
+    OBJECT_STATE_PRE_ARMING,
+    OBJECT_STATE_PRE_RUNNING
+} ObjectStateType; // TODO give numbers
 
 /*! Enumeration of ready to arm statuses of an object */
 typedef enum {