Merge pull request #552 from cyberman54/master

sync dev 2 master
This commit is contained in:
Verkehrsrot 2020-02-11 09:26:22 +01:00 committed by GitHub
commit 6c0c99ec9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -48,7 +48,7 @@ description = Paxcounter is a device for metering passenger flows in realtime. I
release_version = 1.9.90 release_version = 1.9.90
; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running! ; 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 ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
debug_level = 3 debug_level = 5
extra_scripts = pre:build.py extra_scripts = pre:build.py
otakeyfile = ota.conf otakeyfile = ota.conf
lorakeyfile = loraconf.h lorakeyfile = loraconf.h
@ -59,7 +59,7 @@ upload_speed = 115200
lib_deps_lora = lib_deps_lora =
MCCI LoRaWAN LMIC library@>=3.1.0 ; MCCI LMIC by Terrill Moore MCCI LoRaWAN LMIC library@>=3.1.0 ; MCCI LMIC by Terrill Moore
lib_deps_display = lib_deps_display =
ss_oled@>=3.3.0 ; simple and small OLED lib by Larry Bank ss_oled@>=3.3.1 ; simple and small OLED lib by Larry Bank
BitBang_I2C@>=1.3.0 BitBang_I2C@>=1.3.0
QRCode@>=0.0.1 QRCode@>=0.0.1
lib_deps_matrix_display = lib_deps_matrix_display =
@ -125,4 +125,4 @@ upload_protocol = esptool
upload_protocol = esptool upload_protocol = esptool
build_type = debug build_type = debug
platform = https://github.com/platformio/platform-espressif32.git#develop platform = https://github.com/platformio/platform-espressif32.git#develop
platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git