Commit Graph

8846 Commits

Author SHA1 Message Date
Michael Keller c9a2701fe0 Merge pull request #3423 from jflyper/bfdev-amend-left-out-LEDx-defs
Amend leftout LEDx defs
2017-07-04 08:30:43 +12:00
Martin Budden 0dae37dbf0 Merge pull request #3426 from fishpepper/fix_multi_defines
removed triple definition of MIN/MAX macros
2017-07-03 20:43:20 +01:00
Martin Budden dfa13f8e76 Merge pull request #3427 from fishpepper/lst_generation
added make target for lst output
2017-07-03 20:42:35 +01:00
fishpepper f9cd4c3800 added make target for lst output 2017-07-03 20:57:00 +02:00
fishpepper 7b55aed9ed removed triple definition of MIN/MAX macros 2017-07-03 19:29:55 +02:00
Petr Ledvina 5112ffd4d1 Merge pull request #3425 from jflyper/bfdev-spi-minor-fix
SPI  fix bad return value from spiDeviceByInstance
2017-07-03 16:44:27 +02:00
jflyper 57c88382c6 Fix bad return value
Thanks to @martinbudden
2017-07-03 23:37:36 +09:00
Michael Keller 78b22925a7 Merge pull request #3412 from mikeller/added_arming_disable_beeps
Added beeps to indicate the reason for arming being disabled.
2017-07-04 01:50:24 +12:00
mikeller 67acc6c7ec Added beeps to indicate the reason for arming being disabled. 2017-07-04 01:38:04 +12:00
Michael Keller 4c7793567a Merge pull request #3424 from DanNixon/reduce_flash_usage_spf3evo
Reduce flash usage on SPRACINGF3EVO targets
2017-07-04 01:21:08 +12:00
Dan Nixon a7425c07ad Reduce flash usage on SPRACINGF3EVO targets 2017-07-03 14:05:57 +01:00
jflyper 2fb6f7382c Convert LEDx to LEDx_PIN 2017-07-03 20:11:49 +09:00
borisbstyle 31c639b13f Merge pull request #3415 from DanNixon/osd_show_arming_disable_reason
Add most common reason for not arming to OSD
2017-07-03 13:01:40 +02:00
borisbstyle f035751866 Add BETAFLIGHTF4 target 2017-07-03 10:06:24 +02:00
Martin Budden 1ea83c17ef Merge pull request #3402 from martinbudden/bf_gyro_read_spi
Improved efficiency of gyro read for SPI
2017-07-03 06:54:32 +01:00
Michael Keller 57d27f45f8 Merge pull request #3419 from jflyper/bfdev-allow-3-leds-to-be-configured
Allow all three leds to be configurable
2017-07-03 15:33:53 +12:00
jflyper 94e50234c7 Allow all three leds to be configurable 2017-07-03 12:04:04 +09:00
J Blackman c168c1b228 Update .gitignore 2017-07-03 09:59:00 +10:00
Dan Nixon dbbe79a9f4 Add arming disabled reasons to OSD 2017-07-02 17:29:21 +01:00
Martin Budden b78a8bd519 Improved efficiency of gyro read for SPI 2017-07-02 05:32:18 +01:00
Michael Keller 1d5145b869 Merge pull request #3336 from jflyper/bfdev-configurable-spi-phase-1
Configurable SPI
2017-07-02 14:46:24 +12:00
Michael Keller ce8b2e555e Merge pull request #3410 from mikeller/remove_artefact
Removed vim swap file artefact.
2017-07-02 14:34:31 +12:00
jflyper 7cc1102d6e Touching up after rebasing 2017-07-02 11:29:25 +09:00
jflyper d18a06f721 Merge remote-tracking branch 'betaflight/master' into bfdev-configurable-spi-phase-1 2017-07-02 11:06:50 +09:00
mikeller 0f25712931 Removed vim swap file artefact. 2017-07-02 13:32:18 +12:00
Michael Keller 4c8b607f95 Merge pull request #3409 from blckmn/armdisabledflags
Moving gyro to rest of hardware in settings.c
2017-07-02 13:30:32 +12:00
Michael Keller 446184b4cf Merge pull request #3292 from jflyper/bfdev-configurable-transponder
Configurable transponder
2017-07-02 13:28:35 +12:00
Michael Keller b7fdf067b6 Merge pull request #3407 from blckmn/serial_bidir_pp
Fix for missing F7 push pull
2017-07-02 12:55:44 +12:00
blckmn ba298eebb5 Moving gyro to rest of hardware in settings.c 2017-07-02 10:49:45 +10:00
Michael Keller fac3cc5386 Merge pull request #3408 from blckmn/armdisabledflags
Moved disabled flags text to CLI where other flag text is located
2017-07-02 12:27:59 +12:00
blckmn 82b73ce00e Moved disabled flags text to CLI where other flag text is located 2017-07-02 10:06:38 +10:00
Michael Keller 463df6e673 Merge pull request #3391 from jflyper/bfdev-add-gyro-to-MSP_STATUS_EX
Add gyro flag to MSP_STATUS_EX
2017-07-02 12:05:46 +12:00
blckmn b512f006ca Fix for missing F7 push pull 2017-07-02 07:52:24 +10:00
Martin Budden 5353c136d1 Merge pull request #3405 from blckmn/minor_fixes
Minor warning removals
2017-07-01 22:38:48 +01:00
borisbstyle 6329b1185d Merge pull request #3400 from TheIsotopes/sdk_update
SDK updated to 6-2017-q2-update
2017-07-01 23:30:34 +02:00
blckmn 67d2c3ef25 Minor makefile change to support windows better
Removed uninitialised warnings
2017-07-02 06:55:14 +10:00
Martin Budden 43c46d3845 Merge pull request #3399 from martinbudden/bf_spi_handle_cache
Cache SPI handle to improve performance for F7 boards
2017-07-01 21:08:00 +01:00
Martin Budden 6edb4b9c19 Cache SPI handle to improve performance 2017-07-01 20:39:38 +01:00
Martin Budden e97e23e0be Merge pull request #3381 from martinbudden/bf_spi_readwriteregister
Make SPI read and write register generic
2017-07-01 20:30:32 +01:00
J Blackman 5aa81c81ce Merge pull request #3403 from blckmn/SITL
Remove SITL specific defines from fc_init
2017-07-02 05:21:22 +10:00
blckmn b525d5d7b8 Remove warnings if built under 32bit windows (cygwin) 2017-07-02 05:05:26 +10:00
blckmn 1ff5ff7d98 Remove SITL specific defines from fc_init
Cleanup target.c indentation.
2017-07-02 04:40:19 +10:00
Martin Budden a2ebb196c7 Merge pull request #3393 from jflyper/bfdev-print-arming-disable-names
Print names instead of hex value for ArmingDisableFlags
2017-07-01 17:48:58 +01:00
Martin Budden 6157ebe5e3 Removed abbreviations from SPI read/write functions 2017-07-01 16:28:10 +01:00
Martin Budden 1c7777ecc5 BMI160 conversion 2017-07-01 16:28:10 +01:00
Martin Budden 5d7f8cdd6e Function renaming as per ledvinap's suggestion 2017-07-01 16:28:10 +01:00
Martin Budden bdd876b6aa MPU9250 conversion 2017-07-01 16:28:10 +01:00
Martin Budden aedfa1e49c ICM20689 conversion 2017-07-01 16:28:09 +01:00
Martin Budden 79589f99ca MPU6500 conversion 2017-07-01 16:28:09 +01:00
Martin Budden 8df87bc47d Make SPI read and write register generic 2017-07-01 16:28:09 +01:00