J Blackman
42cd8da0e6
Merge pull request #1415 from blckmn/development
...
Development
2016-10-27 19:13:30 +11:00
blckmn
22bc884de2
Merge remote-tracking branch 'betaflight/master' into development
2016-10-27 19:12:18 +11:00
Nathan
a5894f1c24
disable uart tx dma when using dshot on the spracingf3 ( #1412 )
2016-10-26 20:33:45 -06:00
borisbstyle
89fb5bc2d7
Merge pull request #1410 from mikeller/adjust_dshot_range_in_msp
...
Fixed motor value translation to / from MSP for DShot.
2016-10-26 21:37:00 +02:00
Michael Keller
0a4648c03e
Fixed motor value translation to / from MSP for DShot.
...
Fixed 'stopMotors' (used in 'HardfaultHandler' to actually stop motors with DShot. Also made 'disarmMotorOutput' used consistently.
Renamed functions to be more clear.
2016-10-27 08:31:00 +13:00
J Blackman
f804f1e272
Merge pull request #1403 from martinbudden/bf_includes
...
Removed unnecessary #includes
2016-10-27 03:35:15 +11:00
borisbstyle
8ce00ef66e
Merge pull request #1404 from nathantsoi/fix/obf4-osd-dma
...
(obf4) spi3 is shared with the flash, dont use dma.
2016-10-26 13:06:50 +02:00
borisbstyle
3ae51a766c
Merge pull request #1405 from nathantsoi/target/spracingf3-dshot
...
dshot for the spracingf3
2016-10-26 08:24:40 +02:00
nathan
bf36d71bea
dshot for the spracingf3
2016-10-26 00:00:07 -06:00
nathan
efd2c4fe18
spi3 is shared with the flash, dont use dma.
2016-10-25 23:38:30 -06:00
Martin Budden
58c85029d6
Removed unnecessary #includes
2016-10-26 05:15:26 +01:00
J Blackman
32bdeaaa8f
Merge pull request #1400 from mikeller/standardise_msp_baudrate
...
Standardised MSP default baud rate to 115200 (seems to be the fastest that works for all boards / cables).
2016-10-26 14:19:39 +11:00
J Blackman
01d8d8d335
Merge pull request #1402 from kirilian/master
...
STM32FX411 Fixes
2016-10-26 14:17:38 +11:00
Patrick Johnson
a0b3afae31
Updated to correctly support STM32FX411 device. Removed HSE bypass
...
references. Minor cleanup.
2016-10-25 21:48:53 -05:00
Patrick Johnson
06239d2a0d
Changed FLASH_PAGE_COUNT to 3 for STM32FX411xE
2016-10-25 21:34:27 -05:00
Patrick Johnson
9384a8db84
Changed FLASH_PAGE_COUNT to "3" for STM32FX411xE
2016-10-25 21:07:21 -05:00
Michael Keller
bdac27309d
Standardised MSP default baud rate to 115200 (seems to be the fastest that works).
2016-10-26 13:31:01 +13:00
borisbstyle
846705afda
Delete stm32.mak
2016-10-25 16:30:59 +02:00
borisbstyle
a0bd8ace5a
Merge pull request #879 from betaflight/development
...
Start on version 3.1.0
2016-10-25 16:29:49 +02:00
borisbstyle
7228903b24
Merge branch 'master' into development
2016-10-25 16:29:10 +02:00
borisbstyle
1544f95a97
Merge pull request #1395 from betaflight/unsynced_pwm
...
Fix unsynced PWM
2016-10-25 16:17:29 +02:00
borisbstyle
5fef78e6c7
Fix unsynced PWM
2016-10-25 16:16:17 +02:00
borisbstyle
10ec59bd45
Merge pull request #1387 from martinbudden/bf_msp_init
...
Improved MSP initialisation and independence from serial code
2016-10-25 16:07:29 +02:00
borisbstyle
bce61ef7a1
Merge pull request #1380 from martinbudden/bf_fir_filter_tests
...
Added filter unit test and tidied filter code
2016-10-25 15:16:16 +02:00
borisbstyle
1334b2380f
Merge pull request #1394 from bhuism/development
...
fix battery and current monitoring for sparky2
2016-10-25 15:13:33 +02:00
Bas Huisman
8cbcffbdf7
Merge branch 'development' of https://github.com/betaflight/betaflight into development
2016-10-25 15:00:12 +02:00
Bas Huisman
b410200f0c
fix battery and current monitoring for sparky2
2016-10-25 14:58:47 +02:00
borisbstyle
ae2129f943
Merge branch 'development' of https://github.com/borisbstyle/betaflight into development
2016-10-25 14:41:34 +02:00
borisbstyle
50e9b19fab
Remove OLEMEXINO // Fix CJMCU build
2016-10-25 14:41:05 +02:00
borisbstyle
151efa6fda
Merge pull request #1391 from blckmn/fix_dma_warning
...
dma_stm32f4xx warning fixed
2016-10-25 13:19:07 +02:00
borisbstyle
fad6345213
Merge pull request #1390 from blckmn/naze_fix
...
Fixes for NAZE (and potentially other target) uart issues
2016-10-25 13:16:59 +02:00
borisbstyle
b5a70451ec
Merge pull request #1364 from martinbudden/bf_servo_split2
...
Split mixer and servo code
2016-10-25 13:09:26 +02:00
borisbstyle
aa6e4df42a
Merge pull request #1388 from betaflight/dshot300
...
Add DSHOT300
2016-10-25 13:05:33 +02:00
borisbstyle
f79896b1bd
Add DSHOT300
...
Bool check for dshot protocol
Add dshot300 to init
ident
2016-10-25 13:05:03 +02:00
blckmn
4a4daedb1a
dma_stm32f4xx warning fixed
2016-10-25 21:03:40 +11:00
blckmn
6b457e5da1
Fixes for NAZE (and potentially other target) uart issues
2016-10-25 20:21:29 +11:00
Martin Budden
31828873fa
Split mixer and servo code
2016-10-24 20:58:45 +01:00
Martin Budden
6aa40846fe
Improved MSP initialisation and independence from serial code
2016-10-24 18:49:08 +01:00
borisbstyle
726a8d29e2
Refactor conflicting serial function names
2016-10-24 01:52:51 +02:00
borisbstyle
f70d9f3464
Merge pull request #1372 from betaflight/bf_serial
...
Add Serial Passthrough to the motors
2016-10-24 00:03:48 +02:00
borisbstyle
0c142707e8
Add escprog to other F3 / F4 targets
2016-10-24 00:03:08 +02:00
Martin Budden
bc370c78c6
Merge pull request #1383 from martinbudden/bf_gitignore
...
Fixed spurious CR/LF in gitignore
2016-10-23 16:16:52 +01:00
Martin Budden
dcd87aa01a
Fixed spurious CR/LF in gitignore
2016-10-23 16:13:47 +01:00
Martin Budden
01be3842c8
Added filter unit test and tidied filter code
2016-10-23 10:10:14 +01:00
Martin Budden
eef0d7a761
Merge pull request #1379 from martinbudden/bf_cc3d_rom
...
Added back 4way blheli for CC3D
2016-10-23 09:17:15 +01:00
Martin Budden
8a7a6539b4
Added back 4way blheli for CC3D
2016-10-23 08:49:44 +01:00
Sami Korhonen
2478fb84f1
fix cli outputs
2016-10-23 10:45:30 +03:00
Sami Korhonen
14d1e25280
only TX in kiss mode
2016-10-23 10:23:43 +03:00
Martin Budden
96bbdee812
Merge pull request #1377 from blckmn/makefile_sample
...
Added sample to Makefile
2016-10-23 08:11:26 +01:00
Martin Budden
bba49fe378
Merge pull request #1376 from blckmn/msp_update_dshot
...
Added check on motor being enabled in MSP output to ensure only motor…
2016-10-23 08:09:44 +01:00