Index: firmware/App/Drivers/PinchValve.c =================================================================== diff -u -r3479c42f6bf13fb6c565cc48ba13936e1ec22be9 -rb5fdf613847ef1da828a3213099fe61ce329491c --- firmware/App/Drivers/PinchValve.c (.../PinchValve.c) (revision 3479c42f6bf13fb6c565cc48ba13936e1ec22be9) +++ firmware/App/Drivers/PinchValve.c (.../PinchValve.c) (revision b5fdf613847ef1da828a3213099fe61ce329491c) @@ -131,7 +131,7 @@ PINCH_VALVE_HOME_CMD_RESET_EVENTS_COMPLETE, ///< Pinch valve home command reset events complete PINCH_VALVE_HOME_CMD_SET_PROFILE_MODE_SECOND, ///< Pinch valve home command set profile mode second PINCH_VALVE_HOME_CMD_SET_VELOCITY_THIRD, ///< Pinch valve home command set velocity third - PINCH_VALVE_HOME_CMD_SET_POSITION_A, + PINCH_VALVE_HOME_CMD_SET_POSITION_A, ///< Pinch valve home command set position A PINCH_VALVE_HOME_CMD_UPDATE_THIRD, ///< Pinch valve home command update third PINCH_VALVE_HOME_CMD_GET_EVENT_STATUS_THIRD, ///< Pinch valve home command get event status third NUM_OF_PINCH_VALVE_HOMING_COMMANDS ///< Number of pinch valve in the homing commands @@ -171,7 +171,7 @@ { PINCH_VALVE_PMD_CMD_GET_ACTUAL_POSITION, 0, 0, 0, 0, 2, FALSE }, // Reads and stores for position C { PINCH_VALVE_PMD_CMD_RESET_EVENT_STATUS, PINCH_VALVE_RESET_EVENT_STATUS_VALUE, 0, 0, 1, 0, TRUE }, // Clears event bits after endpoint detection is complete. { PINCH_VALVE_PMD_CMD_SET_PROFILE_MODE, PINCH_VALVE_PROFILE_MODE_S_CURVE, 0, 0, 1, 0, TRUE }, // Selects the profile mode used to move to position A - { PINCH_VALVE_PMD_CMD_SET_POSITION, 0, 0, 0, 2, 0, TRUE }, // Set calculated Position A + { PINCH_VALVE_PMD_CMD_SET_POSITION, 0, 0, 0, 2, 0, TRUE }, // Set calculated Position A { PINCH_VALVE_PMD_CMD_SET_VELOCITY, 0, 0, 0, 2, 0, TRUE }, // Sets the velocity used to move to position A { PINCH_VALVE_PMD_CMD_UPDATE, 0, 0, 0, 0, 0, TRUE }, // Starts movement to the calculated position A. { PINCH_VALVE_PMD_CMD_GET_EVENT_STATUS, 0, 0, 0, 0, 1, FALSE } // Polls event status until the third movement completes @@ -195,7 +195,7 @@ { PINCH_VALVE_PMD_CMD_GET_ACTUAL_POSITION, 0, 0, 0, 0, 2, FALSE }, // Reads and stores for position C { PINCH_VALVE_PMD_CMD_RESET_EVENT_STATUS, PINCH_VALVE_RESET_EVENT_STATUS_VALUE, 0, 0, 1, 0, TRUE }, // Clears event bits after endpoint detection is complete { PINCH_VALVE_PMD_CMD_SET_PROFILE_MODE, PINCH_VALVE_PROFILE_MODE_S_CURVE, 0, 0, 1, 0, TRUE }, // Selects the profile mode used to move to position A - { PINCH_VALVE_PMD_CMD_SET_POSITION, 0, 0, 0, 2, 0, TRUE }, // Set calculated Position A + { PINCH_VALVE_PMD_CMD_SET_POSITION, 0, 0, 0, 2, 0, TRUE }, // Set calculated Position A { PINCH_VALVE_PMD_CMD_SET_VELOCITY, 0, 0, 0, 2, 0, TRUE }, // Sets the velocity used to move to position A { PINCH_VALVE_PMD_CMD_UPDATE, 0, 0, 0, 0, 0, TRUE }, // Starts movement to the calculated position A. { PINCH_VALVE_PMD_CMD_GET_EVENT_STATUS, 0, 0, 0, 0, 1, FALSE } // Polls event status until the third movement completes Index: firmware/App/Modes/ModePreTreat.c =================================================================== diff -u -r7452a8f8b7049aa76c2c749774f387869cf3c531 -rb5fdf613847ef1da828a3213099fe61ce329491c --- firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision 7452a8f8b7049aa76c2c749774f387869cf3c531) +++ firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision b5fdf613847ef1da828a3213099fe61ce329491c) @@ -24,7 +24,6 @@ #include "Messaging.h" #include "ModePreTreat.h" #include "OperationModes.h" -#include "TaskGeneral.h" #include "StatePreTxHeparinSetup.h" #include "StatePreTxRecirculate.h" #include "SyringePump.h" @@ -344,7 +343,7 @@ if ( submodeCompleteTransitionTimeCounter++ >= SUBMODE_COMPLETE_UI_TRANSITION_TIME_COUNT ) { submodeCompleteTransitionTimeCounter = 0; - state = TD_PRE_TREATMENT_CONFIRM_RX_STATE; + state = TD_PRE_TREATMENT_PRIME_STATE; } } else Index: firmware/App/Modes/ModePreTreat.h =================================================================== diff -u -r8254d0eaea0d25b62e41dc4189ec7cabbcf4c226 -rb5fdf613847ef1da828a3213099fe61ce329491c --- firmware/App/Modes/ModePreTreat.h (.../ModePreTreat.h) (revision 8254d0eaea0d25b62e41dc4189ec7cabbcf4c226) +++ firmware/App/Modes/ModePreTreat.h (.../ModePreTreat.h) (revision b5fdf613847ef1da828a3213099fe61ce329491c) @@ -37,10 +37,10 @@ U32 execPreTreatmentMode( void ); // Execute the pre-treatment mode state machine (call from OperationModes) void signalAlarmActionToPreTreatmentMode( ALARM_ACTION_T action ); // Execute alarm action as appropriate for pre-treatment mode -TD_PRE_TREATMENT_MODE_STATE_T getPreTreatmentSubState( void ); // Get the current pre-treatment sub mode. -void PreTxRequestTubeSetInstall( void ); // Request Pre-Treatment mode to transition to Install state. -void PreTxRequestContinueFromRecirculate( void ); // Request Pre-Treatment mode to transition to Patient Connection state. +TD_PRE_TREATMENT_MODE_STATE_T getPreTreatmentSubState( void ); // Get the current pre-treatment sub mode. void PreTxRequestTubeSetInstall( void ); // Request Pre-Treatment mode to transition to Install state. +void PreTxRequestContinueFromRecirculate( void ); // Request Pre-Treatment mode to transition to Patient Connection state. +void PreTxRequestTubeSetInstall( void ); // Request Pre-Treatment mode to transition to Install state. void PreTxRequestContinueFromRecirculate( void ); // Request Pre-Treatment mode to transition to Confirm Rx. void PreTxRequestContinueFromHeparinSetupRequested(void ); // Request Pre-Treatment mode to transition to Patient Connection state. BOOL handleStartTreatmentRequest ( MESSAGE_T *message ); // Handle UI request to start treatment. Index: firmware/App/Services/DDInterface.c =================================================================== diff -u -r8254d0eaea0d25b62e41dc4189ec7cabbcf4c226 -rb5fdf613847ef1da828a3213099fe61ce329491c --- firmware/App/Services/DDInterface.c (.../DDInterface.c) (revision 8254d0eaea0d25b62e41dc4189ec7cabbcf4c226) +++ firmware/App/Services/DDInterface.c (.../DDInterface.c) (revision b5fdf613847ef1da828a3213099fe61ce329491c) @@ -120,7 +120,7 @@ dialysateDeliveryCmdSet.bicarbConvFactor = 0.0F; dialysateDeliveryCmdSet.sodium = 0; dialysateDeliveryCmdSet.bicarbonate = 0; - //dialysateDeliveryCmdSet.substitutionRate = 0.0F; + dialysateDeliveryCmdSet.substitutionRate = 0.0F; } /**********************************************************************//** @@ -401,7 +401,7 @@ dialysateDeliveryCmdSet.bicarbConvFactor = bicarbConvFactor; dialysateDeliveryCmdSet.sodium = sodium; dialysateDeliveryCmdSet.bicarbonate = bicarbonate; - //dialysateDeliveryCmdSet.substitutionRate = 0.0F; + dialysateDeliveryCmdSet.substitutionRate = 0.0F; #ifndef TEST_UI_ONLY sendMessage( MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA, COMM_BUFFER_OUT_CAN_TD_2_DD, (U08*)(&dialysateDeliveryCmdSet), sizeof( DIALYSATE_DELIVERY_REQ_PAYLOAD_T ) ); @@ -644,7 +644,7 @@ { if ( TRUE == dialysateDeliveryCmdSet.start ) { - //dialysateDeliveryCmdSet.substitutionRate = qs; + dialysateDeliveryCmdSet.substitutionRate = qs; #ifndef TEST_UI_ONLY sendMessage( MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA, COMM_BUFFER_OUT_CAN_TD_2_DD, (U08*)(&dialysateDeliveryCmdSet), sizeof( DIALYSATE_DELIVERY_REQ_PAYLOAD_T ) ); Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r3479c42f6bf13fb6c565cc48ba13936e1ec22be9 -rb5fdf613847ef1da828a3213099fe61ce329491c --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 3479c42f6bf13fb6c565cc48ba13936e1ec22be9) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision b5fdf613847ef1da828a3213099fe61ce329491c) @@ -16,6 +16,7 @@ ***************************************************************************/ #include // For memcpy() + #include "AirPump.h" #include "AirTrap.h" #include "AlarmMgmt.h" Index: firmware/App/Services/StateServices/DrySelfTests.c =================================================================== diff -u -r4bf6628bf0a34cb227cbb1adf9226cf1b7e128a4 -rb5fdf613847ef1da828a3213099fe61ce329491c --- firmware/App/Services/StateServices/DrySelfTests.c (.../DrySelfTests.c) (revision 4bf6628bf0a34cb227cbb1adf9226cf1b7e128a4) +++ firmware/App/Services/StateServices/DrySelfTests.c (.../DrySelfTests.c) (revision b5fdf613847ef1da828a3213099fe61ce329491c) @@ -1002,7 +1002,6 @@ case DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE: { - U32 targetDialysateFlowMLPM = (F32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ); signalBloodPumpHardStop(); @@ -1124,7 +1123,6 @@ break; case DRY_SELF_TESTS_STOPPED_STATE: - { signalBloodPumpHardStop(); setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF ); // Set valves to stop @@ -1134,7 +1132,6 @@ setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT ); setAlarmResumePerDoor(); doorClosedRequired( FALSE ); - } break; default: