Index: firmware/.gitignore =================================================================== diff -u -r7357a0779e893dbe7262f52777a9279b7e310037 -r35fe6a299d68fe65dbb318134b2e0a8eb2806a24 --- firmware/.gitignore (.../.gitignore) (revision 7357a0779e893dbe7262f52777a9279b7e310037) +++ firmware/.gitignore (.../.gitignore) (revision 35fe6a299d68fe65dbb318134b2e0a8eb2806a24) @@ -33,6 +33,7 @@ /.metadata/ /Debug/ /Release/ +/.launches/ # Ignore symbolically linked folders # The linked folders do not need "/" FWCommon Fisheye: Tag 35fe6a299d68fe65dbb318134b2e0a8eb2806a24 refers to a dead (removed) revision in file `firmware/.launches/DG.launch'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 35fe6a299d68fe65dbb318134b2e0a8eb2806a24 refers to a dead (removed) revision in file `firmware/.launches/VCAST_DEBUG.launch'. Fisheye: No comparison available. Pass `N' to diff? Index: firmware/App/Controllers/FlowSensors.c =================================================================== diff -u -r851ee579efc2add1f16a5012bdaac93658e760ea -r35fe6a299d68fe65dbb318134b2e0a8eb2806a24 --- firmware/App/Controllers/FlowSensors.c (.../FlowSensors.c) (revision 851ee579efc2add1f16a5012bdaac93658e760ea) +++ firmware/App/Controllers/FlowSensors.c (.../FlowSensors.c) (revision 35fe6a299d68fe65dbb318134b2e0a8eb2806a24) @@ -90,12 +90,12 @@ /*********************************************************************//** * @brief - * The execFlowSesnorsMonitor function executes the flow sensors monitor. + * The execFlowSensorsMonitor function executes the flow sensors monitor. * @details Inputs: none * @details Outputs: flowSensorStatus, flowSensorsCalRecord * @return none *************************************************************************/ -void execFlowSesnorsMonitor( void ) +void execFlowSensorsMonitor( void ) { U08 i; U08 countsIndex; Index: firmware/App/Controllers/FlowSensors.h =================================================================== diff -u -r851ee579efc2add1f16a5012bdaac93658e760ea -r35fe6a299d68fe65dbb318134b2e0a8eb2806a24 --- firmware/App/Controllers/FlowSensors.h (.../FlowSensors.h) (revision 851ee579efc2add1f16a5012bdaac93658e760ea) +++ firmware/App/Controllers/FlowSensors.h (.../FlowSensors.h) (revision 35fe6a299d68fe65dbb318134b2e0a8eb2806a24) @@ -32,7 +32,7 @@ SELF_TEST_STATUS_T execFlowSensorsSelfTest( void ); -void execFlowSesnorsMonitor( void ); +void execFlowSensorsMonitor( void ); F32 getMeasuredFlowRateLPM( FLOW_SENSORS_T sensorId ); F32 getMeasuredROFlowRateWithConcPumpsLPM( void ); Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r851ee579efc2add1f16a5012bdaac93658e760ea -r35fe6a299d68fe65dbb318134b2e0a8eb2806a24 --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 851ee579efc2add1f16a5012bdaac93658e760ea) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 35fe6a299d68fe65dbb318134b2e0a8eb2806a24) @@ -460,6 +460,8 @@ SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS; // TODO is there anything else needed in POST for the RO pump? + + return result; } /*********************************************************************//** Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -r851ee579efc2add1f16a5012bdaac93658e760ea -r35fe6a299d68fe65dbb318134b2e0a8eb2806a24 --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 851ee579efc2add1f16a5012bdaac93658e760ea) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 35fe6a299d68fe65dbb318134b2e0a8eb2806a24) @@ -96,7 +96,7 @@ execFluidLeak(); // Monitor flow sensors - execFlowSesnorsMonitor(); + execFlowSensorsMonitor(); // Second pass for FPGA execFPGAOut();