From 5aa86ba801db129de304b58e0d5150c577fd9d8a Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 2 Apr 2018 01:36:51 +0200 Subject: [PATCH] Added RGB LED, and new counters --- src/globals.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/globals.h b/src/globals.h index 4d356a7f..0e626b3d 100644 --- a/src/globals.h +++ b/src/globals.h @@ -3,6 +3,8 @@ // std::set for unified array functions #include +#include +#include // OLED Display #include @@ -11,6 +13,12 @@ #include #include +#ifdef HAS_RGB_LED +#include +#endif +#include "rgb_led.h" +#include "macsniff.h" + // Struct holding devices's runtime configuration typedef struct { int8_t lorasf; // 7-12, lora spreadfactor @@ -25,6 +33,7 @@ typedef struct { int8_t blescancycle; // BLE scan cycle [seconds] int8_t blescan; // 0=disabled, 1=enabled int8_t wifiant; // 0=internal, 1=external (for LoPy/LoPy4) + int8_t rgblum; // RGB Led luminosity (0 100%) char version[10]; // Firmware version } configData_t; @@ -32,8 +41,9 @@ extern configData_t cfg; extern uint8_t mydata[]; extern uint64_t uptimecounter; extern osjob_t sendjob; -extern int macnum, blenum, countermode, screensaver, adrmode, lorasf, txpower, rlim, salt; +extern int countermode, screensaver, adrmode, lorasf, txpower, rlim, salt; extern bool joinstate; +extern std::set wifis; extern std::set macs; #ifdef HAS_DISPLAY @@ -44,4 +54,5 @@ extern std::set macs; #ifdef BLECOUNTER extern int scanTime; -#endif \ No newline at end of file + extern std::set bles; +#endif