Commit Graph

7516 Commits

Author SHA1 Message Date
Martin Budden 0bca49d8c4 Added PG config definitions 1 2017-02-22 09:43:05 +00:00
borisbstyle 90393d5a12 Merge pull request #2455 from martinbudden/bf_ledstrip_fix
Fix ledstrip merge error
2017-02-21 12:49:55 +01:00
Martin Budden ed549b5884 Fix ledstrip merge error 2017-02-21 11:46:38 +00:00
Martin Budden 5e7a755be3 Merge pull request #2382 from mikeller/make_flash_erasing_compile_conditional
Made flash erasing compile conditional on USE_FLASHFS.
2017-02-21 09:18:02 +00:00
Martin Budden c3ac68efa2 Merge pull request #2453 from martinbudden/bf_target_h_rationalisation
Rationalised target.h files by moving common items into common.h
2017-02-21 09:08:23 +00:00
Martin Budden d148ffcaa6 Rationalised target.h files by moving common items into common.h 2017-02-21 08:18:42 +00:00
borisbstyle 9baa9b7e12 Merge pull request #2367 from betaflight/patch_v3.1.6
Patch v3.1.6
2017-02-20 16:10:55 +01:00
borisbstyle cd43ee8ab1 Fix broken targets due to merge 2017-02-20 15:35:53 +01:00
borisbstyle de3d1d527d Merge branch 'master' into patch_v3.1.6 2017-02-20 14:40:43 +01:00
borisbstyle 1fd502c357 Lower F1 looptime restriction 2017-02-20 13:13:45 +01:00
borisbstyle 906e240c13 Change current scale BFF3 2017-02-20 12:00:40 +01:00
Bas Delfos a66be14dcb Softserial 1 & 2 for KISS FC 2017-02-20 02:07:24 +01:00
borisbstyle 84105629ea Fix filter bug for trying filter over nyquist 2017-02-20 01:52:15 +01:00
borisbstyle 1e695ab7d6 Merge branch 'patch_v3.1.6' of https://github.com/betaflight/betaflight into patch_v3.1.6 2017-02-19 23:56:38 +01:00
Bas Delfos 887ce10f7b Moved current sensor to PITCH pad (aka pin A02) with ADC1 2017-02-19 23:56:03 +01:00
Martin Budden 79b4badf62 Merge pull request #2434 from blckmn/config_clean
Removed more target specific conditionals from the main codebase
2017-02-19 22:10:42 +00:00
Martin Budden 161504c3a4 Merge pull request #2440 from martinbudden/bf_inav_cli_alignment
Alignment with iNav
2017-02-19 21:13:04 +00:00
Martin Budden 82a688d1b5 Merge pull request #2438 from martinbudden/bf_pg_preparation14
Preparation for conversion to parameter groups 14
2017-02-19 21:12:41 +00:00
Martin Budden 3d28436724 Alignment with iNav 2017-02-19 20:47:49 +00:00
Martin Budden c67d6eb4f1 Preparation for conversion to parameter groups 14 2017-02-19 20:33:45 +00:00
Martin Budden 743b3e37e3 Merge pull request #2436 from martinbudden/bf_pg_preparation13
Preparation for conversion to parameter groups 13
2017-02-19 20:30:50 +00:00
Martin Budden 72848b6dc1 Merge pull request #2439 from blckmn/osd_feature
Feature OSD moved to default_features to enable
2017-02-19 19:43:22 +00:00
Martin Budden 3275105127 Preparation for conversion to parameter groups 13 2017-02-19 17:46:46 +00:00
Martin Budden 1bfec057cf Merge pull request #2416 from atomiclama/bf_ibus
Fix #2364 remove defines for I2C
2017-02-19 17:34:38 +00:00
Martin Budden e74c7b8c93 Merge pull request #2435 from martinbudden/bf_pg_preparation12
Preparation for conversion to parameter groups 12
2017-02-19 17:26:44 +00:00
blckmn 90e862b97a Feature OSD moved to defaults features to enable, not just if OSD is compiled in 2017-02-20 03:36:46 +11:00
Martin Budden 2c667376fa Preparation for conversion to parameter groups 12 2017-02-19 11:41:49 +00:00
Martin Budden 14a7c805c1 Merge pull request #2425 from martinbudden/bf_pg_preparation11
Preparation for conversion to parameter groups 11
2017-02-19 09:26:30 +00:00
Martin Budden 781b1b1352 Removed dependency of pwm_output driver on mixers and servos 2017-02-19 08:59:37 +00:00
Martin Budden 367f62236a Merge pull request #2424 from martinbudden/bf_pg_preparation10
Preparation for conversion to parameter groups 10
2017-02-19 08:58:58 +00:00
Martin Budden 90c8ed5e3e Preparation for conversion to parameter groups 10 2017-02-19 08:33:25 +00:00
Martin Budden ba6f3a0046 Merge pull request #2420 from martinbudden/bf_pg_preparation9
Preparation for conversion to parameter groups 9
2017-02-19 08:32:10 +00:00
blckmn 4c3e496259 Removing unnecessary target config - resource management takes care of it 2017-02-19 19:12:58 +11:00
Martin Budden e8d0cd1eec Preparation for conversion to parameter groups 9 2017-02-19 08:11:23 +00:00
Martin Budden 5507924b5a Merge pull request #2410 from martinbudden/bf_pg_preparation8
Preparation for conversion to parameter groups 8
2017-02-19 08:10:25 +00:00
blckmn d8e8fbf271 Whitespace cleanup 2017-02-19 17:57:34 +11:00
J Blackman 22234ce42a Merge pull request #2396 from nathantsoi/patch_v3.1.6
[omnibusf4] enable spektrum bind
2017-02-19 17:51:21 +11:00
blckmn 8e9be424ce Removed more target specific conditionals from the main codebase 2017-02-19 17:28:29 +11:00
Michael Keller c283c93807 Fixed timer definitions for REVO / REVOLT / AIRBOTF4. 2017-02-19 00:16:32 +01:00
borisbstyle 0b73e613c0 Remove experimental square in relax calc 2017-02-19 00:13:44 +01:00
Michael Keller 0fb720b37e Merge pull request #2421 from mikeller/move_conditionals
Moved conditionals to right after 'platform.h'.
2017-02-17 14:25:29 +13:00
Michael Keller 4e71410337 Moved conditionals to right after 'platform.h'. 2017-02-17 13:47:11 +13:00
Martin Budden df630f1cf4 Preparation for conversion to parameter groups 8 2017-02-16 21:54:16 +00:00
Martin Budden 981c0455dc Merge pull request #2406 from martinbudden/bf_pg_preparation7
Preparation for conversion to parameter groups 7
2017-02-16 21:51:03 +00:00
Martin Budden d2ac5d84b1 Preparation for conversion to parameter groups 7 2017-02-16 21:28:29 +00:00
Martin Budden 4f4c14a02d Merge pull request #2402 from martinbudden/bf_pg_preparation6
Preparation for conversion to parameter groups 6
2017-02-16 21:19:39 +00:00
Anders Höglund f0e80f5a77 Merge pull request #2418 from mikeller/fix_inconsistent_mess
Fixed inconsistent conditionals in targets.
2017-02-16 22:01:25 +01:00
Martin Budden 23302aa46a Merge pull request #2401 from martinbudden/bf_pg_preparation5
Preparation for conversion to parameter groups 5
2017-02-16 21:00:03 +00:00
Michael Keller 2ce66706b2 Fixed inconsistent conditionals in targets. 2017-02-17 08:35:18 +13:00
Anders Höglund 4e9dbeadb5 Merge pull request #2417 from AndersHoglund/fix_the_reds
SPRF3EVO and AIORF3 builds broken. Include file problems fixed.
2017-02-16 19:20:27 +01:00