-
Notifications
You must be signed in to change notification settings - Fork 117
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into jeremypoulter/issue597
- Loading branch information
Showing
17 changed files
with
104 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -41,7 +41,7 @@ lib_deps = | |
matth-x/[email protected] | ||
matth-x/[email protected] | ||
lib_ignore = WebSockets ; ArduinoOcpp: don't compile built-in WS library | ||
extra_scripts = | ||
extra_scripts = | ||
pre:scripts/auto_fw_version.py | ||
scripts/extra_script.py | ||
debug_flags = | ||
|
@@ -129,7 +129,7 @@ monitor_speed = 115200 | |
monitor_filters = | ||
esp32_exception_decoder | ||
|
||
[env:openevse_nodemcu-32s] | ||
[env:nodemcu-32s] | ||
board = nodemcu-32s | ||
build_flags = | ||
${common.build_flags} | ||
|
@@ -139,7 +139,7 @@ build_flags = | |
-D WIFI_LED_ON_STATE=LOW | ||
-D RAPI_PORT=Serial2 | ||
|
||
[env:openevse_esp-wrover-kit] | ||
[env:espressif_esp-wrover-kit] | ||
board = esp-wrover-kit | ||
lib_deps = | ||
${common.lib_deps} | ||
|
@@ -169,11 +169,11 @@ upload_speed = 2000000 | |
# export PLATFORMIO_UPLOAD_FLAGS="-p 3232" | ||
|
||
|
||
[env:openevse_esp-wrover-kit_latest] | ||
extends = env:openevse_esp-wrover-kit | ||
[env:espressif_esp-wrover-kit_latest] | ||
extends = env:espressif_esp-wrover-kit | ||
platform = espressif32 | ||
|
||
[env:openevse_huzzah32_dev] | ||
[env:adafruit_huzzah32_dev] | ||
board = featheresp32 | ||
build_flags = | ||
${common.build_flags} | ||
|
@@ -186,7 +186,7 @@ build_flags = | |
-D RAPI_PORT=Serial | ||
-D DEBUG_PORT=Serial2 | ||
|
||
[env:openevse_huzzah32] | ||
[env:adafruit_huzzah32] | ||
board = featheresp32 | ||
build_flags = | ||
${common.build_flags} | ||
|
@@ -198,7 +198,7 @@ build_flags = | |
-D RAPI_PORT=Serial | ||
-D DEBUG_PORT=Serial2 | ||
|
||
[env:openevse_featheresp32] | ||
[env:adafruit_featheresp32] | ||
board = featheresp32 | ||
build_flags = | ||
${common.build_flags} | ||
|
@@ -233,7 +233,7 @@ build_flags = | |
-D TX1=16 | ||
upload_command = curl -F firmware=@$SOURCE http://$UPLOAD_PORT/update --progress-bar | cat | ||
|
||
[env:openevse_esp32-gateway-old] | ||
[env:olimex_esp32-gateway-old] | ||
# For hardware older than RevE | ||
board = esp32-gateway | ||
build_flags = | ||
|
@@ -248,7 +248,7 @@ build_flags = | |
-D ENABLE_WIRED_ETHERNET | ||
# https://github.com/espressif/arduino-esp32/blob/master/libraries/WiFi/examples/ETH_LAN8720/ETH_LAN8720.ino | ||
|
||
[env:openevse_esp32-gateway-f] | ||
[env:olimex_esp32-gateway-f] | ||
# For hardware RevF and RevG | ||
# https://github.com/OpenEVSE/ESP32_WiFi_V3.x/blob/master/docs/wired-ethernet.md | ||
board = esp32-gateway | ||
|
@@ -268,31 +268,31 @@ build_flags = | |
board_build.extra_flags = "-DARDUINO_ESP32_GATEWAY=\'F\'" | ||
upload_speed = 921600 | ||
|
||
[env:openevse_esp32-gateway-e] | ||
[env:olimex_esp32-gateway-e] | ||
# For hardware RevE | ||
# https://github.com/OpenEVSE/ESP32_WiFi_V3.x/blob/master/docs/wired-ethernet.md | ||
extends = env:openevse_esp32-gateway-f | ||
extends = env:olimex_esp32-gateway-f | ||
build_flags = | ||
${env:openevse_esp32-gateway-f.build_flags} | ||
${env:olimex_esp32-gateway-f.build_flags} | ||
board_build.extra_flags = "-DARDUINO_ESP32_GATEWAY=\'E\'" | ||
|
||
[env:openevse_esp32-gateway-e_dev] | ||
extends = env:openevse_esp32-gateway-e | ||
[env:olimex_esp32-gateway-e_dev] | ||
extends = env:olimex_esp32-gateway-e | ||
build_flags = | ||
${env:openevse_esp32-gateway-e.build_flags} | ||
${env:olimex_esp32-gateway-e.build_flags} | ||
${common.debug_flags} | ||
build_type = debug | ||
board_build.partitions = ${common.build_partitions_debug} | ||
|
||
[env:openevse_esp32-gateway-f_dev] | ||
extends = env:openevse_esp32-gateway-f | ||
[env:olimex_esp32-gateway-f_dev] | ||
extends = env:olimex_esp32-gateway-f | ||
build_flags = | ||
${env:openevse_esp32-gateway-f.build_flags} | ||
${env:olimex_esp32-gateway-f.build_flags} | ||
${common.debug_flags} | ||
build_type = debug | ||
board_build.partitions = ${common.build_partitions_debug} | ||
|
||
[env:openevse_esp32-poe-iso] | ||
[env:olimex_esp32-poe-iso] | ||
# Tested against Rev C board | ||
board = esp32-poe-iso | ||
build_flags = | ||
|
@@ -306,7 +306,7 @@ build_flags = | |
-D RESET_ETH_PHY_ON_BOOT=1 | ||
upload_speed = 921600 | ||
|
||
[env:openevse_esp32-heltec-wifi-lora-v2] | ||
[env:heltec_esp32-wifi-lora-v2] | ||
board = heltec_wifi_lora_32_V2 | ||
build_flags = | ||
${common.build_flags} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,17 @@ | ||
#!/bin/bash | ||
|
||
# Script to compile all released enviroments and copy build artifacts to project root for easy upload to github releases. | ||
# Script to compile all released enviroments and copy build artifacts to project root for easy upload to github releases. | ||
|
||
pio run -e openevse_wifi_v1 | ||
cp .pio/build/openevse_wifi_v1/firmware.bin firmware.bin | ||
|
||
pio run -e openevse_huzzah32 | ||
cp .pio/build/openevse_wifi_v1/firmware.bin openevse_huzzah32.bin | ||
pio run -e adafruit_huzzah32 | ||
cp .pio/build/openevse_wifi_v1/firmware.bin adafruit_huzzah32.bin | ||
|
||
pio run -e openevse_esp32-gateway-e | ||
pio run -e olimex_esp32-gateway-e | ||
cp .pio/build/openevse_wifi_v1/firmware.bin esp32-gateway-e.bin | ||
|
||
echo "Done" | ||
echo "Done" | ||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -173,4 +173,6 @@ extern String serial; | |
|
||
void restart_system(); | ||
|
||
uint64_t uptimeMillis(); | ||
|
||
#endif // _EMONESP_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.