From 8cb5bbab54b96df20e13bb4203d2a625b97c90f6 Mon Sep 17 00:00:00 2001 From: Verkehrsrot Date: Fri, 27 Sep 2019 17:57:19 +0200 Subject: [PATCH] removed productname --- include/display.h | 2 +- src/display.cpp | 2 +- src/main.cpp | 4 ++-- src/paxcounter.conf | 6 ++---- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/display.h b/include/display.h index 90ea3f38..0431bd8b 100644 --- a/include/display.h +++ b/include/display.h @@ -5,7 +5,7 @@ extern uint8_t DisplayIsOn; -void init_display(const char *Productname, const char *Version); +void init_display(void); void refreshTheDisplay(bool nextPage = false); void draw_page(time_t t, uint8_t page); void dp_printf(int x, int y, int font, int inv, const char *format, ...); diff --git a/src/display.cpp b/src/display.cpp index c2fa81c1..4e35d615 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -46,7 +46,7 @@ const char *printmonth[] = {"xxx", "Jan", "Feb", "Mar", "Apr", "May", "Jun", uint8_t DisplayIsOn = 0; -void init_display(const char *Productname, const char *Version) { +void init_display(void) { // block i2c bus access if (!I2C_MUTEX_LOCK()) diff --git a/src/main.cpp b/src/main.cpp index 91741688..908313e8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -129,7 +129,7 @@ void setup() { esp_log_level_set("*", ESP_LOG_NONE); #endif - ESP_LOGI(TAG, "Starting %s v%s", PRODUCTNAME, PROGVERSION); + ESP_LOGI(TAG, "Starting Software v%s", PROGVERSION); // print chip information on startup if in verbose mode #if (VERBOSE) @@ -200,7 +200,7 @@ void setup() { #ifdef HAS_DISPLAY strcat_P(features, " OLED"); DisplayIsOn = cfg.screenon; - init_display(PRODUCTNAME, PROGVERSION); // note: blocking call + init_display(); // note: blocking call #endif #ifdef BOARD_HAS_PSRAM diff --git a/src/paxcounter.conf b/src/paxcounter.conf index 79943454..2fabde60 100644 --- a/src/paxcounter.conf +++ b/src/paxcounter.conf @@ -6,8 +6,6 @@ // // Note: After editing, before "build", use "clean" button in PlatformIO! -#define PRODUCTNAME "PAXCNT" - // Verbose enables serial output #define VERBOSE 1 // set to 0 to silence the device, for mute use build option @@ -18,7 +16,7 @@ // Set this to include BLE counting and vendor filter functions, or to switch off WIFI counting #define VENDORFILTER 1 // set to 0 if you want to count things, not people -#define BLECOUNTER 0 // set it to 1 if you want to use BLE count, at expense of power & memory +#define BLECOUNTER 1 // set it to 1 if you want to use BLE count, at expense of power & memory #define WIFICOUNTER 1 // set it to 0 if you want to switch off WIFI count // BLE scan parameters @@ -76,7 +74,7 @@ #define TIME_SYNC_INTERVAL_RETRY 10 // retry time sync after lost sync each .. minutes [default = 10], 0 means off #define TIME_SYNC_COMPILEDATE 0 // set to 1 to use compile date to initialize RTC after power outage [default = 0] #define TIME_SYNC_LORAWAN 0 // set to 1 to use LORA network as time source, 0 means off [default = 0] -#define TIME_SYNC_LORASERVER 1 // set to 1 to use LORA timeserver as time source, 0 means off [default = 0] +#define TIME_SYNC_LORASERVER 0 // set to 1 to use LORA timeserver as time source, 0 means off [default = 0] // settings for syncing time with timeserver applications #define TIME_SYNC_SAMPLES 1 // number of time requests for averaging