* new: SensorManager

* BasChatMesh: new onContactRequest(), for PAYLOAD_TYPE_REQ handling. * companion, repeater and room_server: now with basic 'plumbing' to handle REQ_TYPE_GET_TELEMETRY_DATA (0x03). * dependency: added CayenneLPP to libdeps * all target.* modules now with a stub 'sensors' object.
2025-05-03 13:14:03 +10:00
parent 6aa4df6ca5
commit 99774f10ac
46 changed files with 243 additions and 52 deletions
--- a/variants/generic-e22/target.cpp
+++ b/variants/generic-e22/target.cpp
@@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/generic-e22/target.h
+++ b/variants/generic-e22/target.h
@@ -7,10 +7,12 @@
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/CustomSX1268Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern ESP32Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/generic_espnow/target.cpp
+++ b/variants/generic_espnow/target.cpp
@@ -7,6 +7,7 @@ ESP32Board board;
 ESPNOWRadio radio_driver;

 ESP32RTCClock rtc_clock;
+SensorManager sensors;

 bool radio_init() {
  rtc_clock.begin();
--- a/variants/generic_espnow/target.h
+++ b/variants/generic_espnow/target.h
@@ -2,10 +2,12 @@

 #include <helpers/ESP32Board.h>
 #include <helpers/esp32/ESPNOWRadio.h>
+#include <helpers/SensorManager.h>

 extern ESP32Board board;
 extern ESPNOWRadio radio_driver;
 extern ESP32RTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/heltec_v2/target.cpp
+++ b/variants/heltec_v2/target.cpp
@@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/heltec_v2/target.h
+++ b/variants/heltec_v2/target.h
@@ -6,10 +6,12 @@
 #include <helpers/HeltecV2Board.h>
 #include <helpers/CustomSX1276Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern HeltecV2Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/heltec_v3/target.cpp
+++ b/variants/heltec_v3/target.cpp
@@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/heltec_v3/target.h
+++ b/variants/heltec_v3/target.h
@@ -6,10 +6,12 @@
 #include <helpers/HeltecV3Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern HeltecV3Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/lilygo_t3s3/target.cpp
+++ b/variants/lilygo_t3s3/target.cpp
@@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/lilygo_t3s3/target.h
+++ b/variants/lilygo_t3s3/target.h
@@ -6,10 +6,12 @@
 #include <helpers/ESP32Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern ESP32Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/lilygo_tbeam/target.cpp
+++ b/variants/lilygo_tbeam/target.cpp
@@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/lilygo_tbeam/target.h
+++ b/variants/lilygo_tbeam/target.h
@@ -6,10 +6,12 @@
 #include <helpers/TBeamBoard.h>
 #include <helpers/CustomSX1276Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern TBeamBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/lilygo_tbeam_SX1262/target.cpp
+++ b/variants/lilygo_tbeam_SX1262/target.cpp
@@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/lilygo_tbeam_SX1262/target.h
+++ b/variants/lilygo_tbeam_SX1262/target.h
@@ -6,10 +6,12 @@
 #include <helpers/TBeamBoardSX1262.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern TBeamBoardSX1262 board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/lilygo_tbeam_supreme_SX1262/target.cpp
+++ b/variants/lilygo_tbeam_supreme_SX1262/target.cpp
@@ -23,7 +23,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
-
+SensorManager sensors;

 static void setPMUIntFlag(){
  pmuIntFlag = true;
--- a/variants/lilygo_tbeam_supreme_SX1262/target.h
+++ b/variants/lilygo_tbeam_supreme_SX1262/target.h
@@ -5,10 +5,12 @@
 #include <helpers/TBeamS3SupremeBoard.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern TBeamS3SupremeBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/lilygo_tlora_v2_1/target.cpp
+++ b/variants/lilygo_tlora_v2_1/target.cpp
@@ -10,6 +10,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/lilygo_tlora_v2_1/target.h
+++ b/variants/lilygo_tlora_v2_1/target.h
@@ -6,10 +6,12 @@
 #include <helpers/LilyGoTLoraBoard.h>
 #include <helpers/CustomSX1276Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern LilyGoTLoraBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/picow/target.cpp
+++ b/variants/picow/target.cpp
@@ -10,6 +10,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/picow/target.h
+++ b/variants/picow/target.h
@@ -6,10 +6,12 @@
 #include <helpers/rp2040/PicoWBoard.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern PicoWBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/promicro/target.cpp
+++ b/variants/promicro/target.cpp
@@ -10,6 +10,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/promicro/target.h
+++ b/variants/promicro/target.h
@@ -7,10 +7,12 @@
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/CustomLLCC68Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern PromicroBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/rak4631/target.cpp
+++ b/variants/rak4631/target.cpp
@@ -10,6 +10,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/rak4631/target.h
+++ b/variants/rak4631/target.h
@@ -6,10 +6,12 @@
 #include <helpers/nrf52/RAK4631Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern RAK4631Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/station_g2/target.cpp
+++ b/variants/station_g2/target.cpp
@@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/station_g2/target.h
+++ b/variants/station_g2/target.h
@@ -6,10 +6,12 @@
 #include <helpers/StationG2Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern StationG2Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/t1000-e/target.cpp
+++ b/variants/t1000-e/target.cpp
@@ -8,6 +8,7 @@ RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BU
 WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock rtc_clock;
+T1000SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
@@ -84,3 +85,19 @@ mesh::LocalIdentity radio_new_identity() {
  RadioNoiseListener rng(radio);
  return mesh::LocalIdentity(&rng);  // create new random identity
 }
+
+bool T1000SensorManager::begin() {
+  // TODO: init GPS
+  return true;
+}
+
+bool T1000SensorManager::querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) {
+  if (requester_permissions & TELEM_PERM_LOCATION) {   // does requester have permission?
+    telemetry.addGPS(TELEM_CHANNEL_SELF, _lat, _lon, _alt);
+  }
+  return true;
+}
+
+void T1000SensorManager::loop() {
+  // TODO: poll GPS serial,  set _lat, _lon, _alt
+}
--- a/variants/t1000-e/target.h
+++ b/variants/t1000-e/target.h
@@ -6,10 +6,21 @@
 #include <helpers/nrf52/T1000eBoard.h>
 #include <helpers/CustomLR1110Wrapper.h>
 #include <helpers/ArduinoHelpers.h>
+#include <helpers/SensorManager.h>
+
+class T1000SensorManager : public SensorManager {
+  float _lat, _lon, _alt;
+public:
+  T1000SensorManager(): _lat(0), _lon(0), _alt(0) { }
+  bool begin() override;
+  bool querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) override;
+  void loop() override;
+};

 extern T1000eBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern VolatileRTCClock rtc_clock;
+extern T1000SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/t114/target.cpp
+++ b/variants/t114/target.cpp
@@ -10,6 +10,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/t114/target.h
+++ b/variants/t114/target.h
@@ -6,10 +6,12 @@
 #include <helpers/nrf52/T114Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern T114Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/techo/target.cpp
+++ b/variants/techo/target.cpp
@@ -10,6 +10,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/techo/target.h
+++ b/variants/techo/target.h
@@ -6,10 +6,12 @@
 #include <helpers/nrf52/TechoBoard.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern TechoBoard board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/xiao_c3/target.cpp
+++ b/variants/xiao_c3/target.cpp
@@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/xiao_c3/target.h
+++ b/variants/xiao_c3/target.h
@@ -7,10 +7,12 @@
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/CustomSX1268Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern XiaoC3Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/xiao_nrf52/target.cpp
+++ b/variants/xiao_nrf52/target.cpp
@@ -9,6 +9,7 @@ RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BU
 WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock rtc_clock;
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/xiao_nrf52/target.h
+++ b/variants/xiao_nrf52/target.h
@@ -6,10 +6,12 @@
 #include <helpers/nrf52/XiaoNrf52Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/ArduinoHelpers.h>
+#include <helpers/SensorManager.h>

 extern XiaoNrf52Board board;
 extern WRAPPER_CLASS radio_driver;
 extern VolatileRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();
--- a/variants/xiao_s3_wio/target.cpp
+++ b/variants/xiao_s3_wio/target.cpp
@@ -14,6 +14,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
+SensorManager sensors;

 #ifndef LORA_CR
  #define LORA_CR      5
--- a/variants/xiao_s3_wio/target.h
+++ b/variants/xiao_s3_wio/target.h
@@ -6,10 +6,12 @@
 #include <helpers/ESP32Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>
+#include <helpers/SensorManager.h>

 extern ESP32Board board;
 extern WRAPPER_CLASS radio_driver;
 extern AutoDiscoverRTCClock rtc_clock;
+extern SensorManager sensors;

 bool radio_init();
 uint32_t radio_get_rng_seed();