Remove submodules and remove no longer needed dependency

rvdbreemen · Feb 11, 2023 · 188dc93 · 188dc93
1 parent db010f2
commit 188dc93
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 15 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - dev
-      - dev-remove-gitsubmods
       - main
       - actions
       - make-tweaks

diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,27 @@
+[submodule "Arduino/libraries/pubsubclient"]
+	path = Arduino/libraries/pubsubclient
+	url = https://github.com/knolleary/pubsubclient
+[submodule "Arduino/libraries/WiFiManager"]
+	path = Arduino/libraries/WiFiManager
+	url = https://github.com/tzapu/WiFiManager
+[submodule "Arduino/libraries/TelnetStream"]
+	path = Arduino/libraries/TelnetStream
+	url = https://github.com/jandrassy/TelnetStream
 [submodule "Arduino/libraries/aceTime"]
 	path = Arduino/libraries/aceTime
 	url = https://github.com/bxparks/AceTime
 [submodule "Arduino/libraries/Time"]
 	path = Arduino/libraries/Time
 	url = https://github.com/PaulStoffregen/Time.git
+[submodule "Arduino/libraries/ArduinoJson"]
+	path = Arduino/libraries/ArduinoJson
+	url = https://github.com/bblanchon/ArduinoJson
+[submodule "Arduino/packages/esp8266"]
+	path = Arduino/packages/esp8266
+	url = https://github.com/esp8266/Arduino.git
+[submodule "Arduino/libraries/DallasTemperature"]
+	path = Arduino/libraries/DallasTemperature
+	url = https://github.com/milesburton/Arduino-Temperature-Control-Library
+[submodule "Arduino/libraries/OneWire"]
+	path = Arduino/libraries/OneWire
+	url = https://github.com/PaulStoffregen/OneWire.git
diff --git a/Arduino/libraries/ArduinoJson b/Arduino/libraries/ArduinoJson
diff --git a/Arduino/libraries/DallasTemperature b/Arduino/libraries/DallasTemperature
diff --git a/Arduino/libraries/OneWire b/Arduino/libraries/OneWire
diff --git a/Arduino/libraries/TelnetStream b/Arduino/libraries/TelnetStream
diff --git a/Arduino/libraries/WiFiManager b/Arduino/libraries/WiFiManager
diff --git a/Arduino/libraries/pubsubclient b/Arduino/libraries/pubsubclient
diff --git a/Arduino/packages/esp8266 b/Arduino/packages/esp8266
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ CLI := arduino-cli
 PLATFORM := esp8266:esp8266
 CFGFILE := arduino-cli.yaml
 ESP8266URL := https://github.com/esp8266/Arduino/releases/download/3.0.2/package_esp8266com_index.json
-LIBRARIES := libraries/WiFiManager libraries/ArduinoJson libraries/PubSubClient libraries/TelnetStream libraries/AceTime libraries/Time libraries/OneWire libraries/DallasTemperature
+LIBRARIES := libraries/WiFiManager libraries/ArduinoJson libraries/PubSubClient libraries/TelnetStream libraries/AceTime libraries/OneWire libraries/DallasTemperature
 BOARDS := arduino/package_esp8266com_index.json
 # PORT can be overridden by the environment or on the command line. E.g.:
 # export PORT=/dev/ttyUSB2; make upload, or: make upload PORT=/dev/ttyUSB2
@@ -83,9 +83,9 @@ libraries/TelnetStream:
 libraries/AceTime:
 	$(CLI) lib install Acetime@2.0.1
 
-libraries/Time:
-	$(CLI) lib install --git-url https://github.com/PaulStoffregen/Time
-	# https://github.com/PaulStoffregen/Time/archive/refs/tags/v1.6.1.zip
+# libraries/Time:
+# 	$(CLI) lib install --git-url https://github.com/PaulStoffregen/Time
+# 	# https://github.com/PaulStoffregen/Time/archive/refs/tags/v1.6.1.zip
 
 libraries/OneWire:
 	$(CLI) lib install OneWire@2.3.6

diff --git a/networkStuff.h b/networkStuff.h
@@ -53,7 +53,7 @@
 #include <LittleFS.h>
 
 //Use the NTP SDK ESP 8266 
-#include <time.h>
+//#include <time.h>
 extern "C" int clock_gettime(clockid_t unused, struct timespec *tp);
 
 enum NtpStatus_t {

diff --git a/version.h b/version.h
@@ -2,15 +2,15 @@
 #define _VERSION_MAJOR 0
 #define _VERSION_MINOR 10  
 #define _VERSION_PATCH 1
-#define _VERSION_BUILD 2043
-#define _VERSION_GITHASH "c8970c8"
-#define _VERSION_PRERELEASE beta
+#define _VERSION_BUILD 2044
+#define _VERSION_GITHASH "db010f2"
+//#define _VERSION_PRERELEASE beta  //uncomment to define prerelease labels: alpha - beta - rc
 #define _VERSION_DATE "11-02-2023"
-#define _VERSION_TIME "01:21:13"
+#define _VERSION_TIME "09:30:33"
 #define _SEMVER_CORE "0.10.1"
-#define _SEMVER_BUILD "0.10.1+2043"
-#define _SEMVER_GITHASH "0.10.1+c8970c8"
-#define _SEMVER_FULL "0.10.1-beta+c8970c8"
-#define _SEMVER_NOBUILD "0.10.1-beta (11-02-2023)"
-#define _VERSION "0.10.1-beta+c8970c8 (11-02-2023)"
+#define _SEMVER_BUILD "0.10.1+2044"
+#define _SEMVER_GITHASH "0.10.1+db010f2"
+#define _SEMVER_FULL "0.10.1+db010f2"
+#define _SEMVER_NOBUILD "0.10.1 (11-02-2023)"
+#define _VERSION "0.10.1+db010f2 (11-02-2023)"
 //The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver