diff --git a/.github/workflows/doxygen-gh-pages.yml b/.github/workflows/doxygen-gh-pages.yml index 5c16ea5e..06646520 100644 --- a/.github/workflows/doxygen-gh-pages.yml +++ b/.github/workflows/doxygen-gh-pages.yml @@ -5,7 +5,7 @@ on: branches: - main paths: - - 'Mk2_3phase_RFdatalog_temp/**' + - 'runtime/Mk2_3phase_RFdatalog_temp/**' - Doxyfile workflow_dispatch: diff --git a/Mk2_3phase_RFdatalog_temp/.vscode/arduino.json b/Mk2_3phase_RFdatalog_temp/.vscode/arduino.json deleted file mode 100644 index 72ffdf14..00000000 --- a/Mk2_3phase_RFdatalog_temp/.vscode/arduino.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "board": "arduino:avr:uno", - "sketch": "Mk2_3phase_RFdatalog_temp.ino", - "output": "../build" -} \ No newline at end of file diff --git a/Mk2_3phase_RFdatalog_temp/.vscode/settings.json b/Mk2_3phase_RFdatalog_temp/.vscode/settings.json deleted file mode 100644 index aac55415..00000000 --- a/Mk2_3phase_RFdatalog_temp/.vscode/settings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "files.watcherExclude": { - "**/.git/objects/**": true, - "**/.git/subtree-cache/**": true, - "**/.pio/*/**": true - } -} \ No newline at end of file diff --git a/PVRouter-3-phase.code-workspace b/PVRouter-3-phase.code-workspace index 2329b137..ba5bafbe 100644 --- a/PVRouter-3-phase.code-workspace +++ b/PVRouter-3-phase.code-workspace @@ -9,7 +9,7 @@ }, { "name": "Router program", - "path": "Mk2_3phase_RFdatalog_temp" + "path": "runtime" }, { "name": "Transformer checker", diff --git a/dev/cal_CTx_v_meter/cal_CTx_v_meter.ino b/dev/cal_CTx_v_meter/cal_CTx_v_meter.ino index 94c1b0e5..f2966f2e 100644 --- a/dev/cal_CTx_v_meter/cal_CTx_v_meter.ino +++ b/dev/cal_CTx_v_meter/cal_CTx_v_meter.ino @@ -45,4 +45,4 @@ */ static_assert(__cplusplus >= 201703L, "**** Please define 'gnu++17' in 'platform.txt' ! ****"); -static_assert(__cplusplus >= 201703L, "See also : https://github.com/FredM67/PVRouter-3-phase/blob/Laclare/Mk2_3phase_RFdatalog_temp/Readme.md"); +static_assert(__cplusplus >= 201703L, "See also : https://github.com/FredM67/PVRouter-3-phase/blob/main/runtime/Mk2_3phase_RFdatalog_temp/Readme.md"); diff --git a/dev/cal_CTx_v_meter/main.cpp b/dev/cal_CTx_v_meter/main.cpp index ce87d150..fe18dcd8 100644 --- a/dev/cal_CTx_v_meter/main.cpp +++ b/dev/cal_CTx_v_meter/main.cpp @@ -1,6 +1,6 @@ static_assert(__cplusplus >= 201703L, "**** Please define 'gnu++17' in 'platform.txt' ! ****"); -static_assert(__cplusplus >= 201703L, "See also : https://github.com/FredM67/PVRouter-3-phase/blob/main/Mk2_3phase_RFdatalog_temp/Readme.md"); +static_assert(__cplusplus >= 201703L, "See also : https://github.com/FredM67/PVRouter-3-phase/blob/main/runtime/Mk2_3phase_RFdatalog_temp/Readme.md"); #include // may not be needed, but it's probably a good idea to include this diff --git a/Mk2_3phase_RFdatalog_temp/.gitignore b/runtime/.gitignore similarity index 100% rename from Mk2_3phase_RFdatalog_temp/.gitignore rename to runtime/.gitignore diff --git a/Mk2_3phase_RFdatalog_temp/.vscode/extensions.json b/runtime/.vscode/extensions.json similarity index 100% rename from Mk2_3phase_RFdatalog_temp/.vscode/extensions.json rename to runtime/.vscode/extensions.json diff --git a/Mk2_3phase_RFdatalog_temp/.clang-format b/runtime/Mk2_3phase_RFdatalog_temp/.clang-format similarity index 100% rename from Mk2_3phase_RFdatalog_temp/.clang-format rename to runtime/Mk2_3phase_RFdatalog_temp/.clang-format diff --git a/Mk2_3phase_RFdatalog_temp/Doxyfile b/runtime/Mk2_3phase_RFdatalog_temp/Doxyfile similarity index 100% rename from Mk2_3phase_RFdatalog_temp/Doxyfile rename to runtime/Mk2_3phase_RFdatalog_temp/Doxyfile diff --git a/Mk2_3phase_RFdatalog_temp/Mk2_3phase_RFdatalog_temp.ino b/runtime/Mk2_3phase_RFdatalog_temp/Mk2_3phase_RFdatalog_temp.ino similarity index 100% rename from Mk2_3phase_RFdatalog_temp/Mk2_3phase_RFdatalog_temp.ino rename to runtime/Mk2_3phase_RFdatalog_temp/Mk2_3phase_RFdatalog_temp.ino diff --git a/Mk2_3phase_RFdatalog_temp/Readme.en.md b/runtime/Mk2_3phase_RFdatalog_temp/Readme.en.md similarity index 100% rename from Mk2_3phase_RFdatalog_temp/Readme.en.md rename to runtime/Mk2_3phase_RFdatalog_temp/Readme.en.md diff --git a/Mk2_3phase_RFdatalog_temp/Readme.md b/runtime/Mk2_3phase_RFdatalog_temp/Readme.md similarity index 100% rename from Mk2_3phase_RFdatalog_temp/Readme.md rename to runtime/Mk2_3phase_RFdatalog_temp/Readme.md diff --git a/Mk2_3phase_RFdatalog_temp/calibration.h b/runtime/Mk2_3phase_RFdatalog_temp/calibration.h similarity index 100% rename from Mk2_3phase_RFdatalog_temp/calibration.h rename to runtime/Mk2_3phase_RFdatalog_temp/calibration.h diff --git a/Mk2_3phase_RFdatalog_temp/config.h b/runtime/Mk2_3phase_RFdatalog_temp/config.h similarity index 100% rename from Mk2_3phase_RFdatalog_temp/config.h rename to runtime/Mk2_3phase_RFdatalog_temp/config.h diff --git a/Mk2_3phase_RFdatalog_temp/config_system.h b/runtime/Mk2_3phase_RFdatalog_temp/config_system.h similarity index 100% rename from Mk2_3phase_RFdatalog_temp/config_system.h rename to runtime/Mk2_3phase_RFdatalog_temp/config_system.h diff --git a/Mk2_3phase_RFdatalog_temp/constants.h b/runtime/Mk2_3phase_RFdatalog_temp/constants.h similarity index 100% rename from Mk2_3phase_RFdatalog_temp/constants.h rename to runtime/Mk2_3phase_RFdatalog_temp/constants.h diff --git a/Mk2_3phase_RFdatalog_temp/debug.h b/runtime/Mk2_3phase_RFdatalog_temp/debug.h similarity index 100% rename from Mk2_3phase_RFdatalog_temp/debug.h rename to runtime/Mk2_3phase_RFdatalog_temp/debug.h diff --git a/Mk2_3phase_RFdatalog_temp/dualtariff.h b/runtime/Mk2_3phase_RFdatalog_temp/dualtariff.h similarity index 100% rename from Mk2_3phase_RFdatalog_temp/dualtariff.h rename to runtime/Mk2_3phase_RFdatalog_temp/dualtariff.h diff --git a/Mk2_3phase_RFdatalog_temp/ewma_avg.hpp b/runtime/Mk2_3phase_RFdatalog_temp/ewma_avg.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/ewma_avg.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/ewma_avg.hpp diff --git a/Mk2_3phase_RFdatalog_temp/main.cpp b/runtime/Mk2_3phase_RFdatalog_temp/main.cpp similarity index 99% rename from Mk2_3phase_RFdatalog_temp/main.cpp rename to runtime/Mk2_3phase_RFdatalog_temp/main.cpp index ba3bdfbe..2b185bc2 100644 --- a/Mk2_3phase_RFdatalog_temp/main.cpp +++ b/runtime/Mk2_3phase_RFdatalog_temp/main.cpp @@ -10,7 +10,7 @@ */ static_assert(__cplusplus >= 201703L, "**** Please define 'gnu++17' in 'platform.txt' ! ****"); -static_assert(__cplusplus >= 201703L, "See also : https://github.com/FredM67/PVRouter-3-phase/blob/main/Mk2_3phase_RFdatalog_temp/Readme.md"); +static_assert(__cplusplus >= 201703L, "See also : https://github.com/FredM67/PVRouter-3-phase/blob/main/runtime/Mk2_3phase_RFdatalog_temp/Readme.md"); #include // may not be needed, but it's probably a good idea to include this diff --git a/Mk2_3phase_RFdatalog_temp/movingAvg.h b/runtime/Mk2_3phase_RFdatalog_temp/movingAvg.h similarity index 100% rename from Mk2_3phase_RFdatalog_temp/movingAvg.h rename to runtime/Mk2_3phase_RFdatalog_temp/movingAvg.h diff --git a/Mk2_3phase_RFdatalog_temp/processing.cpp b/runtime/Mk2_3phase_RFdatalog_temp/processing.cpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/processing.cpp rename to runtime/Mk2_3phase_RFdatalog_temp/processing.cpp diff --git a/Mk2_3phase_RFdatalog_temp/processing.h b/runtime/Mk2_3phase_RFdatalog_temp/processing.h similarity index 100% rename from Mk2_3phase_RFdatalog_temp/processing.h rename to runtime/Mk2_3phase_RFdatalog_temp/processing.h diff --git a/Mk2_3phase_RFdatalog_temp/type_traits.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/conditional.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/conditional.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/conditional.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/conditional.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/declval.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/declval.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/declval.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/declval.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/enable_if.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/enable_if.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/enable_if.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/enable_if.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/integral_constant.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/integral_constant.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/integral_constant.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/integral_constant.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/is_array.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_array.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/is_array.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_array.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/is_base_of.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_base_of.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/is_base_of.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_base_of.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/is_class.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_class.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/is_class.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_class.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/is_const.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_const.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/is_const.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_const.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/is_convertible.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_convertible.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/is_convertible.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_convertible.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/is_enum.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_enum.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/is_enum.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_enum.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/is_floating_point.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_floating_point.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/is_floating_point.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_floating_point.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/is_integral.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_integral.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/is_integral.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_integral.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/is_pointer.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_pointer.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/is_pointer.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_pointer.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/is_same.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_same.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/is_same.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_same.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/is_signed.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_signed.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/is_signed.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_signed.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/is_unsigned.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_unsigned.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/is_unsigned.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/is_unsigned.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/make_unsigned.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/make_unsigned.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/make_unsigned.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/make_unsigned.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/make_void.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/make_void.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/make_void.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/make_void.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/remove_const.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/remove_const.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/remove_const.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/remove_const.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/remove_cv.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/remove_cv.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/remove_cv.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/remove_cv.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/remove_reference.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/remove_reference.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/remove_reference.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/remove_reference.hpp diff --git a/Mk2_3phase_RFdatalog_temp/type_traits/type_identity.hpp b/runtime/Mk2_3phase_RFdatalog_temp/type_traits/type_identity.hpp similarity index 100% rename from Mk2_3phase_RFdatalog_temp/type_traits/type_identity.hpp rename to runtime/Mk2_3phase_RFdatalog_temp/type_traits/type_identity.hpp diff --git a/Mk2_3phase_RFdatalog_temp/types.h b/runtime/Mk2_3phase_RFdatalog_temp/types.h similarity index 100% rename from Mk2_3phase_RFdatalog_temp/types.h rename to runtime/Mk2_3phase_RFdatalog_temp/types.h diff --git a/Mk2_3phase_RFdatalog_temp/utils.h b/runtime/Mk2_3phase_RFdatalog_temp/utils.h similarity index 100% rename from Mk2_3phase_RFdatalog_temp/utils.h rename to runtime/Mk2_3phase_RFdatalog_temp/utils.h diff --git a/Mk2_3phase_RFdatalog_temp/utils_dualtariff.h b/runtime/Mk2_3phase_RFdatalog_temp/utils_dualtariff.h similarity index 100% rename from Mk2_3phase_RFdatalog_temp/utils_dualtariff.h rename to runtime/Mk2_3phase_RFdatalog_temp/utils_dualtariff.h diff --git a/Mk2_3phase_RFdatalog_temp/utils_pins.h b/runtime/Mk2_3phase_RFdatalog_temp/utils_pins.h similarity index 100% rename from Mk2_3phase_RFdatalog_temp/utils_pins.h rename to runtime/Mk2_3phase_RFdatalog_temp/utils_pins.h diff --git a/Mk2_3phase_RFdatalog_temp/utils_relay.h b/runtime/Mk2_3phase_RFdatalog_temp/utils_relay.h similarity index 100% rename from Mk2_3phase_RFdatalog_temp/utils_relay.h rename to runtime/Mk2_3phase_RFdatalog_temp/utils_relay.h diff --git a/Mk2_3phase_RFdatalog_temp/utils_rf.h b/runtime/Mk2_3phase_RFdatalog_temp/utils_rf.h similarity index 100% rename from Mk2_3phase_RFdatalog_temp/utils_rf.h rename to runtime/Mk2_3phase_RFdatalog_temp/utils_rf.h diff --git a/Mk2_3phase_RFdatalog_temp/utils_temp.h b/runtime/Mk2_3phase_RFdatalog_temp/utils_temp.h similarity index 100% rename from Mk2_3phase_RFdatalog_temp/utils_temp.h rename to runtime/Mk2_3phase_RFdatalog_temp/utils_temp.h diff --git a/Mk2_3phase_RFdatalog_temp/validation.h b/runtime/Mk2_3phase_RFdatalog_temp/validation.h similarity index 100% rename from Mk2_3phase_RFdatalog_temp/validation.h rename to runtime/Mk2_3phase_RFdatalog_temp/validation.h diff --git a/Mk2_3phase_RFdatalog_temp/inject_sketch_name.py b/runtime/inject_sketch_name.py similarity index 100% rename from Mk2_3phase_RFdatalog_temp/inject_sketch_name.py rename to runtime/inject_sketch_name.py diff --git a/Mk2_3phase_RFdatalog_temp/platformio.ini b/runtime/platformio.ini similarity index 97% rename from Mk2_3phase_RFdatalog_temp/platformio.ini rename to runtime/platformio.ini index a4bfec8f..70658d5f 100644 --- a/Mk2_3phase_RFdatalog_temp/platformio.ini +++ b/runtime/platformio.ini @@ -10,7 +10,7 @@ [platformio] description = Router program default_envs = basic -src_dir = ./ +src_dir = Mk2_3phase_RFdatalog_temp [env] platform = atmelavr @@ -28,7 +28,6 @@ check_flags = cppcheck: --enable=all --std=c++17 --suppress=missingIncludeSystem clangtidy: --fix --extra-arg=-std=c++17 --checks=*,-llvmlibc-callee-namespace,-llvmlibc-implementation-in-namespace,-clang-diagnostic-c++17-extensions,-llvm-header-guard check_skip_packages = yes -check_src_filters = +<*> monitor_filters = default ; Remove typical terminal control codes from input time ; Add timestamp with milliseconds for each new line