DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed productname

Browse Source
This commit is contained in:
Verkehrsrot 2019-09-27 17:57:19 +02:00
parent c30ee996be
commit 8cb5bbab54
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/display.h
View File

@ -5,7 +5,7 @@
extern uint8_t DisplayIsOn; extern uint8_t DisplayIsOn;
void init_display(const char *Productname, const char *Version); void init_display(void);
void refreshTheDisplay(bool nextPage = false); void refreshTheDisplay(bool nextPage = false);
void draw_page(time_t t, uint8_t page); void draw_page(time_t t, uint8_t page);
void dp_printf(int x, int y, int font, int inv, const char *format, ...); void dp_printf(int x, int y, int font, int inv, const char *format, ...);

2
src/display.cpp
View File

@ -46,7 +46,7 @@ const char *printmonth[] = {"xxx", "Jan", "Feb", "Mar", "Apr", "May", "Jun",
uint8_t DisplayIsOn = 0; uint8_t DisplayIsOn = 0;
void init_display(const char *Productname, const char *Version) { void init_display(void) {
// block i2c bus access // block i2c bus access
if (!I2C_MUTEX_LOCK()) if (!I2C_MUTEX_LOCK())

4
src/main.cpp
View File

@ -129,7 +129,7 @@ void setup() {
esp_log_level_set("*", ESP_LOG_NONE); esp_log_level_set("*", ESP_LOG_NONE);
#endif #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 // print chip information on startup if in verbose mode
#if (VERBOSE) #if (VERBOSE)
@ -200,7 +200,7 @@ void setup() {
#ifdef HAS_DISPLAY #ifdef HAS_DISPLAY
strcat_P(features, " OLED"); strcat_P(features, " OLED");
DisplayIsOn = cfg.screenon; DisplayIsOn = cfg.screenon;
init_display(PRODUCTNAME, PROGVERSION); // note: blocking call init_display(); // note: blocking call
#endif #endif
#ifdef BOARD_HAS_PSRAM #ifdef BOARD_HAS_PSRAM

6
src/paxcounter.conf
View File

@ -6,8 +6,6 @@
// //
// Note: After editing, before "build", use "clean" button in PlatformIO! // Note: After editing, before "build", use "clean" button in PlatformIO!
#define PRODUCTNAME "PAXCNT"
// Verbose enables serial output // Verbose enables serial output
#define VERBOSE 1 // set to 0 to silence the device, for mute use build option #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 // 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 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 #define WIFICOUNTER 1 // set it to 0 if you want to switch off WIFI count
// BLE scan parameters // 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_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_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_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 // settings for syncing time with timeserver applications
#define TIME_SYNC_SAMPLES 1 // number of time requests for averaging #define TIME_SYNC_SAMPLES 1 // number of time requests for averaging