Merge branch 'dev' into dev

variants/sensecap_solar/SenseCapSolarBoard.cpp

@@ -49,7 +49,7 @@ void SenseCapSolarBoard::begin() {
 
 #ifdef LED_WHITE
   pinMode(LED_WHITE, OUTPUT);
-  digitalWrite(LED_WHITE, HIGH);
+  digitalWrite(LED_WHITE, LOW);
 #endif
 #ifdef LED_BLUE
   pinMode(LED_BLUE, OUTPUT);

variants/sensecap_solar/SenseCapSolarBoard.h

@@ -54,7 +54,7 @@ public:
 #ifdef NRF52_POWER_MANAGEMENT
     initiateShutdown(SHUTDOWN_REASON_USER);
 #else
-    sd_power_system_off();
+    NRF52Board::powerOff();
 #endif
   }
 };

variants/sensecap_solar/platformio.ini

@@ -12,7 +12,7 @@ build_flags = ${nrf52_base.build_flags}
   -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
-  -D P_LORA_TX_LED=11
+  -D P_LORA_TX_LED=12
   -D P_LORA_DIO_1=1
   -D P_LORA_RESET=2
   -D P_LORA_BUSY=3
@@ -91,6 +91,7 @@ build_flags =
   ${SenseCap_Solar.build_flags}
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
+  -D ENABLE_USB_INTERFACE
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${SenseCap_Solar.build_src_filter}
@@ -99,3 +100,8 @@ build_src_filter = ${SenseCap_Solar.build_src_filter}
 lib_deps =
   ${SenseCap_Solar.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:SenseCap_Solar_kiss_modem]
+extends = SenseCap_Solar
+build_src_filter = ${SenseCap_Solar.build_src_filter}
+  +<../examples/kiss_modem/>

variants/sensecap_solar/target.cpp

@@ -25,21 +25,6 @@ bool radio_init() {
     return radio.std_init(&SPI);
 }
 
-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(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity

variants/sensecap_solar/target.h

@@ -15,8 +15,5 @@ extern AutoDiscoverRTCClock rtc_clock;
 extern EnvironmentSensorManager 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(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();