Index: firmware/App/Controllers/Voltages.c =================================================================== diff -u -r8466e63f95f65a3ffb18c3af85ac99328e41167b -r8f217e3f4f171dba78c9ac69a3470af442941a89 --- firmware/App/Controllers/Voltages.c (.../Voltages.c) (revision 8466e63f95f65a3ffb18c3af85ac99328e41167b) +++ firmware/App/Controllers/Voltages.c (.../Voltages.c) (revision 8f217e3f4f171dba78c9ac69a3470af442941a89) @@ -52,9 +52,9 @@ 28.25, // MONITORED_LINE_24V_REGEN 1.3125, // MONITORED_LINE_FPGA_REF_V 3.3, // MONITORED_LINE_PBA_REF_V - 3.3, // MONITORED_LINE_FPGA_VCC_V - 3.3, // MONITORED_LINE_FPGA_AUX_V - 1.1 // MONITORED_LINE_FPGA_PVN_V + 1.1, // MONITORED_LINE_FPGA_VCC_V + 1.98, // MONITORED_LINE_FPGA_AUX_V + 0.1 // MONITORED_LINE_FPGA_PVN_V }; /// Minimum voltage/current level for each monitored signal. static const F32 MIN_VOLTAGES[ NUM_OF_MONITORED_LINES ] = @@ -67,9 +67,9 @@ 22.0, // MONITORED_LINE_24V_REGEN 1.1875, // MONITORED_LINE_FPGA_REF_V 2.7, // MONITORED_LINE_PBA_REF_V - 2.7, // MONITORED_LINE_FPGA_VCC_V - 2.7, // MONITORED_LINE_FPGA_AUX_V - 0.9 // MONITORED_LINE_FPGA_PVN_V + 0.9, // MONITORED_LINE_FPGA_VCC_V + 1.62, // MONITORED_LINE_FPGA_AUX_V + -0.1 // MONITORED_LINE_FPGA_PVN_V }; // ********** private data ********** Index: firmware/App/Controllers/Voltages.h =================================================================== diff -u -r1c628bfd5d6414b74b8cbd083f66839888a8236b -r8f217e3f4f171dba78c9ac69a3470af442941a89 --- firmware/App/Controllers/Voltages.h (.../Voltages.h) (revision 1c628bfd5d6414b74b8cbd083f66839888a8236b) +++ firmware/App/Controllers/Voltages.h (.../Voltages.h) (revision 8f217e3f4f171dba78c9ac69a3470af442941a89) @@ -64,7 +64,7 @@ F32 fpgaVpvn; ///< FPGA pvn voltage } VOLTAGES_DATA_PAYLOAD_T; -#define MIN_24V_MEASURED_FOR_AC 20.0 ///< Minimum voltage from 24V in order to say we have AC power. +#define MIN_24V_MEASURED_FOR_AC 5.0 ///< Minimum voltage from 24V in order to say we have AC power. // ********** public function prototypes ********** Index: firmware/App/HDCommon.h =================================================================== diff -u -r1c628bfd5d6414b74b8cbd083f66839888a8236b -r8f217e3f4f171dba78c9ac69a3470af442941a89 --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 1c628bfd5d6414b74b8cbd083f66839888a8236b) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision 8f217e3f4f171dba78c9ac69a3470af442941a89) @@ -45,10 +45,10 @@ // #define TST_3WAY_VALVES_ALWAYS_OPEN 1 // After POST and homing, open all 4 valves // #define DISABLE_ACCELS 1 // Disable accelerometer POST and monitoring // #define DISABLE_CRC_ERROR 1 // Do not error on bad CRC for CAN messages -// #define DISABLE_ACK_ERRORS 1 // Do not error on failure of other node(s) to ACK a message + #define DISABLE_ACK_ERRORS 1 // Do not error on failure of other node(s) to ACK a message #define DISABLE_MOTOR_CURRENT_CHECKS 1 // Do not error on HD pump current checks #define DISABLE_PUMP_FLOW_CHECKS 1 // Do not error on HD pump flow checks -// #define ENABLE_ALTERNATE_FLOW 1 // Enable calculation of speed/pressure based flow and publish in lieu of MC motor speed + #define ENABLE_ALTERNATE_FLOW 1 // Enable calculation of speed/pressure based flow and publish in lieu of MC motor speed #define DISABLE_PUMP_SPEED_CHECKS 1 // Do not error on HD pump speed checks // #define DISABLE_PUMP_DIRECTION_CHECKS 1 // Do not error on HD pump direction checks #define DISABLE_SYRINGE_PUMP 1 // Disable syringe pump functionality @@ -73,7 +73,7 @@ #define DISABLE_SYRINGE_PUMP_ALARMS 1 // Disable some syringe pump alarms that are triggering intermittently // #define NO_PUMP_FLOW_LIMITS 1 // Allow any commanded flow rate for peristaltic pumps #define DISABLE_BUBBLE_ALARMS 1 // Disable bubble alarms -// #define DISABLE_UI_POST_TEST 1 // Disable the UI POST + #define DISABLE_UI_POST_TEST 1 // Disable the UI POST // Skip Pre-Treatment and get to treatment as soon as possible #define SKIP_UI_INTERACTION 1 // Skip UI interaction. Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -r1c628bfd5d6414b74b8cbd083f66839888a8236b -r8f217e3f4f171dba78c9ac69a3470af442941a89 --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 1c628bfd5d6414b74b8cbd083f66839888a8236b) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 8f217e3f4f171dba78c9ac69a3470af442941a89) @@ -130,10 +130,6 @@ switch ( postState ) { case POST_STATE_START: - if ( getMonitoredLineLevel( MONITORED_LINE_24V ) < MIN_24V_MEASURED_FOR_AC ) - { - initiatePowerOff(); - } sendUIVersionRequest(); postState = POST_STATE_FW_INTEGRITY; break; @@ -143,6 +139,17 @@ postState = handlePOSTStatus( testStatus ); break; + case POST_STATE_AC: + if ( getMonitoredLineLevel( MONITORED_LINE_24V ) < MIN_24V_MEASURED_FOR_AC ) + { + initiatePowerOff(); + } + else + { + postState = POST_STATE_WATCHDOG; + } + break; + case POST_STATE_WATCHDOG: testStatus = execWatchdogTest(); postState = handlePOSTStatus( testStatus ); Index: firmware/App/Tasks/TaskBG.c =================================================================== diff -u -r1c628bfd5d6414b74b8cbd083f66839888a8236b -r8f217e3f4f171dba78c9ac69a3470af442941a89 --- firmware/App/Tasks/TaskBG.c (.../TaskBG.c) (revision 1c628bfd5d6414b74b8cbd083f66839888a8236b) +++ firmware/App/Tasks/TaskBG.c (.../TaskBG.c) (revision 8f217e3f4f171dba78c9ac69a3470af442941a89) @@ -34,7 +34,6 @@ // ********** private definitions ********** #define MAX_TIME_FOR_UI_TO_COMMUNICATE_MS 30000 ///< Maximum time we wait for UI to communicate after power up (30 seconds). -#define TIME_FOR_AC_CHECK_AFTER_POWER_UP_MS 2000 ///< Two seconds after power up, check to see if we have AC power. // ********** private data ********** @@ -70,14 +69,6 @@ } #endif #endif - // Two seconds after power up, check to see if we have AC power. If not, power down HD. - if ( TIME_FOR_AC_CHECK_AFTER_POWER_UP_MS == calcTimeSince( startUICommTimeout ) ) - { - if ( getMonitoredLineLevel( MONITORED_LINE_24V ) < MIN_24V_MEASURED_FOR_AC ) - { - initiatePowerOff(); - } - } } // Manage the watchdog