Index: firmware/.launches/DG.launch =================================================================== diff -u -r28b5f2e7f757647145a82a39aca0a5f3652c68a1 -r5f86e35ac3c021b68708457d17d4ef51b20aef9c --- firmware/.launches/DG.launch (.../DG.launch) (revision 28b5f2e7f757647145a82a39aca0a5f3652c68a1) +++ firmware/.launches/DG.launch (.../DG.launch) (revision 5f86e35ac3c021b68708457d17d4ef51b20aef9c) @@ -1,10 +1,26 @@ + + + + + + + + + + + + + + + + Index: firmware/App/Controllers/TemperatureSensors.c =================================================================== diff -u -r05208358eaa8489054bf9fec70e22bf1117aceaa -r5f86e35ac3c021b68708457d17d4ef51b20aef9c --- firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 05208358eaa8489054bf9fec70e22bf1117aceaa) +++ firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 5f86e35ac3c021b68708457d17d4ef51b20aef9c) @@ -720,7 +720,7 @@ processTempSnsrsADCRead( TEMPSENSORS_OUTLET_PRIMARY_HEATER, getFPGATPoTemp(), getFPGARTDErrorCount(), getFPGARTDReadCount() ); processTempSnsrsADCRead( TEMPSENSORS_CONDUCTIVITY_SENSOR_1, getFPGACD1Temp(), getFPGARTDErrorCount(), getFPGARTDReadCount() ); processTempSnsrsADCRead( TEMPSENSORS_CONDUCTIVITY_SENSOR_2, getFPGACD2Temp(), getFPGARTDErrorCount(), getFPGARTDReadCount() ); - processTempSnsrsADCRead( TEMPSENSORS_OUTLET_REDUNDANT, getFPGATHDoTemp(), getFPGATRoErrorCount(), getFPGATRoReadCount() ); + processTempSnsrsADCRead( TEMPSENSORS_OUTLET_REDUNDANT, getFPGATRoTemp(), getFPGATRoErrorCount(), getFPGATRoReadCount() ); processTempSnsrsADCRead( TEMPSENSORS_INLET_DIALYSATE, getFPGATDiTemp(), getFPGATDiErrorCount(), getFPGATDiReadCount() ); processHtrsTempSnsrsADCRead( TEMPSENSORS_PRIMARY_HEATER_THERMO_COUPLE, getFPGAPrimaryHeaterTemp(), getFPGAPrimaryHeaterFlags(), @@ -742,7 +742,7 @@ processTempSnsrsADCRead( TEMPSENSORS_FPGA_BOARD_SENSOR, getFPGABoardTemp(), 0, ++simulatedCounter ); processTempSnsrsADCRead( TEMPSENSORS_LOAD_CELL_A1_B1, getFPGALoadCellsA1B1Temp(), getFPGAADC1ErrorCount(), getFPGAADC1ReadCount() ); processTempSnsrsADCRead( TEMPSENSORS_LOAD_CELL_A2_B2, getFPGALoadCellsA2B2Temp(), getFPGAADC2ErrorCount(), getFPGAADC2ReadCount() ); - processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_THDO_RTD, getFPGATHDoInternalTemp(), getFPGATRoErrorCount(), getFPGATRoReadCount() ); + processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_THDO_RTD, getFPGATRoInternalTemp(), getFPGATRoErrorCount(), getFPGATRoReadCount() ); processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_TDI_RTD, getFPGATDiInternalTemp(), getFPGATDiErrorCount(), getFPGATDiReadCount() ); processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR, getFPGACondSnsrInternalTemp(), getFPGARTDErrorCount(), getFPGARTDReadCount() ); Index: firmware/App/DGCommon.h =================================================================== diff -u -rebbb1f85550a1f9b8f946655f7b2b63f76fbf67d -r5f86e35ac3c021b68708457d17d4ef51b20aef9c --- firmware/App/DGCommon.h (.../DGCommon.h) (revision ebbb1f85550a1f9b8f946655f7b2b63f76fbf67d) +++ firmware/App/DGCommon.h (.../DGCommon.h) (revision 5f86e35ac3c021b68708457d17d4ef51b20aef9c) @@ -37,20 +37,20 @@ // #define SIMULATE_UI 1 // #define TASK_TIMING_OUTPUT_ENABLED 1 // re-purposes drain pump enable pin for task timing // #define DISABLE_HEATERS_AND_TEMPS 1 - #define DISABLE_ACCELS 1 - #define SKIP_POST 1 +// #define DISABLE_ACCELS 1 +// #define SKIP_POST 1 #define DISABLE_CAL_CHECK 1 // #define ENABLE_DIP_SWITCHES 1 // #define EMC_TEST_BUILD 1 #define ALARMS_DEBUG 1 // #define HEATERS_DEBUG 1 // #define PRESSURES_DEBUG 1 #define DISABLE_DIALYSATE_CHECK 1 - #define IGNORE_DRAIN_PUMP_MONITOR 1 - #define IGNORE_HEATERS_MONITOR 1 +// #define IGNORE_DRAIN_PUMP_MONITOR 1 +// #define IGNORE_HEATERS_MONITOR 1 // #define IGNORE_RO_PUMP_MONITOR 1 #define IGNORE_HEAT_DISINFECT_RSRVR_TIMEOUT 1 - #define DISABLE_RO_RATIO_CHECK 1 +// #define DISABLE_RO_RATIO_CHECK 1 #define DISABLE_COND_SENSOR_CHECK 1 #define DISABLE_MIXING 1 #define DISABLE_WATER_QUALITY_CHECK 1 Index: firmware/App/Modes/ModeFault.c =================================================================== diff -u -r0c3e4f0618d7e42f35386fe5acf450fbb61481b6 -r5f86e35ac3c021b68708457d17d4ef51b20aef9c --- firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision 0c3e4f0618d7e42f35386fe5acf450fbb61481b6) +++ firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision 5f86e35ac3c021b68708457d17d4ef51b20aef9c) @@ -17,6 +17,7 @@ #include "OperationModes.h" #include "ModeFault.h" +#include "SystemCommMessages.h" /** * @addtogroup DGFaultMode @@ -55,7 +56,8 @@ // Publish POST failure status to UI if fault triggered in Init/POST mode if ( DG_MODE_INIT == getPreviousOperationMode() ) { - // TODO - send POST failure to UI + // Broadcast final POST failed + sendPOSTFinalResult( FALSE ); } } Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r1f9bebfb549c5c9334f4d3f0dc2b4da3779d590c -r5f86e35ac3c021b68708457d17d4ef51b20aef9c --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 1f9bebfb549c5c9334f4d3f0dc2b4da3779d590c) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 5f86e35ac3c021b68708457d17d4ef51b20aef9c) @@ -107,8 +107,8 @@ U32 fpgaTPiTemp; ///< Reg 292. ADC RTD channel 3 - conductivity sensor CPi temperature U32 fpgaRTDTemp; ///< Reg 296. ADC RTD channel 4 - internal temperature - U32 fpgaTHDo; ///< Reg 300. ADC THDo channel 0 - temperature - U32 fpgaTHDoTemp; ///< Reg 304. ADC THDo channel 1 - internal temperature + U32 fpgaTRo; ///< Reg 300. ADC TRo channel 0 - temperature + U32 fpgaTRoTemp; ///< Reg 304. ADC TRo channel 1 - internal temperature U32 fpgaTDi; ///< Reg 308. ADC TDi channel 0 - temperature U32 fpgaTDiTemp; ///< Reg 312. ADC TDi channel 1 - internal temperature @@ -1240,13 +1240,13 @@ * @brief * The getFPGATRoTemp function gets the latest redundant sensor outlet * temperature reading in ADC. - * @details Inputs: fpgaSensorReadings.fpgaTHDoTemp + * @details Inputs: fpgaSensorReadings.fpgaTRo * @details Outputs: none * @return Last redundant sensor outlet temperature reading *************************************************************************/ -U32 getFPGATHDoTemp( void ) +U32 getFPGATRoTemp( void ) { - return fpgaSensorReadings.fpgaTHDo; + return fpgaSensorReadings.fpgaTRo; } /*********************************************************************//** @@ -1733,14 +1733,14 @@ /*********************************************************************//** * @brief - * The getFPGATHDoInternalTemp function gets THDo internal temperature reading. + * The getFPGATRoInternalTemp function gets TRo internal temperature reading. * @details Inputs: fpgaSensorReadings * @details Outputs: none - * @return THDo internal temperature reading in ADC counts + * @return TRo internal temperature reading in ADC counts *************************************************************************/ -U32 getFPGATHDoInternalTemp( void ) +U32 getFPGATRoInternalTemp( void ) { - return fpgaSensorReadings.fpgaTHDoTemp; + return fpgaSensorReadings.fpgaTRoTemp; } /*********************************************************************//** Index: firmware/App/Services/FPGA.h =================================================================== diff -u -r76f413c7bde4ca9d12cc61e0191daddb1e86e9f1 -r5f86e35ac3c021b68708457d17d4ef51b20aef9c --- firmware/App/Services/FPGA.h (.../FPGA.h) (revision 76f413c7bde4ca9d12cc61e0191daddb1e86e9f1) +++ firmware/App/Services/FPGA.h (.../FPGA.h) (revision 5f86e35ac3c021b68708457d17d4ef51b20aef9c) @@ -68,7 +68,7 @@ U08 getFPGARTDErrorCount( void ); U08 getFPGARTDReadCount( void ); -U32 getFPGATHDoTemp( void ); +U32 getFPGATRoTemp( void ); U08 getFPGATRoErrorCount( void ); U08 getFPGATRoReadCount( void ); @@ -122,7 +122,7 @@ U16 getFPGABoardTemp( void ); U32 getFPGALoadCellsA1B1Temp( void ); U32 getFPGALoadCellsA2B2Temp( void ); -U32 getFPGATHDoInternalTemp( void ); +U32 getFPGATRoInternalTemp( void ); U32 getFPGATDiInternalTemp( void ); U32 getFPGACondSnsrInternalTemp( void ); Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r39841b84f399b7b3233822942c39efba24ffcd12 -r5f86e35ac3c021b68708457d17d4ef51b20aef9c --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 39841b84f399b7b3233822942c39efba24ffcd12) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 5f86e35ac3c021b68708457d17d4ef51b20aef9c) @@ -1190,7 +1190,7 @@ memcpy( payloadPtr, &testID, sizeof( U32) ); // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_REQUIRED ); + result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED ); return result; @@ -1219,7 +1219,7 @@ memcpy( payloadPtr, &passed, sizeof( BOOL ) ); // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_REQUIRED ); + result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED ); return result; }