Commit Graph

8689 Commits

Author SHA1 Message Date
Michael Keller 11616f9230 Merge pull request #3237 from DanNixon/osd_gps_speed_fmt_fix
Fix formatting of GPS speed
2017-06-09 08:27:59 +12:00
Michael Keller c0c8be1f5d Merge pull request #3238 from grizewald/master
Update LED1 and BEEPER pins to match circuit diagram.
2017-06-09 08:00:28 +12:00
Michael Keller df6d751cbd Merge pull request #3239 from bnn1044/CL_RACINGF4
Change default Current scale on CL_RACINGF4 FC
2017-06-09 07:59:17 +12:00
Cheng Lin 8308b75e3d Change default Current scale on CL_RACINGF4 FC 2017-06-08 15:18:17 -04:00
Dan Nixon c3cccb888b Fix formatting of GPS speed
Fixes #3236
2017-06-08 15:16:45 +01:00
Michael Keller a6d8816a98 Merge pull request #3235 from mikeller/fix_spracingf4neo
From cleanflight: Fix SPRACINGF4NEO.
2017-06-09 00:39:00 +12:00
mikeller cef13c2a2b Fixed the fix. 2017-06-09 00:36:36 +12:00
Dominic Clifton 534a252342 Merge pull request #2845 from cleanflight/betaflight-master
merge recent BF changes
2017-06-09 00:29:41 +12:00
TonyBazz b4d2388103 Some simple changes to allow for Proshot (Another digital protocol). 2017-06-08 21:44:15 +10:00
Martin Budden 51f607fdfc Merge pull request #3233 from ukmook/sparky_2
Fix sparky2 target
2017-06-08 10:29:51 +01:00
malcolm 5bd6bd932f Fix sparky2 target 2017-06-08 07:53:07 +01:00
Michael Keller 313a2dd722 Merge pull request #3230 from jflyper/bfdev-omnibusf4-enable-transponder
Enable transponder for OMNIBUSF4 and AIRBOTF4 (REVO) variants
2017-06-08 14:49:49 +12:00
jflyper a7c6c3fbef Add transponder to REVO/AIRBOTF4 and variants 2017-06-07 21:35:27 +09:00
jflyper 25deb20b15 Add transponder to OMNIBUSF4 and variants 2017-06-07 21:34:24 +09:00
grizewald 353acbe940 Update LED1 and BEEPER pins to match circuit diagram. 2017-06-07 13:03:53 +02:00
Martin Budden d68a72da92 Merge pull request #3226 from jflyper/bfdev-add-uartPinConfigure-for-osd_slave
Fix OSD slave serial port initialisation
2017-06-07 08:16:53 +01:00
jflyper 18b4c48499 Fix OSD slave serial port initialisation
Per cleanflight/#2847.
2017-06-07 10:13:36 +09:00
Michael Keller 81a0fcaddd Merge pull request #3221 from mikeller/removed_stale_callback_handler_counts
Removed stale EXTI callback handler counts.
2017-06-07 07:34:54 +12:00
mikeller c5c459c7ab Removed stale EXTI callback handler counts. 2017-06-07 00:52:37 +12:00
Michael Keller b6c9d93e25 Merge pull request #3210 from adrianmiriuta/master
enable BOXHEADADJ when HEADFREEE is enabled
2017-06-06 08:36:13 +12:00
Adrian Miriuta 64c3df565b enable BOXHEADADJ when HEADFREEE is enabled, to enable correction of gyro drift 2017-06-05 10:42:40 +02:00
Martin Budden 1ed61a25ea Merge pull request #3208 from mikeller/cleanup-dashboard-1
From cleanflight: Cleanup some dashboard code.
2017-06-05 07:03:40 +01:00
Dominic Clifton 15a786d7f1 Merge pull request #2839 from cleanflight/cleanup-dashboard-1
Cleanup some dashboard code.
2017-06-05 09:55:32 +12:00
Dominic Clifton a72f98e4f3 Merge pull request #2841 from McGiverGim/fix-compile-issues-ifndef-USE_SERVOS
Fix compiles issues when not defined USE_SERVOS
2017-06-05 09:51:36 +12:00
mikeller a2dd2f9c08 Changed serial word length to be 9 bits with parity when HAL is used. 2017-06-05 09:23:57 +12:00
Michael Keller 671d453709 Merge pull request #3097 from jflyper/bfdev-uart-refactor-and-configurable
UART refactor and configurable
2017-06-05 08:35:29 +12:00
Martin Budden da042a2331 Merge pull request #3200 from mikeller/added_spracingf4neo
SPRACINGF4NEO - Initial target support.
2017-06-04 15:14:26 +01:00
Martin Budden 70eef18497 Merge pull request #3198 from mikeller/spracingf3neo-current-sensor-scale
CF/BF - SPRACINGF3NEO - Use appropriate current sensor scale.
2017-06-04 15:10:40 +01:00
Martin Budden 91e9101808 Merge pull request #3197 from mikeller/cleanup-osd
CF/BF - Cleanup OSD default positions.
2017-06-04 15:10:13 +01:00
Martin Budden 46feda16cd Merge pull request #3196 from mikeller/size_optimise_non_critical_files
CF/BF - Always size optimize some non-speed critical files.
2017-06-04 15:09:43 +01:00
Martin Budden 926c5e4184 Merge pull request #3206 from martinbudden/bf_beebrain_blheli
Restored BLHELI 4WAY interface on BEEBRAIN
2017-06-04 15:08:04 +01:00
Martin Budden eac5cec261 Merge pull request #3205 from martinbudden/bf_code_tidy
Code tidy
2017-06-04 15:07:23 +01:00
Martin Budden f6c5726d35 Merge pull request #3199 from mikeller/fix_battery_config_defines
Fixed battery source defines.
2017-06-04 15:06:43 +01:00
Martin Budden 5e553ea35d Restored BLHELI 4WAY interface on BEEBRAIN 2017-06-04 14:17:39 +01:00
Martin Budden 39d6b31036 Code tidy 2017-06-04 14:12:56 +01:00
mikeller 6a39d35c37 Moved target specific configuration into 'config.c'
Moved target specific configuration into 'config.c'
2017-06-04 11:48:56 +12:00
Dominic Clifton 08b401737b Merge pull request #2835 from cleanflight/spracingf4neo
SPRACINGF4NEO - Initial target support.
2017-06-04 11:16:22 +12:00
mikeller fb6254aa1f Fixed battery source defines. 2017-06-04 11:10:28 +12:00
Dominic Clifton e016eac457 Merge pull request #2829 from cleanflight/spracingf3neo-current-sensor-scale
CF/BF - SPRACINGF3NEO - Use appropriate current sensor scale.
2017-06-04 10:47:16 +12:00
Dominic Clifton e3b3b6881c Merge pull request #2836 from cleanflight/cleanup-osd-2
CF/BF - Cleanup OSD default positions.
2017-06-04 10:42:58 +12:00
Dominic Clifton 4dca2d3ddc Merge pull request #2837 from cleanflight/size-optimize
CF/BF - Always size optimize some non-speed critical files.
2017-06-04 10:39:42 +12:00
Michael Keller 6e4af36c9c Merge pull request #3195 from mikeller/fix_beeper_led
Changed beeper warning LED to only activate when no other warnings are shown.
2017-06-03 12:57:27 +12:00
Michael Keller e8b9bc3290 Changed beeper warning LED to only activate when no other warnings are shown. 2017-06-02 20:12:19 +12:00
Michael Keller 27679e69f2 Merge pull request #3193 from DanNixon/osd_volt_symbol
Use the volts symbol for voltages in OSD
2017-06-02 15:37:10 +12:00
Martin Budden ae0f735ae1 Merge pull request #3177 from jflyper/bfdev-reset-unsupported-mixer-to-custom-followup2
Follow up to mixer validation
2017-06-01 17:53:24 +01:00
Martin Budden 811b80a7ad Merge pull request #3178 from jflyper/bfdev-disable-uncommon-servo-mixers
Disable uncommon servo mixers if NOT USE_UNCOMMON_MIXERS
2017-06-01 17:51:10 +01:00
Martin Budden c70c83ae39 Merge pull request #3186 from mikeller/update_gitignore
Added VS Code / CLion metadata to .gitignore.
2017-06-01 17:50:09 +01:00
Martin Budden 9d71718363 Merge pull request #3192 from jflyper/bfdev-smartport-and-dport-telemetry-inversion-to-default-set
Set telemetry_inversion to default on
2017-06-01 17:49:36 +01:00
Dan Nixon 6297969a5e Use the volts symbol for voltages in OSD 2017-06-01 11:40:57 +01:00
jflyper eb0f098264 Set telemetry_inversion to default on 2017-06-01 18:09:40 +09:00