From ec89b8c1d378d80dff28b719bab1b36ef6e2fc09 Mon Sep 17 00:00:00 2001
From: Klaus K Wilting <Klaus.K.Wilting@deutschebahn.com>
Date: Mon, 2 Apr 2018 09:38:45 +0200
Subject: [PATCH] resolved merge conflicts

---
 platformio.ini | 4 ++--
 src/globals.h  | 2 +-
 src/main.cpp   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index dcafa2a0..64493f66 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -10,9 +10,9 @@
 
 ; ---> SELECT TARGET PLATFORM HERE! <---
 [platformio]
-env_default = heltec_wifi_lora_32
+;env_default = heltec_wifi_lora_32
 ;env_default = ttgov1
-;env_default = ttgov2
+env_default = ttgov2
 ;env_default = lopy
 ;env_default = lopy4
 ;env_default = lolin32lite_lora
diff --git a/src/globals.h b/src/globals.h
index 402d2f0e..f569cbbd 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -54,5 +54,5 @@ extern std::set<uint16_t> macs;
 
 #ifdef BLECOUNTER
     extern int scanTime;
-    extern std::set<uint32_t> bles; 
+    extern std::set<uint16_t> bles; 
 #endif
diff --git a/src/main.cpp b/src/main.cpp
index 79fb6da6..c1d3b896 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -45,7 +45,7 @@ configData_t cfg; // struct holds current device configuration
 osjob_t sendjob, initjob; // LMIC
 
 // Initialize global variables
-uint16_t macnum = 0, salt;
+int macnum = 0, salt;
 uint64_t uptimecounter = 0;
 bool joinstate = false;