Merge branch 'development03' of https://github.com/dAjaY85/ahoy into …

…development03
lumapu · Jan 16, 2023 · 7c3a78e · 7c3a78e
2 parents 3f0cfd4 + 7e14377
commit 7c3a78e
Show file tree

Hide file tree

Showing 2 changed files with 165 additions and 158 deletions.
diff --git a/src/platformio.ini b/src/platformio.ini
@@ -104,8 +104,8 @@ lib_deps =
 	paulstoffregen/Time
 	https://github.com/bertmelis/espMqttClient#v1.3.3
 	bblanchon/ArduinoJson
-    olikraus/U8g2
     https://github.com/JChristensen/Timezone
+    olikraus/U8g2
 
 [env:esp8266-ssd1306]
 platform = espressif8266
@@ -122,8 +122,8 @@ lib_deps =
 	paulstoffregen/Time
 	https://github.com/bertmelis/espMqttClient#v1.3.3
 	bblanchon/ArduinoJson
-    https://github.com/ThingPulse/esp8266-oled-ssd1306.git
     https://github.com/JChristensen/Timezone
+    olikraus/U8g2
 
 [env:esp8266-sh1106]
 platform = espressif8266
@@ -140,8 +140,8 @@ lib_deps =
 	paulstoffregen/Time
 	https://github.com/bertmelis/espMqttClient#v1.3.3
 	bblanchon/ArduinoJson
-    https://github.com/ThingPulse/esp8266-oled-ssd1306.git
     https://github.com/JChristensen/Timezone
+    olikraus/U8g2
 
 [env:esp32-wroom32-release]
 platform = espressif32
@@ -179,8 +179,8 @@ lib_deps =
 	paulstoffregen/Time
 	https://github.com/bertmelis/espMqttClient#v1.3.3
 	bblanchon/ArduinoJson
-    olikraus/U8g2
     https://github.com/JChristensen/Timezone
+    olikraus/U8g2
 
 [env:esp32-wroom32-ssd1306]
 platform = espressif32
@@ -199,6 +199,7 @@ lib_deps =
 	bblanchon/ArduinoJson
     https://github.com/ThingPulse/esp8266-oled-ssd1306.git
     https://github.com/JChristensen/Timezone
+    olikraus/U8g2
 
 [env:esp32-wroom32-sh1106]
 platform = espressif32
@@ -216,4 +217,5 @@ lib_deps =
 	https://github.com/bertmelis/espMqttClient#v1.3.3
 	bblanchon/ArduinoJson
     https://github.com/ThingPulse/esp8266-oled-ssd1306.git
-    https://github.com/JChristensen/Timezone
+    https://github.com/JChristensen/Timezone
+    olikraus/U8g2