Index: firmware/App/Controllers/BloodLeak.c =================================================================== diff -u -rf5e94d652d50cf8eac2fdc91948d4f5a52d6ce42 -rff9cc57001ec23f2f27a94f944a7b73b7c554644 --- firmware/App/Controllers/BloodLeak.c (.../BloodLeak.c) (revision f5e94d652d50cf8eac2fdc91948d4f5a52d6ce42) +++ firmware/App/Controllers/BloodLeak.c (.../BloodLeak.c) (revision ff9cc57001ec23f2f27a94f944a7b73b7c554644) @@ -101,17 +101,17 @@ enum EmbCommands { - NU_EMB_MODE_CMD = 0, ///< Null command. - CS_EMB_MODE_CMD, ///< Control S command to switch to embedded mode. - SP, ///< Set point command to set the set point. - T, ///< Self test command. - G, ///< Get self test command. - I, ///< Intensity command. - V, ///< Blood detection level command. - Z, ///< Zero sensor command. - Q, ///< Zero sensor confirm command. - D, ///< Display blood detection command. - C, ///< Calibration sensor command. + NU_EMB_MODE_CMD = 0, ///< Null command. + CS_EMB_MODE_CMD, ///< Control S command to switch to embedded mode. + SP_EMB_MODE_CMD, ///< Set point command to set the set point. + T_EMB_MODE_CMD, ///< Self test command. + G_EMB_MODE_CMD, ///< Get self test command. + I_EMB_MODE_CMD, ///< Intensity command. + V_EMB_MODE_CMD, ///< Blood detection level command. + Z_EMB_MODE_CMD, ///< Zero sensor command. + Q_EMB_MODE_CMD, ///< Zero sensor confirm command. + D_EMB_MODE_CMD, ///< Display blood detection command. + C_EMB_MODE_CMD, ///< Calibration sensor command. NUM_OF_EMB_CMDS, ///< Number of embedded mode commands. }; @@ -857,14 +857,14 @@ break; case CS_EMB_MODE_CMD: - case T: - case G: - case I: - case V: - case Z: - case Q: - case D: - case C: + case T_EMB_MODE_CMD: + case G_EMB_MODE_CMD: + case I_EMB_MODE_CMD: + case V_EMB_MODE_CMD: + case Z_EMB_MODE_CMD: + case Q_EMB_MODE_CMD: + case D_EMB_MODE_CMD: + case C_EMB_MODE_CMD: // The requested command is not set point and so update the command sequence buffer. // The first index of calibration command sequence is the requested command in ASCII. bloodLeakEmbModeCmdSquence[ 0 ] = bloodLeakEmbModeCmd[ bloodLeakEmbModeRqstedCmd ].commandASCII; @@ -873,7 +873,7 @@ state = BLOOD_LEAK_CAL_SEND_COMMAND_STATE; break; - case SP: + case SP_EMB_MODE_CMD: prepareSetPointSeq( bloodLeakEmbModeSetPoint ); bloodLeakEmbModeNumOfCmdTries = 0; @@ -904,22 +904,22 @@ switch ( bloodLeakEmbModeRqstedCmd ) { case CS_EMB_MODE_CMD: - case T: - case G: - case I: - case V: - case Z: - case Q: - case D: - case C: + case T_EMB_MODE_CMD: + case G_EMB_MODE_CMD: + case I_EMB_MODE_CMD: + case V_EMB_MODE_CMD: + case Z_EMB_MODE_CMD: + case Q_EMB_MODE_CMD: + case D_EMB_MODE_CMD: + case C_EMB_MODE_CMD: command = bloodLeakEmbModeCmdSquence[ bloodLeakUARTCmdIndex ]; isUARTTxDone = ( bloodLeakUARTCmdIndex <= BLOOD_LEAK_EMB_MODE_STOP_INDEX ? FALSE : TRUE ); isUARTCtrlDone = ( bloodLeakUARTCmdIndex > ( BLOOD_LEAK_EMB_MODE_CMD_SEQ_LENGTH - 1 ) ? TRUE : FALSE ); bloodLeakUARTCmdIndex++; break; - case SP: + case SP_EMB_MODE_CMD: // Check if the current buffer index is less than the buffer length if( bloodLeakUARTCmdIndex < bloodLeakSetPointSeqLength ) { @@ -1228,58 +1228,58 @@ bloodLeakEmbModeCmd[ CS_EMB_MODE_CMD ].length = 5; // Set point command - bloodLeakEmbModeCmd[ SP ].commandASCII = 83; // ASCII for S - bloodLeakEmbModeCmd[ SP ].expChar1 = 88; // ASCII for X (Timeout) - bloodLeakEmbModeCmd[ SP ].expChar2 = 70; // ASCII for F (Fail) - bloodLeakEmbModeCmd[ SP ].length = 1; + bloodLeakEmbModeCmd[ SP_EMB_MODE_CMD ].commandASCII = 83; // ASCII for S + bloodLeakEmbModeCmd[ SP_EMB_MODE_CMD ].expChar1 = 88; // ASCII for X (Timeout) + bloodLeakEmbModeCmd[ SP_EMB_MODE_CMD ].expChar2 = 70; // ASCII for F (Fail) + bloodLeakEmbModeCmd[ SP_EMB_MODE_CMD ].length = 1; // Self test command - bloodLeakEmbModeCmd[ T ].commandASCII = 84; // ASCII for T - bloodLeakEmbModeCmd[ T ].expChar1 = 80; // ASCII for P - bloodLeakEmbModeCmd[ T ].expChar2 = 70; // ASCII for F - bloodLeakEmbModeCmd[ T ].length = 1; + bloodLeakEmbModeCmd[ T_EMB_MODE_CMD ].commandASCII = 84; // ASCII for T + bloodLeakEmbModeCmd[ T_EMB_MODE_CMD ].expChar1 = 80; // ASCII for P + bloodLeakEmbModeCmd[ T_EMB_MODE_CMD ].expChar2 = 70; // ASCII for F + bloodLeakEmbModeCmd[ T_EMB_MODE_CMD ].length = 1; // Get self test command - bloodLeakEmbModeCmd[ G ].commandASCII = 71; // ASCII for G - bloodLeakEmbModeCmd[ G ].expChar1 = 71; - bloodLeakEmbModeCmd[ G ].expChar2 = NU_EMB_MODE_CMD; - bloodLeakEmbModeCmd[ G ].length = 5; + bloodLeakEmbModeCmd[ G_EMB_MODE_CMD ].commandASCII = 71; // ASCII for G + bloodLeakEmbModeCmd[ G_EMB_MODE_CMD ].expChar1 = 71; + bloodLeakEmbModeCmd[ G_EMB_MODE_CMD ].expChar2 = NU_EMB_MODE_CMD; + bloodLeakEmbModeCmd[ G_EMB_MODE_CMD ].length = 5; // Intensity command - bloodLeakEmbModeCmd[ I ].commandASCII = 73; // ASCII for I - bloodLeakEmbModeCmd[ I ].expChar1 = 73; - bloodLeakEmbModeCmd[ I ].expChar2 = NU_EMB_MODE_CMD; - bloodLeakEmbModeCmd[ I ].length = 5; + bloodLeakEmbModeCmd[ I_EMB_MODE_CMD ].commandASCII = 73; // ASCII for I + bloodLeakEmbModeCmd[ I_EMB_MODE_CMD ].expChar1 = 73; + bloodLeakEmbModeCmd[ I_EMB_MODE_CMD ].expChar2 = NU_EMB_MODE_CMD; + bloodLeakEmbModeCmd[ I_EMB_MODE_CMD ].length = 5; // Blood detection command - bloodLeakEmbModeCmd[ V ].commandASCII = 86; // ASCII for V - bloodLeakEmbModeCmd[ V ].expChar1 = 86; - bloodLeakEmbModeCmd[ V ].expChar2 = NU_EMB_MODE_CMD; - bloodLeakEmbModeCmd[ V ].length = 5; + bloodLeakEmbModeCmd[ V_EMB_MODE_CMD ].commandASCII = 86; // ASCII for V + bloodLeakEmbModeCmd[ V_EMB_MODE_CMD ].expChar1 = 86; + bloodLeakEmbModeCmd[ V_EMB_MODE_CMD ].expChar2 = NU_EMB_MODE_CMD; + bloodLeakEmbModeCmd[ V_EMB_MODE_CMD ].length = 5; // Zero sensor command - bloodLeakEmbModeCmd[ Z ].commandASCII = 90; // ASCII for Z - bloodLeakEmbModeCmd[ Z ].expChar1 = 89; // ASCII for Y - bloodLeakEmbModeCmd[ Z ].expChar2 = NU_EMB_MODE_CMD; - bloodLeakEmbModeCmd[ Z ].length = 1; + bloodLeakEmbModeCmd[ Z_EMB_MODE_CMD ].commandASCII = 90; // ASCII for Z + bloodLeakEmbModeCmd[ Z_EMB_MODE_CMD ].expChar1 = 89; // ASCII for Y + bloodLeakEmbModeCmd[ Z_EMB_MODE_CMD ].expChar2 = NU_EMB_MODE_CMD; + bloodLeakEmbModeCmd[ Z_EMB_MODE_CMD ].length = 1; // Zero confirm command - bloodLeakEmbModeCmd[ Q ].commandASCII = 81; // ASCII for Q - bloodLeakEmbModeCmd[ Q ].expChar1 = 80; // ASCII for P - bloodLeakEmbModeCmd[ Q ].expChar2 = 70; // ASCII for F - bloodLeakEmbModeCmd[ Q ].length = 1; + bloodLeakEmbModeCmd[ Q_EMB_MODE_CMD ].commandASCII = 81; // ASCII for Q + bloodLeakEmbModeCmd[ Q_EMB_MODE_CMD ].expChar1 = 80; // ASCII for P + bloodLeakEmbModeCmd[ Q_EMB_MODE_CMD ].expChar2 = 70; // ASCII for F + bloodLeakEmbModeCmd[ Q_EMB_MODE_CMD ].length = 1; // Display blood detection command - bloodLeakEmbModeCmd[ D ].commandASCII = 68; - bloodLeakEmbModeCmd[ D ].expChar1 = 68; // ASCII for D - bloodLeakEmbModeCmd[ D ].expChar2 = NU_EMB_MODE_CMD; - bloodLeakEmbModeCmd[ D ].length = 5; + bloodLeakEmbModeCmd[ D_EMB_MODE_CMD ].commandASCII = 68; + bloodLeakEmbModeCmd[ D_EMB_MODE_CMD ].expChar1 = 68; // ASCII for D + bloodLeakEmbModeCmd[ D_EMB_MODE_CMD ].expChar2 = NU_EMB_MODE_CMD; + bloodLeakEmbModeCmd[ D_EMB_MODE_CMD ].length = 5; // Calibrate command - bloodLeakEmbModeCmd[ C ].commandASCII = 67; - bloodLeakEmbModeCmd[ C ].expChar1 = 67; // ASCII for C - bloodLeakEmbModeCmd[ C ].expChar2 = NU_EMB_MODE_CMD; - bloodLeakEmbModeCmd[ C ].length = 4; + bloodLeakEmbModeCmd[ C_EMB_MODE_CMD ].commandASCII = 67; + bloodLeakEmbModeCmd[ C_EMB_MODE_CMD ].expChar1 = 67; // ASCII for C + bloodLeakEmbModeCmd[ C_EMB_MODE_CMD ].expChar2 = NU_EMB_MODE_CMD; + bloodLeakEmbModeCmd[ C_EMB_MODE_CMD ].length = 4; }