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

a bit more 'transparent' V calibration #1758

Merged
merged 35 commits into from
Jul 24, 2023
Merged
Changes from 32 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
43e13c3
finer resolution
discip Apr 6, 2023
1cba3ea
Update settingsGUI.cpp
discip Apr 7, 2023
634d24d
Update settingsGUI.cpp
discip Apr 8, 2023
0ecccc6
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Apr 8, 2023
8ee98fa
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Apr 10, 2023
420a466
Update settingsGUI.cpp
discip Apr 10, 2023
a719c82
test
discip Apr 10, 2023
4cdba6e
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Apr 18, 2023
f192ae3
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Apr 24, 2023
4aa56ea
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Apr 25, 2023
7943a26
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Apr 27, 2023
6439143
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Apr 28, 2023
8f656a3
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip May 8, 2023
d9d2771
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip May 16, 2023
7b53041
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip May 17, 2023
9af416a
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip May 22, 2023
2a0c31c
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Jun 5, 2023
7b139d6
Update settingsGUI.cpp
discip Jun 5, 2023
80da33f
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Jun 16, 2023
610ec30
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Jun 17, 2023
933047c
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Jun 20, 2023
26cd462
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Jun 29, 2023
84bdf17
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Jun 30, 2023
bd95faa
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Jul 2, 2023
eceb8cf
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Jul 5, 2023
58f21da
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Jul 6, 2023
ed45602
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Jul 17, 2023
7ca16d3
Update settingsGUI.cpp
discip Jul 17, 2023
0756568
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Jul 18, 2023
ab3a427
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Jul 20, 2023
b887d9c
Merge branch 'Ralim:dev' into finer-resolution-V-calibration
discip Jul 21, 2023
6c9e625
Merge branch 'Ralim:dev' into enhanced-V-calibration
discip Jul 24, 2023
3a2b516
Add files via upload
discip Jul 24, 2023
fad7f3f
Update settingsGUI.cpp
discip Jul 24, 2023
8a31f01
Update translations_definitions.json
discip Jul 24, 2023
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
12 changes: 7 additions & 5 deletions source/Core/Src/settingsGUI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -884,29 +884,31 @@ 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:
case BUTTON_B_LONG:
saveSettings();
OLED::clearScreen();
OLED::setCursor(0, 0);
OLED::printNumber(getSettingValue(SettingsOptions::VoltageDiv), 3, FontStyle::LARGE);
warnUser(translatedString(Tr->CJCCalibrationDone), 3 * TICKS_SECOND);
discip marked this conversation as resolved.
Show resolved Hide resolved
OLED::refresh();
waitForButtonPressOrTimeout(1 * TICKS_SECOND);
waitForButtonPressOrTimeout(0.5 * TICKS_SECOND);
return false;
case BUTTON_NONE:
default:
Expand Down