From 9449ac896e2dc5465fbc805bc89c595b26c0b17b Mon Sep 17 00:00:00 2001 From: PlayDay <18056374+playday3008@users.noreply.github.com> Date: Mon, 8 Mar 2021 12:05:40 +0100 Subject: [PATCH 1/6] Fix Battery icon --- source/Core/Threads/GUIThread.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index 1fbb14f8..0a04b2f3 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -160,11 +160,11 @@ static void gui_drawBatteryIcon() { uint32_t cellV = getInputVoltageX10(systemSettings.voltageDiv, 0) / cellCount; // Should give us approx cell voltage X10 // Range is 42 -> 33 = 9 steps therefore we will use battery 0-9 - if (cellV < 33) - cellV = 33; - cellV -= 33; // Should leave us a number of 0-9 - if (cellV > 9) - cellV = 9; + if (cellV < systemSettings.minVoltageCells) + cellV = systemSettings.minVoltageCells; + cellV -= systemSettings.minVoltageCells; // Should leave us a number of 0-9 + if (cellV > (uint32_t)(42 - systemSettings.minVoltageCells)) + cellV = 42 - systemSettings.minVoltageCells; OLED::drawBattery(cellV + 1); } else { OLED::drawSymbol(15); // Draw the DC Logo From 6a81f92efdecd55288c915ba5cd36ca781b71494 Mon Sep 17 00:00:00 2001 From: PlayDay <18056374+playday3008@users.noreply.github.com> Date: Mon, 8 Mar 2021 12:12:20 +0100 Subject: [PATCH 2/6] Update GUIThread.cpp --- source/Core/Threads/GUIThread.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index 0a04b2f3..3c3776c8 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -163,8 +163,8 @@ static void gui_drawBatteryIcon() { if (cellV < systemSettings.minVoltageCells) cellV = systemSettings.minVoltageCells; cellV -= systemSettings.minVoltageCells; // Should leave us a number of 0-9 - if (cellV > (uint32_t)(42 - systemSettings.minVoltageCells)) - cellV = 42 - systemSettings.minVoltageCells; + if (cellV > 9) + cellV = 9; OLED::drawBattery(cellV + 1); } else { OLED::drawSymbol(15); // Draw the DC Logo From c380cab159eaffa2b3065968810a6bd0ede79936 Mon Sep 17 00:00:00 2001 From: PlayDay <18056374+playday3008@users.noreply.github.com> Date: Mon, 8 Mar 2021 12:15:52 +0100 Subject: [PATCH 3/6] Update GUIThread.cpp --- source/Core/Threads/GUIThread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index 3c3776c8..f58a1e8c 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -159,7 +159,7 @@ static void gui_drawBatteryIcon() { uint8_t cellCount = systemSettings.minDCVoltageCells + 2; uint32_t cellV = getInputVoltageX10(systemSettings.voltageDiv, 0) / cellCount; // Should give us approx cell voltage X10 - // Range is 42 -> 33 = 9 steps therefore we will use battery 0-9 + // Range is 42 -> Minimum voltage setting (systemSettings.minVoltageCells) = 9 steps therefore we will use battery 0-9 if (cellV < systemSettings.minVoltageCells) cellV = systemSettings.minVoltageCells; cellV -= systemSettings.minVoltageCells; // Should leave us a number of 0-9 From dd7d2a4830fff7937f1b5e2a09ce7457a552af3a Mon Sep 17 00:00:00 2001 From: PlayDay <18056374+playday3008@users.noreply.github.com> Date: Mon, 8 Mar 2021 12:32:25 +0100 Subject: [PATCH 4/6] Update UK, RU and PL languages --- Translations/translation_PL.json | 14 +++++++------- Translations/translation_RU.json | 14 +++++++------- Translations/translation_UK.json | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json index 0b820b45..2e4c5b96 100644 --- a/Translations/translation_PL.json +++ b/Translations/translation_PL.json @@ -48,15 +48,15 @@ "SettingLockDisableChar": "W", "SettingLockBoostChar": "B", "SettingLockFullChar": "P", - "SettingNAChar": "N/A" + "SettingNAChar": "N/D" }, "menuGroups": { "PowerMenu": { "text2": [ - "Power", - "settings" + "Ustawienia", + "zasilania" ], - "desc": "Power settings" + "desc": "Zasilanie i minimalne napięcie na komórkę" }, "SolderingMenu": { "text2": [ @@ -286,10 +286,10 @@ }, "MinVolCell": { "text2": [ - "Minimum", - "voltage" + "Minimalne", + "napięcie" ], - "desc": "Minimum allowed voltage per cell" + "desc": "Minimalne dozwolone napięcie na komórkę <3S — 3.0V - 3.7V, 4/5/6S — 2.4V - 3.7V>" } } } diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json index 49f7240b..5c780d1c 100644 --- a/Translations/translation_RU.json +++ b/Translations/translation_RU.json @@ -47,15 +47,15 @@ "SettingLockDisableChar": "О", "SettingLockBoostChar": "Т", "SettingLockFullChar": "П", - "SettingNAChar": "N/A" + "SettingNAChar": "Н/Д" }, "menuGroups": { "PowerMenu": { "text2": [ - "Power", - "settings" + "Параметры", + "питания" ], - "desc": "Power settings" + "desc": "Источник питания и минимальное напряжение на ячейку" }, "SolderingMenu": { "text2": [ @@ -285,10 +285,10 @@ }, "MinVolCell": { "text2": [ - "Minimum", - "voltage" + "Мин.", + "напр." ], - "desc": "Minimum allowed voltage per cell" + "desc": "Минимальное разрешенное напряжение на ячейку <В вольтах> <3S — 3.0V - 3.7V, 4/5/6S — 2.4V - 3.7V>" } } } diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json index 6a17ec53..fcf8d186 100644 --- a/Translations/translation_UK.json +++ b/Translations/translation_UK.json @@ -47,15 +47,15 @@ "SettingLockDisableChar": "В", "SettingLockBoostChar": "Т", "SettingLockFullChar": "П", - "SettingNAChar": "N/A" + "SettingNAChar": "Н/Д" }, "menuGroups": { "PowerMenu": { "text2": [ - "Power", - "settings" + "Параметри", + "живлення" ], - "desc": "Power settings" + "desc": "Джерело живлення, та мінамільна напруга на комірку" }, "SolderingMenu": { "text2": [ @@ -285,10 +285,10 @@ }, "MinVolCell": { "text2": [ - "Minimum", - "voltage" + "Мін.", + "напруга" ], - "desc": "Minimum allowed voltage per cell" + "desc": "Мінімальна дозволена напруга на комірку <В вольтах> <3S — 3.0V - 3.7V, 4/5/6S — 2.4V - 3.7V>" } } } From 75406848657d2b2a3989681f17c54de796eff222 Mon Sep 17 00:00:00 2001 From: PlayDay <18056374+playday3008@users.noreply.github.com> Date: Mon, 8 Mar 2021 13:19:25 +0100 Subject: [PATCH 5/6] Fix scroll blink --- source/Core/Src/gui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/Src/gui.cpp b/source/Core/Src/gui.cpp index 945eab36..9b9f254f 100644 --- a/source/Core/Src/gui.cpp +++ b/source/Core/Src/gui.cpp @@ -310,7 +310,7 @@ static bool settings_setInputVRange(void) { systemSettings.minDCVoltageCells = (systemSettings.minDCVoltageCells + 1) % 5; if (systemSettings.minDCVoltageCells == 1 && systemSettings.minVoltageCells < 30) systemSettings.minVoltageCells = 30; - return systemSettings.minDCVoltageCells == 5; + return systemSettings.minDCVoltageCells == 4; } static void settings_displayInputVRange(void) { @@ -330,7 +330,7 @@ static bool settings_setInputMinVRange(void) { systemSettings.minVoltageCells = 30; else if(systemSettings.minVoltageCells < 24) systemSettings.minVoltageCells = 24; - return systemSettings.minVoltageCells == 38; + return systemSettings.minVoltageCells == 37; } static void settings_displayInputMinVRange(void) { From 69ffe4948c77dfdd8d6cf8ab4a9dcc0e75935fba Mon Sep 17 00:00:00 2001 From: PlayDay <18056374+playday3008@users.noreply.github.com> Date: Mon, 8 Mar 2021 15:52:12 +0100 Subject: [PATCH 6/6] Fix text in RU and UK translations --- Translations/translation_RU.json | 2 +- Translations/translation_UK.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json index 5c780d1c..29621499 100644 --- a/Translations/translation_RU.json +++ b/Translations/translation_RU.json @@ -7,7 +7,7 @@ "SettingsCalibrationWarning": "Прежде чем продолжить, пожалуйста, убедитесь, что жало имеет комнатную температуру!", "SettingsResetWarning": "Вы уверены, что хотите сбросить настройки к значениям по умолчанию?", "UVLOWarningString": "НАПРЯЖ--", - "UndervoltageString": "Низкое\nнапряжение", + "UndervoltageString": "Низкое напряжение", "InputVoltageString": "Питание В: ", "WarningTipTempString": "Темп. жала: ", "BadTipString": "ЖАЛО--", diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json index fcf8d186..38a7c6eb 100644 --- a/Translations/translation_UK.json +++ b/Translations/translation_UK.json @@ -7,7 +7,7 @@ "SettingsCalibrationWarning": "Переконайтеся, що жало охололо до кімнатної температури, перш ніж продовжувати!", "SettingsResetWarning": "Ви дійсно хочете скинути налаштування до значень за замовчуванням? ", "UVLOWarningString": "АККУМ--", - "UndervoltageString": "Низька\nнапруга", + "UndervoltageString": "Низька напруга", "InputVoltageString": "Жив.(B): ", "WarningTipTempString": "Жало t°: ", "BadTipString": "ЖАЛО--",