From 456fdcb895f1066223033a747c3295078500d68f Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Wed, 3 Jun 2020 17:25:55 +0200
Subject: [PATCH] revert to original. use pio_local for local settings

---
 .gitignore     |  3 ---
 platformio.ini | 20 +++++---------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 887d4c52b..9f5029d80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,4 @@ scripts/stackdmp.txt
 firmware
 *.bin
 emsesp
-doc/github.txt
-doc/test_data.txt
 
-/src/uart/uart_proddy.txt
diff --git a/platformio.ini b/platformio.ini
index f94869833..918b8b425 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1,10 +1,8 @@
-; PlatformIO Project Configuration File
-; For EMS-ESP
+; PlatformIO Project Configuration File for EMS-ESP
 
 [platformio]
 default_envs = esp8266
 ; default_envs = esp32
-; default_envs = esp32_d1
 
 # override any settings with your own local ones in pio_local.ini
 extra_configs = pio_local.ini
@@ -22,7 +20,7 @@ extra_configs = pio_local.ini
 
 ;debug_flags = -DDEBUG_ESP_PORT=Serial -DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM
 debug_flags =
-  ; -D EMSESP_DEBUG
+  -D EMSESP_DEBUG
   ; -D EMSESP_SAFE_MODE
   ; -D ENABLE_CORS -D CORS_ORIGIN=\"http://localhost:3000\"
 
@@ -63,7 +61,7 @@ check_flags =
     clangtidy: --checks=-*,clang-analyzer-*,performance-*
 
 ; USB upload
- ;upload_protocol = esptool
+; upload_protocol = esptool
 ; example ports for OSX
 ;upload_port = /dev/cu.wchusbserial14403
 ;upload_port = /dev/cu.usbserial-1440
@@ -74,20 +72,20 @@ upload_protocol = espota
 upload_flags = 
    --port=8266
    --auth=neo
-;upload_port = 192.168.0.20
+upload_port = ems-esp.local
 
 [env:esp8266]
 build_type = release
 platform = espressif8266 ; https://github.com/platformio/platform-espressif8266/releases
 ;platform = espressif8266@2.4.0 ; Arduino core 2.6.3 
 board = esp12e
+board_build.flash_mode = dout
 ; board = d1_mini ; https://github.com/platformio/platform-espressif8266/blob/master/boards/d1_mini.json
 lib_deps = ${common.libs_core} ${common.libs_esp8266}
 board_build.f_cpu = 160000000L ; 160MHz
 board_build.ldscript = eagle.flash.4m1m.ld ; 1019 KB sketch, 1000 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 2052 KB OTA & buffer
 ; board_build.ldscript = eagle.flash.4m2m.ld ; 1019 KB sketch, 2024 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 1028 KB OTA & buffer
 build_flags = ${common.build_flags} ${common.debug_flags} -D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-upload_port = 192.168.0.20
 
 [env:esp32]
 build_type = release
@@ -95,11 +93,3 @@ platform = espressif32
 board = esp32dev
 lib_deps = ${common.libs_core} ${common.libs_esp32}
 build_flags = ${common.build_flags} ${common.debug_flags} -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
-
-[env:esp32_d1]
-build_type = release
-platform = espressif32
-board = wemos_d1_mini32
-lib_deps = ${common.libs_core} ${common.libs_esp32}
-build_flags = ${common.build_flags} ${common.debug_flags} -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH -D WEMOS_D1_32
-upload_port = 192.168.0.23