From 79bbcdc3e8f2c3b5ea038a8f5e6ba1f833126ed6 Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Wed, 14 Dec 2022 21:10:08 +0000 Subject: [PATCH] update - set customname to use PIOENV insted of BOARD --- ESP/tools/customname.py | 5 ++++- ESP/tools/versioning | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ESP/tools/customname.py b/ESP/tools/customname.py index 9d465e7..b7161a3 100644 --- a/ESP/tools/customname.py +++ b/ESP/tools/customname.py @@ -2,6 +2,9 @@ Import("env") +# Dump global construction environment (for debug purpose) +#print(env.Dump()) + my_flags = env.ParseFlags(env['BUILD_FLAGS']) defines = dict() for x in my_flags.get("CPPDEFINES"): @@ -19,5 +22,5 @@ for x in my_flags.get("CPPDEFINES"): s = lambda x: x.replace('"', "") env.Replace( PROGNAME="%s-%s-%s-%s-%s" % - (s(defines.get("PIO_SRC_NAM")), s(defines.get("VERSION")), str(env["BOARD"]), + (s(defines.get("PIO_SRC_NAM")), s(defines.get("VERSION")), str(env["PIOENV"]), s(defines.get("PIO_SRC_REV")), s(defines.get("PIO_SRC_BRH")))) diff --git a/ESP/tools/versioning b/ESP/tools/versioning index 9d0f8af..ed61520 100644 --- a/ESP/tools/versioning +++ b/ESP/tools/versioning @@ -1 +1 @@ -578 \ No newline at end of file +590 \ No newline at end of file