diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-03-04 13:24:34 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-03-04 13:24:34 +0200 |
| commit | 7a1a4e7c8578148d086293c5e449d8800b66179a (patch) | |
| tree | cf78e028d199272a27eca35b3d5c448ad90e3cad /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 122461b98adad3fc7a267cdb6a0126a6439c5e78 (diff) | |
| parent | 99f7f5459baabb7651ab4a111e677e6aab167686 (diff) | |
| download | Tango-7a1a4e7c8578148d086293c5e449d8800b66179a.tar.gz Tango-7a1a4e7c8578148d086293c5e449d8800b66179a.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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index da4f04f3b..0e95f4053 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -59,6 +59,8 @@ #include <Drivers/I2C_Communication/WHS_Card/D_ADS122_PT100/WHS_PT100_ADC.h> #include <Drivers/I2C_Communication/I2C_Task.h> #include <Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.h> +#include "Modules/Heaters/Heaters_ex.h" +#include <Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.h> Task_Handle Millisecond_Task_Handle; /******************** Definitions ********************************************/ @@ -705,8 +707,8 @@ uint32_t MillisecLowLoop(uint32_t tick) } if (Onesecond_Tick) { - char Lenstr[160]; - static int Counter = 0; + //char Lenstr[160]; + //static int Counter = 0; MachineUpdateResponseFunc(); //KeepAliveOneSecondCall(); |