From 593220d6cfa484a6b8faff952e953a590eecd562 Mon Sep 17 00:00:00 2001 From: DeltaLima Date: Fri, 13 Dec 2024 21:03:15 +0100 Subject: [PATCH] firmware wip - include libs as git submodules --- .gitmodules | 24 +++++++++++++++++ Arduino/CanGrow/CanGrow.ino | 30 +++++++++++---------- Arduino/CanGrow/lib/Adafruit-GFX-Library | 1 + Arduino/CanGrow/lib/Adafruit_BME280_Library | 1 + Arduino/CanGrow/lib/Adafruit_SHT31 | 1 + Arduino/CanGrow/lib/Adafruit_SSD1306 | 1 + Arduino/CanGrow/lib/ArduinoJson | 1 + Arduino/CanGrow/lib/NTPClient | 1 + Arduino/CanGrow/lib/Time | 1 + 9 files changed, 47 insertions(+), 14 deletions(-) create mode 100644 .gitmodules create mode 160000 Arduino/CanGrow/lib/Adafruit-GFX-Library create mode 160000 Arduino/CanGrow/lib/Adafruit_BME280_Library create mode 160000 Arduino/CanGrow/lib/Adafruit_SHT31 create mode 160000 Arduino/CanGrow/lib/Adafruit_SSD1306 create mode 160000 Arduino/CanGrow/lib/ArduinoJson create mode 160000 Arduino/CanGrow/lib/NTPClient create mode 160000 Arduino/CanGrow/lib/Time diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..43a56c9 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,24 @@ +[submodule "Arduino/CanGrow/Adafruit-GFX-Library"] + path = Arduino/CanGrow/Adafruit-GFX-Library + url = https://github.com/adafruit/Adafruit-GFX-Library +[submodule "Arduino/CanGrow/lib/Adafruit-GFX-Library"] + path = Arduino/CanGrow/lib/Adafruit-GFX-Library + url = https://github.com/adafruit/Adafruit-GFX-Library +[submodule "Arduino/CanGrow/lib/Adafruit_SSD1306"] + path = Arduino/CanGrow/lib/Adafruit_SSD1306 + url = https://github.com/adafruit/Adafruit_SSD1306 +[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 +[submodule "Arduino/CanGrow/lib/Time"] + path = Arduino/CanGrow/lib/Time + url = https://github.com/PaulStoffregen/Time +[submodule "Arduino/CanGrow/lib/Adafruit_SHT31"] + path = Arduino/CanGrow/lib/Adafruit_SHT31 + url = https://github.com/adafruit/Adafruit_SHT31/ diff --git a/Arduino/CanGrow/CanGrow.ino b/Arduino/CanGrow/CanGrow.ino index 4fae1e7..adf18c4 100644 --- a/Arduino/CanGrow/CanGrow.ino +++ b/Arduino/CanGrow/CanGrow.ino @@ -9,7 +9,7 @@ * */ -// Libraries +// Libraries internal (Arduino Core / ESP) // https://github.com/arduino/ArduinoCore-avr/tree/master/libraries/SPI #include // https://github.com/arduino/ArduinoCore-avr/tree/master/libraries/Wire @@ -23,27 +23,29 @@ #include // OTA update #include + +// Libraries external // https://github.com/adafruit/Adafruit-GFX-Library -#include +#include // https://github.com/adafruit/Adafruit_SSD1306 -#include -// https://github.com/adafruit/Adafruit_BME280_Library/ -#include -#include +#include +// https://github.com/adafruit/Adafruit_Sensor +#include +// https://github.com/adafruit/Adafruit_BME280_Library +#include +// https://github.com/adafruit/Adafruit_SHT31/ +#include "lib//Adafruit_SHT31.h" // https://github.com/bblanchon/ArduinoJson -#include +#include // https://github.com/arduino-libraries/NTPClient -#include +#include // https://github.com/PaulStoffregen/Time -#include +#include + + // DHT support dropped // https://github.com/adafruit/DHT-sensor-library // #include "DHT.h" -// SHT30/31 -// https://github.com/adafruit/Adafruit_SHT31/ -#include "Adafruit_SHT31.h" - - /* * CanGrow header files diff --git a/Arduino/CanGrow/lib/Adafruit-GFX-Library b/Arduino/CanGrow/lib/Adafruit-GFX-Library new file mode 160000 index 0000000..d472098 --- /dev/null +++ b/Arduino/CanGrow/lib/Adafruit-GFX-Library @@ -0,0 +1 @@ +Subproject commit d4720987895bc49bdb38beb9d3e288de8bd59078 diff --git a/Arduino/CanGrow/lib/Adafruit_BME280_Library b/Arduino/CanGrow/lib/Adafruit_BME280_Library new file mode 160000 index 0000000..9412f3d --- /dev/null +++ b/Arduino/CanGrow/lib/Adafruit_BME280_Library @@ -0,0 +1 @@ +Subproject commit 9412f3d1a2e334a3415d79df706dad02925488aa diff --git a/Arduino/CanGrow/lib/Adafruit_SHT31 b/Arduino/CanGrow/lib/Adafruit_SHT31 new file mode 160000 index 0000000..5e34a20 --- /dev/null +++ b/Arduino/CanGrow/lib/Adafruit_SHT31 @@ -0,0 +1 @@ +Subproject commit 5e34a20df62371150f7cb10330919e9393b884b1 diff --git a/Arduino/CanGrow/lib/Adafruit_SSD1306 b/Arduino/CanGrow/lib/Adafruit_SSD1306 new file mode 160000 index 0000000..78d6a13 --- /dev/null +++ b/Arduino/CanGrow/lib/Adafruit_SSD1306 @@ -0,0 +1 @@ +Subproject commit 78d6a130b2045a8b7b76616da81603796757ed47 diff --git a/Arduino/CanGrow/lib/ArduinoJson b/Arduino/CanGrow/lib/ArduinoJson new file mode 160000 index 0000000..e33e78d --- /dev/null +++ b/Arduino/CanGrow/lib/ArduinoJson @@ -0,0 +1 @@ +Subproject commit e33e78d202d03f45a63fb8d44fae25eef1ae8bd7 diff --git a/Arduino/CanGrow/lib/NTPClient b/Arduino/CanGrow/lib/NTPClient new file mode 160000 index 0000000..61684d4 --- /dev/null +++ b/Arduino/CanGrow/lib/NTPClient @@ -0,0 +1 @@ +Subproject commit 61684d4516839b579b81105be3447499c1417908 diff --git a/Arduino/CanGrow/lib/Time b/Arduino/CanGrow/lib/Time new file mode 160000 index 0000000..a18e50d --- /dev/null +++ b/Arduino/CanGrow/lib/Time @@ -0,0 +1 @@ +Subproject commit a18e50dcea4ee17285d732d39e7bc559482d1d3d