hardware/fertirrega_v6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issues related to Temperature and EC

Browse Source
This commit is contained in:
hardware
2026-08-11 11:25:47 +01:00
parent ebb76da3b0
commit 1b19d8035b
12 changed files with 12292 additions and 12821 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Fertirrega_v6/Core/Inc/ad5934_driver.h
+33 -19
View File
@@ -150,6 +150,15 @@ extern "C" {
#define AD5934_GAIN_FACTOR_1K 1000.0f
#define AD5934_GAIN_FACTOR_10K 10000.0f
#define AD5934_EC_IN_SERIES_RESISTOR 100.0f
#define AD5934_EC_10MS 0.01f // Ref 100R
#define AD5934_EC_1MS 0.001f // Ref 1K
#define AD5934_EC_0_1MS 0.0001f // Ref 10k
#define AD5934_DRIFT_PT100 2.12f
#define AD5934_DRIFT_PT1000 0.22f
#define AD5934_GAIN_FACTOR_1413US 1413.0f
#define AD5934_GAIN_FACTOR_12880US 12880.0f
@@ -165,11 +174,19 @@ extern "C" {
#define AD5934_EC_ALPHA_PER_C 0.02f
#define AD5934_EC_TEMP_REF_C 25.0f
#define AD5934_EC_1413US_PT100_DEFAULT 3111 // magnitude
#define AD5934_EC_1413US_PT1000_DEFAULT 2970 // magnitude
//Mux Set to Read...
#define AD5934_ID_RTD 0
#define AD5934_ID_EC 1
#define AD5934_ID_REF 2
#define AD5934_ID_REF_100R_LOWGAIN 2
#define AD5934_ID_REF_100R_MIDGAIN 3
#define AD5934_ID_REF_100R_HIGHGAIN 4
#define AD5934_ID_REF_1K_MIDGAIN 5
#define AD5934_ID_REF_1K_HIGHGAIN 6
#define AD5934_ID_REF_10K_HIGHGAIN 7
/*****************************************************************************/
/**************************** Filtering Defines *****************************/
@@ -179,7 +196,7 @@ extern "C" {
#define AD5934_BURST_SIZE 1 // Number of Repeated Sweeps on the same channel before change the Mux
#define AD5934_TRIM_COUNT 0
#define AD5934_HISTORY_SIZE 8
#define AD5934_HISTORY_SIZE 16
#define AD5934_IIR_ALPHA 0.10f
#define AD5934_REF_FLOAT_SCALE_MIN 1850.0f
@@ -195,12 +212,12 @@ extern "C" {
#define AD5934_RTD_OUT_SCALE_MAX 800
#define AD5934_EC5_FLOAT_SCALE_MIN 0.0f
#define AD5934_EC5_FLOAT_SCALE_MAX 20500.0f
#define AD5934_EC5_FLOAT_SCALE_MAX 7000.0f
#define AD5934_EC5_OUT_SCALE_MIN 0
#define AD5934_EC5_OUT_SCALE_MAX 4095
#define AD5934_EC10_FLOAT_SCALE_MIN 0.0f
#define AD5934_EC10_FLOAT_SCALE_MAX 15000.0f
#define AD5934_EC10_FLOAT_SCALE_MAX 14000.0f
#define AD5934_EC10_OUT_SCALE_MIN 0
#define AD5934_EC10_OUT_SCALE_MAX 4095
@@ -378,8 +395,6 @@ static const uint16_t AD5934_Scale_Out_Max[AD5934_CH_MAX] = {
extern I2C_HandleTypeDef hi2c2;
extern float reference_resistor, temperature_RTD, thermal_compensaded_EC;
extern volatile AD5934_State_t ad5934_state;
extern volatile uint32_t g_ms_counter; // Increment each 1ms Timer
extern volatile uint32_t state_timer;
@@ -391,10 +406,9 @@ extern uint8_t current_ec_mux;
extern uint8_t current_rtd_mux;
extern uint8_t current_ref_mux;
extern AD5934_filter_t g_rtd_filter, g_ec_filter, g_ref_filter;
extern AD5934_filter_t g_rtd_filter, g_ec_filter, g_ref_100R_LowGain_filter, g_ref_100R_MidGain_filter, g_ref_100R_HighGain_filter, g_ref_1K_MidGain_filter, g_ref_1K_HighGain_filter, g_ref_10K_HighGain_filter;
extern int16_t rtd_now, ref_now, ec_now;
extern int16_t rtd_now_i, ref_now_i, ec_now_i;
extern uint8_t is_startup;
/*****************************************************************************/
/************************ Functions Declarations *****************************/
@@ -415,7 +429,7 @@ void AD5934_StopSweep(void);
float AD5934_Get_Ref_Resistance(void);
float AD5934_Calculate_Temperature(float mag_ref, float mag_dut);
float AD5934_Calculate_Temperature(float mag_ref_pt100, float mag_ref_pt1000, float mag_dut);
float AD5934_EC_Compensate_Magnitude_To_25C(float mag_dut, float temperature_dut);
@@ -425,6 +439,8 @@ float AD5934_GetMagnitude(void);
float AD5934_GetImpedance(float mag_ref, float mag_dut);
float AD5934_GetAdmittance(float mag_ref_10mS_MidGain, float mag_ref_1mS_MidGain, float mag_ref_1mS_HighGain, float mag_ref_0_1mS_HighGain, float mag_dut);
uint32_t AD5934_Get_Real_Imag_Numbers(void);
uint16_t AD5934_Compress_To_IntScale(float value, uint8_t scale);
@@ -449,21 +465,19 @@ void AD5934_Process_Sample(AD5934_filter_t *ch, float raw);
void AD5934_RTD_NewSample(float raw);
void AD5934_RTD_Real_NewSample(float raw);
void AD5934_RTD_Imag_NewSample(float raw);
void AD5934_EC_NewSample(float raw);
void AD5934_EC_Real_NewSample(float raw);
void AD5934_Reference_100R_LowGain_NewSample(float raw);
void AD5934_EC_Imag_NewSample(float raw);
void AD5934_Reference_100R_MidGain_NewSample(float raw);
void AD5934_Reference_NewSample(float raw);
void AD5934_Reference_100R_HighGain_NewSample(float raw);
void AD5934_Reference_Real_NewSample(float raw);
void AD5934_Reference_1K_MidGain_NewSample(float raw);
void AD5934_Reference_Imag_NewSample(float raw);
void AD5934_Reference_1K_HighGain_NewSample(float raw);
void AD5934_Reference_10K_HighGain_NewSample(float raw);
void ADG715_SetRegisterValue(char value);