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

Merge pull request #715 from cyberman54/development

Browse Source 
Development
This commit is contained in:
Verkehrsrot 2021-01-10 00:37:49 +01:00 committed by GitHub
commit 7927e86f39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/globals.h
View File

@ -22,24 +22,14 @@
#define _bitl(b) (1UL << (b)) #define _bitl(b) (1UL << (b))
// bits in payloadmask for filtering payload data // bits in payloadmask for filtering payload data
#define COUNT_DATA _bit(1) #define COUNT_DATA _bit(0)
#define ALARM_DATA _bit(2) #define ALARM_DATA _bit(1)
#define MEMS_DATA _bit(3) #define MEMS_DATA _bit(2)
#define GPS_DATA _bit(4) #define GPS_DATA _bit(3)
#define SENSOR1_DATA _bit(5) #define SENSOR1_DATA _bit(4)
#define SENSOR2_DATA _bit(6) #define SENSOR2_DATA _bit(5)
#define SENSOR3_DATA _bit(7) #define SENSOR3_DATA _bit(6)
#define BATT_DATA _bit(8) #define BATT_DATA _bit(7)
// bits in configmask for device runmode control
#define GPS_MODE _bit(1)
#define ALARM_MODE _bit(2)
#define BEACON_MODE _bit(3)
#define UPDATE_MODE _bit(4)
#define FILTER_MODE _bit(5)
#define ANTENNA_MODE _bit(6)
#define BLE_MODE _bit(7)
#define SCREEN_MODE _bit(8)
// length of display buffer for lmic event messages // length of display buffer for lmic event messages
#define LMIC_EVENTMSG_LEN 17 #define LMIC_EVENTMSG_LEN 17

20
include/irqhandler.h
View File

@ -1,16 +1,16 @@
#ifndef _IRQHANDLER_H #ifndef _IRQHANDLER_H
#define _IRQHANDLER_H #define _IRQHANDLER_H
#define DISPLAY_IRQ _bitl(1) #define DISPLAY_IRQ _bitl(0)
#define BUTTON_IRQ _bitl(2) #define BUTTON_IRQ _bitl(1)
#define SENDCYCLE_IRQ _bitl(3) #define SENDCYCLE_IRQ _bitl(2)
#define CYCLIC_IRQ _bitl(4) #define CYCLIC_IRQ _bitl(3)
#define TIMESYNC_IRQ _bitl(5) #define TIMESYNC_IRQ _bitl(4)
#define MASK_IRQ _bitl(6) #define MASK_IRQ _bitl(5)
#define UNMASK_IRQ _bitl(7) #define UNMASK_IRQ _bitl(6)
#define BME_IRQ _bitl(8) #define BME_IRQ _bitl(7)
#define MATRIX_DISPLAY_IRQ _bitl(9) #define MATRIX_DISPLAY_IRQ _bitl(8)
#define PMU_IRQ _bitl(10) #define PMU_IRQ _bitl(9)
#include "globals.h" #include "globals.h"
#include "button.h" #include "button.h"

2
src/TTN/packed_decoder.js
View File

@ -262,7 +262,7 @@ var bitmap2 = function (byte) {
} }
var i = bytesToInt(byte); var i = bytesToInt(byte);
var bm = ('00000000' + Number(i).toString(2)).substr(-8).split('').map(Number).map(Boolean); var bm = ('00000000' + Number(i).toString(2)).substr(-8).split('').map(Number).map(Boolean);
return ['battery', 'sensor3', 'sensor2', 'sensor1', 'counter', 'bme', 'alarm', 'gps'] return ['battery', 'sensor3', 'sensor2', 'sensor1', 'gps', 'bme', 'alarm', 'counter']
.reduce(function (obj, pos, index) { .reduce(function (obj, pos, index) {
obj[pos] = +bm[index]; obj[pos] = +bm[index];
return obj; return obj;

4
src/display.cpp
View File

@ -345,10 +345,10 @@ void dp_drawPage(time_t t, bool nextpage) {
#if (HAS_LORA) #if (HAS_LORA)
// LMiC event display // LMiC event display
dp_printf("%-16s", lmic_event_msg); dp_printf("%-16s ", lmic_event_msg);
// LORA datarate, display inverse if ADR disabled // LORA datarate, display inverse if ADR disabled
dp_setFont(MY_FONT_SMALL, !cfg.adrmode); dp_setFont(MY_FONT_SMALL, !cfg.adrmode);
dp_printf(" %-4s", getSfName(updr2rps(LMIC.datarate))); dp_printf("%-4s", getSfName(updr2rps(LMIC.datarate)));
dp_setFont(MY_FONT_SMALL, 0); dp_setFont(MY_FONT_SMALL, 0);
dp_println(); dp_println();
#endif // HAS_LORA #endif // HAS_LORA