From 337c932b2361dfb31d28418075ec6016a121b3b1 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" <5425387+Ralim@users.noreply.github.com> Date: Mon, 15 Mar 2021 21:43:01 +1100 Subject: [PATCH] Cleanup (#877) * Clean translation * Create enum for off/slow/med/fast * Update configuration.h * Default loop on * Create Medium speed symbol slot * True/False are no longer defined, move to off string + slightly smoother lerp animations --- Translations/translation_BG.json | 3 +- Translations/translation_CS.json | 3 +- Translations/translation_DA.json | 3 +- Translations/translation_DE.json | 3 +- Translations/translation_EN.json | 3 +- Translations/translation_ES.json | 3 +- Translations/translation_FI.json | 3 +- Translations/translation_FR.json | 3 +- Translations/translation_HR.json | 3 +- Translations/translation_HU.json | 3 +- Translations/translation_IT.json | 3 +- Translations/translation_LT.json | 3 +- Translations/translation_NL.json | 3 +- Translations/translation_NL_BE.json | 3 +- Translations/translation_NO.json | 3 +- Translations/translation_PL.json | 3 +- Translations/translation_PT.json | 3 +- Translations/translation_RU.json | 1 + Translations/translation_SK.json | 3 +- Translations/translation_SL.json | 3 +- Translations/translation_SR_CYRL.json | 3 +- Translations/translation_SR_LATN.json | 3 +- Translations/translation_SV.json | 3 +- Translations/translation_TR.json | 3 +- Translations/translation_UK.json | 1 + Translations/translation_YUE_HK.json | 3 +- Translations/translation_ZH_TW.json | 3 +- Translations/translations_def.js | 4 +++ source/Core/Drivers/OLED.cpp | 2 +- source/Core/Inc/Settings.h | 10 ++++-- source/Core/Inc/Translation.h | 3 +- source/Core/Src/gui.cpp | 52 +++++++++++++-------------- source/configuration.h | 5 +-- 33 files changed, 95 insertions(+), 58 deletions(-) diff --git a/Translations/translation_BG.json b/Translations/translation_BG.json index 2e3ee512..bbe9d851 100644 --- a/Translations/translation_BG.json +++ b/Translations/translation_BG.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "F", "SettingSlowChar": "S", + "SettingMediumChar": "M", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_CS.json b/Translations/translation_CS.json index 8640b56c..bb04a87c 100644 --- a/Translations/translation_CS.json +++ b/Translations/translation_CS.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "R", "SettingSlowChar": "P", + "SettingMediumChar": "M", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_DA.json b/Translations/translation_DA.json index c1fe7fee..5dd4b385 100644 --- a/Translations/translation_DA.json +++ b/Translations/translation_DA.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "F", "SettingSlowChar": "S", + "SettingMediumChar": "M", "SettingStartSolderingChar": "L", "SettingStartSleepChar": "D", "SettingStartSleepOffChar": "O", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_DE.json b/Translations/translation_DE.json index 4a9d8cfd..19ea9bee 100644 --- a/Translations/translation_DE.json +++ b/Translations/translation_DE.json @@ -37,6 +37,7 @@ "SettingAutoChar": "A", "SettingFastChar": "S", "SettingSlowChar": "L", + "SettingMediumChar": "M", "SettingStartSolderingChar": "L", "SettingStartSleepChar": "R", "SettingStartSleepOffChar": "K", @@ -303,7 +304,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json index 93d1e86b..7606eae8 100644 --- a/Translations/translation_EN.json +++ b/Translations/translation_EN.json @@ -37,6 +37,7 @@ "SettingAutoChar": "A", "SettingFastChar": "F", "SettingSlowChar": "S", + "SettingMediumChar": "M", "SettingStartSolderingChar": "S", "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "R", @@ -303,7 +304,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_ES.json b/Translations/translation_ES.json index bf182b54..4bf62987 100644 --- a/Translations/translation_ES.json +++ b/Translations/translation_ES.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "R", "SettingSlowChar": "L", + "SettingMediumChar": "M", "SettingStartSolderingChar": "S", "SettingStartSleepChar": "R", "SettingStartSleepOffChar": "F", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_FI.json b/Translations/translation_FI.json index b608aea0..76e75898 100644 --- a/Translations/translation_FI.json +++ b/Translations/translation_FI.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "N", "SettingSlowChar": "H", + "SettingMediumChar": "M", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_FR.json b/Translations/translation_FR.json index ba00f9c4..d6b2752e 100644 --- a/Translations/translation_FR.json +++ b/Translations/translation_FR.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "R", "SettingSlowChar": "L", + "SettingMediumChar": "M", "SettingStartSolderingChar": "A", "SettingStartSleepChar": "V", "SettingStartSleepOffChar": "O", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_HR.json b/Translations/translation_HR.json index ff77803f..0dcb0ac4 100644 --- a/Translations/translation_HR.json +++ b/Translations/translation_HR.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "B", "SettingSlowChar": "S", + "SettingMediumChar": "M", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_HU.json b/Translations/translation_HU.json index dd13c803..87c17e26 100644 --- a/Translations/translation_HU.json +++ b/Translations/translation_HU.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "G", "SettingSlowChar": "L", + "SettingMediumChar": "M", "SettingStartSolderingChar": "F", "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "S", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_IT.json b/Translations/translation_IT.json index 1a5ea89c..046f43b8 100644 --- a/Translations/translation_IT.json +++ b/Translations/translation_IT.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "V", "SettingSlowChar": "L", + "SettingMediumChar": "M", "SettingStartSolderingChar": "S", "SettingStartSleepChar": "R", "SettingStartSleepOffChar": "A", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_LT.json b/Translations/translation_LT.json index 2f3e7d00..6ef898b5 100644 --- a/Translations/translation_LT.json +++ b/Translations/translation_LT.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "G", "SettingSlowChar": "L", + "SettingMediumChar": "M", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "M", "SettingStartSleepOffChar": "K", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_NL.json b/Translations/translation_NL.json index 4762f58e..2f12c4b0 100644 --- a/Translations/translation_NL.json +++ b/Translations/translation_NL.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "F", "SettingSlowChar": "S", + "SettingMediumChar": "M", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_NL_BE.json b/Translations/translation_NL_BE.json index a0ac4141..4f8dd944 100644 --- a/Translations/translation_NL_BE.json +++ b/Translations/translation_NL_BE.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "S", "SettingSlowChar": "T", + "SettingMediumChar": "M", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_NO.json b/Translations/translation_NO.json index 09caf348..5958f1e3 100644 --- a/Translations/translation_NO.json +++ b/Translations/translation_NO.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "H", "SettingSlowChar": "L", + "SettingMediumChar": "M", "SettingStartSolderingChar": "L", "SettingStartSleepChar": "D", "SettingStartSleepOffChar": "O", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json index 56608867..4c84fb8b 100644 --- a/Translations/translation_PL.json +++ b/Translations/translation_PL.json @@ -37,6 +37,7 @@ "SettingAutoChar": "A", "SettingFastChar": "S", "SettingSlowChar": "W", + "SettingMediumChar": "M", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "O", @@ -303,7 +304,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_PT.json b/Translations/translation_PT.json index 589d0c85..d837aec7 100644 --- a/Translations/translation_PT.json +++ b/Translations/translation_PT.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "R", "SettingSlowChar": "L", + "SettingMediumChar": "M", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json index 5f020f8f..aa3af9d5 100644 --- a/Translations/translation_RU.json +++ b/Translations/translation_RU.json @@ -36,6 +36,7 @@ "SettingAutoChar": "А", "SettingFastChar": "Б", "SettingSlowChar": "М", + "SettingMediumChar": "M", "SettingStartSolderingChar": "П", "SettingStartSleepChar": "О", "SettingStartSleepOffChar": "К", diff --git a/Translations/translation_SK.json b/Translations/translation_SK.json index da9322f7..9dd8732e 100644 --- a/Translations/translation_SK.json +++ b/Translations/translation_SK.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "R", "SettingSlowChar": "P", + "SettingMediumChar": "M", "SettingStartSolderingChar": "S", "SettingStartSleepChar": "K", "SettingStartSleepOffChar": "O", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_SL.json b/Translations/translation_SL.json index cee4fe3e..670868cb 100644 --- a/Translations/translation_SL.json +++ b/Translations/translation_SL.json @@ -36,6 +36,7 @@ "SettingAutoChar": "S", "SettingFastChar": "H", "SettingSlowChar": "P", + "SettingMediumChar": "M", "SettingStartSolderingChar": "S", "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "V", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_SR_CYRL.json b/Translations/translation_SR_CYRL.json index 6313191e..650a94c0 100644 --- a/Translations/translation_SR_CYRL.json +++ b/Translations/translation_SR_CYRL.json @@ -36,6 +36,7 @@ "SettingAutoChar": "А", "SettingFastChar": "Б", "SettingSlowChar": "С", + "SettingMediumChar": "M", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_SR_LATN.json b/Translations/translation_SR_LATN.json index 33c7c2a3..012c6093 100644 --- a/Translations/translation_SR_LATN.json +++ b/Translations/translation_SR_LATN.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "B", "SettingSlowChar": "S", + "SettingMediumChar": "M", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_SV.json b/Translations/translation_SV.json index 2fefe9d1..1a1d472a 100644 --- a/Translations/translation_SV.json +++ b/Translations/translation_SV.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "S", "SettingSlowChar": "L", + "SettingMediumChar": "M", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", @@ -302,7 +303,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_TR.json b/Translations/translation_TR.json index 2af0ea91..e5b63c10 100644 --- a/Translations/translation_TR.json +++ b/Translations/translation_TR.json @@ -33,6 +33,7 @@ "SettingAutoChar": "A", "SettingFastChar": "F", "SettingSlowChar": "S", + "SettingMediumChar": "M", "SettingStartSolderingChar": "T", "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", @@ -320,7 +321,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json index c606f396..bc816a27 100644 --- a/Translations/translation_UK.json +++ b/Translations/translation_UK.json @@ -36,6 +36,7 @@ "SettingAutoChar": "A", "SettingFastChar": "Ш", "SettingSlowChar": "П", + "SettingMediumChar": "M", "SettingStartSolderingChar": "П", "SettingStartSleepChar": "О", "SettingStartSleepOffChar": "К", diff --git a/Translations/translation_YUE_HK.json b/Translations/translation_YUE_HK.json index 173fdd67..5d709d5e 100644 --- a/Translations/translation_YUE_HK.json +++ b/Translations/translation_YUE_HK.json @@ -37,6 +37,7 @@ "SettingAutoChar": "自", "SettingFastChar": "快", "SettingSlowChar": "慢", + "SettingMediumChar": "M", "SettingStartSolderingChar": "焊", "SettingStartSleepChar": "待", "SettingStartSleepOffChar": "室", @@ -303,7 +304,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translation_ZH_TW.json b/Translations/translation_ZH_TW.json index b5794a52..3a629552 100644 --- a/Translations/translation_ZH_TW.json +++ b/Translations/translation_ZH_TW.json @@ -37,6 +37,7 @@ "SettingAutoChar": "自", "SettingFastChar": "快", "SettingSlowChar": "慢", + "SettingMediumChar": "M", "SettingStartSolderingChar": "焊", "SettingStartSleepChar": "待", "SettingStartSleepOffChar": "室", @@ -303,7 +304,7 @@ "Anim.", "speed" ], - "desc": "Speed of icon animations in root menu " + "desc": "Speed of icon animations in menu " } } } diff --git a/Translations/translations_def.js b/Translations/translations_def.js index 22d214a7..ded42f08 100644 --- a/Translations/translations_def.js +++ b/Translations/translations_def.js @@ -142,6 +142,10 @@ var def = "id": "SettingSlowChar", "len": 1 }, + { + "id": "SettingMediumChar", + "len": 1 + }, { "id": "SettingStartSolderingChar", "len": 1 diff --git a/source/Core/Drivers/OLED.cpp b/source/Core/Drivers/OLED.cpp index 824c762e..9159cdbc 100644 --- a/source/Core/Drivers/OLED.cpp +++ b/source/Core/Drivers/OLED.cpp @@ -195,7 +195,7 @@ void OLED::transitionSecondaryFramebuffer(bool forwardNavigation) { memmove(&secondStripPtr[newStart], &secondBackStripPtr[newEnd], progress); refresh(); - osDelay(40); + osDelay(TICKS_100MS/5); } } diff --git a/source/Core/Inc/Settings.h b/source/Core/Inc/Settings.h index d69e3b04..6c74720d 100644 --- a/source/Core/Inc/Settings.h +++ b/source/Core/Inc/Settings.h @@ -30,7 +30,7 @@ typedef struct { uint8_t OrientationMode : 2; // Selects between Auto,Right and left handed layouts uint8_t sensitivity : 4; // Sensitivity of accelerometer (5 bits) uint8_t animationLoop : 1; // Animation loop switch - uint16_t animationSpeed; // Animation speed (in miliseconds) + uint8_t animationSpeed : 2; // Animation speed (in miliseconds) uint8_t autoStartMode : 2; // Should the unit automatically jump straight // into soldering mode when power is applied uint8_t ShutdownTime; // Time until unit shuts down if left alone @@ -63,7 +63,13 @@ typedef struct { // MUST BE LAST } systemSettingsType; - +typedef enum { + OFF = 0, // Off (disabled) + SLOW = 1, // + MEDIUM = 2, // + FAST = 3, // + MAX_VALUE = 4 // +} settingOffSpeed_t; extern volatile systemSettingsType systemSettings; void saveSettings(); diff --git a/source/Core/Inc/Translation.h b/source/Core/Inc/Translation.h index 0944a04d..b1b1b2c4 100644 --- a/source/Core/Inc/Translation.h +++ b/source/Core/Inc/Translation.h @@ -44,8 +44,6 @@ extern const char *LockingKeysString; extern const char *UnlockingKeysString; extern const char *WarningKeysLockedString; -extern const char *SettingTrueChar; -extern const char *SettingFalseChar; extern const char *SettingRightChar; extern const char *SettingLeftChar; extern const char *SettingAutoChar; @@ -63,6 +61,7 @@ extern const char *SettingLockFullChar; extern const char *SettingNAChar; extern const char *SettingFastChar; +extern const char *SettingMediumChar; extern const char *SettingSlowChar; extern const char *TipModelStrings[]; extern const char *DebugMenu[]; diff --git a/source/Core/Src/gui.cpp b/source/Core/Src/gui.cpp index 04b00d91..633b0cbe 100644 --- a/source/Core/Src/gui.cpp +++ b/source/Core/Src/gui.cpp @@ -914,37 +914,25 @@ static void settings_displayAnimationLoop(void) { } static bool settings_setAnimationSpeed(void) { - switch (systemSettings.animationSpeed) { - case 0: - systemSettings.animationSpeed = TICKS_100MS * 5; - break; - case TICKS_100MS * 5: - systemSettings.animationSpeed = TICKS_100MS * 4; - break; - case TICKS_100MS * 4: - systemSettings.animationSpeed = TICKS_100MS * 3; - break; - default: - systemSettings.animationSpeed = 0; - break; - } - return systemSettings.animationSpeed == TICKS_100MS * 3; + systemSettings.animationSpeed++; + systemSettings.animationSpeed %= settingOffSpeed_t::MAX_VALUE; + return systemSettings.animationSpeed == (uint8_t)settingOffSpeed_t::FAST; } static void settings_displayAnimationSpeed(void) { - printShortDescription(30, 7); + printShortDescription(30, 5); switch (systemSettings.animationSpeed) { - case TICKS_100MS * 5: - OLED::print(SettingSensitivityLow); + case settingOffSpeed_t::SLOW: + OLED::print(SettingSlowChar); break; - case TICKS_100MS * 4: - OLED::print(SettingSensitivityMedium); + case settingOffSpeed_t::MEDIUM: + OLED::print(SettingMediumChar); break; - case TICKS_100MS * 3: - OLED::print(SettingSensitivityHigh); + case settingOffSpeed_t::FAST: + OLED::print(SettingFastChar); break; default: - OLED::print(SettingSensitivityOff); + OLED::print(OffString); break; } } @@ -997,14 +985,26 @@ static void displayMenu(size_t index) { static TickType_t menuSwitchLoopTick = 0; static size_t menuCurrentIndex = sizeof(rootSettingsMenu) + 1; static size_t currentFrame = 0; + TickType_t step = TICKS_100MS * 5; + switch (systemSettings.animationSpeed) { + case settingOffSpeed_t::FAST: + step = TICKS_100MS * 3; + break; + case settingOffSpeed_t::MEDIUM: + step = TICKS_100MS * 4; + break; + default: // SLOW or off - defaulted above + break; + } if (!animOpenState) { if (menuCurrentIndex != index) { menuCurrentIndex = index; - currentFrame = systemSettings.animationSpeed ? 0 : 2; + currentFrame = systemSettings.animationSpeed == settingOffSpeed_t::OFF ? 2 : 0; menuSwitchLoopTick = xTaskGetTickCount(); } - if (systemSettings.animationSpeed && (systemSettings.animationLoop || currentFrame != 2)) - currentFrame = ((xTaskGetTickCount() - menuSwitchLoopTick) / systemSettings.animationSpeed) % 3; + if (systemSettings.animationSpeed && (systemSettings.animationLoop || currentFrame != 2)) { + currentFrame = ((xTaskGetTickCount() - menuSwitchLoopTick) / step) % 3; + } OLED::drawArea(OLED_WIDTH - 16 - 2, 0, 16, 16, (&SettingsMenuIcons[index][(16 * 2) * currentFrame])); } } diff --git a/source/configuration.h b/source/configuration.h index 087ce0f3..ad3280ea 100644 --- a/source/configuration.h +++ b/source/configuration.h @@ -1,5 +1,6 @@ #pragma once #include "Model_Config.h" +#include "Settings.h" #include /** * Configuration.h @@ -92,8 +93,8 @@ #define RECOM_VOL_CELL 33 // Minimum voltage per cell (Recommended 3.3V (33)) #define TEMPERATURE_INF 0 // default to 0 #define DESCRIPTION_SCROLL_SPEED 0 // 0: Slow 1: Fast - default to slow -#define ANIMATION_LOOP 0 // 0: off 1: on -#define ANIMATION_SPEED 400 // 0: off, 300: High, 400: Medium, 500: Low +#define ANIMATION_LOOP 1 // 0: off 1: on +#define ANIMATION_SPEED settingOffSpeed_t::MEDIUM #define OP_AMP_Rf_TS100 750 * 1000 // 750 Kilo-ohms -> From schematic, R1 #define OP_AMP_Rin_TS100 2370 // 2.37 Kilo-ohms -> From schematic, R2