merge of timer branch

openenergymonitor · Nov 22, 2019 · efd5a47 · efd5a47
1 parent aadb4fb
commit efd5a47
Show file tree

Hide file tree

Showing 22 changed files with 2,007 additions and 981 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ application.linux64
 application.windows32
 application.windows64
 application.macosx
+firmware.map
 
 # =========================
 # Operating System Files

diff --git a/compiled/esp01_1m/firmware.bin b/compiled/esp01_1m/firmware.bin
diff --git a/compiled/esp01_1m/readme.md b/compiled/esp01_1m/readme.md
@@ -0,0 +1,4 @@
+# Command line upload:
+
+    esptool.py erase_flash
+    esptool.py -b 921600 write_flash 0x000000 firmware.bin 0x7B000 spiffs.bin
diff --git a/compiled/esp01_1m/spiffs.bin b/compiled/esp01_1m/spiffs.bin
diff --git a/platformio.ini b/platformio.ini
@@ -1,107 +1,134 @@
-#
-# Project Configuration File
-#
-# A detailed documentation with the EXAMPLES is located here:
-# http://docs.platformio.org/en/latest/projectconf.html
-#
-
-# A sign `#` at the beginning of the line indicates a comment
-# Comment lines are ignored.
-
-# Simple and base environment
-# [env:mybaseenv]
-# platform = %INSTALLED_PLATFORM_NAME_HERE%
-# framework =
-# board =
-#
-# Automatic targets - enable auto-uploading
-# targets = upload
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter, extra scripting
+;   Upload options: custom port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;
+; Please visit documentation for the other options and examples
+; http://docs.platformio.org/en/stable/projectconf.html
 
 [platformio]
-env_default = emonesp
+env_default = sonoff
 data_dir = src/data
 
+[esp82xx_defaults]
+build_flags               = -D NDEBUG
+                            -mtarget-align
+                            -Wl,-Map,firmware.map
+
+[core_2_3_0]
+; *** Esp8266 core for Arduino version 2.3.0
+platform                  = espressif8266@1.5.0
+build_flags               = ${esp82xx_defaults.build_flags}
+                            -Wl,-Tesp8266.flash.1m512.ld
+
+[core_2_4_2]
+; *** Esp8266 core for Arduino version 2.4.2
+platform                  = espressif8266@1.8.0
+build_flags               = ${esp82xx_defaults.build_flags}
+                            -Wl,-Teagle.flash.1m512.ld
+                            -lstdc++ -lsupc++
+; lwIP 1.4 (Default)
+;                            -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
+; lwIP 2 - Low Memory
+                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+; lwIP 2 - Higher Bandwidth
+;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
+;                            -DVTABLES_IN_FLASH
+
+[core_2_5_0]
+; *** Esp8266 core for Arduino version 2.5.0
+platform                  = espressif8266@2.0.1
+build_flags               = ${esp82xx_defaults.build_flags}
+                            -Wl,-Teagle.flash.1m512.ld
+; lwIP 1.4
+;                            -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
+; lwIP 2 - Low Memory
+                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+; lwIP 2 - Higher Bandwidth
+;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
+; lwIP 2 - Higher Bandwidth Low Memory no Features
+;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH
+; lwIP 2 - Higher Bandwidth no Features
+;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
+;                            -DVTABLES_IN_FLASH
+;                            -fno-exceptions
+;                            -lstdc++
+
+[core_stage]
+; *** Esp8266 core for Arduino version latest beta
+platform                  = https://github.com/platformio/platform-espressif8266.git#feature/stage
+build_flags               = ${esp82xx_defaults.build_flags}
+                            -Wl,-Teagle.flash.1m512.ld
+; lwIP 1.4 (Default)
+;                            -DPIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH
+; lwIP 2 - Low Memory
+                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+; lwIP 2 - Higher Bandwidth
+;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
+; lwIP 2 - Higher Bandwitdh Low Memory no Features
+;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY_LOW_FLASH
+; lwIP 2 - Higher Bandwitdh no Features
+;                            -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
+; VTABLES in Flash (default)
+                            -DVTABLES_IN_FLASH
+; VTABLES in Heap
+;                            -DVTABLES_IN_DRAM
+; VTABLES in IRAM
+;                            -DVTABLES_IN_IRAM
+; enable one option set -> No exception recommended
+; No exception code in firmware
+                            -fno-exceptions
+                            -lstdc++
+; Exception code in firmware
+;                           -fexceptions
+;                           -lstdc++-exc
+
+[core_active]
+; Select one core set for platform and build_flags
+;platform                  = ${core_2_3_0.platform}
+;build_flags               = ${core_2_3_0.build_flags}
+platform                  = ${core_2_4_2.platform}
+build_flags               = ${core_2_4_2.build_flags}
+;platform                  = ${core_2_5_0.platform}
+;build_flags               = ${core_2_5_0.build_flags}
+;platform                  = ${core_stage.platform}
+;build_flags               = ${core_stage.build_flags}
+
 [common]
-version = -DBUILD_TAG=2.3.1
-lib_deps = PubSubClient@2.6, ESP Async WebServer@1.1.1
-monitor_speed = 115200
+version = -DBUILD_TAG=2.3.0
+framework                 = arduino
+board                     = esp01_1m
+board_build.flash_mode    = dout
+lib_deps = PubSubClient@2.6, ESP Async WebServer@1.1.1, NTPClient@3.1.0
 
-# specify exact Arduino ESP SDK version, requires platformio 3.5+ (curently dev version)
-# http://docs.platformio.org/en/latest/projectconf/section_env_general.html#platform
-platform = https://github.com/platformio/platform-espressif8266.git#feature/2.4.0-rc2
+platform                  = ${core_active.platform}
+build_flags               = ${core_active.build_flags}
 
-[env:emonesp]
-platform = espressif8266@1.8.0
-framework = arduino
-board = esp12e
-lib_deps = ${common.lib_deps}
-src_build_flags = ${common.version} -DWIFI_LED=0 -DENABLE_DEBUG
-monitor_speed = ${common.monitor_speed}
+; *** Fix espressif8266@1.7.0 induced undesired all warnings
+build_unflags             = -Wall
 
+; set CPU frequency to 80MHz (default) or 160MHz
+board_build.f_cpu         = 80000000L
+;board_build.f_cpu         = 160000000L
 
-[env:emonesp_fast]
-# Upload at faster baud reate 50s upload reduced to  20s :-)
-platform = espressif8266@1.8.0
-framework = arduino
-board = esp12e
-lib_deps = ${common.lib_deps}
-src_build_flags = ${common.version} -DWIFI_LED=0 -DENABLE_DEBUG
-upload_speed=921600
-monitor_speed = ${common.monitor_speed}
+monitor_speed             = 115200
+upload_speed              = 115200
+upload_resetmethod        = nodemcu
 
+; *********************************************************************
 
-[env:emonesp_ota]
-platform = espressif8266@1.8.0
-framework = arduino
-board = esp12e
-upload_port = emonesp.local
-lib_deps = ${common.lib_deps}
-src_build_flags = ${common.version} -DWIFI_LED=0 -DENABLE_DEBUG
-monitor_speed = ${common.monitor_speed}
-
-[env:emonesp_spiffs]
-platform = espressif8266@1.8.0
-framework = arduino
-board = esp12e
-lib_deps = ${common.lib_deps}
-src_build_flags = ${common.version}
-upload_flags = --spiffs
-monitor_speed = ${common.monitor_speed}
-
-
-[env:emonesp_deploy]
-platform = espressif8266@1.8.0
-framework = arduino
-board = esp12e
-lib_deps = ${common.lib_deps}
-src_build_flags = !(test -z $TRAVIS_TAG && echo '${common.version}') || echo '-DBUILD_TAG='$TRAVIS_TAG
-
-[env:emonesp01]
-platform = espressif8266@1.8.0
-framework = arduino
-board = esp01
+[env:sonoff]
+platform = ${common.platform}
+framework = ${common.framework}
+board = ${common.board}
 lib_deps = ${common.lib_deps}
 src_build_flags = ${common.version} -DESP01 -DENABLE_DEBUG
 monitor_speed = ${common.monitor_speed}
-
-# http://docs.platformio.org/en/latest/platforms/espressif8266.html#using-arduino-framework-with-staging-version
-# Staging Arduino framework and common lib version
-[env:emonesp_staging]
-platform = espressif8266_stage
-board = esp12e
-framework = arduino
-lib_deps = ${common.lib_deps}
-src_build_flags = ${common.version} -DWIFI_LED=0 -DENABLE_DEBUG
-upload_port = emonesp.local
+board_build.flash_mode = ${common.board_build.flash_mode}
+board_build.f_cpu = ${common.board_build.f_cpu}
+build_unflags = ${common.build_unflags}
+build_flags = ${common.build_flags}
 monitor_speed = ${common.monitor_speed}
-
-# staging Arduino framwork and latest libs
-[env:emonesp_staging_libs]
-platform = espressif8266_stage
-board = esp12e
-framework = arduino
-lib_deps = https://github.com/knolleary/pubsubclient, https://github.com/me-no-dev/ESPAsyncWebServer.git, https://github.com/me-no-dev/ESPAsyncTCP.git
-src_build_flags = ${common.version} -DWIFI_LED=0 -DENABLE_DEBUG
-upload_port = emonesp.local
-monitor_speed = ${common.monitor_speed}
-
+upload_resetmethod = ${common.upload_resetmethod}
+upload_speed = ${common.upload_speed}
diff --git a/platformio.old.ini b/platformio.old.ini
@@ -0,0 +1,107 @@
+#
+# Project Configuration File
+#
+# A detailed documentation with the EXAMPLES is located here:
+# http://docs.platformio.org/en/latest/projectconf.html
+#
+
+# A sign `#` at the beginning of the line indicates a comment
+# Comment lines are ignored.
+
+# Simple and base environment
+# [env:mybaseenv]
+# platform = %INSTALLED_PLATFORM_NAME_HERE%
+# framework =
+# board =
+#
+# Automatic targets - enable auto-uploading
+# targets = upload
+
+[platformio]
+env_default = emonesp
+data_dir = src/data
+
+[common]
+version = -DBUILD_TAG=2.3.1
+lib_deps = PubSubClient@2.6, ESP Async WebServer@1.1.1
+monitor_speed = 115200
+
+# specify exact Arduino ESP SDK version, requires platformio 3.5+ (curently dev version)
+# http://docs.platformio.org/en/latest/projectconf/section_env_general.html#platform
+platform = https://github.com/platformio/platform-espressif8266.git#feature/2.4.0-rc2
+
+[env:emonesp]
+platform = espressif8266@1.8.0
+framework = arduino
+board = esp12e
+lib_deps = ${common.lib_deps}
+src_build_flags = ${common.version} -DWIFI_LED=0 -DENABLE_DEBUG
+monitor_speed = ${common.monitor_speed}
+
+
+[env:emonesp_fast]
+# Upload at faster baud reate 50s upload reduced to  20s :-)
+platform = espressif8266@1.8.0
+framework = arduino
+board = esp12e
+lib_deps = ${common.lib_deps}
+src_build_flags = ${common.version} -DWIFI_LED=0 -DENABLE_DEBUG
+upload_speed=921600
+monitor_speed = ${common.monitor_speed}
+
+
+[env:emonesp_ota]
+platform = espressif8266@1.8.0
+framework = arduino
+board = esp12e
+upload_port = emonesp.local
+lib_deps = ${common.lib_deps}
+src_build_flags = ${common.version} -DWIFI_LED=0 -DENABLE_DEBUG
+monitor_speed = ${common.monitor_speed}
+
+[env:emonesp_spiffs]
+platform = espressif8266@1.8.0
+framework = arduino
+board = esp12e
+lib_deps = ${common.lib_deps}
+src_build_flags = ${common.version}
+upload_flags = --spiffs
+monitor_speed = ${common.monitor_speed}
+
+
+[env:emonesp_deploy]
+platform = espressif8266@1.8.0
+framework = arduino
+board = esp12e
+lib_deps = ${common.lib_deps}
+src_build_flags = !(test -z $TRAVIS_TAG && echo '${common.version}') || echo '-DBUILD_TAG='$TRAVIS_TAG
+
+[env:emonesp01]
+platform = espressif8266@1.8.0
+framework = arduino
+board = esp01
+lib_deps = ${common.lib_deps}
+src_build_flags = ${common.version} -DESP01 -DENABLE_DEBUG
+monitor_speed = ${common.monitor_speed}
+
+# http://docs.platformio.org/en/latest/platforms/espressif8266.html#using-arduino-framework-with-staging-version
+# Staging Arduino framework and common lib version
+[env:emonesp_staging]
+platform = espressif8266_stage
+board = esp12e
+framework = arduino
+lib_deps = ${common.lib_deps}
+src_build_flags = ${common.version} -DWIFI_LED=0 -DENABLE_DEBUG
+upload_port = emonesp.local
+monitor_speed = ${common.monitor_speed}
+
+# staging Arduino framwork and latest libs
+[env:emonesp_staging_libs]
+platform = espressif8266_stage
+board = esp12e
+framework = arduino
+lib_deps = https://github.com/knolleary/pubsubclient, https://github.com/me-no-dev/ESPAsyncWebServer.git, https://github.com/me-no-dev/ESPAsyncTCP.git
+src_build_flags = ${common.version} -DWIFI_LED=0 -DENABLE_DEBUG
+upload_port = emonesp.local
+monitor_speed = ${common.monitor_speed}
+
diff --git a/readme.md b/readme.md
@@ -318,7 +318,7 @@ pio run -t upload --upload-port 172.16.0.80
 ```
 ***
 
-### Option 2: Compie Using Arduino IDE
+### Option 2: Compile Using Arduino IDE
 
 An overview of this process is:
 - Install ESP boards using board manager.