Fisheye: Tag eff7b1575f008f81b29ef906f6346fac6012d3ab refers to a dead (removed) revision in file `.gitignore'. Fisheye: No comparison available. Pass `N' to diff? Index: firmware/App/Modes/ModeFill.c =================================================================== diff -u -rfd0e359b0ee4b3efdf25ac1fd619f85fffef67b7 -r6d5a23b275903587f400bc686aed4d2709cf3e78 --- firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision fd0e359b0ee4b3efdf25ac1fd619f85fffef67b7) +++ firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 6d5a23b275903587f400bc686aed4d2709cf3e78) @@ -7,8 +7,8 @@ * * @file ModeFill.c * - * @date 19-Sep-2019 - * @author Leonardo Baloa + * @date 19-Nov-2019 + * @author L. Baloa * * @brief Top-level state machine for the fill mode. * Index: firmware/App/Modes/ModeFill.h =================================================================== diff -u -rfd0e359b0ee4b3efdf25ac1fd619f85fffef67b7 -r6d5a23b275903587f400bc686aed4d2709cf3e78 --- firmware/App/Modes/ModeFill.h (.../ModeFill.h) (revision fd0e359b0ee4b3efdf25ac1fd619f85fffef67b7) +++ firmware/App/Modes/ModeFill.h (.../ModeFill.h) (revision 6d5a23b275903587f400bc686aed4d2709cf3e78) @@ -8,7 +8,7 @@ * @file FillMode.h * * @date 19-Nov-2019 - * @author Leonardo Baloa + * @author L. Baloa * * @brief Header file for Fill Mode. * Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -rfd0e359b0ee4b3efdf25ac1fd619f85fffef67b7 -r6d5a23b275903587f400bc686aed4d2709cf3e78 --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision fd0e359b0ee4b3efdf25ac1fd619f85fffef67b7) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 6d5a23b275903587f400bc686aed4d2709cf3e78) @@ -7,8 +7,8 @@ * * @file ModeInitPOST.c * - * @date 19-Sep-2019 - * @author S. Nash + * @date 11-Dec-2019 + * @author L. Baloa * * @brief Top-level state machine for the initialize & POST mode. * Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -rfd0e359b0ee4b3efdf25ac1fd619f85fffef67b7 -r6d5a23b275903587f400bc686aed4d2709cf3e78 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision fd0e359b0ee4b3efdf25ac1fd619f85fffef67b7) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 6d5a23b275903587f400bc686aed4d2709cf3e78) @@ -7,8 +7,8 @@ * * @file ModeStandby.c * - * @date 19-Sep-2019 - * @author S. Nash + * @date 11-Dec-2019 + * @author L. Baloa * * @brief Top-level state machine for the standby mode. * Index: firmware/App/Modes/ModeStandby.h =================================================================== diff -u -reff7b1575f008f81b29ef906f6346fac6012d3ab -r6d5a23b275903587f400bc686aed4d2709cf3e78 --- firmware/App/Modes/ModeStandby.h (.../ModeStandby.h) (revision eff7b1575f008f81b29ef906f6346fac6012d3ab) +++ firmware/App/Modes/ModeStandby.h (.../ModeStandby.h) (revision 6d5a23b275903587f400bc686aed4d2709cf3e78) @@ -7,8 +7,8 @@ * * @file ModeStandby.h * - * @date 19-Sep-2019 - * @author S. Nash + * @date 11-Dec-2019 + * @author L. Baloa * * @brief Header file for Standby Mode. * Index: firmware/App/Modes/OperationModes.c =================================================================== diff -u -rfd0e359b0ee4b3efdf25ac1fd619f85fffef67b7 -r6d5a23b275903587f400bc686aed4d2709cf3e78 --- firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision fd0e359b0ee4b3efdf25ac1fd619f85fffef67b7) +++ firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision 6d5a23b275903587f400bc686aed4d2709cf3e78) @@ -7,8 +7,8 @@ * * @file OperationModes.c * - * @date 19-Sep-2019 - * @author S. Nash + * @date 11-Dec-2019 + * @author L. Baloa * * @brief Top-level state machine for the HD operation modes. * Index: firmware/App/Modes/OperationModes.h =================================================================== diff -u -rfd0e359b0ee4b3efdf25ac1fd619f85fffef67b7 -r6d5a23b275903587f400bc686aed4d2709cf3e78 --- firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision fd0e359b0ee4b3efdf25ac1fd619f85fffef67b7) +++ firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision 6d5a23b275903587f400bc686aed4d2709cf3e78) @@ -7,8 +7,8 @@ * * @file OperationModes.h * - * @date 19-Sep-2019 - * @author S. Nash + * @date 11-Dec-2019 + * @author L. Baloa * * @brief Header file for Operation Modes. * Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -r88b7f489c8da945997f1516600a30032393f5088 -r6d5a23b275903587f400bc686aed4d2709cf3e78 --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 88b7f489c8da945997f1516600a30032393f5088) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 6d5a23b275903587f400bc686aed4d2709cf3e78) @@ -633,8 +633,6 @@ handleDGFillStartStopMessages( message ); break; - - case MSG_ID_TESTER_LOGIN_REQUEST: handleTesterLogInRequest( message ); break; Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r88b7f489c8da945997f1516600a30032393f5088 -r6d5a23b275903587f400bc686aed4d2709cf3e78 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 88b7f489c8da945997f1516600a30032393f5088) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 6d5a23b275903587f400bc686aed4d2709cf3e78) @@ -167,14 +167,18 @@ #endif // If we start therapy - if (message->cargo[0] == START && getCurrentOperationMode() == MODE_STAN) { + if (message->cargo[0] == START && getCurrentOperationMode() == MODE_STAN) + { requestNewOperationMode(MODE_FILL); sendTestAckResponseMsg((MSG_ID_T)message->hdr.msgID, TRUE); } // We can only stop fill if we are in fill mode - else if (message->cargo[0] == STOP && getCurrentOperationMode() == MODE_FILL) { + else if (message->cargo[0] == STOP && getCurrentOperationMode() == MODE_FILL) + { requestNewOperationMode(MODE_STAN); sendTestAckResponseMsg((MSG_ID_T)message->hdr.msgID, TRUE); - } else { + } + else + { // TODO: Print to log that either start was called when t he machine was not // in standby or that stop was called when the machine was not in fill sendTestAckResponseMsg((MSG_ID_T)message->hdr.msgID, FALSE); Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r83b1a65b576994e1f8e1476629d8f1277cd67720 -r6d5a23b275903587f400bc686aed4d2709cf3e78 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 83b1a65b576994e1f8e1476629d8f1277cd67720) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 6d5a23b275903587f400bc686aed4d2709cf3e78) @@ -26,8 +26,8 @@ { MSG_ID_UNUSED = 0, MSG_ID_OFF_BUTTON_PRESS, - MSD_ID_DG_FILL_START_STOP =1000, - MSG_ID_FIRST_TESTER_MESSAGE = 8000, + MSD_ID_DG_FILL_START_STOP =0xA000, + MSG_ID_FIRST_TESTER_MESSAGE = 0xA100, MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TESTER_MESSAGE, MSG_ID_HD_MESSAGE, MSG_ID_OFF_BUTTON_STATE_OVERRIDE,