1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00

OP-994: Refactor/Cleanup of cpu temp measurement: fixed declarations for Voltage Scale constants

This commit is contained in:
Alessio Morale 2013-05-27 02:11:53 +02:00
parent ab1c9c157f
commit bdd80a63c9
4 changed files with 6 additions and 5 deletions

View File

@ -213,7 +213,7 @@ extern uint32_t pios_com_hkosd_id;
#define PIOS_ADC_RATE (72.0e6f / 1.0f / 8.0f / 252.0f / (PIOS_ADC_NUM_CHANNELS >> PIOS_ADC_USE_ADC2))
#define PIOS_ADC_MAX_OVERSAMPLING 36
#define PIOS_ADC_VOLTAGE_SCALE 3.30/4096.0
#define PIOS_ADC_VOLTAGE_SCALE 3.30f/4096.0f
#define PIOS_ADC_TEMPERATURE_PIN 0
#define PIOS_ADC_STM32_TEMP_V25 1.43f /* V */

View File

@ -233,6 +233,11 @@ extern uint32_t pios_ppm_out_id;
#define PIOS_ADC_RATE (72.0e6 / 1.0 / 8.0 / 252.0 / (PIOS_ADC_NUM_CHANNELS >> PIOS_ADC_USE_ADC2))
#define PIOS_ADC_MAX_OVERSAMPLING 36
#define PIOS_ADC_VOLTAGE_SCALE 3.30f/4096.0f
#define PIOS_ADC_TEMPERATURE_PIN 0
#define PIOS_ADC_STM32_TEMP_V25 1.43f /* V */
#define PIOS_ADC_STM32_TEMP_AVG_SLOPE 4.3f /* mV/C */
// ------------------------
// PIOS_RCVR
// See also pios_board.c

View File

@ -295,8 +295,6 @@ extern uint32_t pios_packet_handler;
#define PIOS_ADC_VOLTAGE_SCALE 3.30f / 4096.0f
#define PIOS_ADC_USE_TEMP_SENSOR
#define PIOS_ADC_VOLTAGE_SCALE 3.30f/4096.0f
#define PIOS_ADC_TEMPERATURE_PIN 3
#define PIOS_ADC_STM32_TEMP_V25 0.76f /* V */
#define PIOS_ADC_STM32_TEMP_AVG_SLOPE 2.5f /* mV/C */

View File

@ -257,8 +257,6 @@ extern uint32_t pios_com_hkosd_id;
#define PIOS_ADC_VOLTAGE_SCALE 3.30f / 4096.0f
#define PIOS_ADC_USE_TEMP_SENSOR
#define PIOS_ADC_VOLTAGE_SCALE 3.30f/4096.0f
#define PIOS_ADC_TEMPERATURE_PIN 3 /* V */
#define PIOS_ADC_STM32_TEMP_V25 0.76f /* mV/C */
#define PIOS_ADC_STM32_TEMP_AVG_SLOPE 2.5f