DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #478 from cyberman54/development

Browse Source 
maintenance fixes
This commit is contained in:
Verkehrsrot 2019-10-24 19:21:51 +02:00 committed by GitHub
commit d5cef5f159
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/lorawan.h
View File

@ -55,7 +55,7 @@ const char *getBwName(rps_t rps);
const char *getCrName(rps_t rps); const char *getCrName(rps_t rps);
#if (TIME_SYNC_LORAWAN) #if (TIME_SYNC_LORAWAN)
static void user_request_network_time_callback(void *pVoidUserUTCTime, void user_request_network_time_callback(void *pVoidUserUTCTime,
int flagSuccess); int flagSuccess);
#endif #endif

4
src/display.cpp
View File

@ -77,9 +77,9 @@ void init_display(bool verbose) {
// init display // init display
#ifndef DISPLAY_FLIP #ifndef DISPLAY_FLIP
oledInit(OLED_128x64, ANGLE_0, false, -1, -1, 400000L); oledInit(OLED_128x64, false, false, -1, -1, 400000L);
#else #else
oledInit(OLED_128x64, ANGLE_FLIPY, false, -1, -1, 400000L); oledInit(OLED_128x64, true, false, -1, -1, 400000L);
#endif #endif
// clear display // clear display

8
src/irqhandler.cpp
View File

@ -20,16 +20,16 @@ void irqHandler(void *pvParameters) {
if (InterruptStatus & UNMASK_IRQ) // interrupt handler to be enabled? if (InterruptStatus & UNMASK_IRQ) // interrupt handler to be enabled?
mask_irq = false; mask_irq = false;
// else if (mask_irq) // suppress processing if interrupt handler is
// disabled // suppress processing if interrupt handler is disabled
// or time critical lmic jobs are pending in next 100ms
#if (HAS_LORA) #if (HAS_LORA)
else if (mask_irq || os_queryTimeCriticalJobs(ms2osticks(100))) else if (mask_irq || os_queryTimeCriticalJobs(ms2osticks(100)))
#else #else
else if (mask_irq) else if (mask_irq)
#endif #endif
// suppress processing if interrupt handler is disabled
// or time critical lmic jobs are pending in next 100ms
continue; continue;
else if (InterruptStatus & MASK_IRQ) { // interrupt handler to be disabled? else if (InterruptStatus & MASK_IRQ) { // interrupt handler to be disabled?
mask_irq = true; mask_irq = true;
continue; continue;

2
src/lorawan.cpp
View File

@ -373,7 +373,7 @@ void lora_enqueuedata(MessageBuffer_t *message) {
void lora_queuereset(void) { xQueueReset(LoraSendQueue); } void lora_queuereset(void) { xQueueReset(LoraSendQueue); }
#if (TIME_SYNC_LORAWAN) #if (TIME_SYNC_LORAWAN)
static void IRAM_ATTR user_request_network_time_callback(void *pVoidUserUTCTime, void IRAM_ATTR user_request_network_time_callback(void *pVoidUserUTCTime,
int flagSuccess) { int flagSuccess) {
// Explicit conversion from void* to uint32_t* to avoid compiler errors // Explicit conversion from void* to uint32_t* to avoid compiler errors
time_t *pUserUTCTime = (time_t *)pVoidUserUTCTime; time_t *pUserUTCTime = (time_t *)pVoidUserUTCTime;