Merge branch 'ripplebiz:dev' into dev

variants/heltec_tracker/platformio.ini

@@ -31,6 +31,8 @@ build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/heltec_tracker>
 lib_deps =
   ${esp32_base.lib_deps}
+  stevemarple/MicroNMEA @ ^2.0.6
+  adafruit/Adafruit ST7735 and ST7789 Library @ ^1.11.0
 
 [env:Heltec_Wireless_Tracker_companion_radio_ble]
 extends = Heltec_tracker_base
@@ -56,5 +58,43 @@ build_src_filter = ${Heltec_tracker_base.build_src_filter}
 lib_deps =
   ${Heltec_tracker_base.lib_deps}
   densaugeo/base64 @ ~1.4.0
-  stevemarple/MicroNMEA @ ^2.0.6
-  adafruit/Adafruit ST7735 and ST7789 Library @ ^1.11.0
+
+[env:Heltec_Wireless_Tracker_repeater]
+extends = Heltec_tracker_base
+build_flags =
+  ${Heltec_tracker_base.build_flags}
+  -D DISPLAY_ROTATION=1
+  -D DISPLAY_CLASS=ST7735Display
+  -D ADVERT_NAME='"Heltec Repeater"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D MAX_NEIGHBOURS=8
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Heltec_tracker_base.build_src_filter}
+  +<helpers/ui/ST7735Display.cpp>
+  +<../examples/simple_repeater>
+lib_deps =
+  ${Heltec_tracker_base.lib_deps}
+  ${esp32_ota.lib_deps}
+
+[env:Heltec_Wireless_Tracker_room_server]
+extends = Heltec_tracker_base
+build_flags =
+  ${Heltec_tracker_base.build_flags}
+  -D DISPLAY_ROTATION=1
+  -D DISPLAY_CLASS=ST7735Display
+  -D ADVERT_NAME='"Heltec Room"'
+  -D ADVERT_LAT=0.0
+  -D ADVERT_LON=0.0
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Heltec_tracker_base.build_src_filter}
+  +<helpers/ui/ST7735Display.cpp>
+  +<../examples/simple_room_server>
+lib_deps =
+  ${Heltec_tracker_base.lib_deps}
+  ${esp32_ota.lib_deps}

variants/promicro/platformio.ini

@@ -13,6 +13,14 @@ build_flags = ${nrf52840_base.build_flags}
   -D PIN_BOARD_SDA=8
   -D PIN_OLED_RESET=-1
   -D PIN_USER_BTN=6
+  -D PIN_GPS_RX=3
+  -D PIN_GPS_TX=4
+  -D PIN_GPS_EN=5
+  -D ENV_INCLUDE_GPS=1
+  -D ENV_INCLUDE_AHTX0=1
+  -D ENV_INCLUDE_BME280=1
+  -D ENV_INCLUDE_INA3221=1
+  -D ENV_INCLUDE_INA219=1
 build_src_filter = ${nrf52840_base.build_src_filter}
   +<helpers/nrf52/PromicroBoard.cpp>
   +<helpers/sensors>  
@@ -23,7 +31,8 @@ lib_deps= ${nrf52840_base.lib_deps}
   adafruit/Adafruit INA219 @ ^1.2.3
   adafruit/Adafruit AHTX0 @ ^2.0.5
   adafruit/Adafruit BME280 Library @ ^2.3.0  
-
+  stevemarple/MicroNMEA @ ^2.0.6
+  
 [env:Faketec_Repeater]
 extends = Faketec
 build_src_filter = ${Faketec.build_src_filter}
@@ -99,7 +108,7 @@ build_flags = ${Faketec.build_flags}
   -D OFFLINE_QUEUE_SIZE=256
   -D DISPLAY_CLASS=SSD1306Display
 ;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
+  -D MESH_DEBUG=1
 build_src_filter = ${Faketec.build_src_filter}
   +<helpers/nrf52/SerialBLEInterface.cpp>
   +<../examples/companion_radio>

variants/promicro/target.cpp

@@ -2,6 +2,9 @@
 #include "target.h"
 #include <helpers/ArduinoHelpers.h>
 
+#if ENV_INCLUDE_GPS
+#endif
+
 PromicroBoard board;
 
 RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI);
@@ -10,7 +13,13 @@ WRAPPER_CLASS radio_driver(radio, board);
 
 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
-EnvironmentSensorManager sensors;
+#if ENV_INCLUDE_GPS
+  #include <helpers/sensors/MicroNMEALocationProvider.h>
+  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
+#else
+  EnvironmentSensorManager sensors;
+#endif
 
 #ifdef DISPLAY_CLASS
   DISPLAY_CLASS display;

variants/rak3x72/platformio.ini

@@ -0,0 +1,33 @@
+[rak3x72]
+extends = stm32_base
+board = rak3172
+board_upload.maximum_size = 229376 ; 32kb for FS
+build_flags = ${stm32_base.build_flags}
+  -D RADIO_CLASS=CustomSTM32WLx
+  -D WRAPPER_CLASS=CustomSTM32WLxWrapper
+  -D SPI_INTERFACES_COUNT=0
+  -D RX_BOOSTED_GAIN=true
+  -I variants/rak3x72
+build_src_filter = ${stm32_base.build_src_filter}
+  +<../variants/rak3x72>
+
+[env:rak3x72-repeater]
+extends = rak3x72
+build_flags = ${rak3x72.build_flags}
+  -D LORA_TX_POWER=22
+  -D ADVERT_NAME='"RAK3x72 Repeater"'
+  -D ADMIN_PASSWORD='"password"'
+build_src_filter = ${rak3x72.build_src_filter}
+  +<../examples/simple_repeater/main.cpp>
+
+[env:rak3x72_companion_radio_usb]
+extends = rak3x72
+build_flags = ${rak3x72.build_flags}
+;  -D FORMAT_FS=true
+  -D LORA_TX_POWER=22
+  -D MAX_CONTACTS=100
+  -D MAX_GROUP_CHANNELS=8
+build_src_filter = ${rak3x72.build_src_filter}
+  +<../examples/companion_radio/*.cpp>
+lib_deps = ${rak3x72.lib_deps}
+  densaugeo/base64 @ ~1.4.0

variants/rak3x72/target.cpp

@@ -0,0 +1,67 @@
+#include <Arduino.h>
+#include "target.h"
+#include <helpers/ArduinoHelpers.h>
+
+RAK3x72Board board;
+
+RADIO_CLASS radio = new STM32WLx_Module();
+
+WRAPPER_CLASS radio_driver(radio, board);
+
+static const uint32_t rfswitch_pins[] = {LORAWAN_RFSWITCH_PINS,  RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC};
+static const Module::RfSwitchMode_t rfswitch_table[] = {
+  {STM32WLx::MODE_IDLE,  {LOW,  LOW}},
+  {STM32WLx::MODE_RX,    {HIGH, LOW}},
+  {STM32WLx::MODE_TX_LP, {LOW, HIGH}},
+  {STM32WLx::MODE_TX_HP, {LOW, HIGH}},
+  END_OF_MODE_TABLE,
+};
+
+VolatileRTCClock rtc_clock;
+SensorManager sensors;
+
+#ifndef LORA_CR
+  #define LORA_CR      5
+#endif
+
+bool radio_init() {
+//  rtc_clock.begin(Wire);
+
+  radio.setRfSwitchTable(rfswitch_pins, rfswitch_table);
+
+  int status = radio.begin(LORA_FREQ, LORA_BW, LORA_SF, LORA_CR, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 8, 0, 0); // TCXO set to 0 for RAK3172
+
+  if (status != RADIOLIB_ERR_NONE) {
+    Serial.print("ERROR: radio init failed: ");
+    Serial.println(status);
+    return false;  // fail
+  }
+  
+  #ifdef RX_BOOSTED_GAIN
+    radio.setRxBoostedGainMode(RX_BOOSTED_GAIN);
+  #endif
+
+  radio.setCRC(1);
+  
+  return true;  // success
+}
+
+uint32_t radio_get_rng_seed() {
+  return radio.random(0x7FFFFFFF);
+}
+
+void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
+  radio.setFrequency(freq);
+  radio.setSpreadingFactor(sf);
+  radio.setBandwidth(bw);
+  radio.setCodingRate(cr);
+}
+
+void radio_set_tx_power(uint8_t dbm) {
+  radio.setOutputPower(dbm);
+}
+
+mesh::LocalIdentity radio_new_identity() {
+  RadioNoiseListener rng(radio);
+  return mesh::LocalIdentity(&rng);  // create new random identity
+}

variants/rak3x72/target.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#define RADIOLIB_STATIC_ONLY 1
+#include <RadioLib.h>
+#include <helpers/RadioLibWrappers.h>
+#include <helpers/stm32/STM32Board.h>
+#include <helpers/CustomSTM32WLxWrapper.h>
+#include <helpers/ArduinoHelpers.h>
+#include <helpers/SensorManager.h>
+
+#define  PIN_VBAT_READ    A0
+#define  ADC_MULTIPLIER   (5 * 1.73 * 1000)
+
+class RAK3x72Board : public STM32Board {
+public:
+    const char* getManufacturerName() const override {
+        return "RAK 3x72";
+    }
+
+    uint16_t getBattMilliVolts() override {
+        uint32_t raw = analogRead(PIN_VBAT_READ);            
+        return (ADC_MULTIPLIER * raw) / 1024;
+    }
+};
+
+extern RAK3x72Board board;
+extern WRAPPER_CLASS radio_driver;
+extern VolatileRTCClock rtc_clock;
+extern SensorManager sensors;
+
+bool radio_init();
+uint32_t radio_get_rng_seed();
+void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
+void radio_set_tx_power(uint8_t dbm);
+mesh::LocalIdentity radio_new_identity();

variants/rak3x72/variant.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include <variant_RAK3172_MODULE.h>
+
+#undef RNG

variants/rak4631/platformio.ini

@@ -7,6 +7,7 @@ build_flags = ${nrf52840_base.build_flags}
   -I variants/rak4631
   -D RAK_4631
   -D PIN_USER_BTN=9
+  -D PIN_USER_BTN_ANA=31
   -D PIN_BOARD_SCL=14
   -D PIN_BOARD_SDA=13
   -D PIN_OLED_RESET=-1

variants/wio-e5/platformio.ini

@@ -6,6 +6,7 @@ build_flags = ${stm32_base.build_flags}
   -D RADIO_CLASS=CustomSTM32WLx
   -D WRAPPER_CLASS=CustomSTM32WLxWrapper
   -D SPI_INTERFACES_COUNT=0
+  -D RX_BOOSTED_GAIN=true
   -I variants/wio-e5
 build_src_filter = ${stm32_base.build_src_filter}
   +<../variants/wio-e5>
@@ -13,7 +14,7 @@ build_src_filter = ${stm32_base.build_src_filter}
 [env:wio-e5-repeater]
 extends = lora_e5
 build_flags = ${lora_e5.build_flags}
-  -D LORA_TX_POWER=20
+  -D LORA_TX_POWER=22
   -D ADVERT_NAME='"WIO-E5 Repeater"'
   -D ADMIN_PASSWORD='"password"'
 build_src_filter = ${lora_e5.build_src_filter}
@@ -22,7 +23,7 @@ build_src_filter = ${lora_e5.build_src_filter}
 [env:wio-e5_companion_radio_usb]
 extends = lora_e5
 build_flags = ${lora_e5.build_flags}
-  -D LORA_TX_POWER=20
+  -D LORA_TX_POWER=22
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=8
 build_src_filter = ${lora_e5.build_src_filter}

variants/wio-e5/target.cpp

@@ -2,7 +2,7 @@
 #include "target.h"
 #include <helpers/ArduinoHelpers.h>
 
-STM32Board board;
+WIOE5Board board;
 
 RADIO_CLASS radio = new STM32WLx_Module();
 
@@ -42,7 +42,11 @@ bool radio_init() {
     Serial.println(status);
     return false;  // fail
   }
-  
+    
+  #ifdef RX_BOOSTED_GAIN
+    radio.setRxBoostedGainMode(RX_BOOSTED_GAIN);
+  #endif
+ 
   radio.setCRC(1);
   
   return true;  // success

variants/wio-e5/target.h

@@ -8,7 +8,14 @@
 #include <helpers/ArduinoHelpers.h>
 #include <helpers/SensorManager.h>
 
-extern STM32Board board;
+class WIOE5Board : public STM32Board {
+public:
+    const char* getManufacturerName() const override {
+        return "Seeed Wio E5";
+    }
+};
+
+extern WIOE5Board board;
 extern WRAPPER_CLASS radio_driver;
 extern VolatileRTCClock rtc_clock;
 extern SensorManager sensors;

variants/xiao_nrf52/platformio.ini

@@ -16,6 +16,11 @@ lib_ignore =
 lib_deps =
   ${nrf52_base.lib_deps}
   rweather/Crypto @ ^0.4.0
+  adafruit/Adafruit INA3221 Library @ ^1.0.1
+  adafruit/Adafruit INA219 @ ^1.2.3
+  adafruit/Adafruit AHTX0 @ ^2.0.5
+  adafruit/Adafruit BME280 Library @ ^2.3.0  
+
 
 [Xiao_nrf52]
 extends = nrf52840_xiao
@@ -35,8 +40,15 @@ build_flags = ${nrf52840_xiao.build_flags}
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
+  -D PIN_WIRE_SCL=6
+  -D PIN_WIRE_SDA=7
+  -D ENV_INCLUDE_AHTX0=1
+  -D ENV_INCLUDE_BME280=1
+  -D ENV_INCLUDE_INA3221=1
+  -D ENV_INCLUDE_INA219=1
 build_src_filter = ${nrf52840_xiao.build_src_filter}
   +<helpers/*.cpp>
+  +<helpers/sensors>  
   +<helpers/nrf52/XiaoNrf52Board.cpp>
   +<../variants/xiao_nrf52>
 debug_tool = jlink

variants/xiao_nrf52/target.cpp

@@ -9,7 +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;
+EnvironmentSensorManager sensors;
 
 #ifndef LORA_CR
   #define LORA_CR      5

variants/xiao_nrf52/target.h

@@ -6,12 +6,12 @@
 #include <helpers/nrf52/XiaoNrf52Board.h>
 #include <helpers/CustomSX1262Wrapper.h>
 #include <helpers/ArduinoHelpers.h>
-#include <helpers/SensorManager.h>
+#include <helpers/sensors/EnvironmentSensorManager.h>
 
 extern XiaoNrf52Board board;
 extern WRAPPER_CLASS radio_driver;
 extern VolatileRTCClock rtc_clock;
-extern SensorManager sensors;
+extern EnvironmentSensorManager sensors;
 
 bool radio_init();
 uint32_t radio_get_rng_seed();

variants/xiao_nrf52/variant.h

@@ -110,8 +110,8 @@ static const uint8_t A5  = PIN_A5;
 // Wire Interfaces
 #define WIRE_INTERFACES_COUNT   (1)
 
-#define PIN_WIRE_SDA            (17) // 4 and 5 are used for the sx1262 !
-#define PIN_WIRE_SCL            (16) // use WIRE1_SDA
+// #define PIN_WIRE_SDA            (17) // 4 and 5 are used for the sx1262 !
+// #define PIN_WIRE_SCL            (16) // use WIRE1_SDA
 
 static const uint8_t SDA = PIN_WIRE_SDA;
 static const uint8_t SCL = PIN_WIRE_SCL;