Commit Graph

9673 Commits

Author SHA1 Message Date
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
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
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
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
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
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
jirif 96c7ef22c8 add strict argument checking for the "defaults" cli command 2017-09-12 10:15:13 +02:00
jirif 004e98457f "diff|dump all" export can be used as direct copy/paste import
"defaults" command causing reboot of the FC and ignoring remaining part of the pasted commands from "diff|dump all" exports. This change adding "nosave" parameter/functionality for the "defaults" command and "diff|dump all" exports. This parameter will not save eeprom and do not reboot the FC.
2017-09-11 21:19:26 +02:00
Andreas Bertheussen 3aa171ed47 Set Betaflight F3 current scale default back to 220
Fixes mistake from commit c59e7312c2 in PR #2699 where current scale was set to 200.
2017-09-11 20:56:16 +02:00
Spencer Owen 5bf7ee6cb5 Increase threshold for time sync 2017-09-11 09:07:51 -06:00
Spencer Owen 605b3e14e5 Adds sync commands 2017-09-11 09:05:02 -06:00
Martin Budden b1f47c8a87 Merge pull request #4019 from jflyper/bfdev-escserial-avoid-n-channel-for-rx
ESCSERIAL Avoid N-Channel for RX side
2017-09-11 15:11:17 +01:00
Martin Budden 649ccd7c73 Merge pull request #4124 from spuder/api-version
Show MSP API version in cli
2017-09-11 07:21:41 +01:00
Spencer Owen 992403d2dd Shows MSP api version in cli 2017-09-10 22:12:58 -06:00
Michael Keller aae4d143bf Merge pull request #4098 from spuder/gitignore
Adds vagrant file to gitignore file
2017-09-11 12:09:37 +12:00
Martin Budden 90557f9a41 Merge pull request #4120 from codecae/msp_shared_buffer_reset
Reset msp handling upon receipt of new incoming frames in msp_shared
2017-09-10 22:22:26 +01:00
Curtis Bangert 5ccd39843d Reset msp handling upon receipt of new incoming frames in msp_shared 2017-09-10 15:55:05 -04:00
Martin Budden 9b0e0a4f20 Merge pull request #4116 from DanNixon/osd_power_formatting
OSD power formatting
2017-09-10 17:25:32 +01:00
Martin Budden 0b17f44841 Merge pull request #4117 from mikeller/restore_smartport_msp_frame_handling
Restored SmartPort MSP frame handling to how it was before the addition of MSP over CRSF.
2017-09-10 17:24:15 +01:00
mikeller aa1edbd978 Restored SmartPort MSP frame handling to how it was before the addition of MSP over CRSF. 2017-09-11 04:01:52 +12:00
Martin Budden 1a8e9a8052 Merge pull request #4118 from mikeller/disable_msp_over_telemetry_for_f1
Disabled MSP over telemetry for F1, re-enabled SERVOS.
2017-09-10 16:59:29 +01:00
mikeller 3bce54186c Disabled MSP over telemetry for F1, re-enabled SERVOS. 2017-09-11 03:44:55 +12:00
Dan Nixon 3013229918 Left pad OSD electrical power readout 2017-09-10 15:23:01 +01:00
Dan Nixon 8a1ba09ee8 Test rendering of existing OSD power element 2017-09-10 15:20:11 +01:00
Andrey Mironov 6bf755d0bd Merge pull request #4050 from codecae/msp_shared_crsf_smartport
Decoupled MSP functionality from S.Port.  Implemented MSP telemetry in CRSF.
2017-09-10 13:37:02 +03:00
Martin Budden 308b56957e Merge pull request #4108 from mikeller/add_dshot_command_delay
Added delay before sending Dshot commands to avoid read errors.
2017-09-10 09:39:18 +01:00
Martin Budden 8e8eeedfa5 Merge pull request #4114 from martinbudden/bf_spracingf3eve_dashboard
Undefine USE_DASHBOARD for SPRACINGF3EVO for ROM saving
2017-09-10 09:12:55 +01:00
Martin Budden f5d4dbfb0e Undefine USE_DASHBOARD for SPRACINGF3EVO for ROM saving 2017-09-10 08:31:39 +01:00
Martin Budden 10d1f35122 Merge pull request #4106 from DieHertz/camera-control-internal-resistance
Added internal resistance adjustment
2017-09-10 07:11:40 +01:00
Martin Budden f2785b7267 Merge pull request #4109 from mikeller/fix_gyro_cal_on_first_arm_beeps
Fixed beeping for 'gyro_cal_on_first_arm'.
2017-09-10 07:09:39 +01:00
Curtis Bangert 863b24ae6a Corrected smartport regression issue with msp_shared
Corrected condition where an extra padded zero was added to outgoing msp buffers.
Whitespace tidy and removal of unnecessary condition.
Commented OSD and CMS from STM32F3DISCOVERY target.h
Various improvements to msp_shared (removed byte loops, point arithmetic)
Raised schedule priority of CRSF device and MSP calls
Reworked buffers in msp_shared to enable writes.
Moved msp buffers to msp_shared
Added new custom frames and reworking msp implementation
Implemented CRSF device info reply
Adding crsf ping/pong device info functionality
Changed Colibri FC address to Betaflight address
Implementing MSP in CRSF Telemetry
Decoupled msp functionality from smartport into msp_shared
Moved USE_SERVOS to FLASH>128 per mikeller
2017-09-10 01:36:59 -04:00
mikeller c9e8bae51d Fixed beeping for 'gyro_cal_on_first_arm'. 2017-09-10 13:55:56 +12:00