From c749b5b1ed9e996b88d83571f209de8747d0d177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Metrich?= <45318189+FredM67@users.noreply.github.com> Date: Wed, 3 May 2023 11:34:49 +0200 Subject: [PATCH] Final --- Mk2_3phase_RFdatalog_temp/calibration.h | 2 +- cal_CTx_v_meter/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mk2_3phase_RFdatalog_temp/calibration.h b/Mk2_3phase_RFdatalog_temp/calibration.h index 04a74403..8661cdaf 100644 --- a/Mk2_3phase_RFdatalog_temp/calibration.h +++ b/Mk2_3phase_RFdatalog_temp/calibration.h @@ -31,7 +31,7 @@ // powerCal is the RECIPROCAL of the power conversion rate. A good value // to start with is therefore 1/20 = 0.05 (Watts per ADC-step squared) // -inline constexpr float f_powerCal[NO_OF_PHASES]{ 0.05000F, 0.05000F, 0.05000F }; +inline constexpr float f_powerCal[NO_OF_PHASES]{ 0.04335F, 0.04333F, 0.04252F }; // // f_phaseCal is used to alter the phase of the voltage waveform relative to the current waveform. // The algorithm interpolates between the most recent pair of voltage samples according to the value of f_phaseCal. diff --git a/cal_CTx_v_meter/main.cpp b/cal_CTx_v_meter/main.cpp index 674c7c61..4cf751a3 100644 --- a/cal_CTx_v_meter/main.cpp +++ b/cal_CTx_v_meter/main.cpp @@ -122,7 +122,7 @@ Polarities polarityConfirmedOfLastSampleV[NO_OF_PHASES]; /**< for zero-crossing // powerCal is the RECIPR0CAL of the power conversion rate. A good value // to start with is therefore 1/20 = 0.05 (Watts per ADC-step squared) // -inline constexpr float f_powerCal[NO_OF_PHASES]{ 0.05000F, 0.05000F, 0.05000F }; +inline constexpr float f_powerCal[NO_OF_PHASES]{ 0.04335F, 0.04333F, 0.04252F }; // f_phaseCal is used to alter the phase of the voltage waveform relative to the // current waveform. The algorithm interpolates between the most recent pair