diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-01-14 18:52:44 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-01-14 18:52:44 +0200 |
| commit | 4c9319b4aa25287ab8660b1f667a06ff31fb7dc8 (patch) | |
| tree | f3cbc603d2551357715798047223a285dd4a3c7e /Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | |
| parent | 2b1c55a4e7ba10ecd57f4b4761397a0204dd5b81 (diff) | |
| download | Tango-4c9319b4aa25287ab8660b1f667a06ff31fb7dc8.tar.gz Tango-4c9319b4aa25287ab8660b1f667a06ff31fb7dc8.zip | |
Version 1.4.6.4: fix diagnostics, alarm handling data loading, fix heaters - new head is working. new TPF files for new head
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index cd40afd9c..49930d8a9 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -580,7 +580,7 @@ uint32_t MillisecLowLoop(uint32_t tick) //call all modules Millisec functions //test dancers and speed encoders //check all callback units (state machine waiting for completion of a change) - bool Ten_msTick, Fifty_msTick, Hundred_msTick , m20msecTick,m70msecTick,m90msecTick, Onesecond_Tick,OneMinute_Tick,OneHourTick; + bool Ten_msTick, Fifty_msTick, Hundred_msTick , m20msecTick,m70msecTick,m90msecTick, Onesecond_Tick,OneMinute_Tick,OneHourTick,Gradient_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; @@ -596,6 +596,7 @@ uint32_t MillisecLowLoop(uint32_t tick) O600Millisecond_Tick = (tick%eOneSecond == 600) ?true:false; //O800Millisecond_Tick = (tick%eOneSecond == 800) ?true:false; //O900Millisecond_Tick = (tick%eOneSecond == 900) ?true:false; + Gradient_Tick = (tick%400 == 0) ?true:false; Onesecond_Tick = (tick%eOneSecond == 0) ?true:false; OneMinute_Tick = (tick%eOneMinute == 0) ?true:false; OneHourTick = (tick%eOneHour == 0) ?true:false; @@ -648,7 +649,7 @@ uint32_t MillisecLowLoop(uint32_t tick) for (Sensor_i = 0;Sensor_i < MAX_MAIN_CARD_TEMP_SENS_ID;Sensor_i++) #endif { - // MillisecReadFromTempSensor(Sensor_i, NULL); + MillisecReadFromTempSensor(Sensor_i, NULL); } } if (Hundred_msTick) @@ -657,12 +658,7 @@ uint32_t MillisecLowLoop(uint32_t tick) 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++) @@ -688,13 +684,14 @@ uint32_t MillisecLowLoop(uint32_t tick) } ADC_TriggerCollection(); } - DispensersCollectionCall(); #ifdef Use_Head_Card //Head_Read_IO_Reg(0x46, HIGH);//READ HEAD CARD LS #endif } + if (Gradient_Tick) + DispensersCollectionCall(); if (O100Millisecond_Tick) { Trigger_Heater_Current_Read(); @@ -732,8 +729,12 @@ uint32_t MillisecLowLoop(uint32_t tick) } if (Onesecond_Tick) { + char Lenstr[160]; + static int Counter = 0; MachineUpdateResponseFunc(); - //KeepAliveOneSecondCall(); + KeepAliveOneSecondCall(); + 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 |