Enhanced V calibration (#1758)

2023-07-24 10:23:04 +02:00
parent 6ba2a5c259
commit 118fa09ce7
37 changed files with 44 additions and 42 deletions
--- a/Translations/translation_BE.json
+++ b/Translations/translation_BE.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Беларуская",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Каліброўка\nзроблена!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_BG.json
+++ b/Translations/translation_BG.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Български",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration\ndone!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_CS.json
+++ b/Translations/translation_CS.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Český",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Kalibrace\ndokončena!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_DA.json
+++ b/Translations/translation_DA.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Dansk",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration\ndone!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_DE.json
+++ b/Translations/translation_DE.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Deutsch",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Erfolgreich\nkalibriert!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_EL.json
+++ b/Translations/translation_EL.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Greek",
    "tempUnitFahrenheit": true,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Βαθμονόμηση\nολοκληρώθηκε!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_EN.json
+++ b/Translations/translation_EN.json
@@ -3,7 +3,7 @@
    "languageLocalName": "English",
    "tempUnitFahrenheit": true,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration\ndone!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_ES.json
+++ b/Translations/translation_ES.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Castellano",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "¡Calibracion\nlista!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_FI.json
+++ b/Translations/translation_FI.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Suomi",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration\ndone!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_FR.json
+++ b/Translations/translation_FR.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Français",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Étalonnage\nterminé!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_HR.json
+++ b/Translations/translation_HR.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Hrvatski",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Kalibracija\ndovršena!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_HU.json
+++ b/Translations/translation_HU.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Magyar",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Kalibráció\nkész!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_IT.json
+++ b/Translations/translation_IT.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Italiano",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibrazione\ncompletata!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_JA_JP.json
+++ b/Translations/translation_JA_JP.json
@@ -3,7 +3,7 @@
    "languageLocalName": "日本語",
    "tempUnitFahrenheit": true,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration done!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_LT.json
+++ b/Translations/translation_LT.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Lietuvių",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration\ndone!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_NB.json
+++ b/Translations/translation_NB.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Norsk bokmål",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration\ndone!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_NL.json
+++ b/Translations/translation_NL.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Nederlands",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration\ndone!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_NL_BE.json
+++ b/Translations/translation_NL_BE.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Vlaams",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration\ndone!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_PL.json
+++ b/Translations/translation_PL.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Polski",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Kalibracja\nwykonana!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_PT.json
+++ b/Translations/translation_PT.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Português",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibração\nefetuada!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_RO.json
+++ b/Translations/translation_RO.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Română",
    "tempUnitFahrenheit": true,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration\ndone!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_RU.json
+++ b/Translations/translation_RU.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Русский",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Калибровка\nзавершена!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_SK.json
+++ b/Translations/translation_SK.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Slovenčina",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration\ndone!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_SL.json
+++ b/Translations/translation_SL.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Slovenščina",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration\ndone!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_SR_CYRL.json
+++ b/Translations/translation_SR_CYRL.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Српски",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration\ndone!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_SR_LATN.json
+++ b/Translations/translation_SR_LATN.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Srpski",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration\ndone!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_SV.json
+++ b/Translations/translation_SV.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Svenska",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration\ndone!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_TR.json
+++ b/Translations/translation_TR.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Türkçe",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration\ndone!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_UK.json
+++ b/Translations/translation_UK.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Українська",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "КХС\nвідкалібровано!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_VI.json
+++ b/Translations/translation_VI.json
@@ -3,7 +3,7 @@
    "languageLocalName": "Tieng Viet",
    "tempUnitFahrenheit": false,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration\ndone!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_YUE_HK.json
+++ b/Translations/translation_YUE_HK.json
@@ -3,7 +3,7 @@
    "languageLocalName": "廣東話 (香港)",
    "tempUnitFahrenheit": true,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration done!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_ZH_CN.json
+++ b/Translations/translation_ZH_CN.json
@@ -3,7 +3,7 @@
    "languageLocalName": "简体中文",
    "tempUnitFahrenheit": true,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration done!"
        },
        "ResetOKMessage": {
--- a/Translations/translation_ZH_TW.json
+++ b/Translations/translation_ZH_TW.json
@@ -3,7 +3,7 @@
    "languageLocalName": "正體中文",
    "tempUnitFahrenheit": true,
    "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
            "message": "Calibration done!"
        },
        "ResetOKMessage": {
--- a/Translations/translations_definitions.json
+++ b/Translations/translations_definitions.json
@@ -1,7 +1,7 @@
 {
    "messagesWarn": [{
-            "id": "CJCCalibrationDone",
-            "description": "Confirmation message indicating CJC calibration is complete."
+            "id": "CalibrationDone",
+            "description": "Confirmation message indicating calibration is complete."
        },
        {
            "id": "ResetOKMessage",
--- a/source/Core/Inc/Translation.h
+++ b/source/Core/Inc/Translation.h
@@ -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;
--- a/source/Core/Src/settingsGUI.cpp
+++ b/source/Core/Src/settingsGUI.cpp
@@ -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:
--- a/source/Core/Threads/OperatingModes/CJC.cpp
+++ b/source/Core/Threads/OperatingModes/CJC.cpp
@@ -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);