Merge branch 'main' into f_relay

.gitignore

@@ -1,4 +1,4 @@
 build
 c_cpp_properties.json
 inols*
-platformio-device-monitor-*.log
+logs

Mk2_3phase_RFdatalog_temp/inject_sketch_name.py

@@ -6,13 +6,13 @@
 
 def get_git_revision_short_hash() -> str:
   try:
-    return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'],shell=True).decode('ascii').strip()
+    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('ascii').strip()
+    return subprocess.check_output(['git', 'branch', '--show-current'],shell=True).decode('utf-8').strip()
   except CalledProcessError:
     return "N/A"
 

cal_CTx_v_meter/main.cpp

@@ -143,7 +143,7 @@ constexpr int16_t i_phaseCal{ 256 }; /**< to avoid the need for floating-point m
 // For datalogging purposes, f_voltageCal has been added too. Because the range of ADC values is
 // similar to the actual range of volts, the optimal value for this cal factor is likely to be
 // close to unity.
-inline constexpr float f_voltageCal[NO_OF_PHASES]{ 0.8151F, 0.8184F, 0.8195F }; /**< compared with Fluke 77 meter */
+inline constexpr float f_voltageCal[NO_OF_PHASES]{ 0.8151F, 0.8184F, 0.8195F }; /**< compared with Sentron PAC 4200 */
 
 /**
    @brief Interrupt Service Routine - Interrupt-Driven Analog Conversion.