Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

REBOOT_REQUIRED flag to cms power options, unified confirm page options #9518

Merged
merged 1 commit into from
Mar 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/cms/cms_menu_power.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ static const OSD_Entry cmsx_menuPowerEntries[] =
{
{ "-- POWER --", OME_Label, NULL, NULL, 0},

{ "V METER", OME_TAB, NULL, &(OSD_TAB_t){ &batteryConfig_voltageMeterSource, VOLTAGE_METER_COUNT - 1, voltageMeterSourceNames }, 0 },
{ "I METER", OME_TAB, NULL, &(OSD_TAB_t){ &batteryConfig_currentMeterSource, CURRENT_METER_COUNT - 1, currentMeterSourceNames }, 0 },
{ "V METER", OME_TAB, NULL, &(OSD_TAB_t){ &batteryConfig_voltageMeterSource, VOLTAGE_METER_COUNT - 1, voltageMeterSourceNames }, REBOOT_REQUIRED },
{ "I METER", OME_TAB, NULL, &(OSD_TAB_t){ &batteryConfig_currentMeterSource, CURRENT_METER_COUNT - 1, currentMeterSourceNames }, REBOOT_REQUIRED },
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do all of these really need a reboot?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No sorry, I mainly thought that they affected to real time current/voltage reads, but that is not the case.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please point out what reference to batteryConfig()->voltageMeterSource and batteryConfig()->vbatmaxcellvoltage means that a reboot is required for changes to them to take effect?

The reality is that we are trying to move away from any settings changes requiring a reboot - most of them have been refactored to not require a reboot, and we should try to not muddy the waters by adding required reboots for settings that don't need them.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mikeller Hi i noticed this update in 4.1.5 betaflight Target: TMOTORF7
Manufacturer: TMTR
Version: 4.1.5
Binary: betaflight_4.1.5_STM32F7X2.hex
Date: 16-03-2020 16:50

I am not sure if this is related, but i posted an issue .. WHat happens is Battery readings freeze as soon as quad is armed, readings dont happen i can only see the original battery level. If i unplug battery and re-plug i will only then see the new updated batt levels, again if i re-arm the quad voltage meters freeze again. please help me as i am close to damaging lipos. I use the T-Motor HD F7 Stack and 55a 4in1 32bit esc + DJI system


{ "VBAT CLMAX", OME_UINT16, NULL, &(OSD_UINT16_t) { &batteryConfig_vbatmaxcellvoltage, VBAT_CELL_VOTAGE_RANGE_MIN, VBAT_CELL_VOTAGE_RANGE_MAX, 1 }, 0 },

Expand Down
2 changes: 1 addition & 1 deletion src/main/cms/cms_menu_vtx_smartaudio.c
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ static const OSD_Entry saCmsMenuCommenceEntries[] = {

{ "YES", OME_Funcall, saCmsCommence, NULL, 0 },

{ "BACK", OME_Back, NULL, NULL, 0 },
{ "NO", OME_Back, NULL, NULL, 0 },
{ NULL, OME_END, NULL, NULL, 0 }
};

Expand Down
2 changes: 1 addition & 1 deletion src/main/cms/cms_menu_vtx_tramp.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ static const void *trampCmsOnEnter(void)
static const OSD_Entry trampCmsMenuCommenceEntries[] = {
{ "CONFIRM", OME_Label, NULL, NULL, 0 },
{ "YES", OME_Funcall, trampCmsCommence, NULL, 0 },
{ "BACK", OME_Back, NULL, NULL, 0 },
{ "NO", OME_Back, NULL, NULL, 0 },
{ NULL, OME_END, NULL, NULL, 0 }
};

Expand Down