Commit Graph

8933 Commits

Author SHA1 Message Date
MJ666 491ecba4ed Merge pull request #3488 from AlienWiiBF/FuriousFPV
Disabe telemetry inversion for FortiniF4 and PikoF4 targets
2017-07-10 20:32:01 +02:00
Michael Jakob 8826170516 Disabe telemetry inversion for FortiniF4 and PikoF4 targets 2017-07-10 19:52:40 +02:00
Martin Budden c448f0dae5 Merge pull request #3487 from mikeller/fix_rx_init
Fixed channel count in 'rxInit'.
2017-07-10 13:55:01 +01:00
mikeller 78ebd362b8 Fixed channel count in 'rxInit'. 2017-07-10 23:17:49 +12:00
4712 a885184796 Updated 4way-if version number to indicate latest changes 2017-07-10 10:55:14 +02:00
borisbstyle 5ad25e49b1 Merge pull request #3472 from jflyper/bfdev-use-USE_FLASH_M25P16
Minor tidy in spiPreInit
2017-07-10 09:47:26 +02:00
borisbstyle c2c08dce4e Merge pull request #3460 from martinbudden/bf_rx_channel_count
Better handling of rx channel count
2017-07-10 09:44:52 +02:00
Michael Keller 7b42a4eeea Merge pull request #3414 from jflyper/bfdev-configurable-escserial-pin
Make esc serial tx timer pin configurable
2017-07-10 08:44:34 +12:00
Michael Keller 3b58863222 Merge pull request #3483 from jflyper/bfdev-remove-old-io-from-sdcard-detect-pin
Remove old-IO around sdcard detect pin
2017-07-10 01:19:03 +12:00
jflyper 587ce8180f Remove old-IO around sdcard detect pin 2017-07-09 22:00:04 +09:00
jflyper da63682f49 Tidy on F7 targets 2017-07-09 21:25:22 +09:00
jflyper c485064aba BFF4 tidy 2017-07-09 21:11:52 +09:00
jflyper 4d935dc608 Delete merge artifact 2017-07-09 20:55:04 +09:00
jflyper e30d9e4a29 Rebased onto #3469 2017-07-09 20:53:05 +09:00
Michael Keller 1ab83ee750 Merge pull request #3469 from mikeller/fix_escprog_motor_numbers
Fixed ESC numbering in 'escprog' in CLI. Also cleaned up 'serial_escserial'.
2017-07-09 23:25:51 +12:00
Michael Keller f32ab306dc Merge pull request #3479 from betaflight/cleanup-map-command
BF - Port cleaned-up map command from CF.
2017-07-09 23:25:02 +12:00
Hydra 042811bad7 BF - Port cleaned-up map command from CF.
Note: this uses the recently renamed RX_MAPPABLE_CHANNEL_COUNT instead of magic numbers.
2017-07-09 11:55:29 +01:00
Michael Keller cfbfdf32e8 Merge pull request #3471 from mikeller/added_motor_255_to_cli
Added command 'motor 255' (all motors) to CLI.
2017-07-09 20:25:34 +12:00
Michael Keller 2b7e74c994 Merge pull request #3471 from mikeller/added_motor_255_to_cli
Added command 'motor 255' (all motors) to CLI.
2017-07-09 19:38:20 +12:00
jflyper aff4e0568b Use USE_FLASH_M25P16 to detect flash chip usage 2017-07-09 16:23:16 +09:00
jflyper 870f10e316 Fixed default, added BETAFLIGHTF4 2017-07-09 16:00:37 +09:00
mikeller b20ede5165 Added command 'motor 255' (all motors) to CLI. 2017-07-09 17:41:39 +12:00
Michael Keller 7a3930c7c4 Merge pull request #3457 from mikeller/added_dshotreverse_mode
Added BOXDSHOTREVERSE as a separate mode to BOX3DDISABLE.
2017-07-09 17:05:56 +12:00
jflyper 5a7054f704 Merge branch 'master' into bfdev-configurable-escserial-pin 2017-07-09 12:58:04 +09:00
J Blackman b8b1c89046 Merge pull request #3462 from jflyper/bfdev-fix-bad-uart-pin-initialization-2
Fix #3448 Bad UART pin configuration (Simpler Version)
2017-07-09 10:13:20 +10:00
J Blackman 9303716749 Merge pull request #3468 from blckmn/f7_cleanup
Minor code tidy for F7 init
2017-07-09 08:52:13 +10:00
J Blackman 3ff550abaa Merge pull request #3467 from blckmn/remove_timerclockdivisor
Removed superfluous timerClockDivisor (not used anywhere anymore).
2017-07-09 08:12:06 +10:00
blckmn df0a2b6a11 Minor code tidy 2017-07-09 08:04:56 +10:00
blckmn a078739ec2 Removed superfluous timerClockDivisor (not used anywhere anymore). 2017-07-09 07:41:02 +10:00
J Blackman 750bc6452a Merge pull request #3464 from jflyper/bfdev-fix-timerClock-for-F411xE
Fix timerClock for F411xE
2017-07-09 06:56:22 +10:00
jflyper 55c67116b7 Modify timerClockDivisor and timerClock to use it.
Per @ledvinap ’s comment.
2017-07-09 01:23:03 +09:00
jflyper 045f4bda35 All timers are fed with systemCoreClock on F411xE 2017-07-08 22:31:32 +09:00
jflyper d8acbf5a5d PG is zero cleared when handed to ResetFn 2017-07-08 17:14:05 +09:00
jflyper 8600affda2 Fix loop couter limit to UARTDEV_COUNT 2017-07-08 17:12:29 +09:00
Martin Budden c06666bd4c Better handling of rx channel count 2017-07-08 07:33:43 +01:00
Martin Budden 6fc3c0c48f Merge pull request #3459 from martinbudden/bf_rx_mappable_channels
Renamed MAX_MAPPABLE_RX_INPUTS
2017-07-08 07:31:02 +01:00
Martin Budden 6ec6e7005d Renamed MAX_MAPPABLE_RX_INPUTS 2017-07-08 07:00:15 +01:00
Martin Budden 3f621e26b2 Merge pull request #3454 from AlienWiiBF/MPU9250_spi_fix
MPU6500/9250 AK8963 SPI fix and improvements
2017-07-08 05:54:05 +01:00
mikeller 282668edde Added BOXDSHOTREVERSE as a separate mode to BOX3DDISABLE. 2017-07-08 12:32:23 +12:00
Michael Keller b52b71319b Merge pull request #3456 from mikeller/4way-if_v2.1.0
From cleanflight: Increased timeouts for BLHeli32/GigaDevice MCU
2017-07-08 10:49:52 +12:00
Michael Keller ea5a7cd998 Merge pull request #3373 from DanNixon/generic_osd_timers
Generic OSD timers (plus high precision timer)
2017-07-08 10:21:39 +12:00
4712 2d71acf962 Merge pull request #2879 from 4712/4way-if_v2.1.0
Increased timeouts for BLHeli32/GigaDevice MCU
2017-07-08 10:17:34 +12:00
Michael Keller 2cc1bb309f Merge pull request #3435 from martinbudden/bf_motor_enable
Remove duplication in motor enable/disable
2017-07-08 10:12:59 +12:00
Michael Jakob 5122ba8920 MPU6500/9250 AK8963 SPI fix and improvements 2017-07-07 23:39:45 +02:00
MJ666 b9bda34824 Merge pull request #3455 from AlienWiiBF/AF_updates
AlienFlight updates
2017-07-07 23:37:40 +02:00
Michael Jakob 68f957a9c8 AlienFlight updates
Fix telemetry inversion
Fix SDCard detection inversion
Add SPI flash
2017-07-07 23:20:13 +02:00
Martin Budden 8b36027d65 pwmWriteDshotCommand fix 2017-07-06 09:01:56 +01:00
Martin Budden 51ca725f09 SITL fix 2017-07-06 09:00:20 +01:00
Martin Budden 87ae1616d6 Further better use of pwmAreMotorsEnabled 2017-07-06 08:55:26 +01:00
Martin Budden 3cdbaaf14d Remove duplication in motor enable/disable 2017-07-06 08:55:26 +01:00