aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-12-06 12:50:56 +0200
committerShlomo Hecht <shlomo@twine-s.com>2020-12-06 12:50:56 +0200
commitf81a9d61d0e71abda061e65a4874944f47f55f87 (patch)
tree11d5640c55918be596015f17575a8f91f472c4be
parent8bd3750422f15db5682bd0a7ea7bb601f0367500 (diff)
parenta634917be2b6951188ff20e6229f28a69f280394 (diff)
downloadTango-f81a9d61d0e71abda061e65a4874944f47f55f87.tar.gz
Tango-f81a9d61d0e71abda061e65a4874944f47f55f87.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
index 71524b0ee..6e84c3107 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
@@ -65,6 +65,7 @@ uint8_t HeadBlowersEnable = 1;
uint8_t BlowerIdToSensorId[2] = {HEAD_PT100_ZONE_7_0X86_0, HEAD_PT100_ZONE_5_0X84_0}; //HEAD_FAN_RIGHT, HEAD_FAN_LEFT
uint32_t HeadBlowersInitControlId = 0xFF;
uint32_t HeadBlowersV0InitCount = 0;
+uint32_t HeadBlowersV0InitInProgress = 0;
typedef struct
{
@@ -347,9 +348,11 @@ void ArcHeadAlarms(void)
count5 = (count5 < 0)?(0):(count5);
}
if (currentFlow < 1.0) {
- if (++count6 == ARC_ALARM_LIMIT)
- setArcHeadAlarms(EVENT_TYPE__DYEING_HEAD_BLOWER_1_FLOW_TOO_LOW, true);
- count6 = (count6 > ARC_ALARM_LIMIT)?(ARC_ALARM_LIMIT):(count6);
+ if (!HeadBlowersV0InitInProgress) {
+ if (++count6 == ARC_ALARM_LIMIT)
+ setArcHeadAlarms(EVENT_TYPE__DYEING_HEAD_BLOWER_1_FLOW_TOO_LOW, true);
+ count6 = (count6 > ARC_ALARM_LIMIT)?(ARC_ALARM_LIMIT):(count6);
+ }
} else {
if (--count6 == 0)
setArcHeadAlarms(EVENT_TYPE__DYEING_HEAD_BLOWER_1_FLOW_TOO_LOW, false);
@@ -367,9 +370,11 @@ void ArcHeadAlarms(void)
count7 = (count7 < 0)?(0):(count7);
}
if (currentFlow < 1.0) {
- if (++count8 == ARC_ALARM_LIMIT)
- setArcHeadAlarms(EVENT_TYPE__DYEING_HEAD_BLOWER_2_FLOW_TOO_LOW, true);
- count8 = (count8 > ARC_ALARM_LIMIT)?(ARC_ALARM_LIMIT):(count8);
+ if (!HeadBlowersV0InitInProgress) {
+ if (++count8 == ARC_ALARM_LIMIT)
+ setArcHeadAlarms(EVENT_TYPE__DYEING_HEAD_BLOWER_2_FLOW_TOO_LOW, true);
+ count8 = (count8 > ARC_ALARM_LIMIT)?(ARC_ALARM_LIMIT):(count8);
+ }
} else {
if (--count8 == 0)
setArcHeadAlarms(EVENT_TYPE__DYEING_HEAD_BLOWER_2_FLOW_TOO_LOW, false);
@@ -515,6 +520,7 @@ uint32_t HeadBlowersInitCallbak(uint32_t IfIndex, uint32_t ReadValue)
HeadBlowersInitControlId = 0xFF;
HeadBlowerAirflowCalibration();
HeadBlowersOff(0);
+ HeadBlowersV0InitInProgress = 0;
Report("Head Blowers V0 calculated", __FILE__, __LINE__, PressureSensorV0[0], RpMessage, PressureSensorV0[1], 0);
Waste_Check_Flows();
}
@@ -539,6 +545,7 @@ uint32_t HeadBlowersV0Init(void)
//init Head Blowers V0
HeadBlowersV0InitCount = 0;
+ HeadBlowersV0InitInProgress = 1;
HeadBlowersInitControlId = AddControlCallback("Head Blowers V0 init", HeadBlowersInitCallbak, eOneSecond, TemplateDataReadCBFunction, 0, 0, 0);
Report("Head Blowers V0 init", __FILE__, __LINE__, Head_Type, RpMessage, 0, 0);
return OK;