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

removed var currentMillis

Browse Source
This commit is contained in:
Klaus K Wilting 2018-04-27 21:38:50 +02:00
parent eae0eec036
commit cc003c43f0
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/globals.h
View File

@ -46,7 +46,6 @@ typedef struct {
extern configData_t cfg; extern configData_t cfg;
extern uint8_t mydata[]; extern uint8_t mydata[];
extern uint64_t uptimecounter; extern uint64_t uptimecounter;
extern unsigned long currentMillis ;
extern osjob_t sendjob; extern osjob_t sendjob;
extern char display_lora[], display_lmic[]; extern char display_lora[], display_lmic[];
extern int countermode, screensaver, adrmode, lorasf, txpower, rlim; extern int countermode, screensaver, adrmode, lorasf, txpower, rlim;

6
src/main.cpp
View File

@ -41,8 +41,7 @@ Refer to LICENSE.txt file in repository for more details.
configData_t cfg; // struct holds current device configuration configData_t cfg; // struct holds current device configuration
osjob_t sendjob, initjob; // LMIC jobs osjob_t sendjob, initjob; // LMIC jobs
uint64_t uptimecounter = 0; // timer global for uptime counter uint64_t uptimecounter = 0; // timer global for uptime counter
unsigned long currentMillis = millis(); // timer global for state machine unsigned long previousDisplaymillis = millis(); // Display refresh for state machine
unsigned long previousDisplaymillis = currentMillis; // Display refresh for state machine
uint8_t DisplayState = 0; // globals for state machine uint8_t DisplayState = 0; // globals for state machine
uint16_t macs_total = 0, macs_wifi = 0, macs_ble = 0; // MAC counters globals for display uint16_t macs_total = 0, macs_wifi = 0, macs_ble = 0; // MAC counters globals for display
uint8_t channel = 0; // wifi channel rotation counter global for display uint8_t channel = 0; // wifi channel rotation counter global for display
@ -335,7 +334,7 @@ uint64_t uptime() {
void updateDisplay() { void updateDisplay() {
// timed display refresh according to refresh cycle setting // timed display refresh according to refresh cycle setting
if (currentMillis - previousDisplaymillis >= DISPLAYREFRESH_MS) { if (millis() - previousDisplaymillis >= DISPLAYREFRESH_MS) {
refreshDisplay(); refreshDisplay();
previousDisplaymillis += DISPLAYREFRESH_MS; previousDisplaymillis += DISPLAYREFRESH_MS;
} }
@ -579,7 +578,6 @@ void loop() {
// simple state machine for controlling display, LED, button, etc. // simple state machine for controlling display, LED, button, etc.
uptimecounter = uptime() / 1000; // counts uptime in seconds (64bit) uptimecounter = uptime() / 1000; // counts uptime in seconds (64bit)
currentMillis = millis(); // timebase for state machine in milliseconds (32bit)
#if (HAS_LED != NOT_A_PIN) || defined (HAS_RGB_LED) #if (HAS_LED != NOT_A_PIN) || defined (HAS_RGB_LED)
led_loop(); led_loop();