diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-01-26 17:37:53 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-01-26 17:37:53 +0200 |
| commit | 50cf715b5137990ee2f229dfb63119117ed5210a (patch) | |
| tree | 6e81049004f544ef504e89d36c486341153db859 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | fdac8c5b1dcf37340a2d8d5def1f041446c0a183 (diff) | |
| parent | cb5e4381713d51aea73065fa3e75a3a3de9ebc71 (diff) | |
| download | Tango-50cf715b5137990ee2f229dfb63119117ed5210a.tar.gz Tango-50cf715b5137990ee2f229dfb63119117ed5210a.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 49930d8a9..d3376c400 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -56,6 +56,10 @@ #include "Modules/General/buttons.h" #include "Drivers/I2C_Communication/Head_Card/PT100/Head_PT100_ADC.h" +#ifdef Use_WHS_Card +#include <Drivers/I2C_Communication/WHS_Card/D_ADS122/WHS_PT100_ADC.h> +#include <Drivers/I2C_Communication/I2C_Task.h> +#endif Task_Handle Millisecond_Task_Handle; /******************** Definitions ********************************************/ @@ -733,9 +737,10 @@ uint32_t MillisecLowLoop(uint32_t tick) static int Counter = 0; MachineUpdateResponseFunc(); KeepAliveOneSecondCall(); +#ifdef Use_Head_Card TemperatureListString(Lenstr); ReportWithPackageFilter(ThreadFilter,Lenstr,__FILE__,__LINE__,(int)Counter++,RpWarning,(int) msec_millisecondCounter,0); -#ifdef Use_Head_Card +//#ifdef Use_Head_Card 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++) |