From e6c33bcc8ecb7333e92d300eade79f785075c9ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Metrich?= <45318189+FredM67@users.noreply.github.com> Date: Sun, 14 Apr 2024 15:30:03 +0200 Subject: [PATCH] Re-calib --- Mk2_3phase_RFdatalog_temp/calibration.h | 2 +- Mk2_3phase_RFdatalog_temp/config_system.h | 2 +- dev/cal_CTx_v_meter/main.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Mk2_3phase_RFdatalog_temp/calibration.h b/Mk2_3phase_RFdatalog_temp/calibration.h index 2819deb8..814b0399 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.043950F, 0.045235F, 0.042788F }; +inline constexpr float f_powerCal[NO_OF_PHASES]{ 0.042196F, 0.043512F, 0.040156F }; // // 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/Mk2_3phase_RFdatalog_temp/config_system.h b/Mk2_3phase_RFdatalog_temp/config_system.h index ef3a41ad..6439ea5e 100644 --- a/Mk2_3phase_RFdatalog_temp/config_system.h +++ b/Mk2_3phase_RFdatalog_temp/config_system.h @@ -20,7 +20,7 @@ inline constexpr uint8_t NO_OF_PHASES{ 3 }; /**< number of phases of the main su //-------------------------------------------------------------------------------------------------- // for users with zero-export profile, this value will be negative -inline constexpr int16_t REQUIRED_EXPORT_IN_WATTS{ 20 }; /**< when set to a negative value, this acts as a PV generator */ +inline constexpr int16_t REQUIRED_EXPORT_IN_WATTS{ 0 }; /**< when set to a negative value, this acts as a PV generator */ //-------------------------------------------------------------------------------------------------- // other system constants, should match most of installations diff --git a/dev/cal_CTx_v_meter/main.cpp b/dev/cal_CTx_v_meter/main.cpp index d6988782..377dc44d 100644 --- a/dev/cal_CTx_v_meter/main.cpp +++ b/dev/cal_CTx_v_meter/main.cpp @@ -127,7 +127,7 @@ constexpr int16_t ADCDuration{ 104 }; // Time in microseconds for one ADC conve // 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.043950F, 0.045235F, 0.042788F }; +inline constexpr float f_powerCal[NO_OF_PHASES]{ 0.042196F, 0.043512F, 0.040156F }; // 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