forks/RadioLibSmol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enabling ACK support for LoRaWAN frames.

Browse source
This commit is contained in:
Amalinda 2023-10-30 20:56:21 +08:00
parent aca1d78a97
commit 36ed14300d
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/protocols/LoRaWAN/LoRaWAN.cpp
View file

@ -499,16 +499,16 @@ int16_t LoRaWANNode::beginABP(uint32_t addr, uint8_t* nwkSKey, uint8_t* appSKey,
} }
#if defined(RADIOLIB_BUILD_ARDUINO) #if defined(RADIOLIB_BUILD_ARDUINO)
int16_t LoRaWANNode::uplink(String& str, uint8_t port) { int16_t LoRaWANNode::uplink(String& str, uint8_t port, bool confirm) {
return(this->uplink(str.c_str(), port)); return(this->uplink(str.c_str(), port, confirm));
} }
#endif #endif
int16_t LoRaWANNode::uplink(const char* str, uint8_t port) { int16_t LoRaWANNode::uplink(const char* str, uint8_t port, bool confirm) {
return(this->uplink((uint8_t*)str, strlen(str), port)); return(this->uplink((uint8_t*)str, strlen(str), port, confirm));
} }
int16_t LoRaWANNode::uplink(uint8_t* data, size_t len, uint8_t port) { int16_t LoRaWANNode::uplink(uint8_t* data, size_t len, uint8_t port, bool confirm) {
// check destination port // check destination port
if(port > 0xDF) { if(port > 0xDF) {
return(RADIOLIB_ERR_INVALID_PORT); return(RADIOLIB_ERR_INVALID_PORT);
@ -559,7 +559,7 @@ int16_t LoRaWANNode::uplink(uint8_t* data, size_t len, uint8_t port) {
#endif #endif
// set the packet fields // set the packet fields
uplinkMsg[RADIOLIB_LORAWAN_FHDR_LEN_START_OFFS] = RADIOLIB_LORAWAN_MHDR_MTYPE_UNCONF_DATA_UP | RADIOLIB_LORAWAN_MHDR_MAJOR_R1; uplinkMsg[RADIOLIB_LORAWAN_FHDR_LEN_START_OFFS] = (confirm ? RADIOLIB_LORAWAN_MHDR_MTYPE_CONF_DATA_UP : RADIOLIB_LORAWAN_MHDR_MTYPE_UNCONF_DATA_UP) | RADIOLIB_LORAWAN_MHDR_MAJOR_R1;
LoRaWANNode::hton<uint32_t>(&uplinkMsg[RADIOLIB_LORAWAN_FHDR_DEV_ADDR_POS], this->devAddr); LoRaWANNode::hton<uint32_t>(&uplinkMsg[RADIOLIB_LORAWAN_FHDR_DEV_ADDR_POS], this->devAddr);
// TODO implement adaptive data rate // TODO implement adaptive data rate

9
src/protocols/LoRaWAN/LoRaWAN.h
View file

@ -363,27 +363,30 @@ class LoRaWANNode {
\brief Send a message to the server. \brief Send a message to the server.
\param str Address of Arduino String that will be transmitted. \param str Address of Arduino String that will be transmitted.
\param port Port number to send the message to. \param port Port number to send the message to.
\param confirm Whether or not an ACK is requested for the message.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t uplink(String& str, uint8_t port); int16_t uplink(String& str, uint8_t port, bool confirm=false);
#endif #endif
/*! /*!
\brief Send a message to the server. \brief Send a message to the server.
\param str C-string that will be transmitted. \param str C-string that will be transmitted.
\param port Port number to send the message to. \param port Port number to send the message to.
\param confirm Whether or not an ACK is requested for the message.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t uplink(const char* str, uint8_t port); int16_t uplink(const char* str, uint8_t port, bool confirm=false);
/*! /*!
\brief Send a message to the server. \brief Send a message to the server.
\param data Data to send. \param data Data to send.
\param len Length of the data. \param len Length of the data.
\param port Port number to send the message to. \param port Port number to send the message to.
\param confirm Whether or not an ACK is requested for the message.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t uplink(uint8_t* data, size_t len, uint8_t port); int16_t uplink(uint8_t* data, size_t len, uint8_t port, bool confirm=false);
#if defined(RADIOLIB_BUILD_ARDUINO) #if defined(RADIOLIB_BUILD_ARDUINO)
/*! /*!