1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 16:55:36 +03:00
Commit graph

35 commits

Author SHA1 Message Date
mikeller
cedcf2d7e2 Added calibration menu to CMS. 2019-11-19 13:59:52 +13:00
mikeller
4a7904695e Moved 'config.[ch]' into the 'config/' directory. 2019-10-28 11:17:25 +13:00
Bruce Luckcuck
5c98726318 Replace individual CMS vtx menus with a single entry that redirects to the correct protocol menu
Instead of having individual menus for RTC6705, SmartAudio, and Tramp, Now there is a single VTX menu that detects the type of active device and redirects to the appropriate protocol menu.

Reduces confusion and chances of erroneously using the wrong VTX menu.

Fixes a problem where the Tramp menu could be used to change band/channel/power even though the VTX was a SmartAudio device.

If the VTX is not configured or not communicating, a more informative message will be presented rather than a partially populated protocol menu. For example:
```
  VTX NOT RESPONDING
  OR NOT CONFIGURED

> BACK
```

Extends the CMS menu capabilities by adding an optional `redirectCheck` function that can conditionally return a menu that should be redirected to instead of the current menu. This redirect happens before any processing happens for the original menu. Adds flexibility to make the CMS menus have a more dynamic aspect.
2019-10-19 20:17:43 -04:00
Bruce Luckcuck
9081bd3338 Add CMS menu entry level control of forced reboot on changes
CMS menu items can now be defined with a `REBOOT_REQUIRED` flag. If the user changes flagged elements the the exit/save options will change to `EXIT&REBOOT` and `SAVE&REBOOT` - ensuring that the changed items will be handled properly. This should be used for options where runtime changes either won't take effect (because they are read at boot), or for items that could have unexpected behavior if changed.

Several appropriate menus have been updated to include the flag.

To accomodate the dynamic nature of the save/exit options, the individual options have been removed from the main menu and replaced with a `SAVE/EXIT` submenu. This is the same menu that is presented as the quick-access popup save menu (yaw-right). This menu will adapt to requiring a reboot if any flagged setting is changed. Additionally the `REBOOT_REQD` arming disabled reason will be set (cleared by the reboot).
2019-05-20 12:39:36 -04:00
Dominic Clifton
78f38daa4f Drastically reduce the CMS RAM usage.
Previously the runtime page state was mixed with the page configuration.

This resolves this by:
a) making the configuration entries constant so they do not need to be
in RAM.
b) Maintaining page state independently.
2019-02-17 00:18:24 +01:00
mikeller
38e1ce04df Reorganised interfaces, putting them where they are used. 2019-01-27 13:38:22 +13:00
Bruce Luckcuck
330d93eb5b Add CMS failsafe setup menu
Located under the Features top-level menu. Allows configuring the failsafe procedure (like selecting GPS-RESCUE if applicable).

Bounded with `#ifdef USE_CMS_FAILSAFE_MENU` so it can be disabled for space critical targets.
2019-01-10 15:22:36 -05:00
blckmn
a9f74cd6df Removed excess trailing spaces before new lines on licenses. 2018-04-25 20:58:00 +10:00
blckmn
46fe22b4bd Direct license replacement 2018-04-22 09:22:46 +10:00
Dan Nixon
22874d8ba2 CMS power menu
Menu including:
- Voltage meter selection
- Current meter selection
- Max cell voltage (moved from MISC menu)
- Voltage scale adjust (moved from MISC menu)
- ADC current scale and offset adjust
- Virtual current scale and offset adjust
2018-02-01 15:31:45 +00:00
mikeller
385623bd9d Converted defines for VTX_COMMON, VTX_CONTROL, VTX_RTC6705, VTX_RTC6705SOFTSPI, VTX_TRAMP, VTX_SMARTAUDIO to use USE_ prefix. 2018-01-09 17:34:34 +13:00
Anders Hoglund
0e1f0e89e7 Spektrum, CMS over Telemetry. Rebased and squashed. 2017-11-14 15:57:33 +01:00
Martin Budden
e3ee9a5588 Created new interface directory 2017-11-12 12:20:58 +00:00
Michael Keller
364afcbf25
Merge pull request #4521 from martinbudden/bf_cms_onglobalexit
Remove almost entirely unused CMS ononGlobalExit function
2017-11-10 10:35:13 +13:00
Martin Budden
243e8390a2 Removed CMS menu guards when not debugging 2017-11-09 19:09:17 +00:00
Martin Budden
9a9884e4af Remove almost entirely unused CMS ononGlobalExit function 2017-11-09 19:06:25 +00:00
mikeller
b78d8ad83e Converted more 'feature' type defines to use the 'USE_<x>' convention: LED_STRIP TARGET_CONFIG BRUSHED_ESC_AUTODETECT SERIAL_RX TELEMETRY TELEMETRY_CRSF TELEMETRY_FRSKY TELEMETRY_HOTT TELEMETRY_IBUS TELEMETRY_JETIEXBUS TELEMETRY_LTM TELEMETRY_MAVLINK TELEMETRY_SMARTPORT TELEMETRY_SRXL TELEMETRY_NRF24_LTM TELEMETRY_LTM SPEKTRUM_BIND NAV BUTTONS 2017-11-07 18:49:12 +13:00
mikeller
a8d34dabb0 Changed defines for GYRO/ACC/MAG/BARO/GPS/SONAR/OSD/BLACKBOX/CMS to conform to the USE_ convention. 2017-11-05 10:15:24 +13:00
Martin Budden
028a75fd58 Corrected RTC6705 CMS header file 2017-08-18 07:48:48 +01:00
Martin Budden
aef34a0a53 Split Tramp CMS code into separate module 2017-08-18 07:09:25 +01:00
Martin Budden
091b6bc912 Split smartaudio CMS code into separate module 2017-08-18 06:40:31 +01:00
Dan Nixon
78d28b48f8 Generic OSD timers
- Two configurable timer elements/stat items
- High precision timer (for race timing)
- Add array length checking to OSD items in MSP
2017-07-03 12:30:49 +01:00
Dan Nixon
7919a6ffbd Add MAX7456 image options to CMS 2017-06-12 12:14:52 +01:00
Michael Keller
e5d1382f59 Merge pull request #2833 from jflyper/bfdev-cms-refactor
[CMS] Multi-page bug fix and refactor
2017-05-02 10:19:14 +12:00
Hydra
723831b579 SPRACINGF3NEO - Use RTC6705 clk hack.
CF/BF - Fix typo in max7456DmaInProgress.  Always define an
implementation even when there is no TX-DMA.

CF/BF - Ensure that max7456 communication does not disrupt RTC6705
communication when using the same SPI port for both.

CF/BF - Port RTC6705 to use the VTX API.

* Support VTX channel/band/power on OSD for ALL vtx APIs - previously it only supported RTC6705.
* Remove all FEATURE_VTX usage.
* Remove all `#define VTX` usage.

Note that due to the async nature of tramp/smartaudio it's not possible
to know the current band/channel after requesting a change (as the
request hasn't been processed) so it makes no sense to try and save the
config - and on the tramp/smartaudio vtx the vtx maintains it's state.
So on an RTX6705 equipped FC the user should now MANUALLY save the
config using the save config stick position.

CF/BF - Move CMS for RTC6705 into vtx_rtc6705.c for consistency with
other VTX CMS menus.

CF/BF - Update RTC6705 via SOFT SPI to use VTX API.

* Achieved by simply aligning the API at the driver level and removing
all legacy conditional compilation checks.

CF/BF - Use new IO for RTC6705 CLK Hack

CF/BF - Port VTX button from CF v1.x.

Features:
* Channel Cycle
* Band Cycle
* Power Cycle
* Save Settings
* Works with any VTX using VTX API.

CF/BF - Allow support for Internal and External VTX - External takes
precedence when configured.

CF/BF - Fix display of VTX power in CMS.

* Issue occured when CMS was transitioned from integer to list of
strings.

CF/BF - Disable SMARTAUDIO and TRAMP on the SPRacingF3NEO due to flash
size.

CF/BF - Cleanup const usage of bass-by-value parameters.  Cleanup
naming.

CF/BF - Cleanup naming.  Removing noise-words. Improving consistency.

CF/BF - Improve readability by further naming cleanups.

CF/BF - Remove some magic numbers in the RTC6705 VTX code.

CF/BF - Use braces on some procedural macros.

CF/BF - Improve code readability by renaming rtc6705SetChannel to
rtc6705SetBandAndChannel.

CF/BF - Remove editor mishap.

CF/BF - Make the rtc6705Dev variable static.

CF/BF - remove duplicate state variablertc6705Dev_t - vtxDevice_t had
all we needed.  Use brackets on some procedural style macros.  Make all
the vtx vtable static const.

CF/BF - making some declarations const.

CF/BF - Fix vtx_power maximum value (out by one).
2017-04-21 11:49:31 +12:00
Hydra
73e46e9050 CF/BF - fix CMS compilation when blackbox is disabled. 2017-04-09 14:11:56 +01:00
jflyper
602b656b01 Refactor CMS
- Introduce 'page'
- Handle more than 2 pages correctly
2017-04-07 05:15:27 +09:00
Raphael Coeffic
af72b761b5 fixed pre-processor directives (continued) 2017-01-15 23:18:38 +01:00
jflyper
58ed2ed590 Tramp prototype driver 2017-01-13 15:59:36 +01:00
jflyper
53e637d01e Fix minor glitches 2016-12-13 13:35:59 +09:00
jflyper
61a87480b3 Rebased on to master (with merged CMS) 2016-11-15 15:46:43 +09:00
jflyper
8530cd4ba1 Menu restructuring
- Rate profiles are handled correctly
- Added FILTER GLB (Global) and FILTER PP (Per Profile) sub menus
- Moved MISC menu under top level.
2016-11-09 05:42:22 +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
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
Martin Budden
d8a83518db CMS file renaming. displayPort renaming 2016-11-06 20:24:33 +00:00
Renamed from src/main/io/cms_builtin.c (Browse further)