Index: firmware/App/Modes/ModeDrain.c =================================================================== diff -u -r721bd715bef050760e5c0f79044d1cba642c8354 -r542a50ea0f1958b02ddc8f1824eb534686616e7c --- firmware/App/Modes/ModeDrain.c (.../ModeDrain.c) (revision 721bd715bef050760e5c0f79044d1cba642c8354) +++ firmware/App/Modes/ModeDrain.c (.../ModeDrain.c) (revision 542a50ea0f1958b02ddc8f1824eb534686616e7c) @@ -66,7 +66,6 @@ #define ACID_PERCENT_FILL 0.02222F ///< Acid volume percentage of reservoir volume. #define DATA_PUBLISH_COUNTER_START_COUNT 70 ///< Data publish counter start count. #define DRAIN_MODE_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the drain mode data is published on the CAN bus. -#define MIN_CONCENTRATE_VOLUME_ML 500.0F ///< Minimum concentrate volume in milliliters. // ********** private data ********** @@ -276,18 +275,8 @@ // if we have reached our target drain to volume (by weight) or cannot drain anymore, we are done draining - go back to generation idle mode if ( TRUE == drainStatus ) { - DG_ACID_CONCENTRATES_RECORD_T acid; - F32 acidBottleVolML; - DG_BICARB_CONCENTRATES_RECORD_T bicarb; - F32 bicarbBottleVolML; - - getAcidConcentrateCalRecord( &acid ); - getBicarbConcentrateCalRecord( &bicarb ); signalDrainPumpHardStop(); - acidBottleVolML = acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidFullBottleVolumeML; - bicarbBottleVolML = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbStartVolumeML; - if ( DG_RESERVOIR_1 == inactiveReservoir ) { setValveState( VRD1, VALVE_STATE_CLOSED ); @@ -297,36 +286,6 @@ setValveState( VRD2, VALVE_STATE_CLOSED ); } -#ifndef _RELEASE_ - if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_EMPTY_BOTTLES_ALARM ) != SW_CONFIG_ENABLE_VALUE ) -#endif - { - HD_MODE_SUB_MODE_T hdMode; - - getHDOperationMode( &hdMode ); - - // Detect empty bottles using integrated volumes - if ( ( ( acidBottleVolML - getChemicalUsedVolumeML( ACID ) ) <= MIN_CONCENTRATE_VOLUME_ML ) && // SRSDG 836 - ( hdMode.hdMode != MODE_POST ) && // don't care about concentrates after treatment complete - ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) ) - { - resetChemicalUsedVolumeML( ACID ); - setThisFirstFillFlag( TRUE ); // indicates bottles need prime - activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ); - activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT ); - } - - if ( ( ( bicarbBottleVolML - getChemicalUsedVolumeML( BICARB ) ) <= MIN_CONCENTRATE_VOLUME_ML ) && // SRSDG 837 - ( hdMode.hdMode != MODE_POST ) && // don't care about concentrates after treatment complete - ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) ) - { - resetChemicalUsedVolumeML( BICARB ); - setThisFirstFillFlag( TRUE ); - activateAlarmNoData( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ); - activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT ); - } - } - if ( TRUE == isReservoirTarePending() ) { // Tare reservoir load cells at empty if requested result = DG_DRAIN_STATE_TARE; Index: firmware/App/Modes/ModeFill.c =================================================================== diff -u -r6e2201a24809b6d718f327ff9d92251eca9a7375 -r542a50ea0f1958b02ddc8f1824eb534686616e7c --- firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 6e2201a24809b6d718f327ff9d92251eca9a7375) +++ firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 542a50ea0f1958b02ddc8f1824eb534686616e7c) @@ -172,8 +172,6 @@ static DIALIN_FILL_FOR_CAL_CHECK_T dialinFillForCalCheck = DIALIN_FILL_FOR_CAL_NONE; ///< Dialin fill for calibration check. // NOTE: this variable should be initialized here because the init function is called every time and then this variable is set to 0.0. static F32 roRejectionRatioFromHD = 0.0F; ///< RO rejection ratio from HD. -static OVERRIDE_F32_T usedAcidVolumeML = { 0.0, 0.0, 0.0, 0.0 }; ///< The integrated acid concentration volume has been used in mL. -static OVERRIDE_F32_T usedBicarbVolumeML = { 0.0, 0.0, 0.0, 0.0 }; ///< The integrated bicarb concentration volume has been used in mL. static OVERRIDE_U32_T fillModeDataPublishInterval = { FILL_MODE_DATA_PUB_INTERVAL, FILL_MODE_DATA_PUB_INTERVAL, 0, 0 }; ///< Interval (in ms) at which to publish fill mode data to CAN bus. static OVERRIDE_F32_T integratedVolumeML = { 0.0, 0.0, 0.0, 0.0 }; ///< Total RO flow rate over period of time. @@ -195,7 +193,6 @@ static void handleDialysateMixing( F32 measuredROFlowRate_mL_min, F32 acidMixingRatio, F32 bicarbMixingRatio ); static BOOL isValueWithinPercentRange( F32 testValue, F32 baseValue, F32 percentFactor ); static void publishFillModeData( void ); -static void updateChemicalsUsage( void ); /*********************************************************************//** * @brief @@ -354,7 +351,6 @@ { checkDialysateTemperatureSensors(); setHeaterTargetTemperature( DG_PRIMARY_HEATER, getPrimaryHeaterTargetTemperature() ); - updateChemicalsUsage(); if ( fillState != DG_FILL_MODE_STATE_PAUSED ) { @@ -498,60 +494,6 @@ /*********************************************************************//** * @brief - * The getChemicalUsedVolumeML function returns the consumed volume of the called - * chemical bottle in milliliters. - * @details Inputs: none - * @details Outputs: none - * @param bottle which the type of bottle (acid or bicarb) can be specified - * @return used chemical volume in millilters - *************************************************************************/ -F32 getChemicalUsedVolumeML( CHEMICAL_BOTTLES_T bottle ) -{ - F32 volume; - - if ( ACID == bottle ) - { - volume = getF32OverrideValue( &usedAcidVolumeML ); - } - else if ( BICARB == bottle ) - { - volume = getF32OverrideValue( &usedBicarbVolumeML ); - } - else - { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CHEMICAL_BOTTLE_SELECTED, bottle ) - } - - return volume; -} - -/*********************************************************************//** - * @brief - * The resetChemicalUsedVolumeML function resets the used volume of a chemical - * bottle. - * @details Inputs: none - * @details Outputs: none - * @param bottle which the type of bottle (acid or bicarb) can be specified - * @return none - *************************************************************************/ -void resetChemicalUsedVolumeML( CHEMICAL_BOTTLES_T bottle ) -{ - if ( ACID == bottle ) - { - usedAcidVolumeML.data = 0.0F; - } - else if ( BICARB == bottle ) - { - usedBicarbVolumeML.data = 0.0F; - } - else - { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CHEMICAL_BOTTLE_SELECTED, bottle ) - } -} - -/*********************************************************************//** - * @brief * The setThisFisrtFillFlag function sets the boolean flag that indicates * the acid and bicarb bottle need priming. * @details Inputs: none @@ -1012,8 +954,6 @@ { setBadAvgConductivityDetectedFlag( TRUE ); // signal idle bad avg conductivity detected setThisFirstFillFlag( TRUE ); - resetChemicalUsedVolumeML( BICARB ); - resetChemicalUsedVolumeML( ACID ); SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_FILL_CONDUCTIVITY_OUT_OF_RANGE, avgBicarbConduSPerCM, bicarbNormalConduSPerCM ); // trigger replace bottles alarm #1 clearAlarm( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT ); // clear this alarm before triggering in case previous fill was bad and still active from before activateAlarmNoData ( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT ); @@ -1327,8 +1267,8 @@ fillModeData.averageBicarbConductivity = averageBicarbConductivity; fillModeData.isThisTheFirstFill = isThisTheFirstFill(); fillModeData.pctDiffInConductivity = pctDiffInConductivity; - fillModeData.usedAcidVolumeML = getChemicalUsedVolumeML( ACID ); - fillModeData.usedBicarbVolumeML = getChemicalUsedVolumeML( BICARB ); + fillModeData.usedAcidVolumeML = 0.0F; + fillModeData.usedBicarbVolumeML = 0.0F; fillModeData.integratedVolumeML = getIntegratedVolumeML(); fillModeData.roOnlyModeStatus = (U32)isROOnlyModeEnabled(); fillModeData.badFillSignal = getCurrentBadFillSignal(); @@ -1340,123 +1280,13 @@ } } -/*********************************************************************//** - * @brief - * The updateChemicalsUsage function updates the used acid and bicarb volumes. - * @details Inputs: usedAcidVolumeML, usedBicarbVolumeML - * @details Outputs: none - * @return none - *************************************************************************/ -static void updateChemicalsUsage( void ) -{ - usedAcidVolumeML.data += getMeasuredPumpSpeedMLPM( CONCENTRATEPUMPS_CP1_ACID ) * FLOW_INTEGRATOR; - usedBicarbVolumeML.data += getMeasuredPumpSpeedMLPM( CONCENTRATEPUMPS_CP2_BICARB ) * FLOW_INTEGRATOR; -} - /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/ - /*********************************************************************//** * @brief - * The testSetUsedAcidVolumeMLOverride function overrides the - * acid volume. - * @details Inputs: used acid volume - * @details Outputs: used acid volume - * @param value override used acid volume in mL - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testSetUsedAcidVolumeMLOverride( F32 value ) -{ - BOOL result = FALSE; - - if ( TRUE == isTestingActivated() ) - { - usedAcidVolumeML.ovInitData = usedAcidVolumeML.data; - usedAcidVolumeML.ovData = value; - usedAcidVolumeML.override = OVERRIDE_KEY; - result = TRUE; - } - - return result; -} - -/*********************************************************************//** - * @brief - * The testResetUsedAcidVolumeMLOverride function resets the override - * of the used acid volume. - * @details Inputs: used acid volume - * @details Outputs: used acid volume - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testResetUsedAcidVolumeMLOverride( void ) -{ - BOOL result = FALSE; - - if ( TRUE == isTestingActivated() ) - { - usedAcidVolumeML.data = usedAcidVolumeML.ovInitData; - usedAcidVolumeML.override = OVERRIDE_RESET; - usedAcidVolumeML.ovInitData = 0.0F; - usedAcidVolumeML.ovData = 0.0F; - result = TRUE; - } - - return result; -} - -/*********************************************************************//** - * @brief - * The testSetUsedBicarbVolumeMLOverride function overrides the - * bicarb volume. - * @details Inputs: used bicarb volume - * @details Outputs: used bicarb volume - * @param value override used bicarb volume in mL - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testSetUsedBicarbVolumeMLOverride( F32 value ) -{ - BOOL result = FALSE; - - if ( TRUE == isTestingActivated() ) - { - usedBicarbVolumeML.ovInitData = usedBicarbVolumeML.data; - usedBicarbVolumeML.ovData = value; - usedBicarbVolumeML.override = OVERRIDE_KEY; - result = TRUE; - } - - return result; -} - -/*********************************************************************//** - * @brief - * The testResetUsedBicarbVolumeMLOverride function resets the override - * of the used bicarb volume. - * @details Inputs: used bicarb volume - * @details Outputs: used bicarb volume - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testResetUsedBicarbVolumeMLOverride( void ) -{ - BOOL result = FALSE; - - if ( TRUE == isTestingActivated() ) - { - usedBicarbVolumeML.data = usedBicarbVolumeML.ovInitData; - usedBicarbVolumeML.override = OVERRIDE_RESET; - usedBicarbVolumeML.ovInitData = 0.0F; - usedBicarbVolumeML.ovData = 0.0F; - result = TRUE; - } - - return result; -} - -/*********************************************************************//** - * @brief * The testSetFillModeDataPublishIntervalOverride function overrides the * fill mode data publish interval. * @details Inputs: FillModeDataPublishInterval Index: firmware/App/Modes/ModeFill.h =================================================================== diff -u -r30cbd9ff622e635f16df3801aabeb15dfaf5fff5 -r542a50ea0f1958b02ddc8f1824eb534686616e7c --- firmware/App/Modes/ModeFill.h (.../ModeFill.h) (revision 30cbd9ff622e635f16df3801aabeb15dfaf5fff5) +++ firmware/App/Modes/ModeFill.h (.../ModeFill.h) (revision 542a50ea0f1958b02ddc8f1824eb534686616e7c) @@ -71,22 +71,13 @@ BOOL isThisTheFirstFill( void ); -F32 getChemicalUsedVolumeML( CHEMICAL_BOTTLES_T bottle ); -void resetChemicalUsedVolumeML( CHEMICAL_BOTTLES_T bottle ); - void setROMode( BOOL enableROOnlyMode ); BOOL isROOnlyModeEnabled( void ); void setAcidAndBicarbType( U32 acid, U32 bicarb ); void setRORejectionRatio( F32 roRejectionRatio ); -BOOL testSetUsedAcidVolumeMLOverride( F32 value ); -BOOL testResetUsedAcidVolumeMLOverride( void ); - -BOOL testSetUsedBicarbVolumeMLOverride( F32 value ); -BOOL testResetUsedBicarbVolumeMLOverride( void ); - BOOL testSetFillModeDataPublishIntervalOverride( U32 value ); BOOL testResetFillModeDataPublishIntervalOverride( void ); Index: firmware/App/Modes/ModeGenIdle.c =================================================================== diff -u -r721bd715bef050760e5c0f79044d1cba642c8354 -r542a50ea0f1958b02ddc8f1824eb534686616e7c --- firmware/App/Modes/ModeGenIdle.c (.../ModeGenIdle.c) (revision 721bd715bef050760e5c0f79044d1cba642c8354) +++ firmware/App/Modes/ModeGenIdle.c (.../ModeGenIdle.c) (revision 542a50ea0f1958b02ddc8f1824eb534686616e7c) @@ -59,9 +59,6 @@ // NOTE: the bad fill state must be initialized here and not in the transition function since in case of a bad fill, the transition function is called // several times to drain and fill and handle a bad fill. static DG_GEN_IDLE_MODE_BAD_FILL_STATE_T badFillState = DG_HANDLE_BAD_FILL_STATE_START; ///< Initialize bad fill sub-state. -// NOTE: the empty bottle flag must be initialized here and not in transition function since this flag must be set to false once the empty bottle -// fill is finished. -static BOOL handleEmptyBottleFlag = FALSE; ///< Internal siganl flag to handle empty bottle flag. static U32 hdLostCommStartTime_ms; ///< Lost communication with HD start time in ms. static BOOL handleBadFillFlag; ///< Internal signal flag to handle bad fill. static OVERRIDE_U32_T genIdleDataPublicationInterval = { BAD_FILL_SUBSTATES_PUB_INTERVAL, @@ -267,8 +264,8 @@ * @brief * The handleIdleStartState function executes the start state of the * generation idle mode state machine. - * @details Inputs: handleEmptyBottleFlag - * @details Outputs: handleEmptyBottleFlag, handleBadFillFlag, badFillState + * @details Inputs: handleBadFillFlag + * @details Outputs: handleBadFillFlag, badFillState * @return the next state *************************************************************************/ static DG_GEN_IDLE_MODE_STATE_T handleIdleStartState( void ) @@ -283,14 +280,6 @@ { badFillState = DG_HANDLE_BAD_FILL_STATE_START; result = DG_GEN_IDLE_MODE_STATE_FLUSH_WATER; - - if ( ( TRUE == handleEmptyBottleFlag ) && ( DG_MODE_FILL == getPreviousOperationMode() ) ) - { - // If the previous mode was fill and the empty bottle flag was TRUE, set it to FALSE and clear the informative alarm - // Done with the empty bottle handling - handleEmptyBottleFlag = FALSE; - clearAlarmCondition( ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT ); - } } return result; @@ -300,28 +289,14 @@ * @brief * The handleFlushWaterState function executes the flush water state * generation idle mode state machine. - * @details Inputs: handleEmptyBottleFlag - * @details Outputs: handleEmptyBottleFlag + * @details Inputs: none + * @details Outputs: none * @return the next state *************************************************************************/ static DG_GEN_IDLE_MODE_STATE_T handleFlushWaterState( void ) { DG_GEN_IDLE_MODE_STATE_T result = DG_GEN_IDLE_MODE_STATE_FLUSH_WATER; - if ( ( TRUE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) || ( TRUE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) ) - { - // The empty bottle alarms are active set the empty bottle alarm to TRUE. - handleEmptyBottleFlag = TRUE; - } - - if ( ( TRUE == handleEmptyBottleFlag ) && - ( isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) != TRUE ) && - ( isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) != TRUE ) ) - { - // User acknowledged empty conc bottle alarm(s) and so time to start a fill - startFillCmd( getTargetFillVolumeML(), getTargetFillFlowRateLPM() ); - } - return result; } Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r8a89e041755b26fad2530e1b8ad2cfeed1937b0a -r542a50ea0f1958b02ddc8f1824eb534686616e7c --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 8a89e041755b26fad2530e1b8ad2cfeed1937b0a) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 542a50ea0f1958b02ddc8f1824eb534686616e7c) @@ -264,9 +264,6 @@ { pendingStartDGRequest = FALSE; signalSyncToHD(); - // About to start a treatment reset the chemical bottles volumes (regardless whether the user has inserted new bottles) - resetChemicalUsedVolumeML( BICARB ); - resetChemicalUsedVolumeML( ACID ); requestNewOperationMode( DG_MODE_GENE ); } else if ( TRUE == pendingStartDGFlushRequest ) Index: firmware/App/Services/AlarmMgmtSWFaults.h =================================================================== diff -u -r721bd715bef050760e5c0f79044d1cba642c8354 -r542a50ea0f1958b02ddc8f1824eb534686616e7c --- firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision 721bd715bef050760e5c0f79044d1cba642c8354) +++ firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision 542a50ea0f1958b02ddc8f1824eb534686616e7c) @@ -131,7 +131,7 @@ SW_FAULT_ID_SAFETY_SHUTDOWN_INVALID_SELF_TEST_STATE, // 100 SW_FAULT_ID_PHANTOM_INTERRUPT, SW_FAULT_ID_ILLEGAL_MEM_ACCESS, - SW_FAULT_ID_INVALID_CHEMICAL_BOTTLE_SELECTED, + SW_FAULT_ID_INVALID_AVAILABLE_1, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED, SW_FAULT_ID_INVALID_FLOW_SENSOR_SELECTED, // 105 SW_FAULT_ID_INVALID_SERVICE_STATE_SELECTED, Index: firmware/App/Services/Reservoirs.c =================================================================== diff -u -r721bd715bef050760e5c0f79044d1cba642c8354 -r542a50ea0f1958b02ddc8f1824eb534686616e7c --- firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 721bd715bef050760e5c0f79044d1cba642c8354) +++ firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 542a50ea0f1958b02ddc8f1824eb534686616e7c) @@ -376,12 +376,6 @@ { fillVolumeTargetMl.data = fillToVolMl; cmdResponse.rejected = FALSE; - - if ( ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) && // reject moving to fill mode if - ( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) ) // alarm is active - { - requestNewOperationMode( DG_MODE_FILL ); - } } else { Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -r30cbd9ff622e635f16df3801aabeb15dfaf5fff5 -r542a50ea0f1958b02ddc8f1824eb534686616e7c --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 30cbd9ff622e635f16df3801aabeb15dfaf5fff5) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 542a50ea0f1958b02ddc8f1824eb534686616e7c) @@ -1240,14 +1240,6 @@ handleTestFansRPMAlarmStartTimeOffsetRequest( message ); break; - case MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE: - handleTestUsedAcidVolumeMLOverrideRequest( message ); - break; - - case MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE: - handleTestUsedBicarbVolumeMLOverrideRequest( message ); - break; - #ifndef _RELEASE_ case MSG_ID_DG_GET_SW_CONFIG_RECORD: handleGetDGSoftwareConfigRecord( message ); Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r30cbd9ff622e635f16df3801aabeb15dfaf5fff5 -r542a50ea0f1958b02ddc8f1824eb534686616e7c --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 30cbd9ff622e635f16df3801aabeb15dfaf5fff5) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 542a50ea0f1958b02ddc8f1824eb534686616e7c) @@ -3921,38 +3921,6 @@ } /*********************************************************************//** - * @brief - * The handleTestUsedAcidVolumeMLOverrideRequest function handles a - * request to override the acid volume. - * @details Inputs: none - * @details Outputs: message handled - * @param message : a pointer to the message to handle - * @return none - *************************************************************************/ -void handleTestUsedAcidVolumeMLOverrideRequest( MESSAGE_T *message ) -{ - TEST_OVERRIDE_PAYLOAD_T payload; - BOOL result = FALSE; - - // Verify payload length - if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen ) - { - memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) ); - if ( FALSE == payload.reset ) - { - result = testSetUsedAcidVolumeMLOverride( payload.state.f32 ); - } - else - { - result = testResetUsedAcidVolumeMLOverride(); - } - } - - // Respond to request - sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); -} - -/*********************************************************************//** * The handleSetFansDutyCycleOverrideRequest function handles a * request to override the fans duty cycle. * @details Inputs: none @@ -3984,38 +3952,6 @@ sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); } -/*********************************************************************//** - * @brief - * The handleTestUsedBicarbVolumeMLOverrideRequest function handles a - * request to override the used bicarb volume. - * @details Inputs: none - * @details Outputs: message handled - * @param message : a pointer to the message to handle - * @return none - *************************************************************************/ -void handleTestUsedBicarbVolumeMLOverrideRequest( MESSAGE_T *message ) -{ - TEST_OVERRIDE_PAYLOAD_T payload; - BOOL result = FALSE; - - // Verify payload length - if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen ) - { - memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) ); - if ( FALSE == payload.reset ) - { - result = testSetUsedBicarbVolumeMLOverride( payload.state.f32 ); - } - else - { - result = testResetUsedBicarbVolumeMLOverride(); - } - } - - // Respond to request - sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); -} - #ifndef _RELEASE_ /*********************************************************************//** * @brief Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r30cbd9ff622e635f16df3801aabeb15dfaf5fff5 -r542a50ea0f1958b02ddc8f1824eb534686616e7c --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 30cbd9ff622e635f16df3801aabeb15dfaf5fff5) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 542a50ea0f1958b02ddc8f1824eb534686616e7c) @@ -406,12 +406,6 @@ // MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET void handleTestFansRPMAlarmStartTimeOffsetRequest( MESSAGE_T *message ); -// MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE -void handleTestUsedAcidVolumeMLOverrideRequest(MESSAGE_T *message); - -// MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE -void handleTestUsedBicarbVolumeMLOverrideRequest(MESSAGE_T *message); - // MSG_ID_DG_FANS_DUTY_CYCLE_OVERRIDE void handleSetFansDutyCycleOverrideRequest( MESSAGE_T *message );