riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkg/semtech-loramac: handle all mcps confirm cases

Browse Source
This commit is contained in:
Alexandre Abadie 2018-04-06 15:24:15 +02:00
parent 736c757b80
commit 87090072cf
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/semtech-loramac/contrib/semtech_loramac.c
View File

@ -171,6 +171,11 @@ static void mcps_confirm(McpsConfirm_t *confirm)
break; break;
} }
} }
else {
msg_t msg;
msg.type = MSG_TYPE_LORAMAC_TX_CNF_FAILED;
msg_send(&msg, semtech_loramac_pid);
}
} }
/* MCPS-Indication event function */ /* MCPS-Indication event function */
@ -555,6 +560,14 @@ void *_semtech_loramac_event_loop(void *arg)
mac->state = SEMTECH_LORAMAC_STATE_IDLE; mac->state = SEMTECH_LORAMAC_STATE_IDLE;
break; break;
} }
case MSG_TYPE_LORAMAC_TX_CNF_FAILED:
DEBUG("[semtech-loramac] loramac TX failed\n");
msg_t msg_ret;
msg_ret.type = MSG_TYPE_LORAMAC_TX_CNF_FAILED;
msg_send(&msg_ret, mac->caller_pid);
/* switch back to idle state now*/
mac->state = SEMTECH_LORAMAC_STATE_IDLE;
break;
case MSG_TYPE_LORAMAC_RX: case MSG_TYPE_LORAMAC_RX:
{ {
msg_t msg_ret; msg_t msg_ret;
@ -678,9 +691,17 @@ uint8_t semtech_loramac_recv(semtech_loramac_t *mac)
/* Wait until the mac receive some information */ /* Wait until the mac receive some information */
msg_t msg; msg_t msg;
msg_receive(&msg); msg_receive(&msg);
uint8_t ret = SEMTECH_LORAMAC_TX_DONE; uint8_t ret;
if (msg.type == MSG_TYPE_LORAMAC_RX) { switch (msg.type) {
case MSG_TYPE_LORAMAC_RX:
ret = SEMTECH_LORAMAC_DATA_RECEIVED; ret = SEMTECH_LORAMAC_DATA_RECEIVED;
break;
case MSG_TYPE_LORAMAC_TX_CNF_FAILED:
ret = SEMTECH_LORAMAC_TX_CNF_FAILED;
break;
default:
ret = SEMTECH_LORAMAC_TX_DONE;
break;
} }
DEBUG("[semtech-loramac] MAC reply received: %d\n", ret); DEBUG("[semtech-loramac] MAC reply received: %d\n", ret);

2
pkg/semtech-loramac/include/semtech_loramac.h
View File

@ -45,6 +45,7 @@ extern "C" {
#define MSG_TYPE_LORAMAC_TX_DONE (0x3462) /**< MAC TX completes */ #define MSG_TYPE_LORAMAC_TX_DONE (0x3462) /**< MAC TX completes */
#define MSG_TYPE_LORAMAC_RX (0x3463) /**< Some data received */ #define MSG_TYPE_LORAMAC_RX (0x3463) /**< Some data received */
#define MSG_TYPE_LORAMAC_LINK_CHECK (0x3464) /**< Link check info received */ #define MSG_TYPE_LORAMAC_LINK_CHECK (0x3464) /**< Link check info received */
#define MSG_TYPE_LORAMAC_TX_CNF_FAILED (0x3465) /**< MAC TX confirmed failed */
/** @} */ /** @} */
/** /**
@ -61,6 +62,7 @@ enum {
SEMTECH_LORAMAC_NOT_JOINED, /**< MAC is not joined */ SEMTECH_LORAMAC_NOT_JOINED, /**< MAC is not joined */
SEMTECH_LORAMAC_TX_SCHEDULED, /**< TX data scheduled */ SEMTECH_LORAMAC_TX_SCHEDULED, /**< TX data scheduled */
SEMTECH_LORAMAC_TX_DONE, /**< Transmission completed */ SEMTECH_LORAMAC_TX_DONE, /**< Transmission completed */
SEMTECH_LORAMAC_TX_CNF_FAILED, /**< Confirmable transmission failed */
SEMTECH_LORAMAC_DATA_RECEIVED, /**< Data received */ SEMTECH_LORAMAC_DATA_RECEIVED, /**< Data received */
SEMTECH_LORAMAC_BUSY /**< Internal MAC is busy */ SEMTECH_LORAMAC_BUSY /**< Internal MAC is busy */
}; };