Merge pull request #181 from J-A-A-M/extended_legacy_mode

Додано режим "Початок на Одещині"
J-A-A-M · Mar 29, 2024 · 7989127 · 7989127
2 parents c21c53e + 455cd48
commit 7989127
Showing 1 changed file with 24 additions and 14 deletions.
diff --git a/src/firmware/firmware.ino b/src/firmware/firmware.ino
@@ -281,7 +281,7 @@ char* melodyNames[MELODIES_COUNT] PROGMEM = {
   "Пакмен",
   "Щедрик",
   "Люди Х",
-  "Местники",
+  "Месники",
 };
 #endif
 
@@ -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);
 }
 
 
@@ -989,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);
   }
 }