From da02e67c8f92684635c36b27e94f1e0547354ecd Mon Sep 17 00:00:00 2001
From: Verkehrsrot <cyberman@obh.snafu.de>
Date: Thu, 25 Jul 2019 23:20:42 +0200
Subject: [PATCH] display.cpp: fix field width BME

---
 platformio.ini      | 8 ++++----
 src/display.cpp     | 6 +++---
 src/hal/ttgobeam.h  | 6 +++---
 src/paxcounter.conf | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 518ee75a..9f841819 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -7,7 +7,7 @@
 
 ; ---> SELECT THE TARGET PLATFORM HERE! <---
 [board]
-halfile = generic.h
+;halfile = generic.h
 ;halfile = ebox.h
 ;halfile = eboxtube.h
 ;halfile = ecopower.h
@@ -18,7 +18,7 @@ halfile = generic.h
 ;halfile = ttgov21old.h
 ;halfile = ttgov21new.h
 ;halfile = ttgofox.h
-;halfile = ttgobeam.h
+halfile = ttgobeam.h
 ;halfile = fipy.h
 ;halfile = lopy.h
 ;halfile = lopy4.h
@@ -40,7 +40,7 @@ description = Paxcounter is a device for metering passenger flows in realtime. I
 
 [common]
 ; for release_version use max. 10 chars total, use any decimal format like "a.b.c"
-release_version = 1.7.82
+release_version = 1.7.841
 ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running!
 ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
 debug_level = 3
@@ -81,7 +81,7 @@ lib_deps_all =
 build_flags_basic =
     -include "src/hal/${board.halfile}"
     -include "src/paxcounter.conf"
-    -w
+    ;-w
     '-DCORE_DEBUG_LEVEL=${common.debug_level}'
     '-DLOG_LOCAL_LEVEL=${common.debug_level}'
     '-DPROGVERSION="${common.release_version}"'
diff --git a/src/display.cpp b/src/display.cpp
index 19ec7bcc..fff3b4a0 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -338,16 +338,16 @@ void draw_page(time_t t, uint8_t page) {
 
 #if (HAS_BME)
     // line 2-3: Temp
-    snprintf(buff, sizeof(buff), "TMP:%-4.1f", bme_status.temperature);
+    snprintf(buff, sizeof(buff), "TMP:%-2.1f", bme_status.temperature);
     u8x8.draw2x2String(0, 2, buff);
 
     // line 4-5: Hum
-    snprintf(buff, sizeof(buff), "HUM:%-4.1f", bme_status.humidity);
+    snprintf(buff, sizeof(buff), "HUM:%-2.1f", bme_status.humidity);
     u8x8.draw2x2String(0, 4, buff);
 
 #ifdef HAS_BME680
     // line 6-7: IAQ
-    snprintf(buff, sizeof(buff), "IAQ:%-4.1f", bme_status.iaq);
+    snprintf(buff, sizeof(buff), "IAQ:%-3.0f", bme_status.iaq);
     u8x8.draw2x2String(0, 6, buff);
 #endif
 
diff --git a/src/hal/ttgobeam.h b/src/hal/ttgobeam.h
index d67a1db4..a7851877 100644
--- a/src/hal/ttgobeam.h
+++ b/src/hal/ttgobeam.h
@@ -29,9 +29,9 @@
 
 // enable only if device has these sensors, otherwise comment these lines
 // BME680 sensor on I2C bus
-//#define HAS_BME 1 // Enable BME sensors in general
-//#define HAS_BME680 SDA, SCL
-//#define BME680_ADDR BME680_I2C_ADDR_PRIMARY // !! connect SDIO of BME680 to GND !!
+#define HAS_BME 1 // Enable BME sensors in general
+#define HAS_BME680 SDA, SCL
+#define BME680_ADDR BME680_I2C_ADDR_PRIMARY // !! connect SDIO of BME680 to GND !!
 
 // display (if connected)
 #define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C
diff --git a/src/paxcounter.conf b/src/paxcounter.conf
index 13b6c0b7..1da72086 100644
--- a/src/paxcounter.conf
+++ b/src/paxcounter.conf
@@ -71,7 +71,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            0       // set to 1 to use LORA timeserver 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]
 
 // settings for syncing time with timeserver applications
 #define TIME_SYNC_SAMPLES               1       // number of time requests for averaging