Merge remote-tracking branch 'upstream/dev' into rak-ethernet

# Conflicts:
#	docs/faq.md

variants/rak4631/platformio.ini

@@ -14,11 +14,13 @@ build_flags = ${nrf52_base.build_flags}
   -D PIN_GPS_RX=PIN_SERIAL1_TX
   -D PIN_GPS_EN=-1
   -D PIN_OLED_RESET=-1
+  -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
+  -D ENV_INCLUDE_RAK12035=1
 build_src_filter = ${nrf52_base.build_src_filter}
   +<../variants/rak4631>
   +<helpers/sensors>

variants/rak4631/target.cpp

@@ -56,3 +56,4 @@ mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity
 }
+

variants/rak4631/target.h

@@ -28,3 +28,4 @@ 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();
+