Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r97e0100921ccad633b39b509a93a7237e4d80446 -rb93d59e35abc7a815cb108831ffca93635321028 --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 97e0100921ccad633b39b509a93a7237e4d80446) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision b93d59e35abc7a815cb108831ffca93635321028) @@ -392,7 +392,6 @@ checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE, isFlowOutOfUpperRange, currentFlow, targetFlow ); checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE, isFlowOutOfLowerRange, currentFlow, targetFlow ); } -#endif // If the pump is off and PPi + 5psi < PPo for a certain period of time, activate safety shutdown if ( FALSE == isROPumpOn ) @@ -408,6 +407,7 @@ activateSafetyShutdown(); } } +#endif // Publish RO pump data on interval publishROPumpData(); Index: firmware/App/DGCommon.h =================================================================== diff -u -r97e0100921ccad633b39b509a93a7237e4d80446 -rb93d59e35abc7a815cb108831ffca93635321028 --- firmware/App/DGCommon.h (.../DGCommon.h) (revision 97e0100921ccad633b39b509a93a7237e4d80446) +++ firmware/App/DGCommon.h (.../DGCommon.h) (revision b93d59e35abc7a815cb108831ffca93635321028) @@ -45,7 +45,7 @@ // #define HEATERS_DEBUG 1 // #define PRESSURES_DEBUG 1 #define DISABLE_DIALYSATE_CHECK 1 -// #define IGNORE_DRAIN_PUMP_MONITOR 1 + #define IGNORE_DRAIN_PUMP_MONITOR 1 // #define IGNORE_HEATERS_MONITOR 1 #define IGNORE_RO_PUMP_MONITOR 1 // #define DISABLE_RO_RATIO_CHECK 1 Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r73c7fed62a1ca2e4c3cc020a0d5f012c5128e592 -rb93d59e35abc7a815cb108831ffca93635321028 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 73c7fed62a1ca2e4c3cc020a0d5f012c5128e592) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision b93d59e35abc7a815cb108831ffca93635321028) @@ -250,6 +250,7 @@ static void startDMAReceiptOfReadResp( void ); static void consumeUnexpectedData( void ); +static void monitorFPGAPowerStatus( void ); /*********************************************************************//** * @brief @@ -927,6 +928,11 @@ } } +static void monitorFPGAPowerStatus( void ) +{ + BOOL isFPGAPowered = (BOOL)( fpgaSensorReadings.fpgaGPIO & FPGA_POWER_STATUS_MASK ); +} + /*********************************************************************//** * @brief * The setFPGAValveStates function sets the DG valve states with a 16-bit @@ -1875,16 +1881,4 @@ return ( fpgaSensorReadings.fpgaGPIO & CONCENTRATE_CAP_SWITCH_MASK ); } -/*********************************************************************//** - * @brief - * The getFPGAPowerStatus function gets the FPGA power status bit. - * @details Inputs: fpgaSensorReadings - * @details Outputs: none - * @return FPGA power status bit - *************************************************************************/ -U08 getFPGAPowerStatus( void ) -{ - return ( fpgaSensorReadings.fpgaGPIO & FPGA_POWER_STATUS_MASK ); -} - /**@}*/ Index: firmware/App/Services/FPGA.h =================================================================== diff -u -r73c7fed62a1ca2e4c3cc020a0d5f012c5128e592 -rb93d59e35abc7a815cb108831ffca93635321028 --- firmware/App/Services/FPGA.h (.../FPGA.h) (revision 73c7fed62a1ca2e4c3cc020a0d5f012c5128e592) +++ firmware/App/Services/FPGA.h (.../FPGA.h) (revision b93d59e35abc7a815cb108831ffca93635321028) @@ -138,8 +138,6 @@ U08 getFPGADialysateCapStatus( void ); U08 getFPGAConcentrateCapStatus( void ); -U08 getFPGAPowerStatus( void ); - /**@}*/ #endif