From b6f37aef6244132aa4ce15ee7b9ff866a2bfe16b Mon Sep 17 00:00:00 2001
From: andreask <andreask>
Date: Wed, 22 Jan 2020 22:25:07 +0100
Subject: [PATCH] different ports for spreading factors

---
 Firmware/lib/LoRaWAN/LoRaWAN.cpp | 4 ++--
 Firmware/lib/LoRaWAN/LoRaWAN.h   | 2 +-
 Firmware/src/main.cpp            | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Firmware/lib/LoRaWAN/LoRaWAN.cpp b/Firmware/lib/LoRaWAN/LoRaWAN.cpp
index 7a35d4c..5b36843 100644
--- a/Firmware/lib/LoRaWAN/LoRaWAN.cpp
+++ b/Firmware/lib/LoRaWAN/LoRaWAN.cpp
@@ -35,7 +35,7 @@ void LoRaWAN::setKeys(unsigned char NwkSkey[], unsigned char AppSkey[], unsigned
 *
 *****************************************************************************************
 */
-void LoRaWAN::Send_Data(unsigned char *Data, unsigned char Data_Length, unsigned int Frame_Counter_Tx, lora_dr_t datarate)
+void LoRaWAN::Send_Data(unsigned char *Data, unsigned char Data_Length, unsigned int Frame_Counter_Tx, lora_dr_t datarate,unsigned char Frame_Port)
 {
   //Define variables
   unsigned char i;
@@ -73,7 +73,7 @@ void LoRaWAN::Send_Data(unsigned char *Data, unsigned char Data_Length, unsigned
   // unsigned char Mac_Header = 0x80;
 
   unsigned char Frame_Control = 0x00;
-  unsigned char Frame_Port = 0x01;
+  //unsigned char Frame_Port = 0x01;
 
   //Encrypt the data
   Encrypt_Payload(Data, Data_Length, Frame_Counter_Tx, Direction);
diff --git a/Firmware/lib/LoRaWAN/LoRaWAN.h b/Firmware/lib/LoRaWAN/LoRaWAN.h
index da1db23..ee226c8 100644
--- a/Firmware/lib/LoRaWAN/LoRaWAN.h
+++ b/Firmware/lib/LoRaWAN/LoRaWAN.h
@@ -40,7 +40,7 @@ class LoRaWAN
   public:
     LoRaWAN(RFM95 &rfm95);
     void setKeys(unsigned char NwkSkey[], unsigned char AppSkey[], unsigned char DevAddr[]);
-    void Send_Data(unsigned char *Data, unsigned char Data_Length, unsigned int Frame_Counter_Tx, lora_dr_t datarate);
+    void Send_Data(unsigned char *Data, unsigned char Data_Length, unsigned int Frame_Counter_Tx, lora_dr_t datarate,unsigned char Frame_Port);
 
   private:
     RFM95 *_rfm95;
diff --git a/Firmware/src/main.cpp b/Firmware/src/main.cpp
index d35f84e..e4ab652 100644
--- a/Firmware/src/main.cpp
+++ b/Firmware/src/main.cpp
@@ -203,11 +203,12 @@ void loop()
   #ifdef RF_LORA
     #ifdef HAS_NO_SENSOR
     // Send Packet in all 12 SFs for Beacon Mode
-
+    unsigned char Frame_Port =0x07;
     for  (int i = SF7BW125; i<=SF12BW125; i++) {
       lora_data tdata = data;
-      lora.Send_Data((unsigned char *)&tdata, sizeof(tdata), Frame_Counter_Tx, static_cast<lora_dr>(i));
+      lora.Send_Data((unsigned char *)&tdata, sizeof(tdata), Frame_Counter_Tx, static_cast<lora_dr>(i), Frame_Port);
       Frame_Counter_Tx++;
+      Frame_Port++;
       delay(25);
     }
     #else