code sanitization (decentralized several vars)
This commit is contained in:
parent
03796c39af
commit
e439d932b9
@ -127,7 +127,6 @@ extern std::array<uint64_t, 0xff> beacons;
|
|||||||
|
|
||||||
extern configData_t cfg; // current device configuration
|
extern configData_t cfg; // current device configuration
|
||||||
extern char clientId[20]; // unique clientID
|
extern char clientId[20]; // unique clientID
|
||||||
extern char lmic_event_msg[LMIC_EVENTMSG_LEN]; // display buffer
|
|
||||||
extern uint8_t batt_level; // display value
|
extern uint8_t batt_level; // display value
|
||||||
extern uint16_t volatile libpax_macs_ble, libpax_macs_wifi; // libpax values
|
extern uint16_t volatile libpax_macs_ble, libpax_macs_wifi; // libpax values
|
||||||
extern uint8_t volatile channel; // wifi channel rotation counter
|
extern uint8_t volatile channel; // wifi channel rotation counter
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern TaskHandle_t lmicTask, lorasendTask;
|
extern TaskHandle_t lmicTask, lorasendTask;
|
||||||
|
extern char lmic_event_msg[LMIC_EVENTMSG_LEN]; // display buffer
|
||||||
|
|
||||||
esp_err_t lmic_init(void);
|
esp_err_t lmic_init(void);
|
||||||
void lora_setupForNetwork(bool preJoin);
|
void lora_setupForNetwork(bool preJoin);
|
||||||
|
@ -20,5 +20,6 @@
|
|||||||
#include "timekeeper.h"
|
#include "timekeeper.h"
|
||||||
#include "corona.h"
|
#include "corona.h"
|
||||||
#include "boot.h"
|
#include "boot.h"
|
||||||
|
#include "libpax_helpers.h"
|
||||||
|
|
||||||
#endif
|
#endif
|
@ -47,6 +47,8 @@ uint8_t displaybuf[MY_DISPLAY_WIDTH * MY_DISPLAY_HEIGHT / 8] = {0};
|
|||||||
static uint8_t plotbuf[MY_DISPLAY_WIDTH * MY_DISPLAY_HEIGHT / 8] = {0};
|
static uint8_t plotbuf[MY_DISPLAY_WIDTH * MY_DISPLAY_HEIGHT / 8] = {0};
|
||||||
static int dp_row = 0, dp_col = 0, dp_font = 0;
|
static int dp_row = 0, dp_col = 0, dp_font = 0;
|
||||||
|
|
||||||
|
hw_timer_t *displayIRQ = NULL;
|
||||||
|
|
||||||
QRCode qrcode;
|
QRCode qrcode;
|
||||||
|
|
||||||
#ifdef HAS_DISPLAY
|
#ifdef HAS_DISPLAY
|
||||||
|
@ -5,6 +5,8 @@
|
|||||||
// Local logging tag
|
// Local logging tag
|
||||||
static const char TAG[] = __FILE__;
|
static const char TAG[] = __FILE__;
|
||||||
|
|
||||||
|
SemaphoreHandle_t I2Caccess;
|
||||||
|
|
||||||
void i2c_init(void) { Wire.begin(MY_DISPLAY_SDA, MY_DISPLAY_SCL, 100000); }
|
void i2c_init(void) { Wire.begin(MY_DISPLAY_SDA, MY_DISPLAY_SCL, 100000); }
|
||||||
|
|
||||||
void i2c_deinit(void) { Wire.~TwoWire(); }
|
void i2c_deinit(void) { Wire.~TwoWire(); }
|
||||||
|
@ -3,6 +3,8 @@
|
|||||||
// Local logging tag
|
// Local logging tag
|
||||||
static const char TAG[] = __FILE__;
|
static const char TAG[] = __FILE__;
|
||||||
|
|
||||||
|
TaskHandle_t irqHandlerTask = NULL;
|
||||||
|
|
||||||
// irq handler task, handles all our application level interrupts
|
// irq handler task, handles all our application level interrupts
|
||||||
void irqHandler(void *pvParameters) {
|
void irqHandler(void *pvParameters) {
|
||||||
|
|
||||||
|
@ -14,6 +14,8 @@ static uint8_t displaybuf[LED_MATRIX_WIDTH * LED_MATRIX_HEIGHT / 8] = {0};
|
|||||||
static unsigned long ulLastNumMacs = 0;
|
static unsigned long ulLastNumMacs = 0;
|
||||||
static time_t ulLastTime = myTZ.toLocal(now());
|
static time_t ulLastTime = myTZ.toLocal(now());
|
||||||
|
|
||||||
|
hw_timer_t *matrixDisplayIRQ = NULL;
|
||||||
|
|
||||||
LEDMatrix matrix(LED_MATRIX_LA_74138, LED_MATRIX_LB_74138, LED_MATRIX_LC_74138,
|
LEDMatrix matrix(LED_MATRIX_LA_74138, LED_MATRIX_LB_74138, LED_MATRIX_LC_74138,
|
||||||
LED_MATRIX_LD_74138, LED_MATRIX_EN_74138, LED_MATRIX_DATA_R1,
|
LED_MATRIX_LD_74138, LED_MATRIX_EN_74138, LED_MATRIX_DATA_R1,
|
||||||
LED_MATRIX_LATCHPIN, LED_MATRIX_CLOCKPIN);
|
LED_MATRIX_LATCHPIN, LED_MATRIX_CLOCKPIN);
|
||||||
|
@ -21,6 +21,7 @@ RTC_DATA_ATTR lmic_t RTC_LMIC;
|
|||||||
|
|
||||||
static QueueHandle_t LoraSendQueue;
|
static QueueHandle_t LoraSendQueue;
|
||||||
TaskHandle_t lmicTask = NULL, lorasendTask = NULL;
|
TaskHandle_t lmicTask = NULL, lorasendTask = NULL;
|
||||||
|
char lmic_event_msg[LMIC_EVENTMSG_LEN]; // display buffer for LMIC event message
|
||||||
|
|
||||||
class MyHalConfig_t : public Arduino_LMIC::HalConfiguration_t {
|
class MyHalConfig_t : public Arduino_LMIC::HalConfiguration_t {
|
||||||
|
|
||||||
|
25
src/main.cpp
25
src/main.cpp
@ -85,31 +85,14 @@ triggers pps 1 sec impulse
|
|||||||
|
|
||||||
// Basic Config
|
// Basic Config
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "libpax_helpers.h"
|
|
||||||
|
|
||||||
configData_t cfg; // struct holds current device configuration
|
|
||||||
char lmic_event_msg[LMIC_EVENTMSG_LEN]; // display buffer for LMIC event message
|
|
||||||
uint8_t batt_level = 0; // display value
|
|
||||||
char clientId[20] = {0}; // unique ClientID
|
|
||||||
|
|
||||||
hw_timer_t *ppsIRQ = NULL, *displayIRQ = NULL, *matrixDisplayIRQ = NULL;
|
|
||||||
|
|
||||||
TaskHandle_t irqHandlerTask = NULL, ClockTask = NULL;
|
|
||||||
SemaphoreHandle_t I2Caccess;
|
|
||||||
bool volatile TimePulseTick = false;
|
|
||||||
timesource_t timeSource = _unsynced;
|
|
||||||
|
|
||||||
// initialize payload encoder
|
|
||||||
PayloadConvert payload(PAYLOAD_BUFFER_SIZE);
|
|
||||||
|
|
||||||
// set Time Zone for user setting from paxcounter.conf
|
|
||||||
TimeChangeRule myDST = DAYLIGHT_TIME;
|
|
||||||
TimeChangeRule mySTD = STANDARD_TIME;
|
|
||||||
Timezone myTZ(myDST, mySTD);
|
|
||||||
|
|
||||||
// local Tag for logging
|
// local Tag for logging
|
||||||
static const char TAG[] = __FILE__;
|
static const char TAG[] = __FILE__;
|
||||||
|
|
||||||
|
configData_t cfg; // struct holds current device configuration
|
||||||
|
uint8_t batt_level = 0; // display value
|
||||||
|
char clientId[20] = {0}; // unique ClientID
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
|
|
||||||
char features[100] = "";
|
char features[100] = "";
|
||||||
|
@ -1,6 +1,9 @@
|
|||||||
#include "globals.h"
|
#include "globals.h"
|
||||||
#include "payload.h"
|
#include "payload.h"
|
||||||
|
|
||||||
|
// initialize payload encoder
|
||||||
|
PayloadConvert payload(PAYLOAD_BUFFER_SIZE);
|
||||||
|
|
||||||
PayloadConvert::PayloadConvert(uint8_t size) {
|
PayloadConvert::PayloadConvert(uint8_t size) {
|
||||||
buffer = (uint8_t *)malloc(size);
|
buffer = (uint8_t *)malloc(size);
|
||||||
cursor = 0;
|
cursor = 0;
|
||||||
|
@ -14,6 +14,17 @@ static const char TAG[] = __FILE__;
|
|||||||
// symbol to display current time source
|
// symbol to display current time source
|
||||||
const char timeSetSymbols[] = {'G', 'R', 'L', 'S', '?'};
|
const char timeSetSymbols[] = {'G', 'R', 'L', 'S', '?'};
|
||||||
|
|
||||||
|
// set Time Zone for user setting from paxcounter.conf
|
||||||
|
TimeChangeRule myDST = DAYLIGHT_TIME;
|
||||||
|
TimeChangeRule mySTD = STANDARD_TIME;
|
||||||
|
Timezone myTZ(myDST, mySTD);
|
||||||
|
|
||||||
|
bool volatile TimePulseTick = false;
|
||||||
|
timesource_t timeSource = _unsynced;
|
||||||
|
|
||||||
|
TaskHandle_t ClockTask = NULL;
|
||||||
|
hw_timer_t *ppsIRQ = NULL;
|
||||||
|
|
||||||
#ifdef HAS_IF482
|
#ifdef HAS_IF482
|
||||||
#if (HAS_SDS011)
|
#if (HAS_SDS011)
|
||||||
#error cannot use IF482 together with SDS011 (both use UART#2)
|
#error cannot use IF482 together with SDS011 (both use UART#2)
|
||||||
|
Loading…
Reference in New Issue
Block a user