From 96630e08f8c828d27e599eae2b0c81a08184c365 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 2 Apr 2018 01:35:36 +0200 Subject: [PATCH] Added RGB Luminosity, changed AES to perf and default BLE duration --- src/main.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main.h b/src/main.h index dadeac93..dbf23da6 100644 --- a/src/main.h +++ b/src/main.h @@ -10,23 +10,27 @@ #define BLECOUNTER 1 // comment out if you don't want BLE count // BLE scan time -#define BLESCANTIME 30 // [seconds] +#define BLESCANTIME 15 // [seconds] // WiFi Sniffer cycle interval #define SEND_SECS 120 // [seconds/2] -> 240 sec. +//#define SEND_SECS 30 // [seconds/2] -> 60 sec. // WiFi sniffer config #define WIFI_CHANNEL_MIN 1 // start channel number where scan begings #define WIFI_CHANNEL_MAX 13 // total channel number to scan #define WIFI_MY_COUNTRY "EU" // for Wifi RF settings #define WIFI_CHANNEL_SWITCH_INTERVAL 50 // [seconds/100] -> 0,5 sec. -#define WIFI_MAC_FILTER_MASK 0x000000000003 // filter local and group MACs +#define WIFI_MAC_FILTER_MASK 0x000000000003 // filter local and group MACs // Default LoRa Spreadfactor #define LORASFDEFAULT 9 // 7 ... 12 #define MAXLORARETRY 500 // maximum count of TX retries if LoRa busy #define RCMDPORT 2 // LoRaWAN Port on which device listenes for remote commands +// Default RGB LED luminosity (in %) +#define RGBLUMINOSITY 50 // 50% + // LMIC settings // define hardware independent LMIC settings here, settings of standard library in /lmic/config.h will be ignored // define hardware specifics settings in platformio.ini as build_flag for hardware environment @@ -100,10 +104,10 @@ // implementation is optimized for speed on 32-bit processors using // fairly big lookup tables, but it takes up big amounts of flash on the // AVR architecture. -// #define USE_ORIGINAL_AES +#define USE_ORIGINAL_AES // // This selects the AES implementation written by Ideetroon for their // own LoRaWAN library. It also uses lookup tables, but smaller // byte-oriented ones, making it use a lot less flash space (but it is // also about twice as slow as the original). -#define USE_IDEETRON_AES +// #define USE_IDEETRON_AES