Commit Graph

5547 Commits

Author SHA1 Message Date
Martin Budden e530c72a18 Removed unused parameters 2016-10-02 08:37:40 +01:00
nathan 28dda8d58b ledstrip defs from the revo 2016-10-01 19:14:20 -07:00
Martin Budden 5fec66b639 Split off serial parts from MSP 2016-10-02 01:01:50 +01:00
borisbstyle 7cd60b66b9 Update .travis.yml 2016-10-02 01:53:36 +02:00
borisbstyle 78b2090abf Merge pull request #1251 from betaflight/second_notch
Add More filtering Options
2016-10-02 01:48:06 +02:00
borisbstyle c191da6c58 Add New Default Filter combination 2016-10-02 01:46:10 +02:00
borisbstyle 63e6182ee5 Merge pull request #1227 from mmiers/local3.0.0
XRacerSPI
2016-10-02 01:01:25 +02:00
borisbstyle 73e952ce16 Move PID relaxation to only D 2016-10-02 00:58:33 +02:00
J Blackman 5253c72625 Merge pull request #1244 from martinbudden/bf_msp_split_stage1
Splitting MSP into serial and MSP parts - stage1
2016-10-02 09:45:37 +11:00
Martin Budden bcf8fc9c1e Splitting MSP into serial and MSP parts- stage1 2016-10-01 23:28:20 +01:00
J Blackman f3aa4e6dd6 Merge pull request #1243 from martinbudden/bf_master_config
Move master_t required #includes into config_master.h
2016-10-02 08:54:06 +11:00
Martin Budden 9889b1db9c Move master_t required #includes into config_master.h 2016-10-01 14:10:09 +01:00
Anders Höglund 666e922399 Merge pull request #1242 from AndersHoglund/development
SINGULARITY build failed. Added missing includes.
2016-09-30 23:22:38 +02:00
Anders Hoglund 37875c47de SINGULARITY build failed. Added missing includes. 2016-09-30 23:12:19 +02:00
J Blackman c603f90226 Merge pull request #1232 from martinbudden/bf_motor_servo_io_split
Split escAndServoConfig into motor and servo parts
2016-10-01 06:32:16 +10:00
borisbstyle 3b4e854fca Merge pull request #1240 from betaflight/minor-cleanups-1
Minor cleanups 1
2016-09-29 12:45:03 +02:00
Hydra 8ebdd98694 delete unused variable 2016-09-29 12:22:11 +02:00
Hydra 544e4a95b4 fix comment to refer to biquadFilter_t instead of the old biquad_t 2016-09-29 12:22:11 +02:00
Hydra 09acef9843 delete unused variable. 2016-09-29 12:22:11 +02:00
Hydra 77873c4162 Remove out of date comment. 2016-09-29 12:22:11 +02:00
Anders Höglund a604abefd8 Merge pull request #1237 from blckmn/revo_led
Moved LED to ESC output 5 - REVO
2016-09-27 22:11:29 +02:00
blckmn 9b62cd453a updated comment for Revo led strip 2016-09-27 22:23:10 +10:00
J Blackman 8f566d70e9 Merge pull request #1236 from martinbudden/bf_linker_scripts
Moved linker scripts into their own directory
2016-09-27 21:44:15 +10:00
blckmn 51fa33190c Moved LED to ESC output 5 - REVO 2016-09-27 21:40:17 +10:00
Martin Budden 32fd3eca43 Moved linker scripts into their own directory 2016-09-27 08:25:02 +01:00
Martin Budden ea4e7de729 Fixup after rebase 2016-09-26 19:29:46 +01:00
Martin Budden a11d0bdb4d Split escAndServoConfig into motor and servo parts 2016-09-26 19:24:52 +01:00
Anders Höglund 60da2b52ff Merge pull request #1230 from AndersHoglund/development
RACEBASE build failed. Incomplete include path corrected.
2016-09-26 11:51:42 +02:00
Anders Hoglund 1ebb0ce4bc RACEBASE build failed. Incomplete include path corrected. 2016-09-26 11:50:11 +02:00
Mitch Miers 25972ce83a Dangling bracket. 2016-09-25 21:09:50 -04:00
Mitch Miers 6a36fadc1b Trim the conditions a bit after a better understanding of what's
possible and what isn't.

This also implies adding some things back to PWM mappings.
2016-09-25 21:00:52 -04:00
Mitch Miers 3dd085dc9e Need to know if useUART2 is set.
The X_RACERSPI target overloads the UART2 pins.  Nobody was setting
this variable at all.  Apparently only needs to be set if F303xC.
2016-09-25 19:52:44 -04:00
borisbstyle 3c4608d6fa Merge branch 'master' into development 2016-09-26 00:51:27 +02:00
borisbstyle 94b26d428c Merge pull request #1225 from DanNixon/development
Merge master into development
2016-09-26 00:50:52 +02:00
borisbstyle 0f88839fa7 Merge pull request #1220 from marbalon/master
Fixed current value in statistics and some minor fixes
2016-09-26 00:49:33 +02:00
Marcin Baliniak bae96d9595 Fixed ident style and compilation for targets with MAX on DMA 2016-09-25 17:51:27 +02:00
Dan Nixon 03f340fe14 Merge branch 'master' into development
Conflicts:
	src/main/build/version.h
	src/main/drivers/max7456.c
	src/main/io/osd.c
	src/main/io/osd.h
	src/main/target/OMNIBUSF4/target.c
2016-09-25 11:31:44 +01:00
Marcin Baliniak 419547a2bf Merge remote-tracking branch 'upstream/master' 2016-09-25 11:57:43 +02:00
Marcin Baliniak 2d83570923 Fixed problem with feature save via OSD, and better LED strip color display in menu 2016-09-25 11:49:08 +02:00
Marcin Baliniak 171b03bfb7 efactor MAX7456 driver code 2016-09-25 11:42:53 +02:00
Marcin Baliniak 0892c4786b Merge remote-tracking branch 'upstream/master' 2016-09-25 11:24:51 +02:00
borisbstyle 7b7a18a52b Merge pull request #1217 from nathantsoi/target/obf4-updates
obf4 updates
2016-09-25 11:20:17 +02:00
borisbstyle 37b4432d4d Merge pull request #1221 from DanNixon/fix_osd_changes
Fix issues introduced in #1218
2016-09-25 11:17:09 +02:00
Dan Nixon 9a00028eb3 Fix brace style in max7456.c 2016-09-25 09:54:04 +01:00
borisbstyle 77695ecffc Merge pull request #1222 from mikeller/fix_logfile_name_detection
Fixed detection of existing log files when logging to SDCard.
2016-09-25 10:46:20 +02:00
Dan Nixon aa15dec809 Fix issues intriduced in #1218 2016-09-24 23:19:10 +01:00
mikeller 2cc4eea6de Fixed detection of existing log files when logging to SDCard. 2016-09-25 10:48:45 +13:00
borisbstyle ad8201173c Merge pull request #1210 from mikeller/change_blackbox_default_file_name
Changed BLACKBOX default filename for SDCard logging to 'LOGXXXXX.BFL'.
2016-09-24 22:55:12 +02:00
borisbstyle 9998284160 Merge pull request #1218 from DanNixon/osd_refactoring
Refactor and clean up OSD code
2016-09-24 22:54:07 +02:00
Marcin Baliniak d9774666da fixed current value in statistics and some minor fixes 2016-09-24 22:31:24 +02:00