Commit Graph

6008 Commits

Author SHA1 Message Date
jflyper cff08148f0 Merge pull request #10 from martinbudden/bf_osd9
Improved CMS const correctness. Added CMS and USE_MSP_DISPLAYPORT to common.h
2016-11-09 01:02:20 +09:00
Martin Budden f68e6a4d2f Improved CMS const correctness. Added CMS and USE_MSP_DISPLAYPORT to common.h 2016-11-08 15:46:05 +00:00
jflyper b5a29955f1 REVO target for testing 2016-11-09 00:18:53 +09:00
jflyper f783ef4015 Added a TASK_CMS start condition for MSP_DISPLAYPORT only case 2016-11-09 00:18:38 +09:00
jflyper c9b7ac21c1 Added onChange function call to scalar data types
This will make changed values to take effect immediately in the profile
related menus.

It’s only used for profile selection now; will be used more through out
the menu contents.
2016-11-08 18:22:00 +09:00
jflyper 0f121c69bb Merge pull request #9 from martinbudden/jf_osd6
CMS currentTime tidy
2016-11-08 18:03:38 +09:00
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 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
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
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
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
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
jflyper ee6641a917 Fix profile number offset problem 2016-11-07 14:33:12 +09: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
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
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
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
jflyper 4ae6f8c1c4 displayPort device registration changed 2016-11-06 02:37:45 +09:00
J Blackman 578bf914f6 Merge pull request #1465 from blckmn/led_fix
Fixes reset LED issue (bad define)
2016-11-05 21:09:09 +11:00
blckmn 3395d9ca2c Fixes reset LED issue (bad define) 2016-11-05 21:08:11 +11:00
Martin Budden abf519f46b Merge pull request #1464 from fredmcc/SmartportSpeedFix
Smart Port telemetry GPS ground speed unit is not applicable. (#2166)
2016-11-05 10:43:48 +01:00
Sami Korhonen d2981cd704 escprog inverted output support
multiport test, usage "escprog ki 255"
2016-11-05 11:27:02 +02:00
hori64 1296169091 Smart Port telemetry GPS ground speed unit is not applicable. (#2166)
Second try
2016-11-05 10:16:07 +01:00
jflyper 131147322d Add menuErr to notify obvious error in menu contents 2016-11-05 17:26:45 +09:00
Martin Budden 9124c496b6 Merge pull request #1462 from blckmn/led_mapping
Moving LED strip output pin to be configurable via resource command
2016-11-05 09:25:01 +01:00
Martin Budden 537e4ce676 Merge pull request #1447 from blckmn/REVOLT
Adding both AirbotF4 and Revolt targets
2016-11-05 09:21:01 +01:00
Martin Budden 504ac9c134 Merge pull request #1460 from blckmn/assign_any
Allow any allocation for motors and servos
2016-11-05 09:18:49 +01:00
blckmn abcbd4cb84 Formatting 2016-11-05 19:09:08 +11:00
blckmn a01a71cddb As per @martinbudden suggestion including io_types.h only, and fixed osd.c master config changes 2016-11-05 17:53:43 +11:00
jflyper e6dd0e6c5c DYNAMIC bit is added to entry flags
This will stash the special type OME_Polled_INT16 for RC preview menu,
and add capability to all value types to be polled dynamically.
2016-11-05 14:24:18 +09:00
jflyper 9008116823 onExit is now called with pointer to OSD_Entry at the time of exit
This will remove the final remaining reference to RC preview menu
(which required not to exit with KEY_ESC).
2016-11-05 13:14:54 +09:00
blckmn e56f915018 Moving LED strip to be configurable via resource command 2016-11-05 13:35:20 +11:00