This commit is contained in:
Klaus K Wilting 2018-08-05 17:49:53 +02:00
parent 95983bd3fc
commit 63a063f9bc
4 changed files with 17 additions and 19 deletions

View File

@ -11,8 +11,8 @@
; ---> SELECT TARGET PLATFORM HERE! <--- ; ---> SELECT TARGET PLATFORM HERE! <---
[platformio] [platformio]
env_default = ebox env_default = generic
;env_default = generic ;env_default = ebox
;env_default = heltec ;env_default = heltec
;env_default = ttgov1 ;env_default = ttgov1
;env_default = ttgov2 ;env_default = ttgov2
@ -43,8 +43,8 @@ build_flags =
; ---> NOTE: For production run set DEBUG_LEVEL level to NONE! <--- ; ---> NOTE: For production run set DEBUG_LEVEL level to NONE! <---
; otherwise device may leak RAM ; otherwise device may leak RAM
; ;
-DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE ; -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_NONE
; -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_INFO -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_INFO
; -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG ; -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
; -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE ; -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE
; ;
@ -52,7 +52,7 @@ build_flags =
-D_lmic_config_h_ -D_lmic_config_h_
-include "src/paxcounter.conf" -include "src/paxcounter.conf"
-include "src/hal/${PIOENV}.h" -include "src/hal/${PIOENV}.h"
; -w -w
[env:ebox] [env:ebox]
platform = ${common_env_data.platform_espressif32} platform = ${common_env_data.platform_espressif32}

View File

@ -56,14 +56,6 @@ var bytesToInt = function (bytes) {
return i; return i;
}; };
var uptime = function (bytes) {
if (bytes.length !== uptime.BYTES) {
throw new Error('uptime must have exactly 8 bytes');
}
return bytesToInt(bytes);
};
uptime.BYTES = 4;
var uint8 = function (bytes) { var uint8 = function (bytes) {
if (bytes.length !== uint8.BYTES) { if (bytes.length !== uint8.BYTES) {
throw new Error('uint8 must have exactly 1 byte'); throw new Error('uint8 must have exactly 1 byte');
@ -96,6 +88,14 @@ var latLng = function (bytes) {
}; };
latLng.BYTES = 4; latLng.BYTES = 4;
var uptime = function (bytes) {
if (bytes.length !== uptime.BYTES) {
throw new Error('Uptime must have exactly 8 bytes');
}
return bytesToInt(bytes);
};
uptime.BYTES = 8;
var hdop = function (bytes) { var hdop = function (bytes) {
if (bytes.length !== hdop.BYTES) { if (bytes.length !== hdop.BYTES) {
throw new Error('hdop must have exactly 2 bytes'); throw new Error('hdop must have exactly 2 bytes');
@ -177,9 +177,10 @@ var decode = function (bytes, mask, names) {
if (typeof module === 'object' && typeof module.exports !== 'undefined') { if (typeof module === 'object' && typeof module.exports !== 'undefined') {
module.exports = { module.exports = {
uptime: uptime,
uint8: uint8, uint8: uint8,
uint16: uint16, uint16: uint16,
uint32: uint32,
uptime: uptime,
temperature: temperature, temperature: temperature,
humidity: humidity, humidity: humidity,
latLng: latLng, latLng: latLng,

View File

@ -9,7 +9,7 @@
// Payload send cycle and encoding // Payload send cycle and encoding
#define SEND_SECS 30 // payload send cycle [seconds/2] -> 60 sec. #define SEND_SECS 30 // payload send cycle [seconds/2] -> 60 sec.
#define PAYLOAD_ENCODER 2 // payload encoder: 1=Plain, 2=Packed, 3=CayenneLPP dynamic, 4=CayenneLPP packed #define PAYLOAD_ENCODER 1 // payload encoder: 1=Plain, 2=Packed, 3=CayenneLPP dynamic, 4=CayenneLPP packed
// Set this to include BLE counting and vendor filter functions // Set this to include BLE counting and vendor filter functions
#define VENDORFILTER 1 // comment out if you want to count things, not people #define VENDORFILTER 1 // comment out if you want to count things, not people

View File

@ -1,6 +1,3 @@
// remote command interpreter, parses and executes commands with arguments in
// array
// Basic Config // Basic Config
#include "globals.h" #include "globals.h"
#include "rcommand.h" #include "rcommand.h"
@ -31,7 +28,7 @@ void set_reset(uint8_t val[]) {
break; break;
case 3: // reset send queues case 3: // reset send queues
ESP_LOGI(TAG, "Remote command: flush send queue"); ESP_LOGI(TAG, "Remote command: flush send queue");
sprintf(display_line6, "Flush queues"); sprintf(display_line6, "Queue reset");
flushQueues(); flushQueues();
break; break;
default: default: