Commit Graph

8822 Commits

Author SHA1 Message Date
mikeller 31df82db2d Reworked arming conditions. 2017-06-30 08:43:46 +12:00
jflyper 71d511cb28 Kick travis 2017-06-29 23:10:00 +09:00
Martin Budden c0ce62d601 Added USE_NAV build flag 2017-06-29 13:29:02 +01:00
borisbstyle fb0429597f Merge pull request #3382 from jamming/development
Fix KakuteF4 blackbox and BFOSD issue
2017-06-29 10:00:16 +02:00
borisbstyle 8781e33309 Merge pull request #3379 from mikeller/enable_escserial_spracingf4evo
Enabled 'escprog' on SPRACINGF4EVO.
2017-06-29 09:58:00 +02:00
J Blackman e45e4a407f Merge pull request #3383 from jflyper/bfdev-cjmcu-disable-USE_RX_INAV
[CJMCU] Disable USE_RX_INAV for flash space
2017-06-29 17:56:23 +10:00
jflyper f3b0026946 Disable USE_RX_INAV 2017-06-29 15:04:05 +09:00
jamming 871cc5b222 blackbox issue changes log 2017-06-29 13:34:49 +08:00
Michael Keller 6aa6870598 Merge pull request #3378 from jflyper/bfdev-omnibusf4-add-rssi-adc
Add RSSI ADC input pin to OMNIBUSF4 target
2017-06-29 16:15:04 +12:00
Michael Keller d2c6f47afa Enabled 'escprog' on SPRACINGF4EVO. 2017-06-29 16:13:23 +12:00
J Blackman 04b184d521 Merge pull request #3377 from blckmn/pwm_define_update
Minor cleanup
2017-06-29 13:54:47 +10:00
jflyper e9b0442747 Enable RSSI ADC on PA0 2017-06-29 10:55:39 +09:00
blckmn 06ad65a2f6 Minor cleanup 2017-06-29 11:19:04 +10:00
jflyper 78bf9da3a6 Merge branch 'master' into bfdev-configurable-spi-phase-1 2017-06-29 09:28:36 +09:00
Martin Budden 9028db79c8 Merge pull request #3375 from martinbudden/bf_displayport_tidy
Displayport tidy
2017-06-28 22:10:49 +01:00
Martin Budden 8d4f838aac Fixed test 2017-06-28 21:36:33 +01:00
Martin Budden bfb1c169f4 Merge pull request #3374 from martinbudden/bf_dashboard_tidy
Dashboard tidy
2017-06-28 21:25:06 +01:00
Martin Budden 1c7f574a55 Displayport tidy 2017-06-28 21:21:29 +01:00
Martin Budden 0d2239ddd6 Dashboard tidy 2017-06-28 21:00:02 +01:00
Martin Budden c1576cdba6 Merge pull request #3354 from martinbudden/bf_reconfigurable_oled
For discussion - Reconfigurable OLED display alternative
2017-06-28 20:31:57 +01:00
Martin Budden 801c240e98 Merge pull request #3372 from mikeller/enable_led_strip_cc3d
Enabled LED_STRIP on CC3D, fixed includes.
2017-06-28 20:09:08 +01:00
Martin Budden 4b48e3ea28 Merge pull request #3365 from blckmn/dynamic_timer
Dynamic PWM output based on timer clock speed
2017-06-28 17:52:07 +01:00
Martin Budden 3d7145b088 Fix as per @jflyper's comments 2017-06-28 14:40:42 +01:00
mikeller 2d45a2e8c3 Enabled LED_STRIP on CC3D, fixed includes. 2017-06-29 01:28:06 +12:00
Martin Budden c00ffe0427 Changed bus to be a pointer variable 2017-06-28 13:37:18 +01:00
Martin Budden 82be9ecd78 For discussion - Reconfigurable OLED display alternative 2017-06-28 13:37:18 +01:00
blckmn 4484ee0616 Removed incorrect floats 2017-06-28 22:04:46 +10:00
blckmn b9ebf8f4fd PWM output calculations dynamic based on clock speed 2017-06-28 21:59:42 +10:00
Michael Keller 9616001057 Merge pull request #3368 from mikeller/fix-servo-filtering
From cleanflight: CF/BF - Fix servo filter initialisation.
2017-06-28 20:16:33 +12:00
Michael Keller 14f82e2a63 Merge pull request #3369 from mikeller/fix_osd_tests
Fixed OSD tests after GPS changes.
2017-06-28 12:46:19 +12:00
Michael Keller 6dfff4ac4d Fixed OSD tests after GPS changes. 2017-06-28 12:45:54 +12:00
Michael Keller 5f1ede6534 Merge pull request #3348 from martinbudden/bf_gps_align
Move some GPS variables into struct. Some alignment with iNav
2017-06-28 11:58:12 +12:00
Michael Keller 8502861acb Merge pull request #3363 from DanNixon/osd_unit_test
OSD unit test
2017-06-28 11:57:38 +12:00
Dominic Clifton 545e30e3c4 Merge pull request #2872 from cleanflight/fix-servo-filtering
CF/BF - Fix servo filter initialisation.
2017-06-28 11:54:34 +12:00
Dan Nixon 270c4bd5fe Update OSD unit test as per comments from @ledvinap 2017-06-27 18:01:55 +01:00
Dan Nixon 427c5fe524 OSD unit test 2017-06-27 10:01:35 +01:00
Michael Keller b052c60fd0 Merge pull request #3360 from mikeller/fix_dshot
Fixed Dshot idle value.
2017-06-27 00:23:54 +12:00
mikeller 4113f9be01 Fixed Dshot idle value. 2017-06-27 00:04:19 +12:00
jflyper d45ef7805b Remove merge artifact 2017-06-26 11:54:27 +09:00
jflyper 0e573383ec Merge remote-tracking branch 'betaflight/master' into bfdev-configurable-spi-phase-1 2017-06-26 11:41:43 +09:00
jflyper 84ba94f266 Remove NSS related defs and ammend cli.c 2017-06-26 11:39:13 +09:00
Martin Budden 564e0c94b8 Move some GPS variables into struct. Some alignment with iNav 2017-06-25 14:44:04 +01:00
Michael Keller 582af3d515 Merge pull request #3351 from mikeller/improve_dshot_reverse_condition
Refactored Dshot reverse condition block.
2017-06-26 01:03:11 +12:00
Martin Budden c96973ea49 Merge pull request #3353 from martinbudden/bf_bus_device
Moved busDevice_t out of sensor.h into bus.h
2017-06-25 13:30:43 +01:00
Martin Budden ccb30565f1 Moved busDevice_t out of sensor.h into bus.h 2017-06-25 12:28:15 +01:00
Martin Budden bf250c2c27 Merge pull request #3345 from martinbudden/bf_blackbox_tidy
Minor tidy of blackbox code. iNav alignment
2017-06-25 11:35:19 +01:00
Martin Budden d714624b7b Merge pull request #3283 from AndersHoglund/unit_test_Werror
Unit tests with clang warnings slips by unnoticed, added -Werror compiler option.
2017-06-25 11:00:21 +01:00
Martin Budden 62b4f8e3ac Merge pull request #3350 from martinbudden/bf_tests_warnings
Fix warnings in unit tests
2017-06-25 10:33:51 +01:00
mikeller 7bd05b2148 Refactored Dshot reverse condition block. 2017-06-25 21:18:39 +12:00
Martin Budden b47df12759 Fix warnings in unit tests 2017-06-25 10:12:21 +01:00