Commit Graph

8164 Commits

Author SHA1 Message Date
Michael Keller d6de0c9e24 Merge pull request #2831 from mikeller/fix_dump_diff_showdefaults
Fixed 'showdefaults' option for CLI 'dump' / 'diff'.
2017-04-07 18:28:01 +12:00
Michael Keller f2c17e6a34 Merge pull request #2832 from mikeller/gps_fix_from_cleanflight
Merge pull request #2699 from McGiverGim/make-gps-stable-again
2017-04-07 12:00:28 +12:00
Michael Keller 3dc4a9378b Merge pull request #2824 from mikeller/add_reverse_scale_range_tests
Added tests for reversed ranges with 'scaleRange'.
2017-04-07 11:54:45 +12:00
Dominic Clifton 181b0eb078 Merge pull request #2699 from McGiverGim/make-gps-stable-again
Make the GPS stable again
2017-04-07 11:50:19 +12:00
Michael Keller e84cbe5fb5 Merge pull request #2818 from mikeller/use_permanent_mode_ids_in_cli
Changed CLI to use permanent mode ids.
2017-04-07 09:06:35 +12:00
Michael Keller 6b008ee971 Merge pull request #2757 from Faduf/BeeperPwm
Buzzer PWM
2017-04-07 09:05:45 +12:00
Michael Keller b48db968ff Added tests for reversed ranges with 'scaleRange'. 2017-04-07 00:36:49 +12:00
mikeller 2afc011b16 Fixed 'showdefaults' option for CLI 'dump' / 'diff'. 2017-04-07 00:19:51 +12:00
Anders Höglund 411ffe06a8 Merge pull request #2828 from AndersHoglund/fix_junittest
junittest xml output was lost, fixed.
2017-04-06 01:49:13 +02:00
Anders Hoglund 073364a285 junittest xml output was lost, fixed. 2017-04-06 01:38:24 +02:00
Michael Keller 8a7241f6cb Changed CLI to use permanent mode ids. 2017-04-06 10:21:07 +12:00
Michael Keller bd2fc2c5f8 Re-added setting of serialRx default UART from 'SERIALRX_UART'. 2017-04-06 09:49:52 +12:00
Michael Keller e555f0ddab Merge pull request #2822 from manors/tidy-scaleRange
Tidy scaleRange code
2017-04-06 08:25:42 +12:00
Manors 6a87a6c40d Add test code for scaleRange 2017-04-06 02:52:45 +08:00
Manors 70101693bc Tidy scaleRange code 2017-04-06 00:45:44 +08:00
borisbstyle 99c87ba2dc merge 3.1.7 defaults 2017-04-05 15:36:52 +02:00
borisbstyle 6899c66a05 Add anti gravity as feature and mode
3.1.7 mergebacks
2017-04-05 15:27:52 +02:00
borisbstyle d8f03693f7 Disable Airmode fully when airmode not active // Adjust default setpoints / pids 2017-04-05 14:57:12 +02:00
Michael Keller 42cbbbb681 Merge pull request #2819 from cs8425/SITL
SITL in gazebosim
2017-04-06 00:04:25 +12:00
cs8425 120fa21693 implement SITL in gazebosim with ArduCopterPlugin
need implement fake eeprom & fake IO

need implement fake system function

can compile, stuck in isEEPROMContentValid()

EEPROM in memory work

EEPROM as file should work

fix some complie warning

MSP over TCP work (add dyad.c)

a little clean up

fix FLASH_CONFIG_Size in ld script & implement some pwmout

IO to simulator work!! need to check direction & scale!!

can fly but Gyro buggy

move dyad.c

fix busy-loop (limit to max 20kHz)

can simulatie in different speed now! (hard code)

add option for IMU calculation

add README.md

move dyad.c and fix F3 overrun the flash size

explanation SITL in README.md and reuse CFLAGS, ASFLAGS
2017-04-05 18:22:59 +08:00
Michael Keller c2307a4bea Merge pull request #2814 from mikeller/increase_gps_task_frequency
Increased GPS task frequency to 100Hz to prevent serial buffer overflows.
2017-04-04 23:54:58 +12:00
borisbstyle 6a1f96b237 Merge pull request #2807 from martinbudden/bf_uncommon_mixers
Disable uncommon mixers for ROM saving
2017-04-04 09:07:11 +02:00
Michael Keller 5ff8ae9628 Increased GPS task frequency to 100Hz to prevent serial buffer overflows. 2017-04-04 12:24:19 +12:00
Michael Keller a03bd7077e Merge pull request #2810 from flyinglemonfpv/master
Fixed KIWI/PLUM sbus issues, added KIWIV2 target
2017-04-04 11:07:35 +12:00
Michael Keller 42509ee139 Merge pull request #2813 from unitware/bf-test-cleanup
major refactor of the unit test makefile
2017-04-04 10:41:16 +12:00
Magnus Ivarsson e88e251df9 major refactor of the unit test makefile
- Specify source files in variables instead of manually writing
   the make file rules, this removes a lot of duplication
 - Use separate folders for all tests allowing for tests and common
   source files to be built with different settings (defines)
2017-04-04 00:06:56 +02:00
borisbstyle a34e6753ff Merge tag 'v3.1.7' 2017-04-04 00:02:14 +02:00
borisbstyle e1c4b5cc2d Revert "Remove GPS for FURYF3"
This reverts commit 02b8204fb1.
2017-04-03 22:27:50 +02:00
borisbstyle 4d63ee598e Add anti gravity feature to cli 2017-04-03 22:19:27 +02:00
borisbstyle 7cce36386f Merge branch 'patch_v3.1.7' of https://github.com/betaflight/betaflight into patch_v3.1.7 2017-04-03 22:13:25 +02:00
Martin Budden a3beebea19 Disable uncommon mixers for ROM saving 2017-04-03 22:12:19 +02:00
Martin Budden 149ed180f6 Merge pull request #2800 from jflyper/bfdef-cms-resurrect-display-cycling
[CMS] Resurrect display cycling
2017-04-03 20:52:30 +01:00
Martin Budden cad16aa26c Merge pull request #2808 from unitware/bf-test-dependencies
handle dependencies in unit tests
2017-04-03 20:51:02 +01:00
Martin Budden c9fd4ec428 Merge pull request #2790 from unitware/bf-test-verbosity
control build verbosity for the unit tests
2017-04-03 20:46:59 +01:00
flyinglemonfpv d7e0917a4f Fixed KIWI/PLUM sbus issues, added KIWIV2 target 2017-04-03 16:33:26 +02:00
Michael Keller e244d1383a Merge pull request #2809 from AndersHoglund/fix_cc3d_msp_uart3
Disable i2c on CC3D flexiport, fixes the problem with MSP on UART3 not working.
2017-04-04 00:02:19 +12:00
Anders Hoglund 34f5f25c8a Disable i2c on CC3D flexiport, fixes the problem with MSP on UART3 not working. 2017-04-03 13:11:04 +02:00
Magnus Ivarsson 27059bdfd8 handle dependencies in unit tests 2017-04-03 13:10:55 +02:00
Martin Budden f24865d9a0 Disable uncommon mixers for ROM saving 2017-04-03 10:59:46 +01:00
borisbstyle ba995ac52b Merge branch 'patch_v3.1.7' of https://github.com/betaflight/betaflight into patch_v3.1.7 2017-04-03 00:48:03 +02:00
borisbstyle 8f3b7b5628 Disable transition by default 2017-04-03 00:47:24 +02:00
Michael Keller f2fa06e52e Merge pull request #2769 from mikeller/fix_adc_current_offset
Fixed ADC current meter for negative offset.
2017-04-03 09:52:35 +12:00
Martin Budden 806742262b Merge pull request #2793 from DieHertz/clean-non-pg-remains
Cleaned USE_PARAMETER_GROUPS remainders
2017-04-02 22:35:44 +01:00
Martin Budden 011acfa4dd Merge pull request #2796 from betaflight/spracingf4evo
Initial target support for SPRacingF4EVO
2017-04-02 22:34:44 +01:00
Martin Budden 787a927258 Merge pull request #2797 from sambas/betaflightF7
Switch SD card detect polarity for AnyFC-F7 production boards
2017-04-02 22:32:55 +01:00
Martin Budden 876f277d69 Merge pull request #2798 from betaflight/spracingf4evo-patch-v3.1.7
SPRACINGF4EVO for v3.1.7
2017-04-02 22:32:25 +01:00
Martin Budden d6c3f8cb18 Merge pull request #2801 from betaflight/fix-spracingf3evo-mag-detection
Fix MPU9250 SPI AK8963 MAG detection
2017-04-02 22:30:10 +01:00
Michael Keller 4b63fe0672 Merge pull request #2804 from betaflight/minor-changes-from-cf-1
Minor changes from CF
2017-04-03 09:09:29 +12:00
borisbstyle ca1ae28b8e Fix bug with unset PID's 2017-04-02 22:38:58 +02:00
Miguel a2841d783b Fix compile linking issues when USE_PWM is disabled 2017-04-02 20:01:41 +01:00