1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-21 15:25:36 +03:00
Commit graph

5826 commits

Author SHA1 Message Date
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
mikeller
66c1911660 Added support for setting fast MSP bitrates in CLI. 2016-09-25 11:25:44 +13: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
Dan Nixon
814c043d01 Correct switch indentation and function name 2016-09-24 16:26:21 +01:00
Dan Nixon
bd699f1353 Replace uint8_t with bool, refactor item display code
Removes uplicate code from OSD element display
2016-09-24 15:01:01 +01:00
Dan Nixon
aea5666cfb Refactor OSD code 2016-09-24 13:57:26 +01:00
borisbstyle
bec109d366 Merge pull request #1213 from marbalon/master
Lock MAX7456 updates during font update
2016-09-24 13:50:55 +02:00
borisbstyle
d135edda21 Coding Style 2016-09-24 13:50:08 +02:00
Michael Keller
73a626a22e Turns out directory entries do not contain the dot. 2016-09-24 23:40:08 +12:00
nathan
c1abcd3c48 fix pwm6 2016-09-24 02:06:46 -07:00
nathan
f5e51d6a45 target(omnibusf4): usb should be on the right side of the board 2016-09-23 23:56:40 -07:00
Michael Keller
63db7f99e6 Fixed char array definition. 2016-09-24 18:22:09 +12:00
nathan
ec61f9d401 fix the omnibusf4 beeper 2016-09-23 22:38:33 -07:00
Mitch Miers
7219fb1fbc Fix X_RACERSPI target
The pin mapping for this target wasn't quite right.

o) old PWM (input) indexes 7,8 didn't really exist (removing these PWMs changed the
   numbers of PWM outputs 9-16 to 7-14)
o) PWM (output) indexes that are now PWM13,14 are shared with UART2 (PA2, PA3)
o) PWM inputs that were marked 7 and 8 were really 5 and 6 (verified with continuity
   test).  Renumbered to 5, 6.  Also, these are softserial 1 (PB0, PB1)
o) PWM inputs 5 and 6 were really MISO and MOSI of SPI1 and not wired to the inputs
   on the board.  Removed as timers. (PB4, PB5)
o) PWM inputs 3 and 4 are shared with UART3 (PB10, PB11)

The rest of the changes are:
o) remove X_RACERSPI reliance on SPRACINGF3 defined
o) fix main.c usage of softserial and X_RACERSPI
o) fix pwm_mapping to avoid collisions between UARTS and PWMs.  UARTs win.
2016-09-23 23:09:15 -04:00
Marcin Baliniak
fa64da4986 Lock MAX7456 updates during font update 2016-09-23 14:43:51 +02:00
Michael Keller
7195f1dd2e Changed suffix for file detection as well. 2016-09-23 19:59:22 +12:00
Nathan
f5e1456bcf faster spi for omnibus, thx marbalon (#1211)
target only, merging
2016-09-22 23:37:03 -07:00
Nathan
66be7a08ff Merge pull request #1206 from marbalon/master
Added OSD alarms to MSP_SET_OSD_CONFIG
2016-09-22 20:36:02 -07:00
Michael Keller
7ed2dc6fe3 Changed BLACKBOX default filename for SDCard logging to 'logXXXXX.bfl'. 2016-09-23 13:14:36 +12:00
Michael Keller
fcf0559d2f Cleaned up LED_STRIP indicator blink frequency calculation. 2016-09-23 12:56:06 +12:00
Marcin Baliniak
6bfcb9f023 Merge remote-tracking branch 'upstream/master' 2016-09-23 01:10:15 +02:00
Marcin Baliniak
ab056c974f Added OSD alarms to MSP_SET_OSD_CONFIG 2016-09-23 01:06:24 +02:00
borisbstyle
6e35a6abc9 Merge pull request #1197 from marbalon/master
Fixed problem for hidding Horizon in options
2016-09-23 01:02:49 +02:00
Marcin Baliniak
a8a5b72f29 Fixed some small bugs and some new menu items 2016-09-23 00:56:27 +02:00
Martin Budden
7205520dc2 Merge pull request #1203 from mikeller/fix_beeper
Fixed beeper delay to use microseconds instead of milliseconds.
2016-09-22 07:11:16 +01:00