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

remove unused OSD data

Browse source 
add dynamic filters to F3 and F7 targets
fix COLIBRI_RACE and OMNIBUS
This commit is contained in:
rav 2017-05-12 17:13:51 +02:00
parent 75089ea24c
commit c7f8e4d7a4
5 changed files with 36 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/sensors/gyroanalyse.c
View file

@ -276,14 +276,6 @@ void gyroDataAnalyseUpdate(biquadFilter_t *notchFilterDyn) {
} }
} }
// copy data for display in OSD
const float scaleFactor = 255.0 / MIN(1, fftResult[axis].maxVal);
const int count = MIN(GYRO_FFT_BIN_COUNT, fftBinCount);
for (int ii = 0; ii < count; ++ii) {
fftResult[axis].bins[ii] = fftData[ii] * scaleFactor;
}
DEBUG_SET(DEBUG_FFT_FREQ, axis, fftResult[axis].centerFreq); DEBUG_SET(DEBUG_FFT_FREQ, axis, fftResult[axis].centerFreq);
DEBUG_SET(DEBUG_FFT_TIME, 1, micros() - startTime); DEBUG_SET(DEBUG_FFT_TIME, 1, micros() - startTime);
break; break;

1
src/main/sensors/gyroanalyse.h
View file

@ -22,7 +22,6 @@
#define GYRO_FFT_BIN_COUNT 16 // FFT_WINDOW_SIZE / 2 #define GYRO_FFT_BIN_COUNT 16 // FFT_WINDOW_SIZE / 2
typedef struct gyroFftData_s { typedef struct gyroFftData_s {
uint8_t bins[GYRO_FFT_BIN_COUNT];
float maxVal; float maxVal;
uint16_t centerFreq; uint16_t centerFreq;
} gyroFftData_t; } gyroFftData_t;

62
src/main/target/COLIBRI_RACE/i2c_bst.c
View file

@ -151,34 +151,38 @@ typedef struct box_e {
// FIXME remove ;'s // FIXME remove ;'s
static const box_t boxes[CHECKBOX_ITEM_COUNT + 1] = { static const box_t boxes[CHECKBOX_ITEM_COUNT + 1] = {
{ BOXARM, "ARM;", 0 }, { BOXARM, "ARM", 0 },
{ BOXANGLE, "ANGLE;", 1 }, { BOXANGLE, "ANGLE", 1 },
{ BOXHORIZON, "HORIZON;", 2 }, { BOXHORIZON, "HORIZON", 2 },
{ BOXBARO, "BARO;", 3 }, { BOXBARO, "BARO", 3 },
//{ BOXVARIO, "VARIO;", 4 }, { BOXANTIGRAVITY, "ANTI GRAVITY", 4 },
{ BOXMAG, "MAG;", 5 }, { BOXMAG, "MAG", 5 },
{ BOXHEADFREE, "HEADFREE;", 6 }, { BOXHEADFREE, "HEADFREE", 6 },
{ BOXHEADADJ, "HEADADJ;", 7 }, { BOXHEADADJ, "HEADADJ", 7 },
{ BOXCAMSTAB, "CAMSTAB;", 8 }, { BOXCAMSTAB, "CAMSTAB", 8 },
{ BOXCAMTRIG, "CAMTRIG;", 9 }, { BOXCAMTRIG, "CAMTRIG", 9 },
{ BOXGPSHOME, "GPS HOME;", 10 }, { BOXGPSHOME, "GPS HOME", 10 },
{ BOXGPSHOLD, "GPS HOLD;", 11 }, { BOXGPSHOLD, "GPS HOLD", 11 },
{ BOXPASSTHRU, "PASSTHRU;", 12 }, { BOXPASSTHRU, "PASSTHRU", 12 },
{ BOXBEEPERON, "BEEPER;", 13 }, { BOXBEEPERON, "BEEPER", 13 },
{ BOXLEDMAX, "LEDMAX;", 14 }, { BOXLEDMAX, "LEDMAX", 14 },
{ BOXLEDLOW, "LEDLOW;", 15 }, { BOXLEDLOW, "LEDLOW", 15 },
{ BOXLLIGHTS, "LLIGHTS;", 16 }, { BOXLLIGHTS, "LLIGHTS", 16 },
{ BOXCALIB, "CALIB;", 17 }, { BOXCALIB, "CALIB", 17 },
{ BOXGOV, "GOVERNOR;", 18 }, { BOXGOV, "GOVERNOR", 18 },
{ BOXOSD, "OSD SW;", 19 }, { BOXOSD, "OSD SW", 19 },
{ BOXTELEMETRY, "TELEMETRY;", 20 }, { BOXTELEMETRY, "TELEMETRY", 20 },
{ BOXGTUNE, "GTUNE;", 21 }, { BOXDYNAMICFILTER, "DYNAMIC FILTER", 21 },
{ BOXSONAR, "SONAR;", 22 }, { BOXSONAR, "SONAR", 22 },
{ BOXSERVO1, "SERVO1;", 23 }, { BOXSERVO1, "SERVO1", 23 },
{ BOXSERVO2, "SERVO2;", 24 }, { BOXSERVO2, "SERVO2", 24 },
{ BOXSERVO3, "SERVO3;", 25 }, { BOXSERVO3, "SERVO3", 25 },
{ BOXBLACKBOX, "BLACKBOX;", 26 }, { BOXBLACKBOX, "BLACKBOX", 26 },
{ BOXFAILSAFE, "FAILSAFE;", 27 }, { BOXFAILSAFE, "FAILSAFE", 27 },
{ BOXAIRMODE, "AIR MODE", 28 },
{ BOX3DDISABLESWITCH, "DISABLE 3D SWITCH", 29},
{ BOXFPVANGLEMIX, "FPV ANGLE MIX", 30},
{ BOXBLACKBOXERASE, "BLACKBOX ERASE (>30s)", 31 },
{ CHECKBOX_ITEM_COUNT, NULL, 0xFF } { CHECKBOX_ITEM_COUNT, NULL, 0xFF }
}; };
@ -318,7 +322,7 @@ static bool bstSlaveProcessFeedbackCommand(uint8_t bstRequest)
IS_ENABLED(IS_RC_MODE_ACTIVE(BOXGOV)) << BOXGOV | IS_ENABLED(IS_RC_MODE_ACTIVE(BOXGOV)) << BOXGOV |
IS_ENABLED(IS_RC_MODE_ACTIVE(BOXOSD)) << BOXOSD | IS_ENABLED(IS_RC_MODE_ACTIVE(BOXOSD)) << BOXOSD |
IS_ENABLED(IS_RC_MODE_ACTIVE(BOXTELEMETRY)) << BOXTELEMETRY | IS_ENABLED(IS_RC_MODE_ACTIVE(BOXTELEMETRY)) << BOXTELEMETRY |
IS_ENABLED(IS_RC_MODE_ACTIVE(BOXGTUNE)) << BOXGTUNE | IS_ENABLED(IS_RC_MODE_ACTIVE(BOXDYNAMICFILTER)) << BOXDYNAMICFILTER |
IS_ENABLED(FLIGHT_MODE(SONAR_MODE)) << BOXSONAR | IS_ENABLED(FLIGHT_MODE(SONAR_MODE)) << BOXSONAR |
IS_ENABLED(ARMING_FLAG(ARMED)) << BOXARM | IS_ENABLED(ARMING_FLAG(ARMED)) << BOXARM |
IS_ENABLED(IS_RC_MODE_ACTIVE(BOXBLACKBOX)) << BOXBLACKBOX | IS_ENABLED(IS_RC_MODE_ACTIVE(BOXBLACKBOX)) << BOXBLACKBOX |

1
src/main/target/OMNIBUS/target.h
View file

@ -20,6 +20,7 @@
#undef TELEMETRY_IBUS //no space left #undef TELEMETRY_IBUS //no space left
#undef TELEMETRY_HOTT //no space left #undef TELEMETRY_HOTT //no space left
#undef TELEMETRY_JETIEXBUS #undef TELEMETRY_JETIEXBUS
#undef USE_GYRO_DATA_ANALYSE
#define TARGET_BOARD_IDENTIFIER "OMNI" // https://en.wikipedia.org/wiki/Omnibus #define TARGET_BOARD_IDENTIFIER "OMNI" // https://en.wikipedia.org/wiki/Omnibus

2
src/main/target/common_fc_pre.h
View file

@ -49,6 +49,7 @@
#define USE_ESC_SENSOR #define USE_ESC_SENSOR
#define I2C3_OVERCLOCK true #define I2C3_OVERCLOCK true
#define TELEMETRY_IBUS #define TELEMETRY_IBUS
#define USE_GYRO_DATA_ANALYSE
#endif #endif
#ifdef STM32F7 #ifdef STM32F7
@ -57,6 +58,7 @@
#define I2C3_OVERCLOCK true #define I2C3_OVERCLOCK true
#define I2C4_OVERCLOCK true #define I2C4_OVERCLOCK true
#define TELEMETRY_IBUS #define TELEMETRY_IBUS
#define USE_GYRO_DATA_ANALYSE
#endif #endif
#if defined(STM32F4) || defined(STM32F7) #if defined(STM32F4) || defined(STM32F7)