From b6b57e9c8dd270614358537ef7a34c34990ee752 Mon Sep 17 00:00:00 2001 From: v00g100skr Date: Fri, 29 Mar 2024 23:19:01 +0200 Subject: [PATCH 1/3] added 3rd mode - from Odesa but settings like in true legacy mode --- src/firmware/firmware.ino | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/src/firmware/firmware.ino b/src/firmware/firmware.ino index b6420e2..1c730a1 100644 --- a/src/firmware/firmware.ino +++ b/src/firmware/firmware.ino @@ -865,21 +865,18 @@ char* displayHeightOptions[DISPLAY_HEIGHT_OPTIONS_COUNT] = { "128x64" }; -#define LEGACY_OPTIONS_COUNT 2 +#define LEGACY_OPTIONS_COUNT 3 char* legacyOptions[LEGACY_OPTIONS_COUNT] = { "Плата JAAM", - "Класична (початок на Закарпатті)" + "Початок на Закарпатті", + "Початок на Одещині" }; //--Init start void initLegacy() { - if (settings.legacy) { - offset = 0; - for (int i = 0; i < 26; i++) { - flag_leds[i] = legacy_flag_leds[i]; - } - settings.service_diodes_mode = 0; - } else { + switch (settings.legacy) { + case 0: + Serial.println("Mode: jaam"); for (int i = 0; i < 26; i++) { flag_leds[calculateOffset(i)] = legacy_flag_leds[i]; } @@ -896,8 +893,24 @@ void initLegacy() { settings.pixelpin = 13; settings.buttonpin = 35; settings.display_height = 64; + break; + case 1: + Serial.println("Mode: transcarpathia"); + offset = 0; + for (int i = 0; i < 26; i++) { + flag_leds[i] = legacy_flag_leds[i]; + } + settings.service_diodes_mode = 0; + break; + case 2: + Serial.println("Mode: odesa"); + for (int i = 0; i < 26; i++) { + flag_leds[calculateOffset(i)] = legacy_flag_leds[i]; + } + break; } pinMode(settings.buttonpin, INPUT_PULLUP); + Serial.printf("Offset: %d\n", offset); } From 563035b5c3ad5b63eefcc5531d0ad8066adbc142 Mon Sep 17 00:00:00 2001 From: Vladyslav Heneraliuk Date: Sat, 30 Mar 2024 00:15:44 +0200 Subject: [PATCH 2/3] small fix for service pin state setting --- src/firmware/firmware.ino | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/firmware/firmware.ino b/src/firmware/firmware.ino index 1c730a1..ca62017 100644 --- a/src/firmware/firmware.ino +++ b/src/firmware/firmware.ino @@ -1002,10 +1002,7 @@ int getNightModeType() { } void servicePin(int pin, uint8_t status, bool force) { - if (!settings.legacy && settings.service_diodes_mode) { - digitalWrite(pin, status); - } - if (force) { + if (force || (!settings.legacy && settings.service_diodes_mode)) { digitalWrite(pin, status); } } From 455cd482423f24372d21a0aa4bf730d65fcc7cb1 Mon Sep 17 00:00:00 2001 From: Vladyslav Heneraliuk Date: Sat, 30 Mar 2024 00:23:51 +0200 Subject: [PATCH 3/3] fix melody name --- src/firmware/firmware.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/firmware/firmware.ino b/src/firmware/firmware.ino index ca62017..e2d3af2 100644 --- a/src/firmware/firmware.ino +++ b/src/firmware/firmware.ino @@ -281,7 +281,7 @@ char* melodyNames[MELODIES_COUNT] PROGMEM = { "Пакмен", "Щедрик", "Люди Х", - "Местники", + "Месники", }; #endif