From 105bd545f6e813d1800934b3eba97be7c423f256 Mon Sep 17 00:00:00 2001 From: cyberman54 Date: Tue, 2 Feb 2021 23:18:05 +0100 Subject: [PATCH 1/2] olimexpoeiso.h: add optional display --- src/hal/olimexpoeiso.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/hal/olimexpoeiso.h b/src/hal/olimexpoeiso.h index dcc32e43..bd962b94 100644 --- a/src/hal/olimexpoeiso.h +++ b/src/hal/olimexpoeiso.h @@ -21,4 +21,10 @@ #define HAS_BUTTON KEY_BUILTIN // on board button #define HAS_LED NOT_A_PIN // no on board LED +//#define HAS_DISPLAY 1 +//#define MY_DISPLAY_FLIP 1 // use if display is rotated +//#define MY_DISPLAY_SDA SDA +//#define MY_DISPLAY_SCL SCL +//#define MY_DISPLAY_RST NOT_A_PIN + #endif From 27be43f48fe2e7e653d39b63fdbe9902c93e2e85 Mon Sep 17 00:00:00 2001 From: Martin Loeschner Date: Wed, 10 Feb 2021 20:39:32 +0100 Subject: [PATCH 2/2] Adapt global settings for BLE and WiFi counters. --- src/configmanager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/configmanager.cpp b/src/configmanager.cpp index 8a9da4ce..edb912f2 100644 --- a/src/configmanager.cpp +++ b/src/configmanager.cpp @@ -48,8 +48,8 @@ static void defaultConfig(configData_t *myconfig) { myconfig->blescantime = BLESCANINTERVAL / 10; // BT channel scan cycle [seconds/100], default 1 (= 10ms) - myconfig->blescan = 1; // 0=disabled, 1=enabled - myconfig->wifiscan = 1; // 0=disabled, 1=enabled + myconfig->blescan = BLECOUNTER; // 0=disabled, 1=enabled + myconfig->wifiscan = WIFICOUNTER; // 0=disabled, 1=enabled myconfig->wifiant = 0; // 0=internal, 1=external (for LoPy/LoPy4) myconfig->macfilter = MACFILTER; // 0=disabled, 1=enabled myconfig->rgblum = RGBLUMINOSITY; // RGB Led luminosity (0..100%)