forked from betaflight/betaflight
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adding OSD quick menu (betaflight#12977)
* QUICK CMS menu * Added RPM LIMIT to quick menu * rpm_limiter csm step = 100 * Renamings + USE_OSD_QUICK_MENU define * Small fixes * Style fixes * tests makefile fix * Activate quick menu by default, if defined USE_OSD_QUICK_MENU * Changed .c/.h license headers to a modern one
- Loading branch information
1 parent
8f50df7
commit 8dac260
Showing
12 changed files
with
308 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| /* | ||
| * This file is part of Betaflight. | ||
| * | ||
| * Betaflight is free software. You can redistribute this software | ||
| * and/or modify this software under the terms of the GNU General | ||
| * Public License as published by the Free Software Foundation, | ||
| * either version 3 of the License, or (at your option) any later | ||
| * version. | ||
| * | ||
| * Betaflight is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| * | ||
| * See the GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public | ||
| * License along with this software. | ||
| * | ||
| * If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| #include <stdbool.h> | ||
| #include <string.h> | ||
|
|
||
| #include "platform.h" | ||
|
|
||
| #ifdef USE_CMS | ||
| #ifdef USE_QUICK_OSD_MENU | ||
|
|
||
| #include "cms/cms.h" | ||
| #include "cms/cms_types.h" | ||
| #include "cms/cms_menu_main.h" | ||
| #include "cms/cms_menu_vtx_common.h" | ||
| #include "cms/cms_menu_rpm_limit.h" | ||
| #include "common/printf.h" | ||
| #include "config/config.h" | ||
|
|
||
| #include "drivers/pwm_output.h" | ||
|
|
||
| #include "fc/controlrate_profile.h" | ||
| #include "fc/core.h" | ||
| #include "fc/runtime_config.h" | ||
| #include "flight/pid.h" | ||
| #include "flight/pid_init.h" | ||
|
|
||
| #include "sensors/battery.h" | ||
|
|
||
| #include "cms_menu_quick.h" | ||
|
|
||
| static controlRateConfig_t rateProfile; | ||
| static uint8_t rateProfileIndex; | ||
| static batteryConfig_t batteryProfile; | ||
| static uint8_t cmsx_motorOutputLimit; | ||
| static uint8_t pidProfileIndex; | ||
| static pidProfile_t *pidProfile; | ||
|
|
||
| static const void *quickMenuOnEnter(displayPort_t *pDisp) | ||
| { | ||
| UNUSED(pDisp); | ||
| pidProfileIndex = getCurrentPidProfileIndex(); | ||
| pidProfile = pidProfilesMutable(pidProfileIndex); | ||
|
|
||
| rateProfileIndex = getCurrentControlRateProfileIndex(); | ||
| memcpy(&rateProfile, controlRateProfiles(rateProfileIndex), sizeof(controlRateConfig_t)); | ||
| memcpy(&batteryProfile, batteryConfigMutable(), sizeof(batteryConfig_t)); | ||
|
|
||
| cmsx_motorOutputLimit = pidProfile->motor_output_limit; | ||
|
|
||
| return NULL; | ||
| } | ||
|
|
||
| static const void *cmsx_RateProfileWriteback(displayPort_t *pDisp, const OSD_Entry *self) | ||
| { | ||
| UNUSED(pDisp); | ||
| UNUSED(self); | ||
|
|
||
| memcpy(controlRateProfilesMutable(rateProfileIndex), &rateProfile, sizeof(controlRateConfig_t)); | ||
| memcpy(batteryConfigMutable(), &batteryProfile, sizeof(batteryConfig_t)); | ||
|
|
||
| pidProfile_t *pidProfile = pidProfilesMutable(pidProfileIndex); | ||
| pidProfile->motor_output_limit = cmsx_motorOutputLimit; | ||
|
|
||
| pidInitConfig(currentPidProfile); | ||
|
|
||
| return NULL; | ||
| } | ||
|
|
||
|
|
||
| static const char * const osdTableThrottleLimitType[] = { | ||
| "OFF", "SCALE", "CLIP" | ||
| }; | ||
|
|
||
| static const OSD_Entry menuMainEntries[] = | ||
| { | ||
| { "-- QUICK --", OME_Label, NULL, NULL }, | ||
|
|
||
| #if defined(USE_RPM_LIMIT) | ||
| { "RPM LIM", OME_Submenu, cmsMenuChange, &cmsx_menuRpmLimit }, | ||
| #endif | ||
| { "THR LIM TYPE",OME_TAB, NULL, &(OSD_TAB_t) { &rateProfile.throttle_limit_type, THROTTLE_LIMIT_TYPE_COUNT - 1, osdTableThrottleLimitType} }, | ||
| { "THR LIM %", OME_UINT8, NULL, &(OSD_UINT8_t) { &rateProfile.throttle_limit_percent, 25, 100, 1} }, | ||
| { "MTR OUT LIM %",OME_UINT8, NULL, &(OSD_UINT8_t) { &cmsx_motorOutputLimit, MOTOR_OUTPUT_LIMIT_PERCENT_MIN, MOTOR_OUTPUT_LIMIT_PERCENT_MAX, 1} }, | ||
| { "FORCE CELLS", OME_UINT8, NULL, &(OSD_UINT8_t) { &batteryProfile.forceBatteryCellCount, 0, 24, 1} }, | ||
| #if defined(USE_VTX_CONTROL) | ||
| #if defined(USE_VTX_RTC6705) || defined(USE_VTX_SMARTAUDIO) || defined(USE_VTX_TRAMP) | ||
| {"VTX", OME_Funcall, cmsSelectVtx, NULL}, | ||
| #endif | ||
| #endif // VTX_CONTROL | ||
| { "MAIN", OME_Submenu, NULL, &cmsx_menuMain }, | ||
| { "EXIT", OME_OSD_Exit, cmsMenuExit, (void *)CMS_EXIT}, | ||
| { "SAVE&REBOOT", OME_OSD_Exit, cmsMenuExit, (void *)CMS_POPUP_SAVEREBOOT}, | ||
| {NULL, OME_END, NULL, NULL}, | ||
| }; | ||
|
|
||
| CMS_Menu cmsx_menuQuick = { | ||
| #ifdef CMS_MENU_DEBUG | ||
| .GUARD_text = "MENUQUICK", | ||
| .GUARD_type = OME_MENU, | ||
| #endif | ||
| .onEnter = quickMenuOnEnter, | ||
| .onExit = cmsx_RateProfileWriteback, | ||
| .onDisplayUpdate = NULL, | ||
| .entries = menuMainEntries, | ||
| }; | ||
|
|
||
| #endif // USE_QUICK_OSD_MENU | ||
| #endif // USE_CMS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /* | ||
| * This file is part of Betaflight. | ||
| * | ||
| * Betaflight is free software. You can redistribute this software | ||
| * and/or modify this software under the terms of the GNU General | ||
| * Public License as published by the Free Software Foundation, | ||
| * either version 3 of the License, or (at your option) any later | ||
| * version. | ||
| * | ||
| * Betaflight is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| * | ||
| * See the GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public | ||
| * License along with this software. | ||
| * | ||
| * If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "cms/cms_types.h" | ||
|
|
||
| extern CMS_Menu cmsx_menuQuick; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * This file is part of Betaflight. | ||
| * | ||
| * Betaflight is free software. You can redistribute this software | ||
| * and/or modify this software under the terms of the GNU General | ||
| * Public License as published by the Free Software Foundation, | ||
| * either version 3 of the License, or (at your option) any later | ||
| * version. | ||
| * | ||
| * Betaflight is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| * | ||
| * See the GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public | ||
| * License along with this software. | ||
| * | ||
| * If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| #include <stdbool.h> | ||
| #include <stdint.h> | ||
| #include <string.h> | ||
| #include <ctype.h> | ||
|
|
||
| #include "platform.h" | ||
|
|
||
| #ifdef USE_CMS | ||
| #ifdef USE_RPM_LIMIT | ||
|
|
||
| #include "cms/cms.h" | ||
| #include "cms/cms_types.h" | ||
| #include "config/config.h" | ||
| #include "pg/stats.h" | ||
| #include "flight/mixer.h" | ||
|
|
||
| #include "cms/cms_menu_rpm_limit.h" | ||
|
|
||
| uint16_t rpm_limit_value; | ||
| uint16_t kv; | ||
| bool rpm_limit; | ||
|
|
||
| static const void *cmsx_RpmLimit_onEnter(displayPort_t *pDisp) | ||
| { | ||
| UNUSED(pDisp); | ||
|
|
||
| rpm_limit_value = mixerConfig()->rpm_limit_value; | ||
| kv = motorConfig()->kv; | ||
| rpm_limit = mixerConfig()->rpm_limit; | ||
|
|
||
| return NULL; | ||
| } | ||
|
|
||
| static const void *cmsx_RpmLimit_onExit(displayPort_t *pDisp, const OSD_Entry *self) | ||
| { | ||
| UNUSED(pDisp); | ||
| UNUSED(self); | ||
|
|
||
| mixerConfigMutable()->rpm_limit_value = rpm_limit_value; | ||
| motorConfigMutable()->kv = kv; | ||
| mixerConfigMutable()->rpm_limit = rpm_limit; | ||
|
|
||
| return NULL; | ||
| } | ||
|
|
||
| static const OSD_Entry cmsx_menuRpmLimitEntries[] = | ||
| { | ||
| { "-- RPM LIMIT --", OME_Label, NULL, NULL }, | ||
| { "ACTIVE", OME_Bool | REBOOT_REQUIRED, NULL, &rpm_limit }, | ||
| { "MAX RPM", OME_UINT16, NULL, &(OSD_UINT16_t){ &rpm_limit_value, 0, UINT16_MAX, 100} }, | ||
| { "KV", OME_UINT16, NULL, &(OSD_UINT16_t){ &kv, 0, UINT16_MAX, 1} }, | ||
|
|
||
| { "SAVE&REBOOT", OME_OSD_Exit, cmsMenuExit, (void *)CMS_POPUP_SAVEREBOOT }, | ||
| { "BACK", OME_Back, NULL, NULL }, | ||
| { NULL, OME_END, NULL, NULL} | ||
| }; | ||
|
|
||
| CMS_Menu cmsx_menuRpmLimit = { | ||
| #ifdef CMS_MENU_DEBUG | ||
| .GUARD_text = "RPMLIMIT", | ||
| .GUARD_type = OME_MENU, | ||
| #endif | ||
| .onEnter = cmsx_RpmLimit_onEnter, | ||
| .onExit = cmsx_RpmLimit_onExit, | ||
| .onDisplayUpdate = NULL, | ||
| .entries = cmsx_menuRpmLimitEntries | ||
| }; | ||
|
|
||
| #endif | ||
| #endif // USE_RPM_LIMIT |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * This file is part of Betaflight. | ||
| * | ||
| * Betaflight is free software. You can redistribute this software | ||
| * and/or modify this software under the terms of the GNU General | ||
| * Public License as published by the Free Software Foundation, | ||
| * either version 3 of the License, or (at your option) any later | ||
| * version. | ||
| * | ||
| * Betaflight is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| * | ||
| * See the GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public | ||
| * License along with this software. | ||
| * | ||
| * If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| extern CMS_Menu cmsx_menuRpmLimit; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.