merged with 1.9.1b12

This commit is contained in:
Paul
2019-10-05 14:47:56 +02:00
34 changed files with 9564 additions and 1130 deletions

View File

@@ -17,7 +17,7 @@ import os
# 3fffffb0: feefeffe feefeffe 3ffe8558 40100b01
# <<<stack<<<
call(['python', 'scripts/decoder.py ', '-s', '-e', os.getcwd()+"/.pio/build/debug/firmware_d1_mini_debug.elf", 'scripts/stackdmp.txt'])
call(['python', 'scripts/decoder.py ', '-s', '-e', os.getcwd()+"/.pio/build/debug/firmware_debug_1_9_1b3.elf", 'scripts/stackdmp.txt'])
# example for linux:
# % cd EMS-ESP

View File

@@ -21,6 +21,13 @@ with open('./src/version.h', 'r') as f:
if m and len(m.groups()) > 0:
bag[var] = m.group(1)
with open('./src/ems-esp.cpp', 'r') as f:
for l in f.readlines():
for expr, var in exprs:
m = expr.match(l)
if m and len(m.groups()) > 0:
bag[var] = m.group(1)
app_version = bag.get('app_version')
app_name = bag.get('app_name')
app_hostname = bag.get('app_hostname')
@@ -32,5 +39,8 @@ branch = env['PIOENV']
env.AddPreAction("buildprog", build_web)
# build filename, replacing . with _ for the version
env.Replace(PROGNAME="firmware_%s" % branch + "_" + app_version.replace(".", "_"))
#env.Replace(PROGNAME="firmware_%s" % branch + "_" + app_version.replace(".", "_"))
env.Replace(PROGNAME=app_name + "-" + app_version.replace(".", "_") + "-" + board + "-" + branch)
#env.Replace(PROGNAME=app_name + "-" + app_version)