moved general drivers into library source directory

.gitignore

@@ -44,3 +44,4 @@ deploy.sh
 releases
 releases/binaries/
 releases/installer/
+examples/espcamlib

examples/freenove-tank/freenove-tank.cpp

@@ -7,11 +7,11 @@
 
 #include <Arduino.h>
 #include <ESP32WifiCLI.hpp>
-#include "CamFreenove.h"
-#include "ESPNowCam.h"
-#include "comm.pb.h"
+#include <ESPNowCam.h>
+#include <common/comm.pb.h>
+#include <common/ConfigApp.hpp> 
+#include <drivers/CamFreenove.h>
 #include <ESP32Servo.h>
-#include "ConfigApp.hpp"
 #include <Utils.h>
 
 #define BUILTINLED 2

examples/m5stickCplus-joystick-tank/m5stickCplus-joystick-tank.cpp

@@ -1,9 +1,8 @@
 #include <Arduino.h>
-#include <ESP32WifiCLI.hpp>
 #include <Wire.h>
 #include <M5Unified.h>
 #include "ESPNowCam.h"
-#include "comm.pb.h"
+#include <common/comm.pb.h>
 
 ESPNowCam radio;
 

examples/xiao-espnow-sender/xiao-espnow-sender.cpp

@@ -6,10 +6,9 @@
 **************************************************/
 
 #include <Arduino.h>
-#include <ESP32WifiCLI.hpp>
-#include "ESPNowCam.h"
-#include "CamXiao.h"
-#include "Utils.h"
+#include <ESPNowCam.h>
+#include <drivers/CamXiao.h>
+#include <Utils.h>
 
 CamXiao Camera;
 ESPNowCam radio;

platformio.ini

@@ -4,7 +4,7 @@
 
 [platformio]
 src_dir = ./examples/
-lib_dir = ./
+lib_dir = ./examples/espcamlib
 
 [env]
 platform = espressif32
@@ -19,6 +19,9 @@ build_flags =
   ; -Werror
   -D CORE_DEBUG_LEVEL=0
   -D BOARD_HAS_PSRAM=1
+lib_deps =
+  nanopb/[email protected]
+extra_scripts = pre:prebuild.py
 
 [esp32common]
 extends = env
@@ -29,25 +32,22 @@ board_build.partitions = ./config/partitions.csv
 [env:xiao-espnow-sender]
 extends = esp32common
 board_build.arduino.memory_type = dio_opi ;
-build_src_filter = -<*> +<xiao-espnow-sender/>
-lib_deps =
-  nanopb/[email protected]
-  https://github.com/hpsaturn/SerialTerminal.git
-  hpsaturn/ESP32 Wifi CLI @^0.2.1
+build_src_filter = -<*> -<*common*> +<xiao-espnow-sender/>
 
 [env:freenove-tank]
 extends = esp32common
 board_build.arduino.memory_type = dio_opi ;
-build_src_filter = -<*> +<freenove-tank/>
-lib_deps = 
-  nanopb/[email protected]
+build_src_filter = -<*> +<common/> +<freenove-tank/>
+lib_deps =
+  ${esp32common.lib_deps}
   madhephaestus/[email protected]
   https://github.com/hpsaturn/SerialTerminal.git
   hpsaturn/ESP32 Wifi CLI @^0.2.1
 
 [m5cores3_common]
 extends = esp32common
 lib_deps = 
+  ${esp32common.lib_deps}
   https://github.com/m5stack/M5CoreS3.git
   m5stack/M5Unified@^0.1.6
 build_flags =
@@ -59,32 +59,24 @@ build_flags =
 [env:m5cores3-espnow-sender]
 extends = m5cores3_common
 build_src_filter = -<*> +<m5cores3-espnow-sender/>
-lib_deps =
-  ${m5cores3_common.lib_deps}
-  nanopb/[email protected]
 
 [env:m5cores3-espnow-receiver]
 extends = m5cores3_common
 build_src_filter = -<*> +<m5cores3-espnow-receiver/>
-lib_deps =
-  ${m5cores3_common.lib_deps}
-  nanopb/[email protected]
 
 [env:m5core2-espnow-receiver]
 extends = esp32common
 board = esp32dev
 build_src_filter = -<*> +<m5core2-espnow-receiver/>
 lib_deps =
+  ${esp32common.lib_deps}
   m5stack/M5Unified@^0.1.6
-  nanopb/[email protected]
 
 [env:m5stickCplus-joystick-tank]
 extends = esp32common
 board = esp32dev
 upload_speed = 1500001
-build_src_filter = -<*> +<m5stickCplus-joystick-tank/>
+build_src_filter = -<*> +<common/> +<m5stickCplus-joystick-tank/>
 lib_deps =
-  m5stack/M5Unified@^0.1.6
-  nanopb/[email protected]
-  https://github.com/hpsaturn/SerialTerminal.git
-  hpsaturn/ESP32 Wifi CLI @^0.2.1
+  ${esp32common.lib_deps}
+  m5stack/M5Unified@^0.1.6