merge from upstream, resolve conflicts in platformio.ini

sidoh · Jul 13, 2024 · 292ccf2 · 292ccf2
2 parents 48bb403 + 1aba026
commit 292ccf2
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -56,15 +56,15 @@ Both modules are SPI devices and should be connected to the standard SPI pins on
 <img src="https://user-images.githubusercontent.com/40266/47967518-67556f00-e05e-11e8-857d-1173a9da955c.png" align="left" width="32%" />
 <img src="https://user-images.githubusercontent.com/40266/47967520-691f3280-e05e-11e8-838a-83706df2edb0.png" align="left" width="22%" />
 
-NodeMCU | Radio | Color
--- | -- | --
-GND | GND | Black
-3V3 | VCC | Red
-D2 (GPIO4) | CE | Orange
-D8 (GPIO15) | CSN/CS | Yellow
-D5 (GPIO14) | SCK | Green
-D7 (GPIO13) | MOSI | Blue
-D6 (GPIO12) | MISO | Violet
+NodeMCU (Esp8266) | Esp32        | Radio | Color
+--------- |--------------|----| --
+GND | GND          | GND | Black        
+3V3 | 3V3          | VCC | Red    
+D2 (GPIO4) | D4 (GPIO4)   | CE | Orange 
+D8 (GPIO15) | D5 (GPIO5)   | CSN/CS | Yellow 
+D5 (GPIO14) | D18 (GPIO18) | SCK | Green 
+D7 (GPIO13) | D23 (GPIO23) | MOSI | Blue  
+D6 (GPIO12) | D19 (GPIO19) | MISO | Violet 
 
 _Image source: [MySensors.org](https://mysensors.org)_
 

diff --git a/dist/global.h b/dist/global.h
diff --git a/lib/MQTT/MqttClient.cpp b/lib/MQTT/MqttClient.cpp
@@ -7,7 +7,7 @@
 #include <WiFiClient.h>
 #include <MiLightRadioConfig.h>
 #include <AboutHelper.h>
-#include <global.h>
+
 
 static const char* STATUS_CONNECTED = "connected";
 static const char* STATUS_DISCONNECTED = "disconnected_clean";

diff --git a/lib/MiLight/MiLightClient.cpp b/lib/MiLight/MiLightClient.cpp
@@ -7,7 +7,7 @@
 #include <ParsedColor.h>
 #include <MiLightCommands.h>
 #include <functional>
-#include <global.h>
+
 
 using namespace std::placeholders;
 

diff --git a/lib/MiLight/V2PacketFormatter.cpp b/lib/MiLight/V2PacketFormatter.cpp
@@ -1,6 +1,6 @@
 #include <V2PacketFormatter.h>
 #include <V2RFEncoding.h>
-#include <global.h>
+
 
 #define GROUP_COMMAND_ARG(status, groupId, numGroups) ( groupId + (status == OFF ? (numGroups + 1) : 0) )
 

diff --git a/lib/MiLightState/GroupState.cpp b/lib/MiLightState/GroupState.cpp
@@ -4,7 +4,7 @@
 #include <RGBConverter.h>
 #include <BulbId.h>
 #include <MiLightCommands.h>
-#include <global.h>
+
 
 static const char* BULB_MODE_NAMES[] = {
   "white",

diff --git a/lib/Settings/BackupManager.cpp b/lib/Settings/BackupManager.cpp
@@ -8,7 +8,7 @@
 #endif
 #include <ProjectFS.h>
 #include <StreamUtils.h>
-#include <global.h>
+
 
 const uint8_t BackupManager::SETTINGS_BACKUP_VERSION = 1;
 const uint32_t BackupManager::SETTINGS_MAGIC_HEADER = 0x92A7C300 | SETTINGS_BACKUP_VERSION;

diff --git a/lib/Types/RF24PowerLevel.cpp b/lib/Types/RF24PowerLevel.cpp
@@ -1,6 +1,5 @@
 #include <RF24PowerLevel.h>
 #include <Size.h>
-#include <global.h>
 
 static const char* RF24_POWER_LEVEL_NAMES[] = {
   "MIN",

diff --git a/lib/WebServer/MiLightHttpServer.cpp b/lib/WebServer/MiLightHttpServer.cpp
@@ -13,7 +13,7 @@
 
 #include <index.html.gz.h>
 #include <BackupManager.h>
-#include <global.h>
+
 
 #ifdef ESP32
   #include <SPIFFS.h>

diff --git a/platformio.ini b/platformio.ini
@@ -23,15 +23,21 @@ framework = arduino
 board_f_cpu = 160000000L
 lib_deps_builtin =
 lib_deps_external =
+<<<<<<< HEAD
   nrf24/RF24@~1.3.2
   ArduinoJson@~6.21
+=======
+  nrf24/RF24 @ ~1.3.2
+  ArduinoJson
+>>>>>>> 1aba0268246b84abced33eebb3941da6e7d1b6f0
   PubSubClient@~2.8
   https://github.com/ratkins/RGBConverter.git#07010f2
   WebSockets@~2.4
   CircularBuffer@~1.3
   PathVariableHandlers@~3.0
   RichHttpServer@~3.1
   StreamUtils@~1.7
+  https://github.com/tzapu/WiFiManager.git#v2.0.16-rc.2
 extra_scripts =
   pre:.build_web.py
 test_ignore = remote
@@ -58,15 +64,17 @@ platform = espressif8266@~4
 lib_deps =
   ${base.lib_deps_builtin}
   ${base.lib_deps_external}
+<<<<<<< HEAD
   https://github.com/tzapu/WiFiManager.git#v2.0.16-rc.2
+=======
+>>>>>>> 1aba0268246b84abced33eebb3941da6e7d1b6f0
 
 [esp32]
 extends = base
 platform = espressif32
 lib_deps =
   ${base.lib_deps_builtin}
   ${base.lib_deps_external}
-  https://github.com/tzapu/WiFiManager.git#v2.0.17
   luc-github/ESP32SSDP@^1.2.1
 
 [env:nodemcuv2]
@@ -100,11 +108,18 @@ extends = esp8266
 board = d1_mini_pro
 build_flags = ${base.build_flags} -D FIRMWARE_VARIANT=d1_mini_PRO
 
+<<<<<<< HEAD
 [env:esp32]
 extends = esp32
 board = esp32doit-devkit-v1
 build_flags = ${base.build_flags} -D FIRMWARE_VARIANT=esp32
 board_build.partitions = default.csv
+=======
+[env:esp32doit-devkit-v1]
+extends = esp32
+board = esp32doit-devkit-v1
+build_flags = ${base.build_flags} -D FIRMWARE_VARIANT=esp32doit-devkit-v1
+>>>>>>> 1aba0268246b84abced33eebb3941da6e7d1b6f0
 
 [env:debug]
 extends = env:d1_mini

diff --git a/src/main.cpp b/src/main.cpp
@@ -22,7 +22,6 @@
 #include <HomeAssistantDiscoveryClient.h>
 #include <TransitionController.h>
 #include <ProjectWifi.h>
-#include <global.h>
 
 #include <ESPId.h>
 
@@ -393,7 +392,6 @@ void postConnectSetup() {
 
 void setup() {
   Serial.begin(9600);
-  delay(1000);
   String ssid = "ESP" + String(getESPId());
 
   // load up our persistent settings from the file system