Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Temp fix for issue #197 Downlink no longer works - esp32 #198

Merged
merged 2 commits into from
Aug 2, 2024
Merged

Temp fix for issue #197 Downlink no longer works - esp32 #198

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
483c82f
fix: esp32 #197 Downlink no longer works
REGIOIGER Jun 25, 2024
35b2d32
refactor: RX2 delay setting
REGIOIGER Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/arduino-rfm/lorawan-arduino-rfm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,12 @@ bool LoRaWANClass::init(void)
LoRa_Settings.Channel_Hopping = 0x00; //0x00 no channel hopping, 0x01 channel hopping

// Set default rx delay and window
LoRa_Settings.Rx1_Delay = 1000; // Thing stack seems to be 5000 ms (so Rx2_delay 6000 ms)
LoRa_Settings.Rx2_Delay = 2000; // Rx2_Delay >= Rx1_Delay + RX1_Window
LoRa_Settings.RX1_Window = 1000;
LoRa_Settings.RX2_Window = 1000;

LoRa_Settings.Rx1_Delay = 5000; // Thing stack seems to be 5000 ms (so Rx2_delay 6000 ms)
LoRa_Settings.Rx2_Delay = LoRa_Settings.Rx1_Delay + LoRa_Settings.RX1_Window;


// Initialise buffer for data to transmit
memset(Data_Tx, 0x00, sizeof(Data_Tx));
Expand Down Expand Up @@ -263,7 +265,10 @@ void LoRaWANClass::setAppSKey(const char *ApskKey_in)

void LoRaWANClass::setDevAddr(const char *devAddr_in)
{
memset(Session_Data.DevAddr, 0x30, sizeof(Session_Data.DevAddr));
//memset(Session_Data.DevAddr, 0x30, sizeof(Session_Data.DevAddr));

size_t devAddrSize = sizeof(Session_Data.DevAddr);
memset(Session_Data.DevAddr, 0x30, devAddrSize);

//Check if it is a set command and there is enough data sent
Address_Tx[0] = ASCII2Hex(devAddr_in[0], devAddr_in[1]);
Expand Down Expand Up @@ -340,7 +345,8 @@ void LoRaWANClass::sendACK()
//Set new command for RFM
RFM_Command_Status = NEW_RFM_COMMAND;
upMsg_Type = MSG_ACK;
sprintf(Str, "");
//sprintf(Str, "");
Str[0] = '\0';
memcpy(Buffer_Tx.Data, Str, sizeof(Str));

}
Expand Down Expand Up @@ -503,7 +509,7 @@ void LoRaWANClass::update(void)
bool isConfirmed = ((Message_Rx.MAC_Header & 0xE0)>>5) == 5 ? true : false ; // MType
uint8_t fPort = Message_Rx.Frame_Port;
if(lora.messageCallback) lora.messageCallback(&Buffer_Rx, isConfirmed, fPort);
Buffer_Rx.Counter = 0x00; // clear counter for the next cycle
Rx_Status = NEW_RX;
Serial.println("Data received over RX1");

}
Expand Down