From 7b7200235e2b78ac518860adcb04a59bebbdd54c Mon Sep 17 00:00:00 2001 From: Avi Levkovich Date: Wed, 1 Jan 2020 14:28:35 +0200 Subject: Add head heaters + PT100 to I2C task + add semaphores to head PT100 ADC --- .../Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules/Control') diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index a5bf4d336..aa8f29451 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -54,7 +54,6 @@ #include "Communication/Connection.h" #include "Modules/General/buttons.h" -#include "Drivers/I2C_Communication/Head_Card/PT100/Head_PT100_ADC.h" Task_Handle Millisecond_Task_Handle; /******************** Definitions ********************************************/ @@ -611,11 +610,14 @@ uint32_t MillisecLowLoop(uint32_t tick) //if (Sensor_Read++ >= MAX_MAIN_CARD_TEMPERATURE_SENSOR_ID) Sensor_Read = 0; if(Machine_Idle_Mode == true) Machine_Idle_Breathing_Led(); + Trigger_HeaterWriting(); + } #ifdef Use_Head_Card if(Fifty_msTick) { - Set_HeadCard_PT100();//call every 50mSec (minimum delay 30mSec) + Trigger_PT100_Read();//call every 50mSec (minimum delay 30mSec) + //Set_HeadCard_PT100();//call every 50mSec (minimum delay 30mSec) } #endif /*#ifdef Use_Head_Card @@ -653,6 +655,14 @@ uint32_t MillisecLowLoop(uint32_t tick) Speed_Data = Calculate_Speed_Sensor_Velocity(); Read_Buttons_Reg(); //Ink_Cart_Led(); + /////////////////////////////////////////////////////////////////// + char Lenstr[160]; + static int Counter = 0; + + TemperatureListString(Lenstr); + ReportWithPackageFilter(ThreadFilter,Lenstr,__FILE__,__LINE__,(int)Counter++,RpWarning,(int) msec_millisecondCounter,0); + /////////////////////////////////////////////////////////////////////////// + #ifdef Use_Head_Card for (Sensor_i = TEMP_SENSE_ANALOG_DRYER_TEMP1;Sensor_i < MAX_HEAD_CARD_TEMP_SENS_ID;Sensor_i++) #else -- cgit v1.3.1