Index: firmware/App/Controllers/Pressures.c =================================================================== diff -u -r7ffa5c7ed2439e3bfba81cac21f8d286e617c143 -r6f2991204047ccbceeb5461f7c35af6d8f5dfd0b --- firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision 7ffa5c7ed2439e3bfba81cac21f8d286e617c143) +++ firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision 6f2991204047ccbceeb5461f7c35af6d8f5dfd0b) @@ -28,7 +28,8 @@ #include "TaskGeneral.h" #include "TaskPriority.h" #include "TemperatureSensors.h" -#include "Timers.h" +#include "Timers.h" +#include "Utilities.h" /** * @addtogroup DGPressures @@ -309,13 +310,10 @@ U08 sensorId; #ifndef _RELEASE_ - if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) ) + if ( ( HW_CONFIG_BETA == getHardwareConfigStatus() ) && ( getCurrentOperationMode() != DG_MODE_INIT ) ) { - if ( getCurrentOperationMode() != DG_MODE_INIT ) - { - zeroPressureOffset = PUMP_V3_PRESSURE_ZERO; - count2PressureConv = PUMP_V3_PRESSURE_PSIA_PER_COUNT; - } + zeroPressureOffset = PUMP_V3_PRESSURE_ZERO; + count2PressureConv = PUMP_V3_PRESSURE_PSIA_PER_COUNT; } #endif @@ -496,7 +494,7 @@ F32 baroPressure = getF32OverrideValue( &pressures[ PRESSURE_SENSOR_BAROMETRIC ] ); #ifndef _RELEASE_ - if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) ) && ( getCurrentOperationMode() != DG_MODE_INIT ) ) + if ( ( HW_CONFIG_BETA == getHardwareConfigStatus() ) && ( getCurrentOperationMode() != DG_MODE_INIT ) ) { baroPressure = PUMP_PRESSURE_PSIA_TO_PSI_OFFSET; } @@ -560,7 +558,7 @@ } // Once the sensors were all checked to be out of range, check the persistent alarm - checkPersistentAlarm( ALARM_ID_DG_PRESSURE_OUT_OF_RANGE, isPressureOutOfRange, pressureOutID, pressureReading ); + //checkPersistentAlarm( ALARM_ID_DG_PRESSURE_OUT_OF_RANGE, isPressureOutOfRange, pressureOutID, pressureReading ); }