Merge branch 'master' of github.com:meshtastic/Meshtastic-device

src/main.cpp

@@ -243,6 +243,12 @@ void setup()
     delay(1);
 #endif
 
+#ifdef RAK4630
+    // We need to enable 3.3V periphery in order to scan it
+    pinMode(PIN_3V3_EN, OUTPUT);
+    digitalWrite(PIN_3V3_EN, 1);
+#endif
+
     // We need to scan here to decide if we have a screen for nodeDB.init()
     scanI2Cdevice();
 #ifdef RAK4630

src/mesh/Channels.cpp

@@ -79,7 +79,7 @@ void Channels::initDefaultChannel(ChannelIndex chIndex)
     Config_LoRaConfig &loraConfig = config.lora;
 
     loraConfig.modem_preset = Config_LoRaConfig_ModemPreset_LONG_FAST; // Default to Long Range & Fast
-
+    loraConfig.use_preset = true;
     loraConfig.tx_power = 0; // default
     uint8_t defaultpskIndex = 1;
     channelSettings.psk.bytes[0] = defaultpskIndex;

src/mesh/RadioInterface.cpp

@@ -361,7 +361,7 @@ void RadioInterface::applyModemConfig()
     // Set up default configuration
     // No Sync Words in LORA mode
     Config_LoRaConfig &loraConfig = config.lora;
-    if (loraConfig.spread_factor == 0) {
+    if (loraConfig.use_preset) {
 
         switch (loraConfig.modem_preset) {
         case Config_LoRaConfig_ModemPreset_SHORT_FAST:

variants/rak4631/variant.h

@@ -185,6 +185,9 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define SX126X_RXEN (37)
 #define SX126X_E22 // DIO2 controlls an antenna switch and the TCXO voltage is controlled by DIO3
 
+// enables 3.3V periphery like GPS or IO Module
+#define PIN_3V3_EN (34)
+
 // RAK1910 GPS module
 // If using the wisblock GPS module and pluged into Port A on WisBlock base
 // IO1 is hooked to PPS (pin 12 on header) = gpio 17
@@ -192,7 +195,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
 // Therefore must be 1 to keep peripherals powered
 // Power is on the controllable 3V3_S rail
 // #define PIN_GPS_RESET (34)
-#define PIN_GPS_EN (34)
+#define PIN_GPS_EN PIN_3V3_EN
 #define PIN_GPS_PPS (17) // Pulse per second input from the GPS
 
 #define GPS_RX_PIN PIN_SERIAL1_RX

variants/rak4631_epaper/variant.h

@@ -185,6 +185,9 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #define SX126X_RXEN (37)
 #define SX126X_E22 // DIO2 controlls an antenna switch and the TCXO voltage is controlled by DIO3
 
+// enables 3.3V periphery like GPS or IO Module
+#define PIN_3V3_EN (34)
+
 // RAK1910 GPS module
 // If using the wisblock GPS module and pluged into Port A on WisBlock base
 // IO1 is hooked to PPS (pin 12 on header) = gpio 17
@@ -192,7 +195,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
 // Therefore must be 1 to keep peripherals powered
 // Power is on the controllable 3V3_S rail
 // #define PIN_GPS_RESET (34)
-#define PIN_GPS_EN (34)
+#define PIN_GPS_EN PIN_3V3_EN
 #define PIN_GPS_PPS (17) // Pulse per second input from the GPS
 
 #define GPS_RX_PIN PIN_SERIAL1_RX