Merge pull request #1641 from discip/power_limit_display_fix
fixing power limit display
This commit is contained in:
@@ -273,7 +273,7 @@ const menuitem advancedMenu[] = {
|
|||||||
#ifdef BLE_ENABLED
|
#ifdef BLE_ENABLED
|
||||||
{SETTINGS_DESC(SettingsItemIndex::BLEEnabled), nullptr, displayBLEEnabled, nullptr, SettingsOptions::BLEEnabled, SettingsItemIndex::BLEEnabled, 7}, /*Advanced idle screen*/
|
{SETTINGS_DESC(SettingsItemIndex::BLEEnabled), nullptr, displayBLEEnabled, nullptr, SettingsOptions::BLEEnabled, SettingsItemIndex::BLEEnabled, 7}, /*Advanced idle screen*/
|
||||||
#endif
|
#endif
|
||||||
{SETTINGS_DESC(SettingsItemIndex::PowerLimit), nullptr, displayPowerLimit, nullptr, SettingsOptions::PowerLimit, SettingsItemIndex::PowerLimit, 5}, /*Power limit*/
|
{SETTINGS_DESC(SettingsItemIndex::PowerLimit), nullptr, displayPowerLimit, nullptr, SettingsOptions::PowerLimit, SettingsItemIndex::PowerLimit, 4}, /*Power limit*/
|
||||||
{SETTINGS_DESC(SettingsItemIndex::CalibrateCJC), setCalibrate, displayCalibrate, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::CalibrateCJC,
|
{SETTINGS_DESC(SettingsItemIndex::CalibrateCJC), setCalibrate, displayCalibrate, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::CalibrateCJC,
|
||||||
7}, /*Calibrate Cold Junktion Compensation at next boot*/
|
7}, /*Calibrate Cold Junktion Compensation at next boot*/
|
||||||
{SETTINGS_DESC(SettingsItemIndex::VoltageCalibration), setCalibrateVIN, displayCalibrateVIN, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::VoltageCalibration,
|
{SETTINGS_DESC(SettingsItemIndex::VoltageCalibration), setCalibrateVIN, displayCalibrateVIN, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::VoltageCalibration,
|
||||||
@@ -651,7 +651,7 @@ static void displayPowerLimit(void) {
|
|||||||
if (getSettingValue(SettingsOptions::PowerLimit) == 0) {
|
if (getSettingValue(SettingsOptions::PowerLimit) == 0) {
|
||||||
OLED::print(translatedString(Tr->OffString), FontStyle::LARGE);
|
OLED::print(translatedString(Tr->OffString), FontStyle::LARGE);
|
||||||
} else {
|
} else {
|
||||||
OLED::printNumber(getSettingValue(SettingsOptions::PowerLimit), 2, FontStyle::LARGE);
|
OLED::printNumber(getSettingValue(SettingsOptions::PowerLimit), 3, FontStyle::LARGE);
|
||||||
OLED::print(LargeSymbolWatts, FontStyle::LARGE);
|
OLED::print(LargeSymbolWatts, FontStyle::LARGE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user