From 5b56c8bc8631d64d3e8767b258cfe530b0cac85f Mon Sep 17 00:00:00 2001
From: DeltaLima <dontsendmespam@deltalima.org>
Date: Fri, 13 Dec 2024 21:41:31 +0100
Subject: [PATCH] firmware wip - try to add external libs as git submodule,
 does not work atm

---
 .gitmodules                         |  6 +++---
 Arduino/CanGrow/CanGrow.ino         | 26 ++++++++++++++++----------
 Arduino/CanGrow/lib/Adafruit_Sensor |  1 +
 3 files changed, 20 insertions(+), 13 deletions(-)
 create mode 160000 Arduino/CanGrow/lib/Adafruit_Sensor

diff --git a/.gitmodules b/.gitmodules
index 43a56c9..3783ce2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,9 +10,6 @@
 [submodule "Arduino/CanGrow/lib/Adafruit_BME280_Library"]
 	path = Arduino/CanGrow/lib/Adafruit_BME280_Library
 	url = https://github.com/adafruit/Adafruit_BME280_Library/
-[submodule "Arduino/CanGrow/lib/ArduinoJson"]
-	path = Arduino/CanGrow/lib/ArduinoJson
-	url = https://github.com/bblanchon/ArduinoJson
 [submodule "Arduino/CanGrow/lib/NTPClient"]
 	path = Arduino/CanGrow/lib/NTPClient
 	url = https://github.com/arduino-libraries/NTPClient
@@ -22,3 +19,6 @@
 [submodule "Arduino/CanGrow/lib/Adafruit_SHT31"]
 	path = Arduino/CanGrow/lib/Adafruit_SHT31
 	url = https://github.com/adafruit/Adafruit_SHT31/
+[submodule "Arduino/CanGrow/lib/Adafruit_Sensor"]
+	path = Arduino/CanGrow/lib/Adafruit_Sensor
+	url = https://github.com/adafruit/Adafruit_Sensor
diff --git a/Arduino/CanGrow/CanGrow.ino b/Arduino/CanGrow/CanGrow.ino
index adf18c4..96babfd 100644
--- a/Arduino/CanGrow/CanGrow.ino
+++ b/Arduino/CanGrow/CanGrow.ino
@@ -26,22 +26,28 @@
 
 // Libraries external
 // https://github.com/adafruit/Adafruit-GFX-Library
-#include <lib/Adafruit-GFX-Library/Adafruit_GFX.h>
+//include "lib/Adafruit-GFX-Library/Adafruit_GFX.h"
+#include <Adafruit_GFX.h>
 // https://github.com/adafruit/Adafruit_SSD1306
-#include <lib/Adafruit_SSD1306/Adafruit_SSD1306.h>
+//include "lib/Adafruit_SSD1306/Adafruit_SSD1306.h"
+#include <Adafruit_SSD1306.h>
 // https://github.com/adafruit/Adafruit_Sensor
-#include <lib/Adafruit_Sensor/Adafruit_Sensor.h>
+// include "lib/Adafruit_Sensor/Adafruit_Sensor.h"
+#include <Adafruit_Sensor.h>
 // https://github.com/adafruit/Adafruit_BME280_Library
-#include <lib/Adafruit_BME280_Library/Adafruit_BME280.h>
+//include "lib/Adafruit_BME280_Library/Adafruit_BME280.h"
+#include <Adafruit_BME280.h>
 // https://github.com/adafruit/Adafruit_SHT31/
-#include "lib//Adafruit_SHT31.h"
+//#include "lib/Adafruit_SHT31/Adafruit_SHT31.h"
+#include <Adafruit_SHT31.h>
 // https://github.com/bblanchon/ArduinoJson
-#include <lib/ArduinoJson/ArduinoJson.h>
+#include "lib/ArduinoJson/ArduinoJson-v7.2.1.h"
 // https://github.com/arduino-libraries/NTPClient
-#include <lib/NTPClient/NTPClient.h>
+//#include "lib/NTPClient/NTPClient.h"
+#include <NTPClient.h>
 // https://github.com/PaulStoffregen/Time
-#include <lib/Time/TimeLib.h>
-
+//#include "lib/Time/TimeLib.h"
+#include <TimeLib.h>
 
 // DHT support dropped
 // https://github.com/adafruit/DHT-sensor-library
@@ -50,7 +56,7 @@
 /*
  * CanGrow header files
  */
-
+#include "CanGrow_Version.h"
 #include "CanGrow_PinAssignments.h"
 #include "CanGrow_Init.h"
 #include "CanGrow_Logo.h"
diff --git a/Arduino/CanGrow/lib/Adafruit_Sensor b/Arduino/CanGrow/lib/Adafruit_Sensor
new file mode 160000
index 0000000..7b2473b
--- /dev/null
+++ b/Arduino/CanGrow/lib/Adafruit_Sensor
@@ -0,0 +1 @@
+Subproject commit 7b2473b6b24ae340f41685b5f5b2b90ad896db04