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

resolved merge conflicts

Browse Source
This commit is contained in:
Klaus K Wilting 2018-04-02 09:38:45 +02:00
parent 9da4a1c10a
commit ec89b8c1d3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platformio.ini
View File

@ -10,9 +10,9 @@
; ---> SELECT TARGET PLATFORM HERE! <--- ; ---> SELECT TARGET PLATFORM HERE! <---
[platformio] [platformio]
env_default = heltec_wifi_lora_32 ;env_default = heltec_wifi_lora_32
;env_default = ttgov1 ;env_default = ttgov1
;env_default = ttgov2 env_default = ttgov2
;env_default = lopy ;env_default = lopy
;env_default = lopy4 ;env_default = lopy4
;env_default = lolin32lite_lora ;env_default = lolin32lite_lora

2
src/globals.h
View File

@ -54,5 +54,5 @@ extern std::set<uint16_t> macs;
#ifdef BLECOUNTER #ifdef BLECOUNTER
extern int scanTime; extern int scanTime;
extern std::set<uint32_t> bles; extern std::set<uint16_t> bles;
#endif #endif

2
src/main.cpp
View File

@ -45,7 +45,7 @@ configData_t cfg; // struct holds current device configuration
osjob_t sendjob, initjob; // LMIC osjob_t sendjob, initjob; // LMIC
// Initialize global variables // Initialize global variables
uint16_t macnum = 0, salt; int macnum = 0, salt;
uint64_t uptimecounter = 0; uint64_t uptimecounter = 0;
bool joinstate = false; bool joinstate = false;