Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -re3699de422fa3ba1b8145c4cc44257702c9e336f -re7fe0454b5b2d39009dc784dc8c156856df8bc86 --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision e3699de422fa3ba1b8145c4cc44257702c9e336f) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision e7fe0454b5b2d39009dc784dc8c156856df8bc86) @@ -414,29 +414,8 @@ *************************************************************************/ BOOL testPressureSensorDataPublishIntervalOverride( MESSAGE_T *message ) { - BOOL result = FALSE; - TEST_OVERRIDE_PAYLOAD_T override; - OVERRIDE_TYPE_T ovType = getOverridePayloadFromMessage( message, &override ); + BOOL result = u32BroadcastIntervalOverride( message, &pressuresDataPublishInterval, TASK_PRIORITY_INTERVAL ); - // Verify tester has logged in with DD and override type is valid - if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) ) - { - if ( OVERRIDE_OVERRIDE == ovType ) - { - U32 intvl = override.state.u32 / TASK_PRIORITY_INTERVAL; - - result = TRUE; - pressuresDataPublishInterval.ovData = intvl; - pressuresDataPublishInterval.override = OVERRIDE_KEY; - } - else - { - result = TRUE; - pressuresDataPublishInterval.override = OVERRIDE_RESET; - pressuresDataPublishInterval.ovData = pressuresDataPublishInterval.ovInitData; - } - } - return result; } @@ -452,35 +431,8 @@ *************************************************************************/ BOOL testPressureSensorFilteredReadingsOverride( MESSAGE_T *message ) { - BOOL result = FALSE; - TEST_OVERRIDE_ARRAY_PAYLOAD_T override; - OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &override ); + BOOL result = f32ArrayOverride( message, &filteredcurrentPressureReadings[0], NUM_OF_PRESSURE_SENSORS - 1 ); - // Verify tester has logged in with DD 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 ) - { - if ( OVERRIDE_OVERRIDE == ovType ) - { - F32 value = override.state.f32; - - filteredcurrentPressureReadings[ sensor ].ovData = value; - filteredcurrentPressureReadings[ sensor ].override = OVERRIDE_KEY; - } - else - { - filteredcurrentPressureReadings[ sensor ].override = OVERRIDE_RESET; - filteredcurrentPressureReadings[ sensor ].ovData = filteredcurrentPressureReadings[ sensor ].ovInitData; - } - - result = TRUE; - } - } - return result; } @@ -496,35 +448,8 @@ *************************************************************************/ BOOL testPressureSensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ) { - BOOL result = FALSE; - TEST_OVERRIDE_ARRAY_PAYLOAD_T override; - OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &override ); + BOOL result = f32ArrayOverride( message, &filteredcurrentPresTempReadings[0], NUM_OF_PRESSURE_SENSORS - 1 ); - // Verify tester has logged in with DD 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 ) - { - if ( OVERRIDE_OVERRIDE == ovType ) - { - F32 value = override.state.f32; - - filteredcurrentPresTempReadings[ sensor ].ovData = value; - filteredcurrentPresTempReadings[ sensor ].override = OVERRIDE_KEY; - } - else - { - filteredcurrentPresTempReadings[ sensor ].override = OVERRIDE_RESET; - filteredcurrentPresTempReadings[ sensor ].ovData = filteredcurrentPresTempReadings[ sensor ].ovInitData; - } - - result = TRUE; - } - } - return result; }