Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r45cc119e54711893ccc2b9d600412b8f51b7764f -r54b9a7699a46c0fde39b4d1a20b9f362bab435af --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 54b9a7699a46c0fde39b4d1a20b9f362bab435af) @@ -222,7 +222,7 @@ // Pre-Treatment // Create Parameters // Pre-Treatment Initiate Treatment - {Gui::GuiActionType::ID_AdjustInitTreatmentReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustInitTreatmentReq , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_AdjustInitTreatmentRsp , 2 * 4 }, // 2 parameters each 4bytes // Pre-Treatment Treatment Parameters Validation/Confirm {Gui::GuiActionType::ID_AdjustParametersValidationReq , 25 * 4 }, //25 parameters each 4bytes Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp =================================================================== diff -u -rac290dfdbd332fafc7a70ad7f78a21ef15e7f82e -r54b9a7699a46c0fde39b4d1a20b9f362bab435af --- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision ac290dfdbd332fafc7a70ad7f78a21ef15e7f82e) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision 54b9a7699a46c0fde39b4d1a20b9f362bab435af) @@ -147,14 +147,12 @@ ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_PAUSED_STATE ) ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_STOP_STATE ) ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_RUN_ADDITIONAL_STATE ) - ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_RECONNECT_PATIENT_STATE ) ENUM_CHECK_C( GuiRinsebackStates, NUM_OF_RINSEBACK_STATES ) } ENUM_READ ( GuiRinsebackStates, RINSEBACK_STOP_INIT_STATE , rbInit ); ENUM_READ ( GuiRinsebackStates, RINSEBACK_RUN_STATE , rbRun ); ENUM_READ ( GuiRinsebackStates, RINSEBACK_PAUSED_STATE , rbPaused ); ENUM_READ ( GuiRinsebackStates, RINSEBACK_STOP_STATE , rbStop ); ENUM_READ ( GuiRinsebackStates, RINSEBACK_RUN_ADDITIONAL_STATE , rbAdditional ); - ENUM_READ ( GuiRinsebackStates, RINSEBACK_RECONNECT_PATIENT_STATE , rbReconnect ); } txRinseback ( mRinseback ); // it's the main rinseback event so moved last to have all the sub-rinseback-states updated prior to. Index: sources/view/td/data/treatment/VTDTreatmentStatesData.h =================================================================== diff -u -rac290dfdbd332fafc7a70ad7f78a21ef15e7f82e -r54b9a7699a46c0fde39b4d1a20b9f362bab435af --- sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision ac290dfdbd332fafc7a70ad7f78a21ef15e7f82e) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision 54b9a7699a46c0fde39b4d1a20b9f362bab435af) @@ -98,7 +98,6 @@ PROPERTY( bool , rbPaused , false) ///< RINSEBACK_PAUSED_STATE = 2 # Rinseback paused state of the rinseback sub-mode state machine PROPERTY( bool , rbStop , false) ///< RINSEBACK_STOP_STATE = 3 # Rinseback stopped (done) state of the rinseback sub-mode state machine PROPERTY( bool , rbAdditional , false) ///< RINSEBACK_RUN_ADDITIONAL_STATE = 4 # Additional rinseback volume (10 mL) state of the rinseback sub-mode state machine - PROPERTY( bool , rbReconnect , false) ///< RINSEBACK_RECONNECT_PATIENT_STATE = 5 # Rinseback reconnect state of the rinseback sub-mode state machine // Recirculate states PROPERTY( bool , rcDisconnect , true ) ///< TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE = 0 # Disconnect patient state of the treatment re-circulate sub-mode state machine