Temperature Limits: -10 to 60 Celsius

Fertirrega_v6/Core/Inc/ad5934_driver.h

@@ -175,22 +175,24 @@ extern "C" {
 #define AD5934_REF_FLOAT_SCALE_MIN		1850.0f
 #define AD5934_REF_FLOAT_SCALE_MAX		2450.0f
 #define AD5934_REF_OUT_SCALE_MIN		0
-#define AD5934_REF_OUT_SCALE_MAX		4096
+#define AD5934_REF_OUT_SCALE_MAX		4095
 
-#define AD5934_RTD_FLOAT_SCALE_MIN		1850.0f
+//#define AD5934_RTD_FLOAT_SCALE_MIN		1850.0f
-#define AD5934_RTD_FLOAT_SCALE_MAX		2450.0f
+//#define AD5934_RTD_FLOAT_SCALE_MAX		2450.0f
-#define AD5934_RTD_OUT_SCALE_MIN		0
+#define AD5934_RTD_FLOAT_SCALE_MIN		(-10.0f)
-#define AD5934_RTD_OUT_SCALE_MAX		4096
+#define AD5934_RTD_FLOAT_SCALE_MAX		60.0f
+#define AD5934_RTD_OUT_SCALE_MIN		70
+#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_OUT_SCALE_MIN		0
-#define AD5934_EC5_OUT_SCALE_MAX		4096
+#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_OUT_SCALE_MIN		0
-#define AD5934_EC10_OUT_SCALE_MAX		4096
+#define AD5934_EC10_OUT_SCALE_MAX		4095
 
 
 

Fertirrega_v6/Core/Src/main.c

@@ -156,35 +156,44 @@ int main(void)
 		}
 	}
 
+	digital_outputs_toggle(0);
+	digital_outputs_toggle(1);
+	digital_outputs_toggle(2);
+	digital_outputs_toggle(3);
+	digital_outputs_toggle(4);
+	digital_outputs_toggle(5);
+	digital_outputs_toggle(6);
+	digital_outputs_toggle(7);
 
 
 	while (1)
 	{
 
-
 		AD5934_Process_System();
 		ADS1015_Process_System();
 
 		current_millis = g_ms_counter;
 
-		if((current_millis % 100) == 0) // Send data each 100ms
+		if((current_millis % 500) == 0) // Send data each 100ms
 		{
 
-			if (g_ref_filter.value_valid) // Reference Resistor on Board: 100 Ohms or 1000 Ohms
+		/*	if (g_ref_filter.value_valid) // Reference Resistor on Board: 100 Ohms or 1000 Ohms
 			{
 				//reference_resistor = g_ref_filter.filtered_value;
 				uint16_t reference_final = AD5934_REF_OUT_SCALE_MAX - AD5934_Compress_To_IntScale(g_ref_filter.filtered_value, current_ref_mux);
+
 				intToStr(reference_final, tempString);
 				// float ref_final = g_ref_filter.filtered_value;
 				//FloatToString(tempString, ref_final);
 	 			rs485_send_broadcast(tempString, (strlen((uint8_t*)tempString)));
 	 			rs485_send_broadcast(&newline, 1);
-			}
+			}*/
 
 			if (g_rtd_filter.value_valid) // PT100 or PT1000 in °C
 			{
 				temperature_RTD = AD5934_Calculate_Temperature(reference_resistor, g_rtd_filter.filtered_value);
-				uint16_t rtd_final = AD5934_RTD_OUT_SCALE_MAX - AD5934_Compress_To_IntScale(g_rtd_filter.filtered_value, current_rtd_mux);
+				uint16_t rtd_final = AD5934_RTD_OUT_SCALE_MAX - AD5934_Compress_To_IntScale(temperature_RTD, current_rtd_mux);
+
 				intToStr(rtd_final, tempString);
 				 //float rtd_final = g_rtd_filter.filtered_value;
 				 //FloatToString(tempString, rtd_final);
@@ -196,6 +205,7 @@ int main(void)
 			{
 				thermal_compensaded_EC = AD5934_EC_Compensate_Magnitude_To_25C(g_ec_filter.filtered_value, temperature_RTD);
 				uint16_t ec_final = AD5934_Compress_To_IntScale(thermal_compensaded_EC, current_ec_mux);
+
 				intToStr(ec_final, tempString);
 				// float ec_final = g_ec_filter.filtered_value;
 				// FloatToString(tempString, ec_final);
@@ -206,6 +216,7 @@ int main(void)
 			if (g_ph_filter.value_valid) // pH
 			{
 				uint16_t ph_final = ADS1015_Compress_To_IntScale(g_ph_filter.filtered_value);
+
 				intToStr(ph_final, tempString);
 				//float ph_final = g_ph_filter.filtered_value;
 				//FloatToString(tempString, ph_final);

Fertirrega_v6/Debug/Core/Src/main.cyclo

@@ -1,6 +1,6 @@
-../Core/Src/main.c:78:5:main	10
+../Core/Src/main.c:78:5:main	9
-../Core/Src/main.c:256:6:SystemClock_Config	4
+../Core/Src/main.c:267:6:SystemClock_Config	4
-../Core/Src/main.c:307:6:FloatToString	8
+../Core/Src/main.c:318:6:FloatToString	8
-../Core/Src/main.c:369:6:intToStr	12
+../Core/Src/main.c:380:6:intToStr	12
-../Core/Src/main.c:427:6:HAL_TIM_PeriodElapsedCallback	2
+../Core/Src/main.c:438:6:HAL_TIM_PeriodElapsedCallback	2
-../Core/Src/main.c:443:6:Error_Handler	1
+../Core/Src/main.c:454:6:Error_Handler	1

Fertirrega_v6/Debug/Core/Src/main.su

@@ -1,6 +1,6 @@
 ../Core/Src/main.c:78:5:main	56	static
-../Core/Src/main.c:256:6:SystemClock_Config	88	static
+../Core/Src/main.c:267:6:SystemClock_Config	88	static
-../Core/Src/main.c:307:6:FloatToString	104	static
+../Core/Src/main.c:318:6:FloatToString	104	static
-../Core/Src/main.c:369:6:intToStr	32	static
+../Core/Src/main.c:380:6:intToStr	32	static
-../Core/Src/main.c:427:6:HAL_TIM_PeriodElapsedCallback	16	static
+../Core/Src/main.c:438:6:HAL_TIM_PeriodElapsedCallback	16	static
-../Core/Src/main.c:443:6:Error_Handler	4	static,ignoring_inline_asm
+../Core/Src/main.c:454:6:Error_Handler	4	static,ignoring_inline_asm