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

Use mcci-catena/arduino-lmic as the base library

Browse Source
This commit is contained in:
Manuel Bleichenbacher
2018-10-02 23:08:38 +02:00
parent 0f97ce4e0f
commit 1fe8bf692c
36 changed files with 5095 additions and 1301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/lmic/oslmic.c
View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2014-2016 IBM Corporation.
* Copyright (c) 2016-2017 MCCI Corporation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -25,9 +26,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#define LMIC_DR_LEGACY 0
#include "lmic.h"
#include "../hal/hal_esp32.h"
#include <stdbool.h>
extern const struct lmic_pinmap lmic_pins;
// RUNTIME STATE
static struct {
@ -35,18 +38,27 @@ static struct {
osjob_t* runnablejobs;
} OS;
void os_init () {
int os_init_ex (const void *pintable) {
memset(&OS, 0x00, sizeof(OS));
hal_init();
radio_init();
hal_init_ex(pintable);
if (! radio_init())
return 0;
LMIC_init();
return 1;
}
void os_init() {
if (os_init_ex((const void *)&lmic_pins))
return;
ASSERT(0);
}
ostime_t os_getTime () {
return hal_ticks();
}
static u1_t unlinkjob (osjob_t** pnext, osjob_t* job) {
// unlink job from queue, return if removed
static int unlinkjob (osjob_t** pnext, osjob_t* job) {
for( ; *pnext; pnext = &((*pnext)->next)) {
if(*pnext == job) { // unlink
*pnext = job->next;
@ -59,14 +71,9 @@ static u1_t unlinkjob (osjob_t** pnext, osjob_t* job) {
// clear scheduled job
void os_clearCallback (osjob_t* job) {
hal_disableIRQs();
u1_t res = unlinkjob(&OS.scheduledjobs, job);
if (res)
unlinkjob(&OS.runnablejobs, job);
// ttn-esp32 change: suppress error 'value computed is not used'
int __attribute__((unused)) res = unlinkjob(&OS.scheduledjobs, job) || unlinkjob(&OS.runnablejobs, job);
hal_enableIRQs();
#if LMIC_DEBUG_LEVEL > 1
if (res)
lmic_printf("%lu: Cleared job %p\n", os_getTime(), job);
#endif
}
// schedule immediately runnable job
@ -74,7 +81,7 @@ void os_setCallback (osjob_t* job, osjobcb_t cb) {
osjob_t** pnext;
hal_disableIRQs();
// remove if job was already queued
os_clearCallback(job);
unlinkjob(&OS.runnablejobs, job);
// fill-in job
job->func = cb;
job->next = NULL;
@ -82,9 +89,6 @@ void os_setCallback (osjob_t* job, osjobcb_t cb) {
for(pnext=&OS.runnablejobs; *pnext; pnext=&((*pnext)->next));
*pnext = job;
hal_enableIRQs();
#if LMIC_DEBUG_LEVEL > 1
lmic_printf("%lu: Scheduled job %p, cb %p ASAP\n", os_getTime(), job, cb);
#endif
}
// schedule timed job
@ -92,7 +96,7 @@ void os_setTimedCallback (osjob_t* job, ostime_t time, osjobcb_t cb) {
osjob_t** pnext;
hal_disableIRQs();
// remove if job was already queued
os_clearCallback(job);
unlinkjob(&OS.scheduledjobs, job);
// fill-in job
job->deadline = time;
job->func = cb;
@ -107,9 +111,6 @@ void os_setTimedCallback (osjob_t* job, ostime_t time, osjobcb_t cb) {
}
*pnext = job;
hal_enableIRQs();
#if LMIC_DEBUG_LEVEL > 1
lmic_printf("%lu: Scheduled job %p, cb %p at %lu\n", os_getTime(), job, cb, time);
#endif
}
// execute jobs from timer and from run queue
@ -120,12 +121,8 @@ void os_runloop () {
}
void os_runloop_once() {
#if LMIC_DEBUG_LEVEL > 1
bool has_deadline = false;
#endif
osjob_t* j = NULL;
hal_enterCriticalSection();
hal_disableIRQs();
// check for runnable jobs
if(OS.runnablejobs) {
j = OS.runnablejobs;
@ -133,18 +130,11 @@ void os_runloop_once() {
} else if(OS.scheduledjobs && hal_checkTimer(OS.scheduledjobs->deadline)) { // check for expired timed jobs
j = OS.scheduledjobs;
OS.scheduledjobs = j->next;
#if LMIC_DEBUG_LEVEL > 1
has_deadline = true;
#endif
}
if(j) { // run job callback
#if LMIC_DEBUG_LEVEL > 1
lmic_printf("%lu: Running job %p, cb %p, deadline %lu\n", os_getTime(), j, j->func, has_deadline ? j->deadline : 0);
#endif
j->func(j);
hal_leaveCriticalSection();
} else { // nothing pending
hal_leaveCriticalSection();
hal_sleep(); // wake by irq (timer already restarted)
}
hal_enableIRQs();
if(j) { // run job callback
j->func(j);
}
}