sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Enhanced V calibration (#1758)

Browse Source
This commit is contained in:
discip
2023-07-24 10:23:04 +02:00
committed by GitHub
parent 6ba2a5c259
commit 118fa09ce7
37 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/Core/Inc/Translation.h
View File

@@ -107,7 +107,7 @@ enum class SettingsItemIndex : uint8_t {
};
struct TranslationIndexTable {
uint16_t CJCCalibrationDone;
uint16_t CalibrationDone;
uint16_t ResetOKMessage;
uint16_t SettingsResetMessage;
uint16_t NoAccelerometerMessage;

12
source/Core/Src/settingsGUI.cpp
View File

@@ -884,19 +884,21 @@ static bool setCalibrateVIN(void) {
OLED::clearScreen();
for (;;) {
OLED::setCursor(0, 0);
OLED::setCursor(25, 0);
uint16_t voltage = getInputVoltageX10(getSettingValue(SettingsOptions::VoltageDiv), 0);
OLED::printNumber(voltage / 10, 2, FontStyle::LARGE);
OLED::print(LargeSymbolDot, FontStyle::LARGE);
OLED::printNumber(voltage % 10, 1, FontStyle::LARGE, false);
OLED::print(LargeSymbolVolts, FontStyle::LARGE);
OLED::setCursor(0, 8);
OLED::printNumber(getSettingValue(SettingsOptions::VoltageDiv), 3, FontStyle::SMALL);
switch (getButtonState()) {
case BUTTON_F_SHORT:
nextSettingValue(SettingsOptions::VoltageDiv);
prevSettingValue(SettingsOptions::VoltageDiv);
break;
case BUTTON_B_SHORT:
prevSettingValue(SettingsOptions::VoltageDiv);
nextSettingValue(SettingsOptions::VoltageDiv);
break;
case BUTTON_BOTH:
case BUTTON_F_LONG:
@@ -904,9 +906,9 @@ static bool setCalibrateVIN(void) {
saveSettings();
OLED::clearScreen();
OLED::setCursor(0, 0);
OLED::printNumber(getSettingValue(SettingsOptions::VoltageDiv), 3, FontStyle::LARGE);
warnUser(translatedString(Tr->CalibrationDone), 3 * TICKS_SECOND);
OLED::refresh();
waitForButtonPressOrTimeout(1 * TICKS_SECOND);
waitForButtonPressOrTimeout(0.5 * TICKS_SECOND);
return false;
case BUTTON_NONE:
default:

2
source/Core/Threads/OperatingModes/CJC.cpp
View File

@@ -30,7 +30,7 @@ void performCJCC(void) {
}
setSettingValue(SettingsOptions::CalibrationOffset, setoffset);
OLED::clearScreen();
warnUser(translatedString(Tr->CJCCalibrationDone), 3 * TICKS_SECOND);
warnUser(translatedString(Tr->CalibrationDone), 3 * TICKS_SECOND);
OLED::refresh();
// Preventing to repeat calibration at boot automatically (only one shot).
setSettingValue(SettingsOptions::CalibrateCJC, 0);