Commit Graph

8822 Commits

Author SHA1 Message Date
jflyper d18a06f721 Merge remote-tracking branch 'betaflight/master' into bfdev-configurable-spi-phase-1 2017-07-02 11:06:50 +09: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
TheIsotopes 67c4a57fa5 sdk update 2017-07-01 12:03:09 +02:00
TheIsotopes 4c152221ad sdk update 2017-07-01 11:21:16 +02:00
Anders Höglund c75697ef34 Merge pull request #3395 from AndersHoglund/fix_SITL_build
Fix SITL compile. Merging this myself as it is absolutely needed on Jenkins or any env running a more recent tool chain than Trusty/14.04 (Travis, Vagrant , etc). No 3.2 CI build binaries would otherwise be available as long as SITL errors the whole build.
2017-07-01 10:43:54 +02:00
J Blackman c1e38f9612 Merge pull request #3398 from blckmn/gitignore
Git Ignore updates
2017-07-01 17:05:56 +10:00
blckmn b40d82ee7e Git Ignore updates 2017-07-01 17:04:33 +10:00
jflyper 3dc7bf23ed Tidy 2017-07-01 12:45:52 +09:00
J Blackman 3253ac26a1 Merge pull request #3392 from blckmn/dynamic_timer
Adding some padding for the synced option.
2017-07-01 05:26:42 +10:00
jflyper fd7df8cc0e Dah! 2017-06-30 22:53:04 +09:00
jflyper 65c4b26aa4 Merge branch 'master' into bfdev-configurable-transponder 2017-06-30 22:36:25 +09:00
Anders Hoglund 08281e8ec9 Fix SITL compile. 2017-06-30 15:34:08 +02:00
jflyper a6355762a6 Remove merge arttifact 2017-06-30 22:33:51 +09:00
jflyper ac0df42a05 Abondon the extension bit, rely on API version for switching 2017-06-30 22:28:04 +09:00
jflyper b3a481e95a Merge remote-tracking branch 'betaflight/master' into bfdev-add-gyro-to-MSP_STATUS_EX 2017-06-30 22:20:57 +09:00
jflyper 42ba069a69 Print names instead of hex value 2017-06-30 22:02:40 +09:00
blckmn 40167bc134 Adding some padding for the synced option. 2017-06-30 20:58:19 +10:00
J Blackman 740b4a91bd Update README.md 2017-06-30 20:41:17 +10:00
Martin Budden 074127d498 Merge pull request #3389 from jflyper/bfdev-gyroless-boot
Allow gyro-less booting
2017-06-30 07:23:46 +01:00
jflyper 1c2573c50f MINIMAL_CLI only print the value. 2017-06-30 14:35:22 +09:00
jflyper 2c7970a9ed Revive visual indication of gyro detection failure 2017-06-30 14:33:35 +09:00
jflyper bdeb004bd0 Add gyro flag to MSP_STATUS_EX
In detected sensor field (16-bits), lower 5-bits (bits 0-4)  represents
traditional sensors (ACC, BARO, MAG, GPS and SONAR).
Bit 5 is an extension bit, and if on, bit 6 indicates gyro detection
status.
2017-06-30 14:08:40 +09:00
J Blackman e36ad629e4 Merge pull request #3385 from martinbudden/bf_use_nav
Added USE_NAV build flag
2017-06-30 14:48:42 +10:00
jflyper 02e0d2e1c4 Bring no gyro flag to the top 2017-06-30 09:04:47 +09:00
jflyper adee15a806 Allow gyro-less booting 2017-06-30 08:51:06 +09:00
Michael Keller b9f533abe3 Merge pull request #3356 from mikeller/rework_arming_conditions
Reworked arming conditions.
2017-06-30 11:18:37 +12:00