v0.94

Blueforcer · Dec 30, 2023 · 151a98c · 151a98c
1 parent 5091803
commit 151a98c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/docs/dev.md b/docs/dev.md
@@ -35,7 +35,7 @@ The JSON object has the following properties:
 | `dfplayer` | boolean | Enables DFPLayer for Awtrix2_conversation builds. | false |
 | `button_callback` | string | http callback url for button presses. | - |
 | `let_it_snow` | boolean | Let it snow as a global Overlay. | true for christmastime |
-
+| `new_year` | boolean | Displays fireworks and plays a jingle at newyear. | false |
 
 #### Example:
 ```json
@@ -45,4 +45,4 @@ The JSON object has the following properties:
   "hum_offset":-2,
   "let_it_snow": true
 }
-```
+```
diff --git a/src/DisplayManager.cpp b/src/DisplayManager.cpp
@@ -1219,7 +1219,8 @@ void DisplayManager_::tick()
     }
   }
 
-  DisplayManager.checkNewYear();
+  if (NEWYEAR)
+    DisplayManager.checkNewYear();
 }
 
 bool newYearEventTriggered = false;

diff --git a/src/GameManager.cpp b/src/GameManager.cpp
@@ -24,7 +24,6 @@ struct PlayerStats
     PlayerStats() : x(0), y(0), isJumping(false), verticalSpeed(0), color(0xFFFFFF) {}
 } GamePlayer;
 
-// Globale Variablen für Spielzustand
 Direction dir = NONE;
 bool pressed = false;
 bool jumpButtonPressed = false;

diff --git a/src/Globals.cpp b/src/Globals.cpp
@@ -166,11 +166,16 @@ void loadDevSettings()
             DEBUG_MODE = doc["debug_mode"].as<bool>();
         }
 
-         if (doc.containsKey("let_it_snow"))
+        if (doc.containsKey("let_it_snow"))
         {
             SNOW = doc["let_it_snow"].as<bool>();
         }
 
+        if (doc.containsKey("new_year"))
+        {
+            NEWYEAR = doc["new_year"].as<bool>();
+        }
+
         if (doc.containsKey("button_callback"))
         {
             BUTTON_CALLBACK = doc["button_callback"].as<String>();
@@ -321,7 +326,7 @@ IPAddress gateway;
 IPAddress subnet;
 IPAddress primaryDNS;
 IPAddress secondaryDNS;
-const char *VERSION = "0.93";
+const char *VERSION = "0.94";
 
 String MQTT_HOST = "";
 uint16_t MQTT_PORT = 1883;
@@ -430,6 +435,7 @@ String AUTH_USER = "";
 String AUTH_PASS = "awtrix";
 String BUTTON_CALLBACK = "";
 bool SNOW = false;
+bool NEWYEAR = false;
 float LDR_GAMMA = 3.0;
 float LDR_FACTOR = 1.0;
 bool GAME_ACTIVE = false;
diff --git a/src/Globals.h b/src/Globals.h
@@ -141,5 +141,6 @@ extern String AUTH_USER;
 extern String AUTH_PASS;
 extern String BUTTON_CALLBACK;
 extern bool SNOW;
+extern bool NEWYEAR;
 extern bool GAME_ACTIVE;
 #endif // Globals_H