Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 17:25:20 +03:00
Code Issues Wiki Activity

Merge pull request #4859 from mikeller/make_dshot_dmar_configurable_per_target

Browse source 
Made Dshot DMAR configurable per target, added define to change defaults for release builds.
This commit is contained in:
Michael Keller 2017-12-29 21:07:15 +13:00 • committed by GitHub
commit ff0628193f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/build/version.h
View file

@ -26,6 +26,9 @@
#define FC_VERSION_STRING STR(FC_VERSION_MAJOR) "." STR(FC_VERSION_MINOR) "." STR(FC_VERSION_PATCH_LEVEL) #define FC_VERSION_STRING STR(FC_VERSION_MAJOR) "." STR(FC_VERSION_MINOR) "." STR(FC_VERSION_PATCH_LEVEL)
// Uncomment this for release / maintenance branches, or use `OPTIONS=RELEASE_BUILD`
//#define RELEASE_BUILD
extern const char* const targetName; extern const char* const targetName;
#define GIT_SHORT_REVISION_LENGTH 7 // lower case hexadecimal digits. #define GIT_SHORT_REVISION_LENGTH 7 // lower case hexadecimal digits.

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

@ -25,6 +25,8 @@
#define BEEPER PB3 #define BEEPER PB3
#define BEEPER_INVERTED #define BEEPER_INVERTED
#define USE_DSHOT_DMAR
// ICM20689 interrupt // ICM20689 interrupt
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PA8 #define MPU_INT_EXTI PA8

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

@ -25,6 +25,8 @@
#define BEEPER PC13 #define BEEPER PC13
#define BEEPER_INVERTED #define BEEPER_INVERTED
#define USE_DSHOT_DMAR
#define INVERTER_PIN_UART2 PC14 #define INVERTER_PIN_UART2 PC14
#define USE_ACC #define USE_ACC

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

@ -53,6 +53,10 @@
#define BEEPER PB4 #define BEEPER PB4
#define BEEPER_INVERTED #define BEEPER_INVERTED
#if defined(OMNIBUSF4SD)
#define USE_DSHOT_DMAR
#endif
#ifdef OMNIBUSF4SD #ifdef OMNIBUSF4SD
// These inverter control pins collide with timer channels on CH5 and CH6 pads. // These inverter control pins collide with timer channels on CH5 and CH6 pads.
// Users of these timers/pads must un-map the inverter assignment explicitly. // Users of these timers/pads must un-map the inverter assignment explicitly.

11
src/main/target/common_fc_post.h
View file

@ -19,6 +19,8 @@
#pragma once #pragma once
#include "build/version.h"
// Targets with built-in vtx do not need external vtx // Targets with built-in vtx do not need external vtx
#if defined(VTX_RTC6705) && !defined(VTX_RTC6705_OPTIONAL) #if defined(VTX_RTC6705) && !defined(VTX_RTC6705_OPTIONAL)
#undef VTX_SMARTAUDIO #undef VTX_SMARTAUDIO
@ -79,3 +81,12 @@
#define USE_RX_FRSKY_SPI #define USE_RX_FRSKY_SPI
#endif #endif
#if !defined(STM32F1) && defined(USE_DSHOT)
#if !defined(USE_DSHOT_DMA) && !defined(USE_DSHOT_DMAR)
#if !defined(RELEASE_BUILD)
#define USE_DSHOT_DMAR
#endif // !RELEASE_BUILD
#endif // !USE_DSHOT_DMA && !USE_DSHOT_DMAR
#endif // !STM32F1 && !STM32F3
#undef USE_DSHOT_DMA

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

@ -47,7 +47,6 @@
#ifdef STM32F4 #ifdef STM32F4
#define USE_DSHOT #define USE_DSHOT
#define USE_DSHOT_DMAR
#define USE_ESC_SENSOR #define USE_ESC_SENSOR
#define I2C3_OVERCLOCK true #define I2C3_OVERCLOCK true
#define USE_TELEMETRY_IBUS #define USE_TELEMETRY_IBUS
@ -59,7 +58,6 @@
#endif #endif
#ifdef STM32F7 #ifdef STM32F7
#define USE_DSHOT #define USE_DSHOT
#define USE_DSHOT_DMAR
#define USE_ESC_SENSOR #define USE_ESC_SENSOR
#define I2C3_OVERCLOCK true #define I2C3_OVERCLOCK true
#define I2C4_OVERCLOCK true #define I2C4_OVERCLOCK true