FSK now working thanks to radiolib patch by 4m1g0

mmobarak · Feb 25, 2020 · f750524 · f750524
1 parent fb93e46
commit f750524
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 38 deletions.
diff --git a/FossaGroundStation/src/Radio/Radio.cpp b/FossaGroundStation/src/Radio/Radio.cpp
@@ -52,20 +52,6 @@ void Radio::init(){
   int state = 0;
   if (board.L_SX127X) {
     lora = new SX1278(new Module(board.L_NSS, board.L_DI00, board.L_DI01, spi));
-    fsk  = new SX1278(new Module(board.L_NSS, board.L_DI00, board.L_DI01, spi));
-//    fsk  = new SX1278(new Module(18, 26, 12));
-//    fsk  = new SX1278(new Module(board.L_NSS, board.L_DI00,board.L_RST,board.L_DI01, spi));
-
-
-//test arrancar en inicio en modo FSK
-  state = ((SX1278*)fsk)->beginFSK();
-  if (state == ERR_NONE) {
-    Serial.println(F("success en inicio enable fsk!"));
-  } else {
-    Serial.print(F("failed fsk en inicio, code "));
-    Serial.println(state);}
-//test
-
     state = ((SX1278*)lora)->begin(LORA_CARRIER_FREQUENCY,
                                       LORA_BANDWIDTH,
                                       LORA_SPREADING_FACTOR,
@@ -672,23 +658,10 @@ void Radio::remote_begin_fsk(char* payload, size_t payload_len) {
   Serial.print(F("Set Preamble Length: ")); Serial.println(preambleLength);
   Serial.print(F("OOK Modulation "));  if (enableOOK) Serial.println(F("ON")); else Serial.println(F("OFF"));
   Serial.print(F("Set Sx1268 datashaping ")); Serial.println(dataShaping);
-
-  int state = 0;
-
-//  test de inicio sin comentarios... 
-  state = ((SX1278*)fsk)->beginFSK();
-  if (state == ERR_NONE) {
-    Serial.println(F("success enable fsk!"));
-  } else {
-    Serial.print(F("failed fsk, code "));
-    Serial.println(state);
-  }
-
-  state =0;
-
 
+  int state = 0;
   if (ConfigManager::getInstance().getBoardConfig().L_SX127X) {
-    state = ((SX1278*)fsk)->beginFSK(freq,
+    state = ((SX1278*)lora)->beginFSK(freq,
                                      br,
                                      freqDev,
                                      rxBw,                                     
@@ -710,15 +683,14 @@ void Radio::remote_begin_fsk(char* payload, size_t payload_len) {
   }
 
   if (state == ERR_NONE) {
-    Serial.println(F("success!"));
+    Serial.println(F("success FSK enable!"));
   } 
   else {
     Serial.print(F("failed, code "));
     Serial.println(state);
     return;
   }
 
-
 }
 
 

diff --git a/FossaGroundStation/src/Radio/Radio.h b/FossaGroundStation/src/Radio/Radio.h
@@ -57,7 +57,7 @@ class Radio {
 private:
   Radio();
   PhysicalLayer* lora;
-  PhysicalLayer* fsk;
+ // PhysicalLayer* fsk;
   void processReceivedFrame(uint8_t functionId, uint8_t *respOptData, size_t respLen);
 
   static void setFlag();

diff --git a/FossaGroundStation/src/Status.h b/FossaGroundStation/src/Status.h
@@ -42,7 +42,7 @@ struct PacketInfo {
 };
 
 struct Status {
-  const uint32_t version = 2002221; // version year month day release
+  const uint32_t version = 2002251; // version year month day release
   bool mqtt_connected = false;
   SysInfo sysInfo;
   PacketInfo lastPacketInfo;

diff --git a/lib/RadioLib/src/modules/SX127x/SX127x.cpp b/lib/RadioLib/src/modules/SX127x/SX127x.cpp
@@ -74,6 +74,10 @@ int16_t SX127x::beginFSK(uint8_t chipVersion, float br, float freqDev, float rxB
     RADIOLIB_ASSERT(state);
   }
 
+  // enable/disable OOK
+  state = setOOK(enableOOK);
+  RADIOLIB_ASSERT(state);
+
   // set bit rate
   state = SX127x::setBitRate(br);
   RADIOLIB_ASSERT(state);
@@ -101,11 +105,7 @@ int16_t SX127x::beginFSK(uint8_t chipVersion, float br, float freqDev, float rxB
 
   // disable address filtering
   state = disableAddressFiltering();
-  RADIOLIB_ASSERT(state);
-
-  // enable/disable OOK
-  state = setOOK(enableOOK);
-  RADIOLIB_ASSERT(state);
+    RADIOLIB_ASSERT(state);
 
   // set default RSSI measurement config
   state = setRSSIConfig(2);