Merge remote-tracking branch 'origin/v3.4' into dev

This commit is contained in:
proddy
2022-01-23 17:56:52 +01:00
parent 02e2b51814
commit 77e1898512
538 changed files with 32282 additions and 38655 deletions

View File

@@ -1,18 +0,0 @@
# for calling dos upload from Window WSL2 Linux, because serial ports are not mapped yet
Import('env', "projenv")
from subprocess import call
def upload(source, target, env):
print("bin file: " + str(target[0]))
# esp8266 or esp32
platform = "esp" + env['PIOPLATFORM'].strip("espressif")
if platform == 'esp8266':
call(["cmd.exe", "/c", "C:\\Users\\Paul\\Desktop\\ems-esp8266.bat"])
if platform == 'esp32':
call(["cmd.exe", "/c", "C:\\Users\\Paul\\Desktop\\ems-esp32.bat"])
env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", [upload])