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

Fix numerous glitches revealed by LMIC update, along with regression from #85 #94

Merged
merged 6 commits into from
Apr 2, 2019
Merged

Fix numerous glitches revealed by LMIC update, along with regression from #85 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6eca474
Fix #89: add new LMIC event codes
terrillmoore Apr 2, 2019
1040a38
Fix #87: clean up tx completion
terrillmoore Apr 2, 2019
5c9c0ee
Fix #91: remove redundant call to UpdateFCntDown()
terrillmoore Apr 2, 2019
05b0420
clean up whitespace
terrillmoore Apr 2, 2019
9a9f441
Fix #92: get correct tx complete status
terrillmoore Apr 2, 2019
915e0fb
Fix #93: add EV_TXCANCELED support
terrillmoore Apr 2, 2019
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
23 changes: 3 additions & 20 deletions src/Arduino_LoRaWAN_lmic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,16 @@
/* Arduino_LoRaWAN_lmic.h Tue Oct 25 2016 06:22:40 tmm */

/*

Module: Arduino_LoRaWAN_lmic.h

Function:
Wrapper header file for LMIC internals.

Version:
V0.1.0 Tue Oct 25 2016 06:22:40 tmm Edit level 1

Copyright notice:
This file copyright (C) 2016 by

MCCI Corporation
3520 Krums Corners Road
Ithaca, NY 14850

An unpublished work. All rights reserved.

This file is proprietary information, and may not be disclosed or
copied without the prior permission of MCCI Corporation.
See accompanying LICENSE file.

Author:
Terry Moore, MCCI Corporation October 2016

Revision history:
0.1.0 Tue Oct 25 2016 06:22:40 tmm
Module created.

*/

#ifndef _ARDUINO_LORAWAN_LMIC_H_ /* prevent multiple includes */
Expand Down Expand Up @@ -79,7 +61,8 @@ class Arduino_LoRaWAN::cLMIC
"BEACON_TRACKED\0" "JOINING\0" "JOINED\0" "RFU1\0" \
"JOIN_FAILED\0" "REJOIN_FAILED\0" "TXCOMPLETE\0" \
"LOST_TSYNC\0" "RESET\0" "RXCOMPLETE\0" "LINK_DEAD\0" \
"LINK_ALIVE\0" "SCAN_FOUND\0" "TXSTART\0"
"LINK_ALIVE\0" "SCAN_FOUND\0" "TXSTART\0" \
"TXCANCELED\0" "RXSTART\0" "JOIN_TXCOMPLETE\0"

/**** end of Arduino_LoRaWAN_lmic.h ****/
#endif /* _ARDUINO_LORAWAN_LMIC_H_ */
2 changes: 1 addition & 1 deletion src/lib/SendBuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ bool Arduino_LoRaWAN::SendBuffer(
uint8_t port
)
{
if (this->m_fTxPending || LMIC.opmode & OP_TXRXPEND)
if (! this->GetTxReady())
{
if (pDoneFn)
(*pDoneFn)(pDoneCtx, false);
Expand Down
136 changes: 65 additions & 71 deletions src/lib/arduino_lorawan_begin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
Module: arduino_lorawan_begin.cpp

Function:
Arduino_LoRaWAN::begin();
Arduino_LoRaWAN::begin();

Copyright notice:
See LICENSE file accompanying this project.
See LICENSE file accompanying this project.

Author:
Terry Moore, MCCI Corporation October 2016
Terry Moore, MCCI Corporation October 2016

*/

Expand Down Expand Up @@ -133,28 +133,29 @@ Arduino_LoRaWAN::cLMIC::GetEventName(uint32_t ev)
Name: Arduino_LoRaWAN::StandardEventProcessor()

Function:
Handle LMIC events.
Handle LMIC events.

Definition:
private: void Arduino_LoRaWAN::StandardEventProcessor(
uint32_t ev
);
private: void Arduino_LoRaWAN::StandardEventProcessor(
uint32_t ev
);

Description:
The simple events emitted from the LMIC core are processed, both
to arrange for completions and notificatoins for asynchronous events,
and to generate notifications to cause data to be pushed to the
platform's persistent storage.
The simple events emitted from the LMIC core are processed, both
to arrange for completions and notificatoins for asynchronous events,
and to generate notifications to cause data to be pushed to the
platform's persistent storage.

Returns:
No explicit result.
No explicit result.

*/

void Arduino_LoRaWAN::StandardEventProcessor(
uint32_t ev
)
{
// update our idea of the downlink counter.
this->UpdateFCntDown(LMIC.seqnoDn);

switch(ev)
Expand All @@ -172,19 +173,15 @@ void Arduino_LoRaWAN::StandardEventProcessor(
// we need to just reset.
if (! this->GetOtaaProvisioningInfo(nullptr))
{
bool txPending = this->m_fTxPending;
this->m_fTxPending = false;
// notify client that TX is complete
if (txPending && this->m_pSendBufferDoneFn)
this->m_pSendBufferDoneFn(this->m_pSendBufferDoneCtx, false);
this->completeTx(false);
}
break;

case EV_JOINED:
{
// announce that we have joined; allows for
// network-specific fixups, and saving keys.
this->NetJoin();
// announce that we have joined; allows for
// network-specific fixups, and saving keys.
this->NetJoin();
SessionInfo Info;
Info.V1.Tag = kSessionInfoTag_V1;
Info.V1.Size = sizeof(Info);
Expand All @@ -202,50 +199,48 @@ void Arduino_LoRaWAN::StandardEventProcessor(
break;

case EV_JOIN_FAILED:
// we failed the join. But we keep trying; client must
// do a reset to stop us.
// TODO(tmm@mcci.com): this->NetJoinFailed(), and/or
// we failed the join. But we keep trying; client must
// do a reset to stop us.
// TODO(tmm@mcci.com): this->NetJoinFailed(), and/or
// an outcall
break;

case EV_REJOIN_FAILED:
// after we join, if ABP is enabled (LMIC_setLinkCheck(true)),
// if we don't get downlink messages for a while, we'll try to
// rejoin. This message indicated that the rejoin failed.
// TODO(tmm@mcci.com): this->NetRejoinFailed(), and/or
// an outcall
// after we join, if ABP is enabled (LMIC_setLinkCheck(true)),
// if we don't get downlink messages for a while, we'll try to
// rejoin. This message indicated that the rejoin failed.
// TODO(tmm@mcci.com): this->NetRejoinFailed(), and/or
// an outcall
break;

case EV_TXCOMPLETE:
this->m_fTxPending = false;
// notify framework that RX may be available (because this happens
// after every transmit).
this->NetRxComplete();

// notify framework that RX may be available (because this happens
// after every transmit).
this->NetRxComplete();

// notify framework that tx is complete
// notify framework that tx is complete
this->NetTxComplete();

// notify client that TX is complete; claim success unless
// LMIC.txrxFlags & TXRX_NACK
this->completeTx(! (LMIC.txrxFlags & TXRX_NACK));
// notify client that TX is complete; claim success unless
// it's confirmed and we didn't get an ACK.
this->completeTx(! LMIC.pendTxConf || (LMIC.txrxFlags & TXRX_ACK) != 0);
break;

case EV_LOST_TSYNC:
// only for class-B or class-C: we lost beacon time synch.
// only for class-B or class-C: we lost beacon time synch.
break;

case EV_RESET:
// the LoRaWAN MAC just got reset due to a pending frame rollover
// on FCntDn or actual rollover on FCntUp.
// the LoRaWAN MAC just got reset due to a pending frame rollover
// on FCntDn or actual rollover on FCntUp.
break;

case EV_RXCOMPLETE:
// data received in ping slot
// see TXCOMPLETE.

// follow protocol:
this->NetRxComplete();
// follow protocol:
this->NetRxComplete();
break;

case EV_LINK_DEAD:
Expand All @@ -258,40 +253,39 @@ void Arduino_LoRaWAN::StandardEventProcessor(
break;

case EV_TXSTART:
this->NetSaveFCntUp(LMIC.seqnoUp);
this->NetSaveFCntUp(LMIC.seqnoUp);
break;

case EV_TXCANCELED:
this->completeTx(false);
break;

default:
break;
}
default:
break;
}
}

void Arduino_LoRaWAN::NetRxComplete(void)
{
// notify client that RX is available
if (LMIC.dataLen != 0 || LMIC.dataBeg != 0)
{
uint8_t port;
port = 0;
if (LMIC.txrxFlags & TXRX_PORT)
port = LMIC.frame[LMIC.dataBeg - 1];

if (this->m_pReceiveBufferFn)
{
this->m_pReceiveBufferFn(
this->m_pReceiveBufferCtx,
port,
LMIC.frame + LMIC.dataBeg,
LMIC.dataLen
);
}
}

// Try to save the Rx sequence number.
// For efficiency, client should look for changes
// since last save.
this->UpdateFCntDown(LMIC.seqnoDn);
}
{
// notify client that RX is available
if (LMIC.dataLen != 0 || LMIC.dataBeg != 0)
{
uint8_t port;
port = 0;
if (LMIC.txrxFlags & TXRX_PORT)
port = LMIC.frame[LMIC.dataBeg - 1];

if (this->m_pReceiveBufferFn)
{
this->m_pReceiveBufferFn(
this->m_pReceiveBufferCtx,
port,
LMIC.frame + LMIC.dataBeg,
LMIC.dataLen
);
}
}
}

/****************************************************************************\
|
Expand Down