Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r7d293e18ea5ac0fce443c68525100e44df80b4fd -r894d80dda120f7b319c212dd1857f203daa27b07 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 7d293e18ea5ac0fce443c68525100e44df80b4fd) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 894d80dda120f7b319c212dd1857f203daa27b07) @@ -176,6 +176,7 @@ { if( heater < NUM_OF_DG_HEATERS ) { +#ifndef DISABLE_HEATERS_AND_TEMPS // Assume the target temperature has not changed heatersStatus[ heater ].hasTargetTempChanged = FALSE; @@ -186,6 +187,7 @@ heatersStatus[ heater ].hasTargetTempChanged = TRUE; // TODO alarm if temperature if out of range or just reject? } +#endif } else { @@ -217,13 +219,16 @@ { BOOL status = FALSE; + if( heater < NUM_OF_DG_HEATERS ) { +#ifndef DISABLE_HEATERS_AND_TEMPS if ( TRUE == heatersStatus[ heater ].hasTargetTempChanged ) { status = TRUE; heatersStatus[ heater ].startHeaterSignal = TRUE; } +#endif } else { @@ -324,10 +329,12 @@ if ( TRUE == heaterCmdPtr->startHeater ) { +#ifndef DISABLE_TRIMMER_HEATER if ( ( MINIMUM_TARGET_TEMPERATURE <= heaterCmdPtr->targetTemp ) && ( heaterCmdPtr->targetTemp <= MAXIMUM_TARGET_TEMPERATURE ) ) { cmdResponse.rejected = FALSE; -#ifndef DISABLE_HEATERS_AND_TEMPS + + #ifndef DISABLE_HEATERS_AND_TEMPS heatersStatus[ DG_TRIMMER_HEATER ].targetTemp = heaterCmdPtr->targetTemp; heatersStatus[ DG_TRIMMER_HEATER ].startHeaterSignal = TRUE; #endif @@ -336,6 +343,7 @@ { cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER; } +#endif } else { @@ -821,12 +829,12 @@ if ( trimmerHeaterInternalTemp > HEATERS_MAX_ALLOWED_INTERNAL_TEMPERATURE_C ) { isTempOut = TRUE; - SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, trimmerHeaterInternalTemp ); + //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, trimmerHeaterInternalTemp ); } else if ( trimmerHeaterColdJunctionTemp > HEATERS_MAX_ALLOWED_COLD_JUNCTION_TEMPERATURE_C ) { isTempOut = TRUE; - SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE, trimmerHeaterColdJunctionTemp ); + //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE, trimmerHeaterColdJunctionTemp ); } // If it is above the range for the first time, stop the trimmer heater Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r7d293e18ea5ac0fce443c68525100e44df80b4fd -r894d80dda120f7b319c212dd1857f203daa27b07 --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 7d293e18ea5ac0fce443c68525100e44df80b4fd) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 894d80dda120f7b319c212dd1857f203daa27b07) @@ -358,18 +358,18 @@ flow = flow - ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) / 1000.0 ) - ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) / 1000.0 ); + // Apply calibration to flow sensor reading measuredROFlowRateLPM.data = pow(flow, 4) * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].fourthOrderCoeff + pow(flow, 3) * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].thirdOrderCoeff + pow(flow, 2) * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].secondOrderCoeff + - flow * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].gain + + flow * flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].gain + flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].offset; - // If the flow is less than a certain value, FPGA will return 0xFFFF meaning that - // the flow is 0. - if ( FLOW_SENSOR_ZERO_READING == roFlowReading ) - { - measuredROFlowRateLPM.data = 0.0; - } + // If the flow is less than a certain value, FPGA will return 0xFFFF meaning that the flow is 0. + if ( FLOW_SENSOR_ZERO_READING == roFlowReading ) + { + measuredROFlowRateLPM.data = 0.0; + } measuredFlowReadingsSum = 0; flowFilterCounter = 0; Index: firmware/App/Modes/ModeFill.c =================================================================== diff -u -r7d293e18ea5ac0fce443c68525100e44df80b4fd -r894d80dda120f7b319c212dd1857f203daa27b07 --- firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 7d293e18ea5ac0fce443c68525100e44df80b4fd) +++ firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 894d80dda120f7b319c212dd1857f203daa27b07) @@ -47,7 +47,6 @@ #define DIALYSATE_FILL_TIME_OUT ( 5 * SEC_PER_MIN * MS_PER_SECOND ) ///< Time out period when reservoir is not filled with correct dialysate. #define EMPTY_BOTTLE_DETECT_PERSISTENT_PERIOD_MS ( 5 * MS_PER_SECOND ) ///< Persistent period for empty bottle detect. - #define CONCENTRATE_PUMP_PRIME_INTERVAL ( 3 * MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Persistent time interval for concentrate pumps prime. #define ACID_BICARB_CONCENTRATE_ADDITION_MULTIPLER 1.06 ///< Acid and bicarbonate concentrates make up around 6% to total volume. Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -r7d293e18ea5ac0fce443c68525100e44df80b4fd -r894d80dda120f7b319c212dd1857f203daa27b07 --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 7d293e18ea5ac0fce443c68525100e44df80b4fd) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 894d80dda120f7b319c212dd1857f203daa27b07) @@ -1287,11 +1287,11 @@ break; case MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE: - handleFilterFlushTimePeriodOverride( message ); + handleFilterFlushTimePeriodOverride(message); break; - case MSG_ID_DG_FANS_RPM_OVERRIDE: - handleFansRPMOverride( message ); + case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION: + handleTestBlockMessagesRequest( message ); break; case MSG_ID_DG_STOP_RTC_CLOCK: @@ -1302,10 +1302,6 @@ handleSetDrainPumpMeasuredRPMOverrideRequest( message ); break; - case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION: - handleTestBlockMessagesRequest( message ); - break; - case MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD: handleTestSuperClearAlarmsRequest( message ); break; Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r7d293e18ea5ac0fce443c68525100e44df80b4fd -r894d80dda120f7b319c212dd1857f203daa27b07 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 7d293e18ea5ac0fce443c68525100e44df80b4fd) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 894d80dda120f7b319c212dd1857f203daa27b07) @@ -22,7 +22,6 @@ #include "Accel.h" #include "ConcentratePumps.h" #include "ConductivitySensors.h" -#include "Fans.h" #include "FPGA.h" #include "Heaters.h" #include "ModeFlush.h" @@ -358,7 +357,6 @@ return result; } - // *********************************************************************** // **************** Message Handling Helper Functions ******************** // *********************************************************************** @@ -3010,37 +3008,6 @@ } /*********************************************************************//** - * @brief - * The handleFansRPMOverride function handles a request to override a fans RPM value. - * @details Inputs: none - * @details Outputs: message handled - * @param message a pointer to the message to handle - * @return none - *************************************************************************/ -void handleFansRPMOverride( MESSAGE_T *message ) -{ - TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; - BOOL result = FALSE; - - // verify payload length - if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen ) - { - memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) ); - if ( FALSE == payload.reset ) - { - result = testSetFanRPMOverride( payload.index, payload.state.f32 ); - } - else - { - result = testResetFanRPMOverride( payload.index ); - } - } - - // respond to request - sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); -} - -/*********************************************************************//** * @brief * The handleStopDGRTCClock function handles a request to stop the RTC clock. * @details Inputs: none Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r7d293e18ea5ac0fce443c68525100e44df80b4fd -r894d80dda120f7b319c212dd1857f203daa27b07 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 7d293e18ea5ac0fce443c68525100e44df80b4fd) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 894d80dda120f7b319c212dd1857f203daa27b07) @@ -358,6 +358,12 @@ // MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE void handleSetDrainPumpMeasuredRPMOverrideRequest( MESSAGE_T *message ); +// MSG_ID_DG_ALARM_INFO_SEND_INTERVAL_OVERRIDE +void handleTestAlarmInfoSendIntervalOverrideRequest( MESSAGE_T *message ); + +// MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD +void handleTestSuperClearAlarmsRequest( MESSAGE_T *message ); + /**@}*/ #endif Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -r76679e197473ee3f88c82809037dcbb8477748ad -r894d80dda120f7b319c212dd1857f203daa27b07 --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 76679e197473ee3f88c82809037dcbb8477748ad) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 894d80dda120f7b319c212dd1857f203daa27b07) @@ -72,10 +72,8 @@ // Monitor load cells execLoadCell(); -#ifndef DISABLE_HEATERS_AND_TEMPS // Temperature sensors read execTemperatureSensors(); -#endif // Conductivity sensors read execConductivitySensors();