diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-12-26 08:07:35 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-12-26 08:07:35 +0200 |
| commit | 3d21d04d1dffe6fa13e64281ab004000a0ded41d (patch) | |
| tree | 79bdd19a23cf57b8d0ea2d671860602cba64d204 /Software/Embedded_SW/Embedded/Modules | |
| parent | e1a2dde7fe9c728dfb3247b34d89b947b4132fd2 (diff) | |
| parent | 1ef776620088308e380a69271518c2c66fd673a0 (diff) | |
| download | Tango-3d21d04d1dffe6fa13e64281ab004000a0ded41d.tar.gz Tango-3d21d04d1dffe6fa13e64281ab004000a0ded41d.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index fb3fd1afb..a5bf4d336 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -495,11 +495,11 @@ uint32_t MillisecLoop(uint32_t tick) #endif return OK; } -int TemperatureSum[MAX_MAIN_CARD_TEMP_SENS_ID]; -int TemperatureMin[MAX_MAIN_CARD_TEMP_SENS_ID]; -int TemperatureMax[MAX_MAIN_CARD_TEMP_SENS_ID]; -int TemperatureCount[MAX_MAIN_CARD_TEMP_SENS_ID]; -int TemperatureCalc[MAX_MAIN_CARD_TEMP_SENS_ID]; +int TemperatureSum[MAX_HEAD_CARD_TEMP_SENS_ID]; +int TemperatureMin[MAX_HEAD_CARD_TEMP_SENS_ID]; +int TemperatureMax[MAX_HEAD_CARD_TEMP_SENS_ID]; +int TemperatureCount[MAX_HEAD_CARD_TEMP_SENS_ID]; +int TemperatureCalc[MAX_HEAD_CARD_TEMP_SENS_ID]; void MillisecUpdateTemperatures (TEMPERATURE_SENSOR_ID_ENUM SensorId,int temperature) { //if(TemperatureCount[SensorId]++>=10) @@ -584,7 +584,7 @@ uint32_t MillisecLowLoop(uint32_t tick) bool O100Millisecond_Tick,O200Millisecond_Tick,O400Millisecond_Tick,O500Millisecond_Tick,O600Millisecond_Tick; //bool O100Millisecond_Tick,O200Millisecond_Tick,O400Millisecond_Tick,O500Millisecond_Tick,O600Millisecond_Tick,O800Millisecond_Tick,O900Millisecond_Tick; Ten_msTick = (tick%eTenMillisecond == 0) ?true:false; - Fifty_msTick = (tick%eHundredMillisecond == 0) ?true:false; //eFiftyMillisecond + Fifty_msTick = (tick%eHundredMillisecond == 40) ?true:false; //eFiftyMillisecond Hundred_msTick = (tick%eHundredMillisecond == 0) ?true:false; m20msecTick = (tick%eHundredMillisecond == 20) ?true:false; m70msecTick = (tick%eHundredMillisecond == 70) ?true:false; @@ -618,27 +618,29 @@ uint32_t MillisecLowLoop(uint32_t tick) Set_HeadCard_PT100();//call every 50mSec (minimum delay 30mSec) } #endif -#ifdef Use_Head_Card50 +/*#ifdef Use_Head_Card if (m20msecTick) //read odd PT1000 { for (Sensor_i = HEAD_PT100_ZONE_1_0X80_0;Sensor_i < HEAD_PT100_ZONE_2_0X80_1;Sensor_i++) { - MillisecReadFromI2CTempSensor(Sensor_i, NULL); + //MillisecReadFromI2CTempSensor(Sensor_i, NULL); } + //Set_HeadCard_PT100(); #warning call chip select replace in I2C } if (m70msecTick) //read odd PT1000 { for (Sensor_i = HEAD_PT100_ZONE_2_0X80_1;Sensor_i < HEAD_PT100_RESERVE_0X8E_1;Sensor_i++) { - MillisecReadFromI2CTempSensor(Sensor_i, NULL); + //MillisecReadFromI2CTempSensor(Sensor_i, NULL); } + //Set_HeadCard_PT100(); } -#endif +#endif */ if (m90msecTick) { #ifdef Use_Head_Card - for (Sensor_i = TEMP_SENSE_ANALOG_DRYER_TEMP1;Sensor_i < MAX_MAIN_CARD_TEMP_SENS_ID;Sensor_i++) + for (Sensor_i = TEMP_SENSE_ANALOG_DRYER_TEMP1;Sensor_i < MAX_HEAD_CARD_TEMP_SENS_ID;Sensor_i++) #else for (Sensor_i = 0;Sensor_i < MAX_MAIN_CARD_TEMP_SENS_ID;Sensor_i++) #endif @@ -652,7 +654,7 @@ uint32_t MillisecLowLoop(uint32_t tick) Read_Buttons_Reg(); //Ink_Cart_Led(); #ifdef Use_Head_Card - for (Sensor_i = TEMP_SENSE_ANALOG_DRYER_TEMP1;Sensor_i < MAX_MAIN_CARD_TEMP_SENS_ID;Sensor_i++) + for (Sensor_i = TEMP_SENSE_ANALOG_DRYER_TEMP1;Sensor_i < MAX_HEAD_CARD_TEMP_SENS_ID;Sensor_i++) #else for (Sensor_i = 0;Sensor_i < MAX_MAIN_CARD_TEMP_SENS_ID;Sensor_i++) #endif @@ -722,7 +724,7 @@ uint32_t MillisecLowLoop(uint32_t tick) MachineUpdateResponseFunc(); //KeepAliveOneSecondCall(); #ifdef Use_Head_Card - for (Sensor_i = TEMP_SENSE_ANALOG_DRYER_TEMP1;Sensor_i < MAX_MAIN_CARD_TEMP_SENS_ID;Sensor_i++) + for (Sensor_i = TEMP_SENSE_ANALOG_DRYER_TEMP1;Sensor_i < MAX_HEAD_CARD_TEMP_SENS_ID;Sensor_i++) #else for (Sensor_i = 0;Sensor_i < MAX_MAIN_CARD_TEMP_SENS_ID;Sensor_i++) #endif |