1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-18 22:05:17 +03:00
Commit graph

10106 commits

Author SHA1 Message Date
Martin Budden
c5ce6d6d35 Added lightweight string handling from iNav 2017-09-20 10:48:18 +01:00
Martin Budden
0c65ac7b21 Merge pull request #4179 from dangeljs/master
Updating CC3D target file to allow for Parallel PWM to  Issue #2177
2017-09-20 07:31:48 +01:00
Martin Budden
3399ccd419 Merge pull request #4191 from jflyper/bdev-omnibusf4sd-avoid-ppm-led-timer-collision
OMNIBUSF4SD: Avoid timer conflict on TIM4 between PPM and LED strip
2017-09-20 07:29:25 +01:00
jflyper
faada4c927 Merge pull request #3993 from jflyper/bfdev-ledstrip-fix-nchannel
F3&F4 Fix N-Channel handling for LED strip
2017-09-20 13:52:30 +09:00
MJ666
23320e5c9b Merge pull request #4193 from AlienWiiBF/FortiniF4
FortiniF4 add camera control pin
2017-09-20 06:49:58 +02:00
Michael Jakob
b48286fee2 FortiniF4 add camera control pin 2017-09-20 06:31:56 +02:00
jflyper
f62d2b9cb6 Merge pull request #4150 from jflyper/bfdev-max7456-handle-spiclock-on-cpu-overclock
MAX7456: Handle SPI clock for CPU over clocked environment
2017-09-20 12:52:40 +09:00
jflyper
503b8dbbfe Issue proper IOConfigGPIOAF for non-F1 targets 2017-09-20 12:11:23 +09:00
jflyper
4500488c94 Avoid timer conflict on TIM4 between PPM and LED strip
PPM (PB8) can be assigned to TIM10_CH1.
2017-09-20 11:05:24 +09:00
Martin Budden
ab44ad8811 Merge pull request #4186 from jflyper/bfdev-fix-f4evo-usb-product-string
F4EVO: Fix USB product name string
2017-09-19 16:33:14 +01:00
jflyper
e29c187c7a Fix typo. 2017-09-19 23:31:15 +09:00
jflyper
51aa8e8177 Fix typo for VTX_RTC6705_OPTIONAL and add vtxCommonDeviceRegistered 2017-09-19 23:15:25 +09:00
mikeller
8ff2c9ba95 Renamed 'DSHOT_CMD_BEEPx' to 'DSHOT_CMD_BEACONx', made beacon tone
configurable.
2017-09-19 23:24:24 +12:00
mikeller
48281c17c9 Renamed 'sbus_inversion' to 'serialrx_inverted' and applied it to all
protocols.
2017-09-19 22:52:46 +12:00
jflyper
298082375d Add I2C2 on TX3/RX3 2017-09-19 18:52:21 +09:00
jflyper
4e867c00bc Timer mapping rework
- UART backdoors are added for maximum flexibility.
- PPM is assigned to TIM10_CH1 to avoid colliding with LED strip.
- Motors 5 and 6 (S5_OUT and S6_OUT) removed, as they are not wired.
- Backdoor on UART6 are removed, as timers on these pins conflict with
motors (TIM3 and TIM8).
- target.h has been modified to accommodate these changes.
2017-09-19 16:03:07 +09:00
Martin Budden
b4edce40d3 Merge pull request #4182 from jflyper/bfdev-ppm-pwm-regression-3991
F3/F4 PPM & PWM: Do proper IOConfigGPIOAF in ppmRxInit and pwmRxInit
2017-09-19 07:56:04 +01:00
jflyper
f3f7029e85 Do proper IOConfigGPIOAF in ppmRxInit and pwmRxInit
Regression after #3991
2017-09-19 10:28:24 +09:00
dangeljs
fd29a8eff0 Reinstall the PPM pin on Timer2 CH2. Issue #2177 2017-09-18 20:24:25 -04:00
dangeljs
29bbaadceb Updating CC3D target file to allow for Parallel PWM to work properly with ESC motors on v2.1 and greater. 2017-09-18 18:30:41 -04:00
Martin Budden
c4e47ddede Merge pull request #4175 from mikeller/fix_crsf_halfduplex_check
Fixed check for halfduplex mode in CRSF.
2017-09-18 16:38:01 +01:00
mikeller
860ec23fbe Fixed check for halfduplex mode in CRSF. 2017-09-19 01:43:55 +12:00
Martin Budden
f2f34b4693 Merge pull request #4166 from brycedjohnson/SmallAngle-turtle
Disable small_angle during crashflip mode
2017-09-18 06:53:15 +01:00
jflyper
7549f9ed68 Remove temporary hack 2017-09-18 11:40:21 +09:00
jflyper
74ba43a137 Temporary fix for BLUEJAYF4 and CLRACINGF4 2017-09-18 11:31:29 +09:00
jflyper
432c9da659 Fix N-Channel handling 2017-09-18 11:29:17 +09:00
Michael Keller
da13d4f5f6 Merge pull request #4168 from mikeller/fix_mixer_for_non_3d
Fixed mixer for non-3D mode.
2017-09-18 13:07:19 +12:00
Michael Keller
b20d5e6f80 Fixed mixer for non-3D mode. 2017-09-18 12:44:40 +12:00
Bryce Johnson
72a8e91fdd Disable small_angle during crashflip mode 2017-09-17 16:52:36 -05:00
Michael Keller
ce824a60d6 Fixed mixer for 3D / Dshot. (#4161) 2017-09-17 15:45:39 +01:00
jflyper
8534d565c7 Define OMNIBUSF4BASE to single out the Gen1 board 2017-09-15 23:50:31 +09:00
Michael Keller
21175320b4 Fixed Spektrum binding when overclocked. Also changed data type of 'spektrum_sat_bind_autoreset' from uint8_t to lookup(TABLE_OFF_ON). 2017-09-15 21:57:55 +12:00
Michael Keller
4f2bea6a84 Merge pull request #4153 from martinbudden/bf_blackbox_p_ratio
Renamed CLI setting blackbox_p_denom to blackbox_p_ratio
2017-09-15 20:48:57 +12:00
Martin Budden
a9d56097d1 Renamed CLI setting blackbox_p_denom to blackbox_p_ratio 2017-09-15 09:31:37 +01:00
jflyper
365a97cc8e Use keywords for max7456_clock value 2017-09-15 14:49:50 +09:00
jflyper
5a7ed7b686 Handle SPI clock for CPU over clocked environment 2017-09-15 11:10:28 +09:00
Martin Budden
07d5990395 Merge pull request #4148 from DanNixon/fix_vtx_define_deps
Fix define dependencies for VTX code
2017-09-14 19:18:16 +01:00
Dan Nixon
811a78c5e1 Fix define dependencies for VTX code
Fixes #4147
2017-09-14 17:57:46 +01:00
awolf78
f4af2da6e8 Added MSP_EXTRA_ESC_DATA MSP (#4140) 2017-09-14 11:22:07 +01:00
Martin Budden
2b10a7ff01 Merge pull request #4126 from elektronisk/patch-2
Set default Betaflight F3 current scale back to 220
2017-09-14 11:17:44 +01:00
jirif
0e19f7701d BEEPER_USB flag will silence the beeper only when battery is really not present (#4121)
Partial fox for #4107
2017-09-14 11:16:52 +01:00
Martin Budden
1dca5adb2b Merge pull request #4127 from jirif/diff_all_export_import
"diff|dump all" export can be used as direct copy/paste import
2017-09-14 11:15:14 +01:00
Martin Budden
52c1961987 Merge pull request #4134 from atomiclama/bf_CSInitialise
Initialise rtc6705 CS to high.
2017-09-14 11:12:38 +01:00
Michael Keller
87e87fbf7b Merge pull request #4141 from betaflight/revert-4132-fix_spektrum_bind_when_overclocked
Revert "Fixed Spektrum binding when overclocked."
2017-09-13 22:15:11 +12:00
Michael Keller
30816c9aa6 Revert "Fixed Spektrum binding when overclocked." 2017-09-13 22:14:40 +12:00
borisbstyle
e2e4841246 Merge pull request #4132 from mikeller/fix_spektrum_bind_when_overclocked
Fixed Spektrum binding when overclocked.
2017-09-13 09:08:18 +02:00
mikeller
7514c4ca26 Restrict LED_STRIP fading to modes where it acutally works. 2017-09-13 13:42:45 +12:00
Anders Höglund
c3c5b6aae6 Merge pull request #4100 from spuder/patch-1
Sync time inside vagrant
2017-09-12 22:24:26 +02:00
atomiclama
f598145b48 Initialise rtc6705 CS to high.
Currently the pin initialisation sets it low, this allows any
initialisation glitches on the DATA and CLK lines to possibly be
detected.

This PR changes the order and forces the CS high before any changes to
the DATA and CLK lines.

I know there is information out there that the rtc6705 ignores the CS
but as we are using it lets do it properly.
2017-09-12 13:55:30 +01:00
mikeller
6edb60b48c Fixed Spektrum binding when overclocked. 2017-09-12 22:51:21 +12:00