aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Control
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2020-02-26 00:12:17 +0200
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2020-02-26 00:12:17 +0200
commit61f2658295193dca0fdaa58744925d90bd2f4044 (patch)
tree5d3cdb936e053dcf8a191a2219e228fb55a56917 /Software/Embedded_SW/Embedded/Modules/Control
parent5b4ef57953bce5479715413b560616436735a37f (diff)
parent2f0962db91caa293c9eb43f511c18f25acf9a603 (diff)
downloadTango-61f2658295193dca0fdaa58744925d90bd2f4044.tar.gz
Tango-61f2658295193dca0fdaa58744925d90bd2f4044.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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 1cc8e766b..00ce306cf 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -694,6 +694,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
if (O600Millisecond_Tick)
{
Trigger_WHSReadAllFanTacho ();
+ DrierHeaterVoltageSetup();
if (RapidPressureRead == false)
{
for (Disp_i = 0;Disp_i < MAX_SYSTEM_DISPENSERS;Disp_i++)
@@ -928,7 +929,7 @@ void HundredMicroTimerInterrupt(int ARG0)
StoreBuffer[StoreBufferId][StoreBufferCounter++] = dancer2;
StoreBuffer[StoreBufferId][StoreBufferCounter++] = dancer3;
/*-----------------------*/
- //len = usprintf(&StoreBuffer[StoreBufferId][StoreBufferCounter], "\r\n%d %d %d", dancer1[dancer_count],dancer2[dancer_count],dancer3[dancer_count]);
+ //len = usprintf(&StoreBuffer[StoreBufferId][StoreBufferCounter], "%d %d %d", dancer1[dancer_count],dancer2[dancer_count],dancer3[dancer_count]);
//StoreBufferCounter+=(len+1);
/*-----------------------*/
dancer1sum+=dancer1;