localhorst/ttn-esp32
1
0
Fork 0
mirror of https://github.com/manuelbl/ttn-esp32.git synced 2025-07-16 07:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve consistency of naming

Browse Source
This commit is contained in:
Manuel Bleichenbacher
2018-07-19 22:04:32 +02:00
parent 88937fe511
commit fc34fed6de
4 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/TheThingsNetwork.cpp
View File

@ -131,13 +131,13 @@ bool TheThingsNetwork::join()
return result == EV_JOINED;
}
ttn_response_t TheThingsNetwork::sendBytes(const uint8_t *payload, size_t length, port_t port, bool confirm)
TTNResponseCode TheThingsNetwork::transmitBytes(const uint8_t *payload, size_t length, port_t port, bool confirm)
{
hal_enterCriticalSection();
if (LMIC.opmode & OP_TXRXPEND)
{
hal_leaveCriticalSection();
return TTN_ERROR_SEND_COMMAND_FAILED;
return kTTNErrorTransmissionFailed;
}
clientAction = eActionSending;
@ -156,16 +156,19 @@ ttn_response_t TheThingsNetwork::sendBytes(const uint8_t *payload, size_t length
port_t port = 0;
if ((LMIC.txrxFlags & TXRX_PORT))
port = LMIC.frame[LMIC.dataBeg - 1];
messageCallback(LMIC.frame + LMIC.dataBeg, LMIC.dataLen, port);
const uint8_t* msg = NULL;
if (LMIC.dataLen > 0)
msg = LMIC.frame + LMIC.dataBeg;
messageCallback(msg, LMIC.dataLen, port);
}
return hasRecevied ? TTN_SUCCESSFUL_RECEIVE : TTN_SUCCESSFUL_TRANSMISSION;
return kTTNSuccessfulTransmission;
}
return TTN_ERROR_SEND_COMMAND_FAILED;
return kTTNErrorTransmissionFailed;
}
void TheThingsNetwork::onMessage(message_cb_t callback)
void TheThingsNetwork::onMessage(TTNMessageCallback callback)
{
messageCallback = callback;
}