Added command response to ARM and Execute

Author: GitWorkingTime

interfaces/obc_gs_interface/commands/command_response_callbacks.py

@@ -85,12 +85,15 @@ def parse_cmd_arm(cmd_response: CmdRes, data: bytes) -> CmdArmRes:
     if cmd_response.cmd_id != CmdCallbackId.CMD_ARM:
         raise ValueError("Wrong command id for parsing the name command")
 
+    cmd_arm = int.from_bytes(data[0:3], "little")
+    cmd_arm_id = int.from_bytes(data[4:8], "little")
+
     return CmdArmRes(
         cmd_response.cmd_id,
         cmd_response.error_code,
         cmd_response.response_length,
-        cmd_response.cmd_arm,
-        cmd_response.cmd_arm_id,
+        cmd_arm,
+        cmd_arm_id,
     )
 
 
@@ -104,12 +107,15 @@ def parse_cmd_execute(cmd_response: CmdRes, data: bytes) -> CmdExecuteRes:
     if cmd_response.cmd_id != CmdCallbackId.CMD_EXECUTE:
         raise ValueError("Wrong command id for parsing the name command")
 
+    cmd_execute = int.from_bytes(data[0:3], "little")
+    cmd_exec_id = int.from_bytes(data[4:8], "little")
+
     return CmdExecuteRes(
         cmd_response.cmd_id,
         cmd_response.error_code,
         cmd_response.response_length,
-        cmd_response.cmd_execute,
-        cmd_response.cmd_exec_id,
+        cmd_execute,
+        cmd_exec_id,
     )
 
 

obc/app/modules/command_mgr/command_callbacks.c

@@ -116,19 +116,46 @@ static obc_error_code_t I2CProbeCmdCallback(cmd_msg_t *cmd, uint8_t *responseDat
   return OBC_ERR_CODE_SUCCESS;
 }
 
-static obc_error_code_t cmdArmCmdCallback(cmd_msg_t *cmd, uint8_t *responseData, uint8_t *responseDataLen) {
+static obc_error_code_t armCmdCallback(cmd_msg_t *cmd, uint8_t *responseData, uint8_t *responseDataLen) {
   if (cmd == NULL || responseData == NULL || responseDataLen == NULL) {
     return OBC_ERR_CODE_INVALID_ARG;
   }
+  // Parsing the cmdArm data into bytes
+  responseData[0] = cmd->cmdArm.cmdArm;
+  responseData[1] = cmd->cmdArm.cmdArm >> 8;
+  responseData[2] = cmd->cmdArm.cmdArm >> 16;
+  responseData[3] = cmd->cmdArm.cmdArm >> 24;
+
+  // Parsing the armId data into bytes
+  responseData[4] = cmd->cmdArm.armId;
+  responseData[5] = cmd->cmdArm.armId >> 8;
+  responseData[6] = cmd->cmdArm.armId >> 16;
+  responseData[7] = cmd->cmdArm.armId >> 24;
+
+  *responseDataLen = 8;
 
   return OBC_ERR_CODE_SUCCESS;
 }
 
-static obc_error_code_t cmdExecuteCmdCallback(cmd_msg_t *cmd, uint8_t *responseData, uint8_t *responseDataLen) {
+static obc_error_code_t executeCmdCallback(cmd_msg_t *cmd, uint8_t *responseData, uint8_t *responseDataLen) {
   if (cmd == NULL || responseData == NULL || responseDataLen == NULL) {
     return OBC_ERR_CODE_INVALID_ARG;
   }
 
+  // Parsing the cmdExecute data into bytes
+  responseData[0] = cmd->cmdExecute.cmdExecute;
+  responseData[1] = cmd->cmdExecute.cmdExecute >> 8;
+  responseData[2] = cmd->cmdExecute.cmdExecute >> 16;
+  responseData[3] = cmd->cmdExecute.cmdExecute >> 24;
+
+  // Parsing the execId data into bytes
+  responseData[4] = cmd->cmdExecute.execId;
+  responseData[5] = cmd->cmdExecute.execId >> 8;
+  responseData[6] = cmd->cmdExecute.execId >> 16;
+  responseData[7] = cmd->cmdExecute.execId >> 24;
+
+  *responseDataLen = 8;
+
   return OBC_ERR_CODE_SUCCESS;
 }
 
@@ -142,8 +169,8 @@ const cmd_info_t cmdsConfig[] = {
     [CMD_PING] = {pingCmdCallback, CMD_POLICY_PROD, CMD_TYPE_NORMAL},
     [CMD_DOWNLINK_TELEM] = {downlinkTelemCmdCallback, CMD_POLICY_PROD, CMD_TYPE_NORMAL},
     [CMD_I2C_PROBE] = {I2CProbeCmdCallback, CMD_POLICY_PROD, CMD_TYPE_NORMAL},
-    [CMD_ARM] = {cmdArmCmdCallback, CMD_POLICY_PROD, CMD_TYPE_NORMAL},
-    [CMD_EXECUTE] = {cmdExecuteCmdCallback, CMD_POLICY_PROD, CMD_TYPE_NORMAL},
+    [CMD_ARM] = {armCmdCallback, CMD_POLICY_PROD, CMD_TYPE_NORMAL},
+    [CMD_EXECUTE] = {executeCmdCallback, CMD_POLICY_PROD, CMD_TYPE_NORMAL},
 };
 
 // This function is purely to trick the compiler into thinking we are using the cmdsConfig variable so we avoid the