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

fix platformio.ini

Browse Source
This commit is contained in:
Oliver Brandmueller 2019-01-19 20:04:47 +01:00
parent 7c55673bf3
commit fc951fa744
1 changed files with 33 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
platformio.ini
View File

@ -16,10 +16,7 @@ env_default = generic
;env_default = ttgov21old ;env_default = ttgov21old
;env_default = ttgov21new ;env_default = ttgov21new
;env_default = ttgobeam ;env_default = ttgobeam
<<<<<<< HEAD
=======
;env_default = ttgofox ;env_default = ttgofox
>>>>>>> bbdbf5a6a3ec2f672b184154603975fc5dd7b875
;env_default = lopy ;env_default = lopy
;env_default = lopy4 ;env_default = lopy4
;env_default = fipy ;env_default = fipy
@ -36,21 +33,13 @@ description = Paxcounter is a proof-of-concept ESP32 device for metering passeng
release_version = 1.7.11 release_version = 1.7.11
; 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
<<<<<<< HEAD
debug_level = 0
=======
debug_level = 3 debug_level = 3
>>>>>>> bbdbf5a6a3ec2f672b184154603975fc5dd7b875
; UPLOAD MODE: select esptool to flash via USB/UART, select custom to upload to cloud for OTA ; UPLOAD MODE: select esptool to flash via USB/UART, select custom to upload to cloud for OTA
upload_protocol = esptool upload_protocol = esptool
;upload_protocol = custom ;upload_protocol = custom
extra_scripts = pre:build.py extra_scripts = pre:build.py
keyfile = ota.conf keyfile = ota.conf
platform_espressif32 = espressif32@1.6.0 platform_espressif32 = espressif32@1.6.0
<<<<<<< HEAD
;platform_espressif32 = https://github.com/platformio/platform-espressif32.git#feature/stage
=======
>>>>>>> bbdbf5a6a3ec2f672b184154603975fc5dd7b875
board_build.partitions = min_spiffs.csv board_build.partitions = min_spiffs.csv
monitor_speed = 115200 monitor_speed = 115200
lib_deps_lora = lib_deps_lora =
@ -213,8 +202,6 @@ upload_protocol = ${common.upload_protocol}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
monitor_speed = ${common.monitor_speed} monitor_speed = ${common.monitor_speed}
<<<<<<< HEAD
=======
[env:ttgofox] [env:ttgofox]
platform = ${common.platform_espressif32} platform = ${common.platform_espressif32}
framework = arduino framework = arduino
@ -231,7 +218,6 @@ upload_protocol = ${common.upload_protocol}
extra_scripts = ${common.extra_scripts} extra_scripts = ${common.extra_scripts}
monitor_speed = ${common.monitor_speed} monitor_speed = ${common.monitor_speed}
>>>>>>> bbdbf5a6a3ec2f672b184154603975fc5dd7b875
[env:ttgobeam] [env:ttgobeam]
platform = ${common.platform_espressif32} platform = ${common.platform_espressif32}
framework = arduino framework = arduino