From 093025f44421a5c4b1699051f462f7574bd0532e Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 3 Jul 2019 17:17:42 +0200 Subject: [PATCH] Bsongis/remove cpu temperature (#6541) Remove CPU temperature --- companion/src/firmwares/generalsettings.h | 2 - .../src/firmwares/opentx/opentxeeprom.cpp | 8 +-- radio/src/datastructs.h | 2 +- radio/src/gui/128x64/radio_hardware.cpp | 21 -------- radio/src/gui/128x64/radio_setup.cpp | 10 ---- radio/src/gui/128x64/view_main.cpp | 5 +- radio/src/gui/128x64/view_statistics.cpp | 10 ---- radio/src/gui/212x64/view_statistics.cpp | 5 -- radio/src/gui/480x272/view_statistics.cpp | 6 --- radio/src/main.cpp | 3 -- radio/src/simu.cpp | 7 --- .../conversions/conversions_216_218.cpp | 3 +- .../targets/common/arm/stm32/adc_driver.cpp | 54 +++++++------------ .../targets/common/arm/stm32/board_common.h | 1 - radio/src/targets/simu/opentxsimulator.cpp | 5 +- radio/src/targets/sky9x/adc_driver.cpp | 5 -- radio/src/targets/sky9x/board.cpp | 5 -- radio/src/targets/sky9x/board.h | 4 -- radio/src/targets/taranis/board.h | 1 - 19 files changed, 29 insertions(+), 128 deletions(-) diff --git a/companion/src/firmwares/generalsettings.h b/companion/src/firmwares/generalsettings.h index 227c0c04a..1bb9217dc 100644 --- a/companion/src/firmwares/generalsettings.h +++ b/companion/src/firmwares/generalsettings.h @@ -130,8 +130,6 @@ class GeneralSettings { unsigned int backlightBright; unsigned int backlightOffBright; int switchesDelay; - int temperatureCalib; - int temperatureWarn; unsigned int mAhWarn; unsigned int mAhUsed; unsigned int globalTimer; diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp index eeea646a1..b03e746cb 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.cpp +++ b/companion/src/firmwares/opentx/opentxeeprom.cpp @@ -2354,11 +2354,11 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type internalField.Append(new UnsignedField<8>(this, generalData.backlightBright)); if (version < 218) internalField.Append(new SignedField<8>(this, generalData.txCurrentCalibration)); - if (version < 218) internalField.Append(new SignedField<8>(this, generalData.temperatureWarn)); + if (version < 218) internalField.Append(new SpareBitsField<8>(this)); if (version < 218) internalField.Append(new UnsignedField<8>(this, generalData.mAhWarn)); if (version < 218) internalField.Append(new UnsignedField<16>(this, generalData.mAhUsed)); internalField.Append(new UnsignedField<32>(this, generalData.globalTimer)); - if (version < 218) internalField.Append(new SignedField<8>(this, generalData.temperatureCalib)); + if (version < 218) internalField.Append(new SpareBitsField<8>(this)); internalField.Append(new UnsignedField<4>(this, generalData.bluetoothBaudrate)); internalField.Append(new UnsignedField<4>(this, generalData.bluetoothMode)); if (version < 218) internalField.Append(new BoolField<8>(this, generalData.optrexDisplay)); @@ -2440,10 +2440,10 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type } else if (IS_SKY9X(board) && version >= 218) { internalField.Append(new SignedField<8>(this, generalData.txCurrentCalibration)); - internalField.Append(new SignedField<8>(this, generalData.temperatureWarn)); + internalField.Append(new SpareBitsField<8>(this)); internalField.Append(new UnsignedField<8>(this, generalData.mAhWarn)); internalField.Append(new UnsignedField<16>(this, generalData.mAhUsed)); - internalField.Append(new SignedField<8>(this, generalData.temperatureCalib)); + internalField.Append(new SpareBitsField<8>(this)); internalField.Append(new BoolField<8>(this, generalData.optrexDisplay)); internalField.Append(new UnsignedField<8>(this, generalData.sticksGain)); internalField.Append(new UnsignedField<8>(this, generalData.rotarySteps)); diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h index da984a14d..0fcfdbb20 100644 --- a/radio/src/datastructs.h +++ b/radio/src/datastructs.h @@ -693,7 +693,7 @@ PACK(struct TrainerData { #elif defined(PCBSKY9X) #define EXTRA_GENERAL_FIELDS \ int8_t txCurrentCalibration; \ - int8_t temperatureWarn; \ + int8_t spare; \ uint8_t mAhWarn; \ uint16_t mAhUsed; \ int8_t temperatureCalib; \ diff --git a/radio/src/gui/128x64/radio_hardware.cpp b/radio/src/gui/128x64/radio_hardware.cpp index 8ef7e3c1b..dada28aa0 100644 --- a/radio/src/gui/128x64/radio_hardware.cpp +++ b/radio/src/gui/128x64/radio_hardware.cpp @@ -118,9 +118,6 @@ enum { #if defined(TX_CAPACITY_MEASUREMENT) ITEM_RADIO_HARDWARE_CAPACITY_CALIB, #endif -#if defined(PCBSKY9X) - ITEM_RADIO_HARDWARE_TEMPERATURE_CALIB, -#endif #if defined(CROSSFIRE) && SPORT_MAX_BAUDRATE < 400000 ITEM_RADIO_HARDWARE_SERIAL_BAUDRATE, #endif @@ -183,12 +180,6 @@ enum { #define TX_CAPACITY_MEASUREMENT_ROWS #endif -#if defined(PCBSKY9X) - #define TEMPERATURE_CALIB_ROWS 0, -#else - #define TEMPERATURE_CALIB_ROWS -#endif - #if defined(CROSSFIRE) && SPORT_MAX_BAUDRATE < 400000 #define MAX_BAUD_ROWS 0, #else @@ -215,8 +206,6 @@ void menuRadioHardware(event_t event) TX_CAPACITY_MEASUREMENT_ROWS - TEMPERATURE_CALIB_ROWS - MAX_BAUD_ROWS BLUETOOTH_ROWS @@ -348,16 +337,6 @@ void menuRadioHardware(event_t event) break; #endif -#if defined(PCBSKY9X) - case ITEM_RADIO_HARDWARE_TEMPERATURE_CALIB: - lcdDrawTextAlignedLeft(y, STR_TEMP_CALIB); - drawValueWithUnit(HW_SETTINGS_COLUMN2, y, getTemperature(), UNIT_TEMPERATURE, attr) ; - if (attr) { - CHECK_INCDEC_GENVAR(event, g_eeGeneral.temperatureCalib, -100, 100); - } - break; -#endif - #if defined(CROSSFIRE) && SPORT_MAX_BAUDRATE < 400000 case ITEM_RADIO_HARDWARE_SERIAL_BAUDRATE: lcdDrawTextAlignedLeft(y, STR_MAXBAUDRATE); diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index a87a78e48..230761ffc 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -75,7 +75,6 @@ enum MenuRadioSetupItems { ITEM_SETUP_ALARMS_LABEL, ITEM_SETUP_BATTERY_WARNING, CASE_CAPACITY(ITEM_SETUP_CAPACITY_WARNING) - CASE_PCBSKY9X(ITEM_SETUP_TEMPERATURE_WARNING) ITEM_SETUP_INACTIVITY_ALARM, ITEM_SETUP_MEMORY_WARNING, ITEM_SETUP_ALARM_WARNING, @@ -153,7 +152,6 @@ void menuRadioSetup(event_t event) CASE_GYRO(0) CASE_GYRO(0) 0, LABEL(ALARMS), 0, CASE_CAPACITY(0) - CASE_PCBSKY9X(0) 0, 0, 0, 0, LABEL(BACKLIGHT), 0, 0, 0, CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) @@ -444,14 +442,6 @@ void menuRadioSetup(event_t event) break; #endif -#if defined(PCBSKY9X) - case ITEM_SETUP_TEMPERATURE_WARNING: - lcdDrawTextAlignedLeft(y, STR_TEMPWARNING); - drawValueWithUnit(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.temperatureWarn, UNIT_TEMPERATURE, attr|LEFT) ; - if(attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.temperatureWarn, 0, 120); // 0 means no alarm - break; -#endif - case ITEM_SETUP_INACTIVITY_ALARM: lcdDrawTextAlignedLeft(y, STR_INACTIVITYALARM); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.inactivityTimer, attr|LEFT); diff --git a/radio/src/gui/128x64/view_main.cpp b/radio/src/gui/128x64/view_main.cpp index e17aebc9e..50db7f60e 100644 --- a/radio/src/gui/128x64/view_main.cpp +++ b/radio/src/gui/128x64/view_main.cpp @@ -213,10 +213,7 @@ void displayBattVoltage() #if defined(PCBSKY9X) void displayVoltageOrAlarm() { - if (g_eeGeneral.temperatureWarn && getTemperature() >= g_eeGeneral.temperatureWarn) { - drawValueWithUnit(6*FW-1, 2*FH, getTemperature(), UNIT_TEMPERATURE, BLINK|INVERS|DBLSIZE|RIGHT); - } - else if (g_eeGeneral.mAhWarn && (g_eeGeneral.mAhUsed + Current_used * (488 + g_eeGeneral.txCurrentCalibration)/8192/36) / 500 >= g_eeGeneral.mAhWarn) { + if (g_eeGeneral.mAhWarn && (g_eeGeneral.mAhUsed + Current_used * (488 + g_eeGeneral.txCurrentCalibration)/8192/36) / 500 >= g_eeGeneral.mAhWarn) { drawValueWithUnit(7*FW-1, 2*FH, (g_eeGeneral.mAhUsed + Current_used*(488 + g_eeGeneral.txCurrentCalibration)/8192/36)/10, UNIT_MAH, BLINK|INVERS|DBLSIZE|RIGHT); } else { diff --git a/radio/src/gui/128x64/view_statistics.cpp b/radio/src/gui/128x64/view_statistics.cpp index ab9001cb1..7a62401e6 100644 --- a/radio/src/gui/128x64/view_statistics.cpp +++ b/radio/src/gui/128x64/view_statistics.cpp @@ -256,16 +256,6 @@ void menuStatisticsDebug(event_t event) y += FH; #endif -#if defined(PCBSKY9X) - lcdDrawTextAlignedLeft(y, STR_CPU_TEMP); - drawValueWithUnit(MENU_DEBUG_COL1_OFS, y, getTemperature(), UNIT_TEMPERATURE, LEFT); - lcdDrawChar(MENU_DEBUG_COL2_OFS, y, '>'); - drawValueWithUnit(MENU_DEBUG_COL2_OFS+FW+1, y, maxTemperature+g_eeGeneral.temperatureCalib, UNIT_TEMPERATURE, LEFT); -#else - lcdDrawTextAlignedLeft(y, STR_CPU_TEMP); - drawValueWithUnit(MENU_DEBUG_COL1_OFS, y, getTemperature(), UNIT_TEMPERATURE, PREC1|LEFT); -#endif - lcdDrawText(LCD_W/2, 7*FH+1, STR_MENUTORESET, CENTERED); lcdInvertLastLine(); } diff --git a/radio/src/gui/212x64/view_statistics.cpp b/radio/src/gui/212x64/view_statistics.cpp index 740ed41a0..af6a4d697 100644 --- a/radio/src/gui/212x64/view_statistics.cpp +++ b/radio/src/gui/212x64/view_statistics.cpp @@ -226,11 +226,6 @@ void menuStatisticsDebug(event_t event) y += FH; #endif -#if defined(STM32) - lcdDrawTextAlignedLeft(y, STR_CPU_TEMP); - drawValueWithUnit(MENU_DEBUG_COL1_OFS, y, getTemperature(), UNIT_TEMPERATURE, PREC1|LEFT); -#endif - lcdDrawText(LCD_W/2, 7*FH+1, STR_MENUTORESET, CENTERED); lcdInvertLastLine(); } diff --git a/radio/src/gui/480x272/view_statistics.cpp b/radio/src/gui/480x272/view_statistics.cpp index c6df6ac6a..f2bce9255 100644 --- a/radio/src/gui/480x272/view_statistics.cpp +++ b/radio/src/gui/480x272/view_statistics.cpp @@ -160,12 +160,6 @@ bool menuStatsDebug(event_t event) y += FH; #endif -//#if defined(STM32) -// lcdDrawText(MENUS_MARGIN_LEFT, y, STR_CPU_TEMP); -// drawValueWithUnit(MENU_STATS_COLUMN1, y, getTemperature(), UNIT_TEMPERATURE, PREC1|LEFT); -// y += FH; -//#endif - #if defined(DISK_CACHE) lcdDrawText(MENUS_MARGIN_LEFT, y, "SD cache hits"); lcdDrawNumber(MENU_STATS_COLUMN1, y, diskCache.getHitRate(), PREC1|LEFT, 0, NULL, "%"); diff --git a/radio/src/main.cpp b/radio/src/main.cpp index 094e1a32f..c7e42f5da 100644 --- a/radio/src/main.cpp +++ b/radio/src/main.cpp @@ -189,9 +189,6 @@ void checkBatteryAlarms() // TRACE("checkBatteryAlarms(): battery low"); } #if defined(PCBSKY9X) - else if (g_eeGeneral.temperatureWarn && getTemperature() >= g_eeGeneral.temperatureWarn) { - AUDIO_TX_TEMP_HIGH(); - } else if (g_eeGeneral.mAhWarn && (g_eeGeneral.mAhUsed + Current_used * (488 + g_eeGeneral.txCurrentCalibration)/8192/36) / 500 >= g_eeGeneral.mAhWarn) { // TODO move calculation into board file AUDIO_TX_MAH_HIGH(); } diff --git a/radio/src/simu.cpp b/radio/src/simu.cpp index f689176d3..281cd8831 100644 --- a/radio/src/simu.cpp +++ b/radio/src/simu.cpp @@ -364,11 +364,6 @@ long OpenTxSim::onTimeout(FXObject*, FXSelector, void*) Coproc_maxtemp = 28; #endif -#if defined(PCBSKY9X) - temperature = 31; - maxTemperature = 42; -#endif - updateKeysAndSwitches(); #if defined(ROTARY_ENCODER_NAVIGATION) @@ -557,8 +552,6 @@ uint16_t anaIn(uint8_t chan) #if defined(PCBTARANIS) else if (chan == TX_INTREF) return 826; // 3V VDD - else if (chan == TX_TEMPERATURE) - return 520; else if (chan == TX_RTC_VOLTAGE) return 800; // 2.34V #endif diff --git a/radio/src/storage/conversions/conversions_216_218.cpp b/radio/src/storage/conversions/conversions_216_218.cpp index f5b5d444a..dc9c03f2f 100644 --- a/radio/src/storage/conversions/conversions_216_218.cpp +++ b/radio/src/storage/conversions/conversions_216_218.cpp @@ -776,7 +776,7 @@ PACK(typedef struct { uint8_t backlightBright; int8_t txCurrentCalibration; - int8_t temperatureWarn; + int8_t spare; uint8_t mAhWarn; uint16_t mAhUsed; uint32_t globalTimer; @@ -883,7 +883,6 @@ void convertRadioData_217_to_218(RadioData &settings) #if defined(PCBSKY9X) settings.txCurrentCalibration = settings_v217.txCurrentCalibration; - settings.temperatureWarn = settings_v217.temperatureWarn; settings.mAhWarn = settings_v217.mAhWarn; settings.mAhUsed = settings_v217.mAhUsed; settings.temperatureCalib = settings_v217.temperatureCalib; diff --git a/radio/src/targets/common/arm/stm32/adc_driver.cpp b/radio/src/targets/common/arm/stm32/adc_driver.cpp index 0bdf92e19..73a5d7567 100644 --- a/radio/src/targets/common/arm/stm32/adc_driver.cpp +++ b/radio/src/targets/common/arm/stm32/adc_driver.cpp @@ -26,24 +26,24 @@ const int8_t adcDirection[NUM_ANALOGS] = {1,-1,1,-1, -1,1,-1, 1,-1, 1, 1,1}; #elif defined(PCBX9E) #if defined(HORUS_STICKS) - const int8_t adcDirection[NUM_ANALOGS] = {1,-1,1,-1, -1,-1,-1,1, -1,1,-1,-1, -1, -1,-1,-1}; + const int8_t adcDirection[NUM_ANALOGS] = {1,-1,1,-1, -1,-1,-1,1, -1,1,-1,-1, -1,-1,-1}; #else - const int8_t adcDirection[NUM_ANALOGS] = {1,1,-1,-1, -1,-1,-1,1, -1,1,-1,-1, -1, -1,-1,-1}; + const int8_t adcDirection[NUM_ANALOGS] = {1,1,-1,-1, -1,-1,-1,1, -1,1,-1,-1, -1,-1,-1}; #endif const uint8_t adcMapping[NUM_ANALOGS] = { 0 /*STICK1*/, 1 /*STICK2*/, 2 /*STICK3*/, 3 /*STICK4*/, - 13 /*POT1*/, 4 /*POT2*/, 5 /*POT3*/, 6 /*POT4*/, - 14 /*SLIDER1*/, 15 /*SLIDER2*/, 7 /*SLIDER3*/, 8 /*SLIDER4*/, - 9 /*TX_VOLTAGE*/, 10 /*TX_TEMP*/, 11 /*ADC_INTREF*/, 12 /*TX_VBAT*/ }; + 12 /*POT1*/, 4 /*POT2*/, 5 /*POT3*/, 6 /*POT4*/, + 13 /*SLIDER1*/, 14 /*SLIDER2*/, 7 /*SLIDER3*/, 8 /*SLIDER4*/, + 9 /*TX_VOLTAGE*/, 10 /*ADC_INTREF*/, 11 /*TX_VBAT*/ }; #elif defined(PCBX9DP) - const int8_t adcDirection[NUM_ANALOGS] = {1,-1,1,-1, 1,1,-1, 1,1, 1, 1,1,1}; + const int8_t adcDirection[NUM_ANALOGS] = {1,-1,1,-1, 1,1,-1, 1,1, 1, 1,1}; #elif defined(PCBX7) - const int8_t adcDirection[NUM_ANALOGS] = {-1,1,-1,1, 1,1, 1, 1,1,1}; + const int8_t adcDirection[NUM_ANALOGS] = {-1,1,-1,1, 1,1, 1, 1,1}; #elif defined(PCBX9LITE) - const int8_t adcDirection[NUM_ANALOGS] = {-1,1,-1,1, 1,1, 1,1,1}; + const int8_t adcDirection[NUM_ANALOGS] = {-1,1,-1,1, 1,1, 1,1}; #elif defined(PCBXLITE) - const int8_t adcDirection[NUM_ANALOGS] = {1,-1,-1,1, -1,1, 1, 1,1,1}; + const int8_t adcDirection[NUM_ANALOGS] = {1,-1,-1,1, -1,1, 1, 1,1}; #else - const int8_t adcDirection[NUM_ANALOGS] = {1,-1,1,-1, 1,1,0, 1,1, 1, 1,1,1}; + const int8_t adcDirection[NUM_ANALOGS] = {1,-1,1,-1, 1,1,0, 1,1, 1, 1,1}; #endif #if NUM_PWMSTICKS > 0 @@ -51,7 +51,7 @@ #define NUM_ANALOGS_ADC (STICKS_PWM_ENABLED() ? (NUM_ANALOGS - NUM_PWMSTICKS) : NUM_ANALOGS) #elif defined(PCBX9E) #define FIRST_ANALOG_ADC 0 - #define NUM_ANALOGS_ADC 13 + #define NUM_ANALOGS_ADC 12 #define NUM_ANALOGS_ADC_EXT (NUM_ANALOGS - NUM_ANALOGS_ADC) #else #define FIRST_ANALOG_ADC 0 @@ -106,27 +106,25 @@ void adcInit() ADC_MAIN->SQR3 = (ADC_CHANNEL_STICK_LH << 0) + (ADC_CHANNEL_STICK_LV << 5) + (ADC_CHANNEL_STICK_RV << 10) + (ADC_CHANNEL_STICK_RH << 15) + (ADC_CHANNEL_POT1 << 20) + (ADC_CHANNEL_POT2 << 25); } #elif defined(PCBX9E) - ADC_MAIN->SQR1 |= (ADC_Channel_Vbat << 0); - ADC_MAIN->SQR2 = (ADC_CHANNEL_POT4 << 0) + (ADC_CHANNEL_SLIDER3 << 5) + (ADC_CHANNEL_SLIDER4 << 10) + (ADC_CHANNEL_BATT << 15) + (ADC_Channel_TempSensor << 20) + (ADC_Channel_Vrefint << 25); + ADC_MAIN->SQR2 = (ADC_CHANNEL_POT4 << 0) + (ADC_CHANNEL_SLIDER3 << 5) + (ADC_CHANNEL_SLIDER4 << 10) + (ADC_CHANNEL_BATT << 15) + (ADC_Channel_Vrefint << 20) + (ADC_Channel_Vbat << 25); ADC_MAIN->SQR3 = (ADC_CHANNEL_STICK_LH << 0) + (ADC_CHANNEL_STICK_LV << 5) + (ADC_CHANNEL_STICK_RV << 10) + (ADC_CHANNEL_STICK_RH << 15) + (ADC_CHANNEL_POT2 << 20) + (ADC_CHANNEL_POT3 << 25); #elif defined(PCBXLITE) if (STICKS_PWM_ENABLED()) { ADC_MAIN->SQR2 = 0; - ADC_MAIN->SQR3 = (ADC_CHANNEL_POT1 << 0) + (ADC_CHANNEL_POT2 << 5) + (ADC_CHANNEL_BATT << 10) + (ADC_Channel_TempSensor << 15) + (ADC_Channel_Vrefint << 20) + (ADC_Channel_Vbat << 25); + ADC_MAIN->SQR3 = (ADC_CHANNEL_POT1 << 0) + (ADC_CHANNEL_POT2 << 5) + (ADC_CHANNEL_BATT << 10) + (ADC_Channel_Vrefint << 15) + (ADC_Channel_Vbat << 20); } else { - ADC_MAIN->SQR2 = (ADC_CHANNEL_BATT << 0) + (ADC_Channel_TempSensor << 5) + (ADC_Channel_Vrefint << 10) + (ADC_Channel_Vbat << 15); + ADC_MAIN->SQR2 = (ADC_CHANNEL_BATT << 0) + (ADC_Channel_Vrefint << 5) + (ADC_Channel_Vbat << 10); ADC_MAIN->SQR3 = (ADC_CHANNEL_STICK_LH << 0) + (ADC_CHANNEL_STICK_LV << 5) + (ADC_CHANNEL_STICK_RV << 10) + (ADC_CHANNEL_STICK_RH << 15) + (ADC_CHANNEL_POT1 << 20) + (ADC_CHANNEL_POT2 << 25); } #elif defined(PCBX7) - ADC_MAIN->SQR2 = (ADC_CHANNEL_BATT << 0) + (ADC_Channel_TempSensor << 5) + (ADC_Channel_Vrefint << 10) + (ADC_Channel_Vbat << 15); + ADC_MAIN->SQR2 = (ADC_CHANNEL_BATT << 0) + (ADC_Channel_Vrefint << 5) + (ADC_Channel_Vbat << 10); ADC_MAIN->SQR3 = (ADC_CHANNEL_STICK_LH << 0) + (ADC_CHANNEL_STICK_LV << 5) + (ADC_CHANNEL_STICK_RV << 10) + (ADC_CHANNEL_STICK_RH << 15) + (ADC_CHANNEL_POT1 << 20) + (ADC_CHANNEL_POT2 << 25); #elif defined(PCBX9LITE) - ADC_MAIN->SQR2 = (ADC_Channel_TempSensor << 0) + (ADC_Channel_Vrefint << 5) + (ADC_Channel_Vbat << 10); + ADC_MAIN->SQR2 = (ADC_Channel_Vrefint << 0) + (ADC_Channel_Vbat << 5); ADC_MAIN->SQR3 = (ADC_CHANNEL_STICK_LH << 0) + (ADC_CHANNEL_STICK_LV << 5) + (ADC_CHANNEL_STICK_RV << 10) + (ADC_CHANNEL_STICK_RH << 15) + (ADC_CHANNEL_POT1 << 20) + (ADC_CHANNEL_BATT << 25); #elif defined(PCBX9D) || defined(PCBX9DP) - ADC_MAIN->SQR1 |= (ADC_Channel_Vbat<<0); - ADC_MAIN->SQR2 = (ADC_CHANNEL_POT3 << 0) + (ADC_CHANNEL_SLIDER1 << 5) + (ADC_CHANNEL_SLIDER2 << 10) + (ADC_CHANNEL_BATT << 15) + (ADC_Channel_TempSensor << 20) + (ADC_Channel_Vrefint << 25); + ADC_MAIN->SQR2 = (ADC_CHANNEL_POT3 << 0) + (ADC_CHANNEL_SLIDER1 << 5) + (ADC_CHANNEL_SLIDER2 << 10) + (ADC_CHANNEL_BATT << 15) + (ADC_Channel_Vrefint << 20) + (ADC_Channel_Vbat << 25); ADC_MAIN->SQR3 = (ADC_CHANNEL_STICK_LH << 0) + (ADC_CHANNEL_STICK_LV << 5) + (ADC_CHANNEL_STICK_RV << 10) + (ADC_CHANNEL_STICK_RH << 15) + (ADC_CHANNEL_POT1 << 20) + (ADC_CHANNEL_POT2 << 25); #endif @@ -157,8 +155,8 @@ void adcInit() ADC_EXT->SQR1 = (NUM_ANALOGS_ADC_EXT - 1) << 20; ADC_EXT->SQR2 = 0; ADC_EXT->SQR3 = (ADC_CHANNEL_POT1 << 0) + (ADC_CHANNEL_SLIDER1 << 5) + (ADC_CHANNEL_SLIDER2 << 10); // conversions 1 to 3 - ADC_EXT->SMPR1 = 0; - ADC_EXT->SMPR2 = (ADC_EXT_SAMPTIME << (3*ADC_CHANNEL_POT1)) + (ADC_EXT_SAMPTIME << (3*ADC_CHANNEL_SLIDER1)) + (ADC_EXT_SAMPTIME << (3*ADC_CHANNEL_SLIDER2)); + ADC_EXT->SMPR1 = (ADC_SAMPTIME << 0) + (ADC_SAMPTIME << 3) + (ADC_SAMPTIME << 6) + (ADC_SAMPTIME << 9) + (ADC_SAMPTIME << 12) + (ADC_SAMPTIME << 15) + (ADC_SAMPTIME << 18) + (ADC_SAMPTIME << 21) + (ADC_SAMPTIME << 24); + ADC_EXT->SMPR2 = (ADC_SAMPTIME << 0) + (ADC_SAMPTIME << 3) + (ADC_SAMPTIME << 6) + (ADC_SAMPTIME << 9) + (ADC_SAMPTIME << 12) + (ADC_SAMPTIME << 15) + (ADC_SAMPTIME << 18) + (ADC_SAMPTIME << 21) + (ADC_SAMPTIME << 24) + (ADC_SAMPTIME << 27); ADC_EXT_DMA_Stream->CR = DMA_SxCR_PL | DMA_SxCR_CHSEL_1 | DMA_SxCR_MSIZE_0 | DMA_SxCR_PSIZE_0 | DMA_SxCR_MINC; ADC_EXT_DMA_Stream->PAR = CONVERT_PTR_UINT(&ADC_EXT->DR); @@ -189,7 +187,7 @@ void adcSingleRead() #if defined(PCBX9E) ADC_EXT_DMA_Stream->CR &= ~DMA_SxCR_EN; // Disable DMA - ADC_EXT->SR &= ~(uint32_t) ( ADC_SR_EOC | ADC_SR_STRT | ADC_SR_OVR ); + ADC_EXT->SR &= ~(uint32_t)(ADC_SR_EOC | ADC_SR_STRT | ADC_SR_OVR); ADC_EXT_SET_DMA_FLAGS(); ADC_EXT_DMA_Stream->CR |= DMA_SxCR_EN; // Enable DMA ADC_EXT->CR2 |= (uint32_t)ADC_CR2_SWSTART; @@ -253,18 +251,6 @@ uint16_t getRTCBatteryVoltage() return rtcBatteryVoltage * 330 / 2048; } #else -// Returns temperature in 10*C -uint16_t getTemperature() -{ - // VDD IN 1/10 mV - int vdd = 2048 * 12100 / anaIn(TX_INTREF); - int vtemp = vdd * anaIn(TX_TEMPERATURE) / 2048; - - // From Doc ID 15818 Rev 7 for STM32F2: - // 25 C = 0.76V, 2.5 mV/C - return (vtemp - 7600) * 10 / 25 + 250; -} - uint16_t getRTCBatteryVoltage() { return (uint16_t )(12100 * 2048 / anaIn(TX_INTREF) * anaIn(TX_RTC_VOLTAGE) / 204800 * 2); diff --git a/radio/src/targets/common/arm/stm32/board_common.h b/radio/src/targets/common/arm/stm32/board_common.h index 6bd1a1597..9ede09768 100644 --- a/radio/src/targets/common/arm/stm32/board_common.h +++ b/radio/src/targets/common/arm/stm32/board_common.h @@ -103,7 +103,6 @@ void adcInit(); void adcRead(); uint16_t getAnalogValue(uint8_t index); uint16_t getBatteryVoltage(); // returns current battery voltage in 10mV steps -uint16_t getTemperature(); uint16_t getRTCBatteryVoltage(); // STM32 uses a 25K+25K voltage divider bridge to measure the battery voltage diff --git a/radio/src/targets/simu/opentxsimulator.cpp b/radio/src/targets/simu/opentxsimulator.cpp index 54b5fc390..ee6e77194 100644 --- a/radio/src/targets/simu/opentxsimulator.cpp +++ b/radio/src/targets/simu/opentxsimulator.cpp @@ -112,9 +112,8 @@ void OpenTxSimulator::init() memset(g_anas, 0, sizeof(g_anas)); #if defined(PCBTARANIS) - g_anas[TX_INTREF] = 826; // 3V VDD - g_anas[TX_RTC_VOLTAGE] = 800; // 2,34V - g_anas[TX_TEMPERATURE] = 520; + g_anas[TX_INTREF] = 826; // 3V VDD + g_anas[TX_RTC_VOLTAGE] = 800; // 2,34V #endif simuInit(); diff --git a/radio/src/targets/sky9x/adc_driver.cpp b/radio/src/targets/sky9x/adc_driver.cpp index dfc6d3578..1f550392a 100644 --- a/radio/src/targets/sky9x/adc_driver.cpp +++ b/radio/src/targets/sky9x/adc_driver.cpp @@ -90,11 +90,6 @@ void adcSingleRead() adcValues[7] = ADC->ADC_CDR14; adcValues[8] = ADC->ADC_CDR8 ; - temperature = (((int32_t)temperature * 7) + ((((int32_t)ADC->ADC_CDR15 - 838) * 621) >> 11)) >> 3; // Filter it - if (get_tmr10ms() >= 100 && temperature > maxTemperature) { - maxTemperature = temperature; - } - // adc direction correct #if defined(FRSKY_STICKS) uint32_t i ; diff --git a/radio/src/targets/sky9x/board.cpp b/radio/src/targets/sky9x/board.cpp index 776d050a4..5b1c2361e 100644 --- a/radio/src/targets/sky9x/board.cpp +++ b/radio/src/targets/sky9x/board.cpp @@ -438,11 +438,6 @@ uint16_t getCurrent() return (current_scale * Current) / 8192; } -uint8_t getTemperature() -{ - return temperature + g_eeGeneral.temperatureCalib; -} - #define STICK_LV_GAIN 0x01 #define STICK_LH_GAIN 0x02 #define STICK_RV_GAIN 0x04 diff --git a/radio/src/targets/sky9x/board.h b/radio/src/targets/sky9x/board.h index e173e1fb0..24849e613 100644 --- a/radio/src/targets/sky9x/board.h +++ b/radio/src/targets/sky9x/board.h @@ -199,10 +199,6 @@ void usbMassStorage(); void configure_pins( uint32_t pins, uint16_t config ); uint16_t getCurrent(); -extern uint8_t temperature ; // Raw temp reading -extern uint8_t maxTemperature ; // Raw temp reading -uint8_t getTemperature(); - extern uint16_t Current_analogue; extern uint16_t Current_max; extern uint32_t Current_accumulator; diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h index 4d76e0f29..7dc7445dc 100644 --- a/radio/src/targets/taranis/board.h +++ b/radio/src/targets/taranis/board.h @@ -453,7 +453,6 @@ enum Analogs { SLIDER2, #endif TX_VOLTAGE, - TX_TEMPERATURE, TX_INTREF, TX_RTC_VOLTAGE, NUM_ANALOGS