borisbstyle
c89a88a9f2
Merge branch 'patch_v3.1.1' of https://github.com/betaflight/betaflight into patch_v3.1.1
2017-01-29 00:24:58 +01:00
Dan Nixon
82df9f0c84
Hide BFOSD when OSDSW is active
2017-01-29 00:24:12 +01:00
mikeller
6140a9bb57
Cleaned up SPRACINGF3 (and TINYBEEF3 variant) targets.
2017-01-29 11:03:48 +13:00
Martin Budden
f3b38f4f09
Put #includes into alphabetical order
2017-01-28 08:44:52 +00:00
Martin Budden
bfbacf8b44
Fixup test code
2017-01-28 07:37:15 +00:00
Martin Budden
65e0d9990b
Moved gps_conversion to common/ directory
2017-01-27 17:12:01 +00:00
Michael Keller
3168f6ba88
Fixed 'gyro_sync_denom' limiting when using 32kHz gyro.
2017-01-27 11:08:40 +13:00
mikeller
94993e55c0
Fixed iBus telemetry handling (cherry-pick from @marcroe 's work in #2170 .
2017-01-26 15:58:49 +01:00
mikeller
f32580601a
Fix for problem with CLI 'diff' in the case of nonexistent default values.
2017-01-26 15:57:42 +01:00
Martin Budden
f3894f8745
Merge pull request #1897 from DieHertz/motor-pwm-polarity
...
Add PWM polarity to motor config
2017-01-26 08:16:16 +00:00
jflyper
6a4e6e5885
Fix TARGET_IO_PORTx defs
...
So bogus ports don’t show up on “resource list”.
2017-01-26 11:33:29 +09:00
Martin Budden
e72528f020
Merge pull request #1860 from martinbudden/bf_pg0
...
Parameter groups EEPROM migration
2017-01-25 21:53:07 +00:00
Michael Keller
4bf65d6752
Merge pull request #2218 from mikeller/fix_atomic
...
Fix atomic (cherry-pick from cleanflight).
2017-01-26 10:31:46 +13:00
Martin Budden
e68df77d96
Merge pull request #1866 from martinbudden/bf_cms_tidy
...
Tidied cms imu code
2017-01-25 21:10:13 +00:00
Martin Budden
f839e658e7
Alignment with iNav
2017-01-25 21:06:34 +00:00
Michael Keller
7f8f7deab9
Fixed typo in generated comment.
2017-01-26 10:05:17 +13:00
Petr Ledvina
afc71be60c
Improve ATOMIC_BARRIER documentation
2017-01-26 09:41:29 +13:00
Petr Ledvina
107fc11939
Fix atomic.h
...
`=m` output operand means that value is write only, gcc may discard previous value because it assumes that it will be overwritten. This bug was not triggered in gcc v4 because `asm volatile` triggered full memory barrier.
With old version, this code will increase `markme` only by 2, not 3:
```
static int markme = 0;
markme++;
ATOMIC_BLOCK_NB(0xff) {
ATOMIC_BARRIER(markme); // markme is marked as overwritten, previous increment can be discarded
markme++;
}
markme++;
```
2017-01-26 09:40:17 +13:00
Michael Keller
42256ca8b5
Merge pull request #2216 from mikeller/bump_sdk_to_6_2_1_q4
...
Rebase of #1917 : Update SDK to 6.2.1 2016q4 (thanks to @TheAngularity).
2017-01-26 09:26:22 +13:00
Michael Keller
db393b8bca
Merge pull request #2211 from mikeller/fixed_ibus_telemetry_handling
...
Fixed iBus telemetry handling (cherry-pick from @marcroe 's work in #2170 ).
2017-01-26 09:25:28 +13:00
Martin Budden
e4c860d4dd
Added STM32F722xx FLASH page size
2017-01-25 20:23:52 +00:00
Martin Budden
fc296533cd
Fixed up unit tests and ROM sizes
2017-01-25 20:23:52 +00:00
Martin Budden
0bca9e0c7a
Preparation for doing PG differencing in CLI
2017-01-25 20:23:52 +00:00
Martin Budden
6ef5f0579a
Updates as per iNav
2017-01-25 20:23:52 +00:00
Martin Budden
6ee5cf1d5d
Added dummy PG. Fixed setting of profile
2017-01-25 20:23:52 +00:00
Martin Budden
106542008f
Fixed typo
2017-01-25 20:23:52 +00:00
Martin Budden
44004b0b0b
Parameter groups EEPROM migration
2017-01-25 20:23:52 +00:00
Michael Keller
bce0415218
Merge pull request #2146 from raphaelcoeffic/vtx-msp
...
Vtx MSP requests (rebased / squashed)
2017-01-26 09:23:38 +13:00
Michael Keller
2070246314
Rebase of #1917 : Update SDK to 6.2.1 2016q4 (thanks to @TheAngularity).
2017-01-26 08:56:22 +13:00
Raphael Coeffic
ebce3d9847
added MSP_VTX_CONFIG & MSP_SET_VTX_CONFIG
2017-01-25 20:32:35 +01:00
Raphael Coeffic
bdbd7b1a8a
some fixes for vtx_common
2017-01-25 20:32:35 +01:00
mikeller
733e515610
Fixed iBus telemetry handling (cherry-pick from @marcroe 's work in #2170 .
2017-01-26 08:19:53 +13:00
Martin Budden
73308e8246
Reorder accgyro_mpu.c functions for clarity and to avoid forward declarations
2017-01-25 18:16:05 +00:00
Martin Budden
deb2052d8e
Updated version, MSP version and EEPROM_CONF_VERSION for 3.2
2017-01-25 17:08:51 +00:00
borisbstyle
2a3104606b
Revert "Increased MSP API version number for next release."
2017-01-25 08:39:56 +01:00
jflyper
753afe0562
Don't write back uninitialized features on onGlobalExit
2017-01-25 11:49:32 +09:00
Michael Keller
109b9b2ca1
Merge pull request #2208 from mikeller/moved_lua_scripts_to_new_repo
...
Moved lua scripts to 'betaflight-tx-lua-scripts' repository.
2017-01-25 13:17:49 +13:00
Michael Keller
8a32f9b875
Moved lua scripts to 'betaflight-tx-lua-scripts' repository.
2017-01-25 13:17:16 +13:00
Michael Keller
1fe48b913a
Merge pull request #2193 from mikeller/disable_current_sensing_without_battery
...
Disabled battery current sensing if no battery is connected.
2017-01-25 12:56:32 +13:00
Michael Keller
0bbbc1290c
Increased MSP API version number for next release.
2017-01-25 12:54:07 +13:00
borisbstyle
6ea7f34745
Bump EEPROM version
2017-01-24 22:36:52 +01:00
borisbstyle
38abced6a9
Fix truncated blackbox logging by restoring PID scale
2017-01-24 22:33:18 +01:00
borisbstyle
c96ffe5164
Add fpvCamAngle to MSP
2017-01-24 21:53:39 +01:00
borisbstyle
68b1f51926
Apply fpv angle mix to calculated rate instead of rcCommand
2017-01-24 13:34:45 +01:00
borisbstyle
c5c5dccd0f
Change OSD defaults
2017-01-24 12:46:56 +01:00
borisbstyle
e84f2c8796
Increase Configurable Filter Range
2017-01-23 09:27:19 +01:00
Michael Keller
07c743e352
Merge pull request #2192 from mikeller/fix_amperage_latest_type
...
Adjusted 'amperageLatest' data type to be 'int32_t' to be consistent with 'amperage'.
2017-01-23 12:46:58 +13:00
Michael Keller
6ad09ee244
Merge pull request #2175 from mikeller/reinstate_telemetry_msp_port_sharing
...
Reinstated telemetry / MSP port sharing, since it can work if 'telemetry_switch' is set to true.
2017-01-23 12:46:33 +13:00
Michael Keller
1395d1cd34
Merge pull request #2145 from mikeller/added_flip32f3osd_target
...
Added FLIP32F3OSD target, changed ZCOREF3 target into a variant of SPRACINGF3.
2017-01-23 12:46:12 +13:00
Michael Keller
1b5ad8dd4f
Increased MSP API version for next release.
2017-01-23 12:43:21 +13:00
