Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 21:05:35 +03:00
Code Issues Wiki Activity

Merge pull request #4995 from mikeller/fix_use_stragglers

Browse source 
Fixed `USE_` stragglers.
This commit is contained in:
Martin Budden 2018-01-20 13:06:22 +00:00 • committed by GitHub
commit db0f1c4f10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/target/PYRODRONEF4/target.h
View file

@ -49,7 +49,7 @@
#define SPI2_MISO_PIN PB14 #define SPI2_MISO_PIN PB14
#define SPI2_MOSI_PIN PB15 #define SPI2_MOSI_PIN PB15
#define OSD #define USE_OSD
#define USE_MAX7456 #define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN PB12 #define MAX7456_SPI_CS_PIN PB12
@ -99,7 +99,7 @@
#define VBAT_ADC_PIN PC2 #define VBAT_ADC_PIN PC2
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_NONE #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_NONE
#define TRANSPONDER #define USE_TRANSPONDER
// DEFINE DEFAULT FEATURE // DEFINE DEFAULT FEATURE
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL

2
src/main/telemetry/ibus_shared.c
View file

@ -242,7 +242,7 @@
static uint16_t getTemperature() static uint16_t getTemperature()
{ {
uint16_t temperature = gyroGetTemperature() * 10; uint16_t temperature = gyroGetTemperature() * 10;
#if defined(BARO) #if defined(USE_BARO)
if (sensors(SENSOR_BARO)) { if (sensors(SENSOR_BARO)) {
temperature = (uint16_t) ((baro.baroTemperature + 50) / 10); temperature = (uint16_t) ((baro.baroTemperature + 50) / 10);
} }