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

Fixed issue related to EC Mid Gain

Browse Source
This commit is contained in:
hardware
2026-08-12 11:35:42 +01:00
parent 1b19d8035b
commit a2e3d50623
15 changed files with 12810 additions and 11905 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Fertirrega_v6/Core/Inc/ad5934_driver.h
+9 -12
View File
@@ -156,8 +156,8 @@ extern "C" {
#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_DRIFT_PT100 2.92f
#define AD5934_DRIFT_PT1000 0.42f
#define AD5934_GAIN_FACTOR_1413US 1413.0f
#define AD5934_GAIN_FACTOR_12880US 12880.0f
@@ -182,11 +182,10 @@ extern "C" {
#define AD5934_ID_RTD 0
#define AD5934_ID_EC 1
#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
#define AD5934_ID_REF_100R_MIDGAIN 3
#define AD5934_ID_REF_1K_MIDGAIN 4
#define AD5934_ID_REF_1K_HIGHGAIN 5
#define AD5934_ID_REF_10K_HIGHGAIN 6
/*****************************************************************************/
/**************************** Filtering Defines *****************************/
@@ -212,12 +211,12 @@ extern "C" {
#define AD5934_RTD_OUT_SCALE_MAX 800
#define AD5934_EC5_FLOAT_SCALE_MIN 0.0f
#define AD5934_EC5_FLOAT_SCALE_MAX 7000.0f
#define AD5934_EC5_FLOAT_SCALE_MAX 5.5f
#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 14000.0f
#define AD5934_EC10_FLOAT_SCALE_MAX 15.0f
#define AD5934_EC10_OUT_SCALE_MIN 0
#define AD5934_EC10_OUT_SCALE_MAX 4095
@@ -406,7 +405,7 @@ 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_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 AD5934_filter_t g_rtd_filter, g_ec_filter, g_ref_100R_LowGain_filter, g_ref_100R_MidGain_filter, g_ref_1K_MidGain_filter, g_ref_1K_HighGain_filter, g_ref_10K_HighGain_filter;
extern uint8_t is_startup;
@@ -471,8 +470,6 @@ void AD5934_Reference_100R_LowGain_NewSample(float raw);
void AD5934_Reference_100R_MidGain_NewSample(float raw);
void AD5934_Reference_100R_HighGain_NewSample(float raw);
void AD5934_Reference_1K_MidGain_NewSample(float raw);
void AD5934_Reference_1K_HighGain_NewSample(float raw);
Fertirrega_v6/Core/Inc/ads1015_driver.h
+4 -4
View File
@@ -128,10 +128,10 @@ extern "C" {
#define ADS1015_CONFIG_START_SINGLE (ADS1015_REG_CONFIG_OS_SINGLE | ADS1015_REG_CONFIG_MUX_DIFF_0_1 | ADS1015_REG_CONFIG_PGA_1_024V | ADS1015_REG_CONFIG_MODE_SINGLE | ADS1015_REG_CONFIG_DR_128SPS | ADS1015_REG_CONFIG_CMODE_TRAD | ADS1015_REG_CONFIG_CPOL_ACTVLOW | ADS1015_REG_CONFIG_CLAT_NONLAT | ADS1015_REG_CONFIG_CQUE_NONE) // 0x8583 // valor de reset já tem OS=1, então só precisa garantir MODE=1b
#define ADS1015_BURST_SIZE 5
#define ADS1015_TRIM_COUNT 1
#define ADS1015_HISTORY_SIZE 5
#define ADS1015_IIR_ALPHA 0.55f
#define ADS1015_BURST_SIZE 1
#define ADS1015_TRIM_COUNT 0
#define ADS1015_HISTORY_SIZE 16
#define ADS1015_IIR_ALPHA 0.1f
#define ADS1015_PH_FLOAT_SCALE_MIN 1000.0f
#define ADS1015_PH_FLOAT_SCALE_MAX 3000.0f