diff options
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index b5797e749..e3955793d 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -49,6 +49,7 @@ #include "Communication/Connection.h" #include "Modules/General/buttons.h" +#include "Drivers/I2C_Communication/Head_Card/PT100/PT100_ADC.h" Task_Handle Millisecond_Task_Handle; /******************** Definitions ********************************************/ @@ -414,14 +415,19 @@ uint32_t MillisecLoop(uint32_t tick) }*/ if (PT100Data[Sensor_i].Active == true) { - TemperatureSendSensorDummyClk(Sensor_i); + #ifndef Use_Head_Card + TemperatureSendSensorDummyClk(Sensor_i); + #endif PT100Data[Sensor_i].Active = false; PT100Data[Sensor_i].WaitForData = true; // mark the motor for data request next round break; // one PT100 activitiy per MS } else if (PT100Data[Sensor_i].WaitForData == true) //Read request sent, data is waiting { - TemperatureSensorReadFromFPGA_Res(Sensor_i); //got the data from the FPGA + #ifdef Use_Head_Card + HeadADCPT100_SendReadDataCommand(Sensor_i); + #endif + TemperatureSensorReadFromFPGA_Res(Sensor_i); //got the data from the FPGA PT100Data[Sensor_i].WaitForData = false; PT100Data[Sensor_i].SyncRequired = true; if (PT100Data[Sensor_i].Callback) @@ -430,7 +436,11 @@ uint32_t MillisecLoop(uint32_t tick) } else if (PT100Data[Sensor_i].SyncRequired == true) { + #ifdef Use_Head_Card + HeadADCPT100_StartSync(Sensor_i); + #endif TemperatureSensorSync(Sensor_i); + PT100Data[Sensor_i].SyncRequired = false; PT100Activity--; break; // one PT100 activitiy per MS @@ -544,6 +554,8 @@ uint32_t MillisecLowLoop(uint32_t tick) } ADC_TriggerCollection(); } + DispensersCollectionCall(); + } if ((O900Millisecond_Tick)&&(RapidPressureRead == false)) @@ -565,13 +577,13 @@ uint32_t MillisecLowLoop(uint32_t tick) DrawerFansStatus = temp & 0x1F; SystemFansStatus = temp & 0xE0; //KeepAliveOneSecondCall(); - /*for (Motor_i = 0;Motor_i < NUM_OF_MOTORS;Motor_i++) + for (Motor_i = 0;Motor_i < NUM_OF_MOTORS;Motor_i++) { - if (Motor_i == HARDWARE_MOTOR_TYPE__MOTO_SCREW) - continue; // + // if (Motor_i == HARDWARE_MOTOR_TYPE__MOTO_SCREW) + // continue; // if (isMotorConfigured(Motor_i)) MotorGetStatusFromFPGA(Motor_i); - }*/ + } if (!(OneMinute_Tick)) { for (Heater_i = 0;Heater_i < NUM_OF_CURRENT_HEATERS;Heater_i++) |