Index: firmware/App/Drivers/PressureSensor.c =================================================================== diff -u -r65824878503f019bf9db443c867e27df8de27c51 -raeffb83507735fc1c84773e868e20ac7aeb60afc --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 65824878503f019bf9db443c867e27df8de27c51) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision aeffb83507735fc1c84773e868e20ac7aeb60afc) @@ -54,16 +54,15 @@ static OVERRIDE_F32_T currentPresTempReadings[ NUM_OF_PRESSURE_SENSORS ]; ///< Current pressure sensor temperature readings (overrideable). //static BARO_SENSOR_CONSTS_T baroConvConsts; ///< Barometric sensor conversion constants. -static const U32 TWO_TO_POWER_OF_6 = ( 1 << 6 ); ///< 2^6. -static const U32 TWO_TO_POWER_OF_7 = ( 1 << 7 ); ///< 2^7. -static const U32 TWO_TO_POWER_OF_15 = ( 1 << 15 ); ///< 2^15. -static const U32 TWO_TO_POWER_OF_16 = ( 1 << 16 ); ///< 2^16. -static const U32 TWO_TO_POWER_OF_17 = ( 1 << 17 ); ///< 2^17. -static const U32 TWO_TO_POWER_OF_21 = ( 1 << 21 ); ///< 2^21. +//static const U32 TWO_TO_POWER_OF_6 = ( 1 << 6 ); ///< 2^6. +//static const U32 TWO_TO_POWER_OF_7 = ( 1 << 7 ); ///< 2^7. +//static const U32 TWO_TO_POWER_OF_15 = ( 1 << 15 ); ///< 2^15. +//static const U32 TWO_TO_POWER_OF_16 = ( 1 << 16 ); ///< 2^16. +//static const U32 TWO_TO_POWER_OF_17 = ( 1 << 17 ); ///< 2^17. +//static const U32 TWO_TO_POWER_OF_21 = ( 1 << 21 ); ///< 2^21. // ********** private function prototypes ********** -static void checkPressureSensors( void ); //static F32 convertBaroPressureReading2mmHg( U32 rawPressure ); //static F32 calculateBaroPressure( U32 pressure ); @@ -137,10 +136,6 @@ currentPressureReadings[ P8_PRES ].data = convertPressureReading( getFPGAP8RawPressure(), presMinPSI, HIGH_PRES_MAX_PSI ); currentPressureReadings[ P13_PRES ].data = convertPressureReading( getFPGAP13RawPressure(), presMinPSI, HIGH_PRES_MAX_PSI ); currentPressureReadings[ P17_PRES ].data = convertPressureReading( getFPGAP17RawPressure(), presMinPSI, HIGH_PRES_MAX_PSI ); - currentPressureReadings[ X1_PRES ].data = convertPressureReading( getFPGAX1RawPressure(), presMinPSI, HIGH_PRES_MAX_PSI ); - currentPressureReadings[ X2_PRES ].data = convertPressureReading( getFPGAX2RawPressure(), presMinPSI, HIGH_PRES_MAX_PSI ); - currentPressureReadings[ X3_PRES ].data = convertPressureReading( getFPGAX3RawPressure(), presMinPSI, HIGH_PRES_MAX_PSI ); - currentPressureReadings[ X4_PRES ].data = convertPressureReading( getFPGAX4RawPressure(), presMinPSI, HIGH_PRES_MAX_PSI ); // Update and convert raw pressure sensor temperatures to deg C currentPresTempReadings[ D9_PRES ].data = convertPressureTempReading2DegC( getFPGAD9PresRawTemperature() ); @@ -153,10 +148,6 @@ currentPresTempReadings[ P8_PRES ].data = convertPressureTempReading2DegC( getFPGAP8RawTemperature() ); currentPresTempReadings[ P13_PRES ].data = convertPressureTempReading2DegC( getFPGAP13RawTemperature() ); currentPresTempReadings[ P17_PRES ].data = convertPressureTempReading2DegC( getFPGAP17RawTemperature() ); - currentPresTempReadings[ X1_PRES ].data = convertPressureTempReading2DegC( getFPGAX1RawTemperature() ); - currentPresTempReadings[ X2_PRES ].data = convertPressureTempReading2DegC( getFPGAX2RawTemperature() ); - currentPresTempReadings[ X3_PRES ].data = convertPressureTempReading2DegC( getFPGAX3RawTemperature() ); - currentPresTempReadings[ X4_PRES ].data = convertPressureTempReading2DegC( getFPGAX4RawTemperature() ); } ///*********************************************************************//**