Merge pull request #442 from cyberman54/development

v1.8.2
cyberman54 · Sep 18, 2019 · 30ccec3 · 30ccec3
2 parents 9b5faf0 + ec3873f
commit 30ccec3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -43,15 +43,15 @@ 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.8.11
+release_version = 1.8.2
 ; 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
 extra_scripts = pre:build.py
 otakeyfile = ota.conf
 lorakeyfile = loraconf.h
 lmicconfigfile = lmic_config.h
-platform_espressif32 = espressif32@1.9.0
+platform_espressif32 = espressif32@1.10.0
 monitor_speed = 115200
 upload_speed = 115200
 lib_deps_lora =

diff --git a/src/hal/ttgobeam.h b/src/hal/ttgobeam.h
@@ -17,7 +17,6 @@
 
 #define HAS_LORA 1       // comment out if device shall not send data via LoRa
 #define CFG_sx1276_radio 1 // HPD13A LoRa SoC
-#define BOARD_HAS_PSRAM // use extra 4MB external RAM
 #define HAS_BUTTON GPIO_NUM_39 // on board button (next to reset)
 #define BAT_MEASURE_ADC ADC1_GPIO35_CHANNEL // battery probe GPIO pin -> ADC1_CHANNEL_7
 #define BAT_VOLTAGE_DIVIDER 2 // voltage divider 100k/100k on board
@@ -29,9 +28,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/hal/ttgobeam10.h b/src/hal/ttgobeam10.h
@@ -13,7 +13,6 @@
 
 #define HAS_LORA 1       // comment out if device shall not send data via LoRa
 #define CFG_sx1276_radio 1 // HPD13A LoRa SoC
-#define BOARD_HAS_PSRAM // use extra 4MB external RAM
 #define HAS_BUTTON GPIO_NUM_38 // middle on board button
 #define HAS_PMU 1 // AXP192 power management chip
 #define PMU_INT GPIO_NUM_35 // AXP192 interrupt