1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 13:25:30 +03:00
Commit graph

6386 commits

Author SHA1 Message Date
jflyper
c58132a198 Merge pull request #8 from martinbudden/jf_osd8
Tidy of osd.c and CMS related #defines
2016-11-08 18:00:27 +09:00
jflyper
6bcec1bcd7 Merge pull request #7 from martinbudden/jf_osd7
Added CMS test code
2016-11-08 17:59:58 +09:00
Martin Budden
2a2960f584 Tidied up CMS related #defines 2016-11-08 06:38:22 +00:00
Martin Budden
1bbc0420ad CMS currentTime tidy 2016-11-08 06:30:24 +00:00
Martin Budden
3fe8e4b0c0 Merge pull request #1491 from blckmn/io_licence_header
Adding missing licence headers
2016-11-08 07:04:08 +01:00
Martin Budden
30dfe0c3a5 Tidy of osd.c 2016-11-08 05:36:56 +00:00
jflyper
7861603c96 Optional string for OME_Label
OME_Label now has an optional string (data).
Profile number is now displayed PID menu using this facility.
2016-11-08 14:20:12 +09:00
blckmn
9fc0f97359 Adding missing licence headers 2016-11-08 15:48:11 +11:00
jflyper
b7342b98e2 Cosmetics around masterConfig.osdProfile.item_pos[] 2016-11-08 13:18:28 +09:00
jflyper
bf5430a2bd Remove historical OSD_CALLS_CMS
This was a part of the original code, and was left here so there will
be an option to call CMS code from OSD task so that there is no need
for a separate CMS task.
It was eventually unused; there are couples of important logics around
cmsOpenMenu so doing this will require the same amount of code.
2016-11-08 12:14:27 +09:00
blckmn
8dc3bee80d Adding DMA ownership for ADC, LED STRIP, USART and MOTOR 2016-11-08 13:47:37 +11:00
Martin Budden
2c9d71aeae Added CMS test code 2016-11-07 20:51:08 +00:00
jflyper
576ad19914 Add OME_Funcall to call a function.
With the introduction of the CME_Menu, OME_Submenu became unsuitable
for general function calls. Actually, it works and call the designated
function, but attempt to externally traverse the menu structure fail
because it expects CME_Menu * as data for OME_Submenu.
2016-11-08 05:27:09 +09:00
Faduf
d93e218073 Beeper inversion and I2C Pull-up deactivation 2016-11-07 19:55:09 +01:00
Faduf
87c305639a Update target.h 2016-11-07 19:54:12 +01:00
borisbstyle
9ec798a6f5 Merge pull request #1487 from rotcehdnih/X_RACERSPI_DSHOT
X_RACERSPI_DSHOT
2016-11-07 16:08:02 +01:00
rotcehdnih
39784a74fe First test // Props off 2016-11-08 01:55:19 +11:00
jflyper
c12942ed41 Substitute FEATURE_MSP_DISPLAYPORT with !defined(OSD)
Save feature bits.
2016-11-07 22:29:35 +09:00
jflyper
5a6828b87f RAMDOM!!! 2016-11-07 20:35:01 +09:00
borisbstyle
d572043b8a Remap TIM17 DMA on SPF3 2016-11-07 12:33:12 +01:00
jflyper
aed2e48266 Tidy 2016-11-07 20:17:52 +09:00
jflyper
1da1837288 Change feature name to MSP_DISPLAYPORT
And some build option fix.
2016-11-07 18:53:23 +09:00
jflyper
3c2849ffdc VTX menu: onEntry and onExit should be working now
Don’t know why this was overlooked.
Needs testing.
2016-11-07 17:12:57 +09:00
jflyper
3bce0fb5f1 Overlooked menu separation from osd.c
This was overlooked (cms_menu_osd.h was already there).

Now the element position editing capability is absolutely gone.
2016-11-07 16:54:22 +09:00
jflyper
941c3abb12 IMU menu: fixed ranges to match that of cli. 2016-11-07 16:51:29 +09:00
Martin Budden
d62a258a03 Merge pull request #1481 from blckmn/timer_irq_removal
Remove need for IRQ to be provided in target.c
2016-11-07 07:54:23 +01:00
jamming
a646622997 changes log 2016-11-07 14:30:44 +08:00
jflyper
ee6641a917 Fix profile number offset problem 2016-11-07 14:33:12 +09:00
blckmn
d7fe69a421 Removing irq completely from target.c 2016-11-07 15:04:13 +11:00
blckmn
159236093e Remove need for IRQ to be provided in target.c 2016-11-07 09:54:55 +11:00
Martin Budden
b7de73bc13 Merge pull request #1480 from blckmn/resource_rename
Renaming resourceOwner_t to resourceOwner_e
2016-11-06 23:13:18 +01:00
blckmn
eb53cbb40d Renaming resourceOwner_t to resourceOwner_e 2016-11-07 08:57:54 +11:00
jflyper
064f090a48 Merge pull request #6 from martinbudden/jf_osd5
Fixed overlooked USE_MSP_OSD
2016-11-07 06:14:38 +09:00
Martin Budden
7ff8547c70 Fixed overlooked USE_MSP_OSD 2016-11-06 21:11:08 +00:00
jflyper
ca4601bc46 Merge pull request #5 from martinbudden/jf_osd4
CMS file renaming. displayPort renaming
2016-11-07 05:52:24 +09:00
borisbstyle
dc5b0a64bd Merge pull request #1478 from blckmn/led_fix2
Remaining LED strip driver issues resolved.
2016-11-06 21:50:31 +01:00
Martin Budden
44d633e5e7 Changed USE_MSP_OSD to USE_MSP_DISPLAYPORT 2016-11-06 20:40:42 +00:00
Martin Budden
d8a83518db CMS file renaming. displayPort renaming 2016-11-06 20:24:33 +00:00
blckmn
e3ab93a416 Adding LED strip to CR 2016-11-07 06:02:32 +11:00
blckmn
18decaf436 Remaining LED strip driver issues resolved. 2016-11-07 05:56:27 +11:00
borisbstyle
504f6b4479 Merge pull request #1474 from Faduf/master
YuPiF4 target : Gyro change
2016-11-06 19:54:23 +01:00
borisbstyle
d6c82f3c73 Merge pull request #1477 from martinbudden/bf_colibri_race
Fixed COLIBRI_RACE build
2016-11-06 19:53:43 +01:00
Martin Budden
74477c8edd Fixed COLIBRI_RACE build 2016-11-06 17:22:46 +00:00
jflyper
70ae5dd8da Merge pull request #4 from martinbudden/jf_osd3
Code tidy and addition of GPL headers
2016-11-07 01:56:10 +09:00
francoisduf
f3690fc769 Gyro change 2016-11-06 11:31:58 +01:00
Martin Budden
a7a428a5bb Code tidy and addition of GPL headers 2016-11-06 10:29:11 +00:00
jflyper
31b6e7e024 Menu tidy 2016-11-06 16:54:53 +09:00
jflyper
0c57456ae7 Fix reference to cms in non-CMS case (osd.c) 2016-11-06 11:54:25 +09:00
jflyper
a6b03a9473 Touch-ups after rebase
Led strip’s color manipulation was dropped due to the drastically
change in the config structure; led strip menu now only has feature
on/off.
2016-11-06 04:34:19 +09:00
jflyper
e9a2f2b2c1 Merge remote-tracking branch 'betaflight/master' into bfdev-osd-cms-separation-poc 2016-11-06 02:43:24 +09:00