From fc319136947c448d72b7e7a7cfa4d0e260fc94e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Metrich?= Date: Sat, 14 Dec 2024 21:39:37 +0100 Subject: [PATCH 1/3] Update calibration parameters for improved performance and restore extra script configuration --- Mk2_fasterControl_Full/calibration.h | 4 ++-- Mk2_fasterControl_Full/platformio.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Mk2_fasterControl_Full/calibration.h b/Mk2_fasterControl_Full/calibration.h index 7920283..4b03100 100644 --- a/Mk2_fasterControl_Full/calibration.h +++ b/Mk2_fasterControl_Full/calibration.h @@ -36,8 +36,8 @@ inline constexpr float powerCal_diverted{ 0.0435F }; // for CT2 inline constexpr float f_voltageCal{ 0.8151F }; /**< compared with Sentron PAC 4200 */ -inline constexpr float lpf_gain{ 0 }; /**< setting this to 0 disables this extra processing */ -inline constexpr float alpha{ 0.002 }; +inline constexpr float lpf_gain{ 9 }; /**< setting this to 0 disables this extra processing */ +inline constexpr float alpha{ 0.0011 }; //-------------------------------------------------------------------------------------------------- diff --git a/Mk2_fasterControl_Full/platformio.ini b/Mk2_fasterControl_Full/platformio.ini index 8ec13d7..67d64a9 100644 --- a/Mk2_fasterControl_Full/platformio.ini +++ b/Mk2_fasterControl_Full/platformio.ini @@ -22,7 +22,6 @@ build_unflags = lib_deps = olikraus/U8g2 -extra_scripts = pre:inject_sketch_name.py check_tool = cppcheck, clangtidy check_flags = cppcheck: --enable=all --std=c++17 --suppress=missingIncludeSystem @@ -39,6 +38,7 @@ platform = atmelavr framework = arduino board = uno test_framework = unity +extra_scripts = pre:inject_sketch_name.py [env:basic] build_src_filter = From 15811e03308bd323c33036e54aea5a91559251b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Metrich?= Date: Sat, 14 Dec 2024 22:22:42 +0100 Subject: [PATCH 2/3] Refactor inject_sketch_name.py for improved readability and consistency in subprocess calls --- Mk2_fasterControl_Full/inject_sketch_name.py | 36 +++++++++----------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/Mk2_fasterControl_Full/inject_sketch_name.py b/Mk2_fasterControl_Full/inject_sketch_name.py index 80a6707..bd54cf4 100644 --- a/Mk2_fasterControl_Full/inject_sketch_name.py +++ b/Mk2_fasterControl_Full/inject_sketch_name.py @@ -1,33 +1,29 @@ -from datetime import datetime, timezone +from datetime import datetime import os -from pathlib import Path import subprocess -from subprocess import check_output, CalledProcessError +from subprocess import CalledProcessError def get_git_revision_short_hash() -> str: - try: - return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'],shell=True).decode('utf-8').strip() - except CalledProcessError: - return "N/A" + try: + return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'], shell=True).decode('utf-8').strip() + except CalledProcessError: + return "N/A" def get_git_current_branch() -> str: - try: - return subprocess.check_output(['git', 'branch', '--show-current'],shell=True).decode('utf-8').strip() - except CalledProcessError: - return "N/A" + try: + return subprocess.check_output(['git', 'branch', '--show-current'], shell=True).decode('utf-8').strip() + except CalledProcessError: + return "N/A" Import("env") -proj_path = env["PROJECT_DIR"] - -proj_path = os.path.join(proj_path, "dummy") - -macro_value = r"\"" + os.path.split(os.path.dirname(proj_path))[1] + r"\"" +proj_path = os.path.join(env["PROJECT_DIR"], "dummy") +macro_value = f"\"{os.path.split(os.path.dirname(proj_path))[1]}\"" tz_dt = datetime.now().replace(microsecond=0).astimezone().isoformat(' ') env.Append(CPPDEFINES=[ - ("PROJECT_PATH", macro_value), - ("CURRENT_TIME", "\\\"" + tz_dt + "\\\""), - ("BRANCH_NAME", r"\"" + get_git_current_branch() + r"\""), - ("COMMIT_HASH", r"\"" + get_git_revision_short_hash() + r"\"") + ("PROJECT_PATH", macro_value), + ("CURRENT_TIME", f"\"{tz_dt}\""), + ("BRANCH_NAME", f"\"{get_git_current_branch()}\""), + ("COMMIT_HASH", f"\"{get_git_revision_short_hash()}\"") ]) From 762547dfa487df225bb5c9f0012c451d0c075a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Metrich?= Date: Sat, 14 Dec 2024 22:38:12 +0100 Subject: [PATCH 3/3] Revert "Refactor inject_sketch_name.py for improved readability and consistency in subprocess calls" This reverts commit 15811e03308bd323c33036e54aea5a91559251b5. --- Mk2_fasterControl_Full/inject_sketch_name.py | 36 +++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/Mk2_fasterControl_Full/inject_sketch_name.py b/Mk2_fasterControl_Full/inject_sketch_name.py index bd54cf4..80a6707 100644 --- a/Mk2_fasterControl_Full/inject_sketch_name.py +++ b/Mk2_fasterControl_Full/inject_sketch_name.py @@ -1,29 +1,33 @@ -from datetime import datetime +from datetime import datetime, timezone import os +from pathlib import Path import subprocess -from subprocess import CalledProcessError +from subprocess import check_output, CalledProcessError def get_git_revision_short_hash() -> str: - try: - return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'], shell=True).decode('utf-8').strip() - except CalledProcessError: - return "N/A" + try: + return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'],shell=True).decode('utf-8').strip() + except CalledProcessError: + return "N/A" def get_git_current_branch() -> str: - try: - return subprocess.check_output(['git', 'branch', '--show-current'], shell=True).decode('utf-8').strip() - except CalledProcessError: - return "N/A" + try: + return subprocess.check_output(['git', 'branch', '--show-current'],shell=True).decode('utf-8').strip() + except CalledProcessError: + return "N/A" Import("env") -proj_path = os.path.join(env["PROJECT_DIR"], "dummy") +proj_path = env["PROJECT_DIR"] + +proj_path = os.path.join(proj_path, "dummy") + +macro_value = r"\"" + os.path.split(os.path.dirname(proj_path))[1] + r"\"" -macro_value = f"\"{os.path.split(os.path.dirname(proj_path))[1]}\"" tz_dt = datetime.now().replace(microsecond=0).astimezone().isoformat(' ') env.Append(CPPDEFINES=[ - ("PROJECT_PATH", macro_value), - ("CURRENT_TIME", f"\"{tz_dt}\""), - ("BRANCH_NAME", f"\"{get_git_current_branch()}\""), - ("COMMIT_HASH", f"\"{get_git_revision_short_hash()}\"") + ("PROJECT_PATH", macro_value), + ("CURRENT_TIME", "\\\"" + tz_dt + "\\\""), + ("BRANCH_NAME", r"\"" + get_git_current_branch() + r"\""), + ("COMMIT_HASH", r"\"" + get_git_revision_short_hash() + r"\"") ])