Index: firmware/App/Controllers/DialOutFlow.c =================================================================== diff -u -r6a6c064bdab77b9b42d25910d94da55812d00ffa -r38e9e1791f490f7a95b7a7040973a6761f7603ff --- firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision 6a6c064bdab77b9b42d25910d94da55812d00ffa) +++ firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision 38e9e1791f490f7a95b7a7040973a6761f7603ff) @@ -1002,6 +1002,7 @@ F32 getLoadCellWeightInGrams( U32 loadCellID ) { F32 result = 0.0; + if ( loadCellID <= NUM_OF_LOAD_CELLS - 1 ) { if ( OVERRIDE_KEY == loadCellWeightInGrams[ loadCellID ].override ) @@ -1017,6 +1018,7 @@ { activateAlarmNoData( ALARM_ID_SOFTWARE_FAULT ); } + return result; } @@ -1031,10 +1033,12 @@ F32 getTotalTargetDialOutUFVolumeInMl( void ) { F32 result = referenceUFVolumeInMl.data; + if ( OVERRIDE_KEY == referenceUFVolumeInMl.override ) { result = referenceUFVolumeInMl.ovData; } + return result; } @@ -1049,10 +1053,12 @@ F32 getTotalMeasuredUFVolumeInMl( void ) { F32 result = totalMeasuredUFVolumeInMl.data; + if ( OVERRIDE_KEY == totalMeasuredUFVolumeInMl.override ) { result = totalMeasuredUFVolumeInMl.ovData; } + return result; } @@ -1068,10 +1074,12 @@ F32 getMeasuredDialOutPumpRotorSpeed( void ) { F32 result = dialOutPumpRotorSpeedRPM.data; + if ( OVERRIDE_KEY == dialOutPumpRotorSpeedRPM.override ) { result = dialOutPumpRotorSpeedRPM.ovData; } + return result; } @@ -1087,10 +1095,12 @@ F32 getMeasuredDialOutPumpSpeed( void ) { F32 result = dialOutPumpSpeedRPM.data; + if ( OVERRIDE_KEY == dialOutPumpSpeedRPM.override ) { result = dialOutPumpSpeedRPM.ovData; } + return result; } @@ -1106,10 +1116,12 @@ F32 getMeasuredDialOutPumpMCSpeed( void ) { F32 result = dialOutPumpMCSpeedRPM.data; + if ( OVERRIDE_KEY == dialOutPumpMCSpeedRPM.override ) { result = dialOutPumpMCSpeedRPM.ovData; } + return result; } @@ -1125,10 +1137,12 @@ F32 getMeasuredDialOutPumpMCCurrent( void ) { F32 result = dialOutPumpMCCurrentmA.data; + if ( OVERRIDE_KEY == dialOutPumpMCCurrentmA.override ) { result = dialOutPumpMCCurrentmA.ovData; } + return result; }