1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 00:05:33 +03:00
Commit graph

79 commits

Author SHA1 Message Date
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
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
Martin Budden
d8a83518db CMS file renaming. displayPort renaming 2016-11-06 20:24:33 +00:00
Martin Budden
a7a428a5bb Code tidy and addition of GPL headers 2016-11-06 10:29:11 +00:00
jflyper
0c57456ae7 Fix reference to cms in non-CMS case (osd.c) 2016-11-06 11:54:25 +09:00
jflyper
4ae6f8c1c4 displayPort device registration changed 2016-11-06 02:37:45 +09:00
jflyper
f66a08d457 Merge branch 'bfdev-osd-cms-separation-poc' of https://github.com/jflyper/cleanflight into bfdev-osd-cms-separation-poc 2016-11-05 11:22:47 +09:00
jflyper
1961e50f0b Introduce CMS_Menu 2016-11-05 10:11:34 +09:00
Martin Budden
ca1de7a4d9 Split OLED displayport out of dashboard 2016-11-04 10:25:44 +00:00
Martin Budden
1f5e593120 Abstracted displayPort from CMS 2016-11-03 21:24:31 +00:00
jflyper
f8c48f569a Menu contents separation 2016-11-03 03:35:33 +09:00
jflyper
cc69964d6b Use max7456WriteChar instead of direct access to screenBuffer (osd.c)
Some fix-ups for different targets.
2016-11-02 19:12:50 +09:00
jflyper
9363f53945 Consistent naming for TxBytesFree 2016-11-02 15:55:29 +09:00
jflyper
f58f7f65b1 Cleanups 2016-11-02 09:12:37 +09:00
jflyper
042096fbb7 Tx buffer availability hack to handle slow devices 2016-11-02 00:30:54 +09:00
jflyper
1aaf2d9d47 Minor touch ups 2016-10-29 13:40:27 +09:00
jflyper
720a841008 More displayPort_t, CANVAS as new feature, multi-display cycling
- Further touch-ups with displayPort_t handling.
- CANVAS is a FEATURE now.
- Device specific xxxCmsInit() are registered by device’s init, and
called by CMS upon entry to menu.
- Multiple display devices can be cycled by entering menu invocation
command while in menu.
- The menu invocation command is (was) changed to THR-Mid + YAW-Left +
Pitch-Full to avoid collision with MWOSD menu invocation command.
- More separation attempt.
2016-10-28 13:22:28 +09:00
jflyper
7960b1665d Introduction of displayPort_t 2016-10-27 19:07:27 +09:00
jflyper
2e2bac6da3 Prevent osd.c from calling cmsInit and cmsResync if CMS is not defined 2016-10-25 18:45:36 +09:00
jflyper
38660aa8a6 Touch-ups, tidy, bandwidth mgmt on serial canvas 2016-10-25 14:34:08 +09:00
jflyper
6cf9086f56 CMS-OSD separation 2016-10-23 19:03:35 +09:00
jflyper
c795135542 Further touch-ups 2016-10-21 00:41:15 +09:00
jflyper
7f2ebbd2fa Touch ups 2016-10-20 23:49:24 +09:00
jflyper
b2a682b2ea Merge remote-tracking branch 'origin/bfdev-osd-cms-separation-poc' into bfdev-osd-cms-separation-poc 2016-10-20 23:27:08 +09:00
jflyper
0249443862 Rebased onto super-abstracted msp 2016-10-20 23:21:32 +09:00
jflyper
01eab00fd7 Configuration Menu System support for external OSD
A quick hack to support config menu on external OSD, consisiting of:

- CMS-OSD partial separation (CMS and OSD reside in a same file: osd.c)
- MSP message injection (take it as server-push in client-server model)
2016-10-20 22:42:39 +09:00
jflyper
6793692217 Configuration Menu System support for external OSD
A quick hack to support config menu on external OSD, consisiting of:

- CMS-OSD partial separation (CMS and OSD reside in a same file: osd.c)
- MSP message injection (take it as server-push in client-server model)
2016-10-19 22:08:14 +09:00
Martin Budden
a771280b50 Moved config.c from config directory to fc directory 2016-10-18 08:57:39 +01:00
borisbstyle
b168141b67 Fix OSD menu for d setpoint transition 2016-10-10 01:09:56 +02:00
Anders Hoglund
ff69a0c409 OMNIBUS build failed. OSD fumc prototype fixed. 2016-10-07 16:11:48 +02:00
borisbstyle
09d16bd0cb Merge branch 'master' into development 2016-10-07 01:41:55 +02:00
Dan Nixon
9d4c240671 New OSD features (#1263)
* Add max. alt to stats

* Allow toggle of crosshair separate from AH
2016-10-04 22:50:59 -07:00
Martin Budden
3fa5669c7c Removed rssi extern from .c files 2016-10-02 16:29:07 +01:00
borisbstyle
73e952ce16 Move PID relaxation to only D 2016-10-02 00:58:33 +02:00
Martin Budden
9889b1db9c Move master_t required #includes into config_master.h 2016-10-01 14:10:09 +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
borisbstyle
3c4608d6fa Merge branch 'master' into development 2016-09-26 00:51:27 +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
Dan Nixon
aa15dec809 Fix issues intriduced in #1218 2016-09-24 23:19:10 +01: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