Index: firmware/App/Drivers/PressureSensor.c =================================================================== diff -u -r0ac32b16df2334a48c964d976ba0c846830a5f4c -ra91074d04b607deabe4fbf714d40e9d191590359 --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 0ac32b16df2334a48c964d976ba0c846830a5f4c) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision a91074d04b607deabe4fbf714d40e9d191590359) @@ -36,7 +36,7 @@ static OVERRIDE_F32_T currentPresTempReadings[ NUM_OF_PRESSURE_SENSORS ]; ///< Current pressure sensor temperature readings (overrideable). static OVERRIDE_U32_T lastPressureReadCounter[ NUM_OF_PRESSURE_SENSORS ]; ///< Last pressure sensor read count (Overrideable). static OVERRIDE_U32_T lastPressureErrorCounter[ NUM_OF_PRESSURE_SENSORS ]; ///< Last pressure sensor error count (Overrideable). - + // ********** private function prototypes ********** static void checkPressureSensors( void ); @@ -273,35 +273,8 @@ *************************************************************************/ BOOL testPressureSensorOverride( MESSAGE_T *message ) { - BOOL result = FALSE; - TEST_OVERRIDE_ARRAY_PAYLOAD_T override; - OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &override ); + BOOL result = f32ArrayOverride( message, ¤tPressureReadings[0], NUM_OF_PRESSURE_SENSORS - 1 ); - // Verify tester has logged in with TD and override type is valid - if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) ) - { - U32 sensor = override.index; - - // Verify pressure sensor index of override - if ( sensor < NUM_OF_PRESSURE_SENSORS ) - { - result = TRUE; - - if ( OVERRIDE_OVERRIDE == ovType ) - { - F32 value = override.state.f32; - - currentPressureReadings[ sensor ].ovData = value; - currentPressureReadings[ sensor ].override = OVERRIDE_KEY; - } - else - { - currentPressureReadings[ sensor ].override = OVERRIDE_RESET; - currentPressureReadings[ sensor ].ovData = currentPressureReadings[ sensor ].ovInitData; - } - } - } - return result; }