diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-01-30 16:47:22 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-01-30 16:47:22 +0200 |
| commit | bdb2ae480c0616dff10deabaa7c8cbb6fa16ffff (patch) | |
| tree | bd5b6068a5e56b30cd26a025a20cc456c4d9fcdf /Software | |
| parent | e1a8c002ded63f0ff87f8b2e9dc93370ff51e5ba (diff) | |
| download | Tango-bdb2ae480c0616dff10deabaa7c8cbb6fa16ffff.tar.gz Tango-bdb2ae480c0616dff10deabaa7c8cbb6fa16ffff.zip | |
Version 1.4.6.7 : beginning of removing the #ifdefs. Sylco head and arc head temperature control fixed. new events (version 18),
Diffstat (limited to 'Software')
28 files changed, 625 insertions, 414 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c index 067466f74..d7388a64b 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c @@ -157,7 +157,7 @@ uint32_t ActivateVersionRequestFunc(MessageContainer* requestContainer) usnprintf(FullPath, 50, "%s%s%s", request->path,"/", VersionPackage->filedescriptors[File_i]->filename); Fresult = f_unlink("//SYSINFO//EMBPARAM.CFG"); Fresult |= f_rename (FullPath, "//SYSINFO//EMBPARAM.CFG"); - LoadConfigurationParamsFromFile(); + LoadConfigurationParamsFromFile(true); CurrentRunningFile++; break; case VERSION_FILE_DESTINATION__ProcessParams: diff --git a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c index 4032db82f..ec3bc602e 100644 --- a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c +++ b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c @@ -20,7 +20,7 @@ typedef struct } TangoVersion_t; -TangoVersion_t _gTangoVersion = {1,4,6,6}; +TangoVersion_t _gTangoVersion = {1,4,6,7}; #define BUILD_DATE __DATE__ char Dat[50] = BUILD_DATE; char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c index 4fbae36bf..a7d7c17ef 100644 --- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c +++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c @@ -94,8 +94,9 @@ uint32_t OpenLogFile(void) uint32_t CloseLogFile(void) { /* perform default error output */ - //f_close(LogFileHandle); + //LogFresult = f_close(LogFileHandle); + return LogFresult; } uint32_t LogToFile(char *message, /* The formatted message */ char *FileName, diff --git a/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c b/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c index 56ceccd28..5369878f8 100644 --- a/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c +++ b/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c @@ -73,13 +73,18 @@ uint32_t initArray(size_t initialSize) } else { - int i; + int i,j; for (i = 0; i < 10; i++) { if (SerialBufferUsed[i] == false) break; } - if (i == 10) return 0xFF; + if (i == 10) + { + for (j = 0; j < 10; j++) + Report("initArray all buffers busy", __FILE__, j, inBuffer[j].size, RpWarning, (int)SerialBufferUsed[j], 0); + return 0xFF; + } else { SerialBufferUsed[i] = true; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.c index dbd0f88e0..7d340fb5e 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.c +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.c @@ -7,7 +7,7 @@ #endif #include "EventType.pb-c.h" -static const ProtobufCEnumValue event_type__enum_values_by_number[294] = +static const ProtobufCEnumValue event_type__enum_values_by_number[358] = { { "None", "EVENT_TYPE__None", 0 }, { "REQUEST_SENT", "EVENT_TYPE__REQUEST_SENT", 1000 }, @@ -141,12 +141,12 @@ static const ProtobufCEnumValue event_type__enum_values_by_number[294] = { "DYEING_HEAD_ZONE_2_CURRENT_OUT_OF_RANGE", "EVENT_TYPE__DYEING_HEAD_ZONE_2_CURRENT_OUT_OF_RANGE", 5019 }, { "DYEING_HEAD_ZONE_3_CURRENT_OUT_OF_RANGE", "EVENT_TYPE__DYEING_HEAD_ZONE_3_CURRENT_OUT_OF_RANGE", 5020 }, { "DYEING_HEAD_ZONE_4_CURRENT_OUT_OF_RANGE", "EVENT_TYPE__DYEING_HEAD_ZONE_4_CURRENT_OUT_OF_RANGE", 5021 }, - { "DYEING_HEAD_ZONE_5_6_CURRENT_OUT_OF_RANGE", "EVENT_TYPE__DYEING_HEAD_ZONE_5_6_CURRENT_OUT_OF_RANGE", 5022 }, + { "DYEING_HEAD_ZONE_5_CURRENT_OUT_OF_RANGE", "EVENT_TYPE__DYEING_HEAD_ZONE_5_CURRENT_OUT_OF_RANGE", 5022 }, { "DYEING_HEAD_ZONE_1_CURRENT_LOOP_BREAK", "EVENT_TYPE__DYEING_HEAD_ZONE_1_CURRENT_LOOP_BREAK", 5023 }, { "DYEING_HEAD_ZONE_2_CURRENT_LOOP_BREAK", "EVENT_TYPE__DYEING_HEAD_ZONE_2_CURRENT_LOOP_BREAK", 5024 }, { "DYEING_HEAD_ZONE_3_CURRENT_LOOP_BREAK", "EVENT_TYPE__DYEING_HEAD_ZONE_3_CURRENT_LOOP_BREAK", 5025 }, { "DYEING_HEAD_ZONE_4_CURRENT_LOOP_BREAK", "EVENT_TYPE__DYEING_HEAD_ZONE_4_CURRENT_LOOP_BREAK", 5026 }, - { "DYEING_HEAD_ZONE_5_6_CURRENT_LOOP_BREAK", "EVENT_TYPE__DYEING_HEAD_ZONE_5_6_CURRENT_LOOP_BREAK", 5027 }, + { "DYEING_HEAD_ZONE_5_CURRENT_LOOP_BREAK", "EVENT_TYPE__DYEING_HEAD_ZONE_5_CURRENT_LOOP_BREAK", 5027 }, { "DYEING_HEAD_THERMAL_CUTOFF", "EVENT_TYPE__DYEING_HEAD_THERMAL_CUTOFF", 5028 }, { "DYEING_HEAD_COVER_OPEN_TIMEOUT", "EVENT_TYPE__DYEING_HEAD_COVER_OPEN_TIMEOUT", 5029 }, { "DYEING_HEAD_COVER_CLOSE_TIMEOUT", "EVENT_TYPE__DYEING_HEAD_COVER_CLOSE_TIMEOUT", 5030 }, @@ -162,6 +162,56 @@ static const ProtobufCEnumValue event_type__enum_values_by_number[294] = { "DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERTEMPERATURE", "EVENT_TYPE__DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERTEMPERATURE", 5040 }, { "DYEING_HEAD_CLEANING_HEAD_MOTOR_STALL", "EVENT_TYPE__DYEING_HEAD_CLEANING_HEAD_MOTOR_STALL", 5041 }, { "DYEING_HEAD_CLEANING_HEAD_MOTOR_UNDERVOLTAGE", "EVENT_TYPE__DYEING_HEAD_CLEANING_HEAD_MOTOR_UNDERVOLTAGE", 5042 }, + { "DYEING_HEAD_ZONE_7_OVERTEMPERATURE", "EVENT_TYPE__DYEING_HEAD_ZONE_7_OVERTEMPERATURE", 5043 }, + { "DYEING_HEAD_ZONE_8_OVERTEMPERATURE", "EVENT_TYPE__DYEING_HEAD_ZONE_8_OVERTEMPERATURE", 5044 }, + { "DYEING_HEAD_ZONE_9_OVERTEMPERATURE", "EVENT_TYPE__DYEING_HEAD_ZONE_9_OVERTEMPERATURE", 5045 }, + { "DYEING_HEAD_ZONE_10_OVERTEMPERATURE", "EVENT_TYPE__DYEING_HEAD_ZONE_10_OVERTEMPERATURE", 5046 }, + { "DYEING_HEAD_ZONE_11_OVERTEMPERATURE", "EVENT_TYPE__DYEING_HEAD_ZONE_11_OVERTEMPERATURE", 5047 }, + { "DYEING_HEAD_ZONE_12_OVERTEMPERATURE", "EVENT_TYPE__DYEING_HEAD_ZONE_12_OVERTEMPERATURE", 5048 }, + { "DYEING_HEAD_ZONE_7_UNDERTEMPERATURE_A", "EVENT_TYPE__DYEING_HEAD_ZONE_7_UNDERTEMPERATURE_A", 5049 }, + { "DYEING_HEAD_ZONE_8_UNDERTEMPERATURE_A", "EVENT_TYPE__DYEING_HEAD_ZONE_8_UNDERTEMPERATURE_A", 5050 }, + { "DYEING_HEAD_ZONE_9_UNDERTEMPERATURE_A", "EVENT_TYPE__DYEING_HEAD_ZONE_9_UNDERTEMPERATURE_A", 5051 }, + { "DYEING_HEAD_ZONE_10_UNDERTEMPERATURE_A", "EVENT_TYPE__DYEING_HEAD_ZONE_10_UNDERTEMPERATURE_A", 5052 }, + { "DYEING_HEAD_ZONE_11_UNDERTEMPERATURE_A", "EVENT_TYPE__DYEING_HEAD_ZONE_11_UNDERTEMPERATURE_A", 5053 }, + { "DYEING_HEAD_ZONE_12_UNDERTEMPERATURE_A", "EVENT_TYPE__DYEING_HEAD_ZONE_12_UNDERTEMPERATURE_A", 5054 }, + { "DYEING_HEAD_ZONE_7_UNDERTEMPERATURE_B", "EVENT_TYPE__DYEING_HEAD_ZONE_7_UNDERTEMPERATURE_B", 5055 }, + { "DYEING_HEAD_ZONE_8_UNDERTEMPERATURE_B", "EVENT_TYPE__DYEING_HEAD_ZONE_8_UNDERTEMPERATURE_B", 5056 }, + { "DYEING_HEAD_ZONE_9_UNDERTEMPERATURE_B", "EVENT_TYPE__DYEING_HEAD_ZONE_9_UNDERTEMPERATURE_B", 5057 }, + { "DYEING_HEAD_ZONE_10_UNDERTEMPERATURE_B", "EVENT_TYPE__DYEING_HEAD_ZONE_10_UNDERTEMPERATURE_B", 5058 }, + { "DYEING_HEAD_ZONE_11_UNDERTEMPERATURE_B", "EVENT_TYPE__DYEING_HEAD_ZONE_11_UNDERTEMPERATURE_B", 5059 }, + { "DYEING_HEAD_ZONE_12_UNDERTEMPERATURE_B", "EVENT_TYPE__DYEING_HEAD_ZONE_12_UNDERTEMPERATURE_B", 5060 }, + { "DYEING_HEAD_ZONE_6_CURRENT_OUT_OF_RANGE", "EVENT_TYPE__DYEING_HEAD_ZONE_6_CURRENT_OUT_OF_RANGE", 5061 }, + { "DYEING_HEAD_ZONE_7_CURRENT_OUT_OF_RANGE", "EVENT_TYPE__DYEING_HEAD_ZONE_7_CURRENT_OUT_OF_RANGE", 5062 }, + { "DYEING_HEAD_ZONE_8_CURRENT_OUT_OF_RANGE", "EVENT_TYPE__DYEING_HEAD_ZONE_8_CURRENT_OUT_OF_RANGE", 5063 }, + { "DYEING_HEAD_ZONE_9_CURRENT_OUT_OF_RANGE", "EVENT_TYPE__DYEING_HEAD_ZONE_9_CURRENT_OUT_OF_RANGE", 5064 }, + { "DYEING_HEAD_ZONE_10_CURRENT_OUT_OF_RANGE", "EVENT_TYPE__DYEING_HEAD_ZONE_10_CURRENT_OUT_OF_RANGE", 5065 }, + { "DYEING_HEAD_ZONE_11_CURRENT_OUT_OF_RANGE", "EVENT_TYPE__DYEING_HEAD_ZONE_11_CURRENT_OUT_OF_RANGE", 5066 }, + { "DYEING_HEAD_ZONE_12_CURRENT_OUT_OF_RANGE", "EVENT_TYPE__DYEING_HEAD_ZONE_12_CURRENT_OUT_OF_RANGE", 5067 }, + { "DYEING_HEAD_ZONE_6_CURRENT_LOOP_BREAK", "EVENT_TYPE__DYEING_HEAD_ZONE_6_CURRENT_LOOP_BREAK", 5068 }, + { "DYEING_HEAD_ZONE_7_CURRENT_LOOP_BREAK", "EVENT_TYPE__DYEING_HEAD_ZONE_7_CURRENT_LOOP_BREAK", 5069 }, + { "DYEING_HEAD_ZONE_8_CURRENT_LOOP_BREAK", "EVENT_TYPE__DYEING_HEAD_ZONE_8_CURRENT_LOOP_BREAK", 5070 }, + { "DYEING_HEAD_ZONE_9_CURRENT_LOOP_BREAK", "EVENT_TYPE__DYEING_HEAD_ZONE_9_CURRENT_LOOP_BREAK", 5071 }, + { "DYEING_HEAD_ZONE_10_CURRENT_LOOP_BREAK", "EVENT_TYPE__DYEING_HEAD_ZONE_10_CURRENT_LOOP_BREAK", 5072 }, + { "DYEING_HEAD_ZONE_11_CURRENT_LOOP_BREAK", "EVENT_TYPE__DYEING_HEAD_ZONE_11_CURRENT_LOOP_BREAK", 5073 }, + { "DYEING_HEAD_ZONE_12_CURRENT_LOOP_BREAK", "EVENT_TYPE__DYEING_HEAD_ZONE_12_CURRENT_LOOP_BREAK", 5074 }, + { "DYEING_HEAD_BLOWER_1_OVERTEMPERATURE", "EVENT_TYPE__DYEING_HEAD_BLOWER_1_OVERTEMPERATURE", 5075 }, + { "DYEING_HEAD_BLOWER_2_OVERTEMPERATURE", "EVENT_TYPE__DYEING_HEAD_BLOWER_2_OVERTEMPERATURE", 5076 }, + { "DYEING_HEAD_BLOWER_1_UNDERTEMPERATURE_A", "EVENT_TYPE__DYEING_HEAD_BLOWER_1_UNDERTEMPERATURE_A", 5077 }, + { "DYEING_HEAD_BLOWER_2_UNDERTEMPERATURE_A", "EVENT_TYPE__DYEING_HEAD_BLOWER_2_UNDERTEMPERATURE_A", 5078 }, + { "DYEING_HEAD_BLOWER_1_UNDERTEMPERATURE_B", "EVENT_TYPE__DYEING_HEAD_BLOWER_1_UNDERTEMPERATURE_B", 5079 }, + { "DYEING_HEAD_BLOWER_2_UNDERTEMPERATURE_B", "EVENT_TYPE__DYEING_HEAD_BLOWER_2_UNDERTEMPERATURE_B", 5080 }, + { "DYEING_HEAD_BLOWER_1_CURRENT_OUT_OF_RANGE", "EVENT_TYPE__DYEING_HEAD_BLOWER_1_CURRENT_OUT_OF_RANGE", 5081 }, + { "DYEING_HEAD_BLOWER_2_CURRENT_OUT_OF_RANGE", "EVENT_TYPE__DYEING_HEAD_BLOWER_2_CURRENT_OUT_OF_RANGE", 5082 }, + { "DYEING_HEAD_BLOWER_1_CURRENT_LOOP_BREAK", "EVENT_TYPE__DYEING_HEAD_BLOWER_1_CURRENT_LOOP_BREAK", 5083 }, + { "DYEING_HEAD_BLOWER_2_CURRENT_LOOP_BREAK", "EVENT_TYPE__DYEING_HEAD_BLOWER_2_CURRENT_LOOP_BREAK", 5084 }, + { "DYEING_HEAD_BLOWER_1_FAN_STOPPED", "EVENT_TYPE__DYEING_HEAD_BLOWER_1_FAN_STOPPED", 5085 }, + { "DYEING_HEAD_BLOWER_2_FAN_STOPPED", "EVENT_TYPE__DYEING_HEAD_BLOWER_2_FAN_STOPPED", 5086 }, + { "DYEING_HEAD_BLOWER_1_FAN_RPM_TOO_LOW", "EVENT_TYPE__DYEING_HEAD_BLOWER_1_FAN_RPM_TOO_LOW", 5087 }, + { "DYEING_HEAD_BLOWER_2_FAN_RPM_TOO_LOW", "EVENT_TYPE__DYEING_HEAD_BLOWER_2_FAN_RPM_TOO_LOW", 5088 }, + { "DYEING_HEAD_RIGHT_ACTUATOR_UP_TIMEOUT", "EVENT_TYPE__DYEING_HEAD_RIGHT_ACTUATOR_UP_TIMEOUT", 5089 }, + { "DYEING_HEAD_LEFT_ACTUATOR_UP_TIMEOUT", "EVENT_TYPE__DYEING_HEAD_LEFT_ACTUATOR_UP_TIMEOUT", 5090 }, + { "DYEING_HEAD_RIGHT_ACTUATOR_DOWN_TIMEOUT", "EVENT_TYPE__DYEING_HEAD_RIGHT_ACTUATOR_DOWN_TIMEOUT", 5091 }, + { "DYEING_HEAD_LEFT_ACTUATOR_DOWN_TIMEOUT", "EVENT_TYPE__DYEING_HEAD_LEFT_ACTUATOR_DOWN_TIMEOUT", 5092 }, { "MIXER_OVERTEMPERATURE", "EVENT_TYPE__MIXER_OVERTEMPERATURE", 6000 }, { "MIXER_UNDERTEMPERATURE_A", "EVENT_TYPE__MIXER_UNDERTEMPERATURE_A", 6001 }, { "MIXER_UNDERTEMPERATURE_B", "EVENT_TYPE__MIXER_UNDERTEMPERATURE_B", 6002 }, @@ -297,6 +347,20 @@ static const ProtobufCEnumValue event_type__enum_values_by_number[294] = { "CHILLER_DRY_CONTACT", "EVENT_TYPE__CHILLER_DRY_CONTACT", 9006 }, { "INSUFFICIENT_AIR_FLOW", "EVENT_TYPE__INSUFFICIENT_AIR_FLOW", 9007 }, { "VOC_SENSOR_ALARM_SLOPE", "EVENT_TYPE__VOC_SENSOR_ALARM_SLOPE", 9008 }, + { "PRE_COOLER_FAN_1_STOPPED", "EVENT_TYPE__PRE_COOLER_FAN_1_STOPPED", 9009 }, + { "PRE_COOLER_FAN_2_STOPPED", "EVENT_TYPE__PRE_COOLER_FAN_2_STOPPED", 9010 }, + { "COOLER_FAN_1_STOPPED", "EVENT_TYPE__COOLER_FAN_1_STOPPED", 9011 }, + { "COOLER_FAN_2_STOPPED", "EVENT_TYPE__COOLER_FAN_2_STOPPED", 9012 }, + { "COOLER_FAN_3_STOPPED", "EVENT_TYPE__COOLER_FAN_3_STOPPED", 9013 }, + { "COOLER_FAN_4_STOPPED", "EVENT_TYPE__COOLER_FAN_4_STOPPED", 9014 }, + { "PRE_COOLER_FAN_1_RPM_TOO_LOW", "EVENT_TYPE__PRE_COOLER_FAN_1_RPM_TOO_LOW", 9015 }, + { "PRE_COOLER_FAN_2_RPM_TOO_LOW", "EVENT_TYPE__PRE_COOLER_FAN_2_RPM_TOO_LOW", 9016 }, + { "COOLER_FAN_1_RPM_TOO_LOW", "EVENT_TYPE__COOLER_FAN_1_RPM_TOO_LOW", 9017 }, + { "COOLER_FAN_2_RPM_TOO_LOW", "EVENT_TYPE__COOLER_FAN_2_RPM_TOO_LOW", 9018 }, + { "COOLER_FAN_3_RPM_TOO_LOW", "EVENT_TYPE__COOLER_FAN_3_RPM_TOO_LOW", 9019 }, + { "COOLER_FAN_4_RPM_TOO_LOW", "EVENT_TYPE__COOLER_FAN_4_RPM_TOO_LOW", 9020 }, + { "COOLER_TEMPERATURE_TOO_HIGH", "EVENT_TYPE__COOLER_TEMPERATURE_TOO_HIGH", 9021 }, + { "COOLER_TEMPERATURE_TOO_LOW", "EVENT_TYPE__COOLER_TEMPERATURE_TOO_LOW", 9022 }, { "INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT", "EVENT_TYPE__INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT", 10000 }, { "INK_CARTRIDGE_RFID_TIMEOUT", "EVENT_TYPE__INK_CARTRIDGE_RFID_TIMEOUT", 10001 }, { "NO_WASTE_CARTRIDGE_AVAILABLE", "EVENT_TYPE__NO_WASTE_CARTRIDGE_AVAILABLE", 10002 }, @@ -305,107 +369,117 @@ static const ProtobufCEnumValue event_type__enum_values_by_number[294] = { "WASTE_CARTRIDGE_RFID_TIMEOUT", "EVENT_TYPE__WASTE_CARTRIDGE_RFID_TIMEOUT", 10005 }, }; static const ProtobufCIntRange event_type__value_ranges[] = { -{0, 0},{1000, 1},{2000, 15},{3000, 36},{4000, 88},{5000, 110},{6000, 153},{7000, 159},{8000, 247},{9000, 279},{10000, 288},{0, 294} +{0, 0},{1000, 1},{2000, 15},{3000, 36},{4000, 88},{5000, 110},{6000, 203},{7000, 209},{8000, 297},{9000, 329},{10000, 352},{0, 358} }; -static const ProtobufCEnumValueIndex event_type__enum_values_by_name[294] = +static const ProtobufCEnumValueIndex event_type__enum_values_by_name[358] = { - { "AIR_FILTER_CLOGGED", 280 }, - { "AIR_FILTER_NOT_INSTALLED", 279 }, - { "ALL_WASTE_CARTRIDGES_FULL", 291 }, + { "AIR_FILTER_CLOGGED", 330 }, + { "AIR_FILTER_NOT_INSTALLED", 329 }, + { "ALL_WASTE_CARTRIDGES_FULL", 355 }, { "APPLICATION_EXCEPTION", 4 }, { "APPLICATION_INFORMATION", 5 }, { "APPLICATION_STARTED", 6 }, { "APPLICATION_TERMINATED", 7 }, { "CARTRIDGES_COVER_OPEN", 21 }, - { "CHILLER_DRY_CONTACT", 285 }, - { "DISPENSER_1_EMPTY", 175 }, - { "DISPENSER_1_HIGH_PRESSURE", 239 }, - { "DISPENSER_1_LOWER_HARD_LIMIT", 231 }, - { "DISPENSER_1_MOTOR_OVERCURRENT", 191 }, - { "DISPENSER_1_MOTOR_OVERTEMPERATURE", 199 }, - { "DISPENSER_1_MOTOR_STALL", 207 }, - { "DISPENSER_1_MOTOR_UNDERVOLTAGE", 215 }, - { "DISPENSER_1_OVERPRESSURE", 159 }, - { "DISPENSER_1_REFILL_FAILURE", 183 }, - { "DISPENSER_1_UNDERPRESSURE", 167 }, - { "DISPENSER_1_UPPER_HARD_LIMIT", 223 }, - { "DISPENSER_2_EMPTY", 176 }, - { "DISPENSER_2_HIGH_PRESSURE", 240 }, - { "DISPENSER_2_LOWER_HARD_LIMIT", 232 }, - { "DISPENSER_2_MOTOR_OVERCURRENT", 192 }, - { "DISPENSER_2_MOTOR_OVERTEMPERATURE", 200 }, - { "DISPENSER_2_MOTOR_STALL", 208 }, - { "DISPENSER_2_MOTOR_UNDERVOLTAGE", 216 }, - { "DISPENSER_2_OVERPRESSURE", 160 }, - { "DISPENSER_2_REFILL_FAILURE", 184 }, - { "DISPENSER_2_UNDERPRESSURE", 168 }, - { "DISPENSER_2_UPPER_HARD_LIMIT", 224 }, - { "DISPENSER_3_EMPTY", 177 }, - { "DISPENSER_3_HIGH_PRESSURE", 241 }, - { "DISPENSER_3_LOWER_HARD_LIMIT", 233 }, - { "DISPENSER_3_MOTOR_OVERCURRENT", 193 }, - { "DISPENSER_3_MOTOR_OVERTEMPERATURE", 201 }, - { "DISPENSER_3_MOTOR_STALL", 209 }, - { "DISPENSER_3_MOTOR_UNDERVOLTAGE", 217 }, - { "DISPENSER_3_OVERPRESSURE", 161 }, - { "DISPENSER_3_REFILL_FAILURE", 185 }, - { "DISPENSER_3_UNDERPRESSURE", 169 }, - { "DISPENSER_3_UPPER_HARD_LIMIT", 225 }, - { "DISPENSER_4_EMPTY", 178 }, - { "DISPENSER_4_HIGH_PRESSURE", 242 }, - { "DISPENSER_4_LOWER_HARD_LIMIT", 234 }, - { "DISPENSER_4_MOTOR_OVERCURRENT", 194 }, - { "DISPENSER_4_MOTOR_OVERTEMPERATURE", 202 }, - { "DISPENSER_4_MOTOR_STALL", 210 }, - { "DISPENSER_4_MOTOR_UNDERVOLTAGE", 218 }, - { "DISPENSER_4_OVERPRESSURE", 162 }, - { "DISPENSER_4_REFILL_FAILURE", 186 }, - { "DISPENSER_4_UNDERPRESSURE", 170 }, - { "DISPENSER_4_UPPER_HARD_LIMIT", 226 }, - { "DISPENSER_5_EMPTY", 179 }, - { "DISPENSER_5_HIGH_PRESSURE", 243 }, - { "DISPENSER_5_LOWER_HARD_LIMIT", 235 }, - { "DISPENSER_5_MOTOR_OVERCURRENT", 195 }, - { "DISPENSER_5_MOTOR_OVERTEMPERATURE", 203 }, - { "DISPENSER_5_MOTOR_STALL", 211 }, - { "DISPENSER_5_MOTOR_UNDERVOLTAGE", 219 }, - { "DISPENSER_5_OVERPRESSURE", 163 }, - { "DISPENSER_5_REFILL_FAILURE", 187 }, - { "DISPENSER_5_UNDERPRESSURE", 171 }, - { "DISPENSER_5_UPPER_HARD_LIMIT", 227 }, - { "DISPENSER_6_EMPTY", 180 }, - { "DISPENSER_6_HIGH_PRESSURE", 244 }, - { "DISPENSER_6_LOWER_HARD_LIMIT", 236 }, - { "DISPENSER_6_MOTOR_OVERCURRENT", 196 }, - { "DISPENSER_6_MOTOR_OVERTEMPERATURE", 204 }, - { "DISPENSER_6_MOTOR_STALL", 212 }, - { "DISPENSER_6_MOTOR_UNDERVOLTAGE", 220 }, - { "DISPENSER_6_OVERPRESSURE", 164 }, - { "DISPENSER_6_REFILL_FAILURE", 188 }, - { "DISPENSER_6_UNDERPRESSURE", 172 }, - { "DISPENSER_6_UPPER_HARD_LIMIT", 228 }, - { "DISPENSER_7_EMPTY", 181 }, - { "DISPENSER_7_HIGH_PRESSURE", 245 }, - { "DISPENSER_7_LOWER_HARD_LIMIT", 237 }, - { "DISPENSER_7_MOTOR_OVERCURRENT", 197 }, - { "DISPENSER_7_MOTOR_OVERTEMPERATURE", 205 }, - { "DISPENSER_7_MOTOR_STALL", 213 }, - { "DISPENSER_7_MOTOR_UNDERVOLTAGE", 221 }, - { "DISPENSER_7_OVERPRESSURE", 165 }, - { "DISPENSER_7_REFILL_FAILURE", 189 }, - { "DISPENSER_7_UNDERPRESSURE", 173 }, - { "DISPENSER_7_UPPER_HARD_LIMIT", 229 }, - { "DISPENSER_8_EMPTY", 182 }, - { "DISPENSER_8_HIGH_PRESSURE", 246 }, - { "DISPENSER_8_LOWER_HARD_LIMIT", 238 }, - { "DISPENSER_8_MOTOR_OVERCURRENT", 198 }, - { "DISPENSER_8_MOTOR_OVERTEMPERATURE", 206 }, - { "DISPENSER_8_MOTOR_STALL", 214 }, - { "DISPENSER_8_MOTOR_UNDERVOLTAGE", 222 }, - { "DISPENSER_8_OVERPRESSURE", 166 }, - { "DISPENSER_8_REFILL_FAILURE", 190 }, - { "DISPENSER_8_UNDERPRESSURE", 174 }, - { "DISPENSER_8_UPPER_HARD_LIMIT", 230 }, + { "CHILLER_DRY_CONTACT", 335 }, + { "COOLER_FAN_1_RPM_TOO_LOW", 346 }, + { "COOLER_FAN_1_STOPPED", 340 }, + { "COOLER_FAN_2_RPM_TOO_LOW", 347 }, + { "COOLER_FAN_2_STOPPED", 341 }, + { "COOLER_FAN_3_RPM_TOO_LOW", 348 }, + { "COOLER_FAN_3_STOPPED", 342 }, + { "COOLER_FAN_4_RPM_TOO_LOW", 349 }, + { "COOLER_FAN_4_STOPPED", 343 }, + { "COOLER_TEMPERATURE_TOO_HIGH", 350 }, + { "COOLER_TEMPERATURE_TOO_LOW", 351 }, + { "DISPENSER_1_EMPTY", 225 }, + { "DISPENSER_1_HIGH_PRESSURE", 289 }, + { "DISPENSER_1_LOWER_HARD_LIMIT", 281 }, + { "DISPENSER_1_MOTOR_OVERCURRENT", 241 }, + { "DISPENSER_1_MOTOR_OVERTEMPERATURE", 249 }, + { "DISPENSER_1_MOTOR_STALL", 257 }, + { "DISPENSER_1_MOTOR_UNDERVOLTAGE", 265 }, + { "DISPENSER_1_OVERPRESSURE", 209 }, + { "DISPENSER_1_REFILL_FAILURE", 233 }, + { "DISPENSER_1_UNDERPRESSURE", 217 }, + { "DISPENSER_1_UPPER_HARD_LIMIT", 273 }, + { "DISPENSER_2_EMPTY", 226 }, + { "DISPENSER_2_HIGH_PRESSURE", 290 }, + { "DISPENSER_2_LOWER_HARD_LIMIT", 282 }, + { "DISPENSER_2_MOTOR_OVERCURRENT", 242 }, + { "DISPENSER_2_MOTOR_OVERTEMPERATURE", 250 }, + { "DISPENSER_2_MOTOR_STALL", 258 }, + { "DISPENSER_2_MOTOR_UNDERVOLTAGE", 266 }, + { "DISPENSER_2_OVERPRESSURE", 210 }, + { "DISPENSER_2_REFILL_FAILURE", 234 }, + { "DISPENSER_2_UNDERPRESSURE", 218 }, + { "DISPENSER_2_UPPER_HARD_LIMIT", 274 }, + { "DISPENSER_3_EMPTY", 227 }, + { "DISPENSER_3_HIGH_PRESSURE", 291 }, + { "DISPENSER_3_LOWER_HARD_LIMIT", 283 }, + { "DISPENSER_3_MOTOR_OVERCURRENT", 243 }, + { "DISPENSER_3_MOTOR_OVERTEMPERATURE", 251 }, + { "DISPENSER_3_MOTOR_STALL", 259 }, + { "DISPENSER_3_MOTOR_UNDERVOLTAGE", 267 }, + { "DISPENSER_3_OVERPRESSURE", 211 }, + { "DISPENSER_3_REFILL_FAILURE", 235 }, + { "DISPENSER_3_UNDERPRESSURE", 219 }, + { "DISPENSER_3_UPPER_HARD_LIMIT", 275 }, + { "DISPENSER_4_EMPTY", 228 }, + { "DISPENSER_4_HIGH_PRESSURE", 292 }, + { "DISPENSER_4_LOWER_HARD_LIMIT", 284 }, + { "DISPENSER_4_MOTOR_OVERCURRENT", 244 }, + { "DISPENSER_4_MOTOR_OVERTEMPERATURE", 252 }, + { "DISPENSER_4_MOTOR_STALL", 260 }, + { "DISPENSER_4_MOTOR_UNDERVOLTAGE", 268 }, + { "DISPENSER_4_OVERPRESSURE", 212 }, + { "DISPENSER_4_REFILL_FAILURE", 236 }, + { "DISPENSER_4_UNDERPRESSURE", 220 }, + { "DISPENSER_4_UPPER_HARD_LIMIT", 276 }, + { "DISPENSER_5_EMPTY", 229 }, + { "DISPENSER_5_HIGH_PRESSURE", 293 }, + { "DISPENSER_5_LOWER_HARD_LIMIT", 285 }, + { "DISPENSER_5_MOTOR_OVERCURRENT", 245 }, + { "DISPENSER_5_MOTOR_OVERTEMPERATURE", 253 }, + { "DISPENSER_5_MOTOR_STALL", 261 }, + { "DISPENSER_5_MOTOR_UNDERVOLTAGE", 269 }, + { "DISPENSER_5_OVERPRESSURE", 213 }, + { "DISPENSER_5_REFILL_FAILURE", 237 }, + { "DISPENSER_5_UNDERPRESSURE", 221 }, + { "DISPENSER_5_UPPER_HARD_LIMIT", 277 }, + { "DISPENSER_6_EMPTY", 230 }, + { "DISPENSER_6_HIGH_PRESSURE", 294 }, + { "DISPENSER_6_LOWER_HARD_LIMIT", 286 }, + { "DISPENSER_6_MOTOR_OVERCURRENT", 246 }, + { "DISPENSER_6_MOTOR_OVERTEMPERATURE", 254 }, + { "DISPENSER_6_MOTOR_STALL", 262 }, + { "DISPENSER_6_MOTOR_UNDERVOLTAGE", 270 }, + { "DISPENSER_6_OVERPRESSURE", 214 }, + { "DISPENSER_6_REFILL_FAILURE", 238 }, + { "DISPENSER_6_UNDERPRESSURE", 222 }, + { "DISPENSER_6_UPPER_HARD_LIMIT", 278 }, + { "DISPENSER_7_EMPTY", 231 }, + { "DISPENSER_7_HIGH_PRESSURE", 295 }, + { "DISPENSER_7_LOWER_HARD_LIMIT", 287 }, + { "DISPENSER_7_MOTOR_OVERCURRENT", 247 }, + { "DISPENSER_7_MOTOR_OVERTEMPERATURE", 255 }, + { "DISPENSER_7_MOTOR_STALL", 263 }, + { "DISPENSER_7_MOTOR_UNDERVOLTAGE", 271 }, + { "DISPENSER_7_OVERPRESSURE", 215 }, + { "DISPENSER_7_REFILL_FAILURE", 239 }, + { "DISPENSER_7_UNDERPRESSURE", 223 }, + { "DISPENSER_7_UPPER_HARD_LIMIT", 279 }, + { "DISPENSER_8_EMPTY", 232 }, + { "DISPENSER_8_HIGH_PRESSURE", 296 }, + { "DISPENSER_8_LOWER_HARD_LIMIT", 288 }, + { "DISPENSER_8_MOTOR_OVERCURRENT", 248 }, + { "DISPENSER_8_MOTOR_OVERTEMPERATURE", 256 }, + { "DISPENSER_8_MOTOR_STALL", 264 }, + { "DISPENSER_8_MOTOR_UNDERVOLTAGE", 272 }, + { "DISPENSER_8_OVERPRESSURE", 216 }, + { "DISPENSER_8_REFILL_FAILURE", 240 }, + { "DISPENSER_8_UNDERPRESSURE", 224 }, + { "DISPENSER_8_UPPER_HARD_LIMIT", 280 }, { "DRYER_DOOR_OPEN", 92 }, { "DRYER_FAN_RPM_TOO_LOW", 103 }, { "DRYER_FAN_STOPPED", 104 }, @@ -428,6 +502,20 @@ static const ProtobufCEnumValueIndex event_type__enum_values_by_name[294] = { "DRYER_ZONE_2_OVERTEMPERATURE", 94 }, { "DRYER_ZONE_2_UNDERTEMPERATURE_A", 109 }, { "DRYER_ZONE_2_UNDERTEMPERATURE_B", 97 }, + { "DYEING_HEAD_BLOWER_1_CURRENT_LOOP_BREAK", 193 }, + { "DYEING_HEAD_BLOWER_1_CURRENT_OUT_OF_RANGE", 191 }, + { "DYEING_HEAD_BLOWER_1_FAN_RPM_TOO_LOW", 197 }, + { "DYEING_HEAD_BLOWER_1_FAN_STOPPED", 195 }, + { "DYEING_HEAD_BLOWER_1_OVERTEMPERATURE", 185 }, + { "DYEING_HEAD_BLOWER_1_UNDERTEMPERATURE_A", 187 }, + { "DYEING_HEAD_BLOWER_1_UNDERTEMPERATURE_B", 189 }, + { "DYEING_HEAD_BLOWER_2_CURRENT_LOOP_BREAK", 194 }, + { "DYEING_HEAD_BLOWER_2_CURRENT_OUT_OF_RANGE", 192 }, + { "DYEING_HEAD_BLOWER_2_FAN_RPM_TOO_LOW", 198 }, + { "DYEING_HEAD_BLOWER_2_FAN_STOPPED", 196 }, + { "DYEING_HEAD_BLOWER_2_OVERTEMPERATURE", 186 }, + { "DYEING_HEAD_BLOWER_2_UNDERTEMPERATURE_A", 188 }, + { "DYEING_HEAD_BLOWER_2_UNDERTEMPERATURE_B", 190 }, { "DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERCURRENT", 149 }, { "DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERTEMPERATURE", 150 }, { "DYEING_HEAD_CLEANING_HEAD_MOTOR_STALL", 151 }, @@ -442,7 +530,26 @@ static const ProtobufCEnumValueIndex event_type__enum_values_by_name[294] = { "DYEING_HEAD_COVER_MOTOR_STALL", 143 }, { "DYEING_HEAD_COVER_MOTOR_UNDERVOLTAGE", 144 }, { "DYEING_HEAD_COVER_OPEN_TIMEOUT", 139 }, + { "DYEING_HEAD_LEFT_ACTUATOR_DOWN_TIMEOUT", 202 }, + { "DYEING_HEAD_LEFT_ACTUATOR_UP_TIMEOUT", 200 }, + { "DYEING_HEAD_RIGHT_ACTUATOR_DOWN_TIMEOUT", 201 }, + { "DYEING_HEAD_RIGHT_ACTUATOR_UP_TIMEOUT", 199 }, { "DYEING_HEAD_THERMAL_CUTOFF", 138 }, + { "DYEING_HEAD_ZONE_10_CURRENT_LOOP_BREAK", 182 }, + { "DYEING_HEAD_ZONE_10_CURRENT_OUT_OF_RANGE", 175 }, + { "DYEING_HEAD_ZONE_10_OVERTEMPERATURE", 156 }, + { "DYEING_HEAD_ZONE_10_UNDERTEMPERATURE_A", 162 }, + { "DYEING_HEAD_ZONE_10_UNDERTEMPERATURE_B", 168 }, + { "DYEING_HEAD_ZONE_11_CURRENT_LOOP_BREAK", 183 }, + { "DYEING_HEAD_ZONE_11_CURRENT_OUT_OF_RANGE", 176 }, + { "DYEING_HEAD_ZONE_11_OVERTEMPERATURE", 157 }, + { "DYEING_HEAD_ZONE_11_UNDERTEMPERATURE_A", 163 }, + { "DYEING_HEAD_ZONE_11_UNDERTEMPERATURE_B", 169 }, + { "DYEING_HEAD_ZONE_12_CURRENT_LOOP_BREAK", 184 }, + { "DYEING_HEAD_ZONE_12_CURRENT_OUT_OF_RANGE", 177 }, + { "DYEING_HEAD_ZONE_12_OVERTEMPERATURE", 158 }, + { "DYEING_HEAD_ZONE_12_UNDERTEMPERATURE_A", 164 }, + { "DYEING_HEAD_ZONE_12_UNDERTEMPERATURE_B", 170 }, { "DYEING_HEAD_ZONE_1_CURRENT_LOOP_BREAK", 133 }, { "DYEING_HEAD_ZONE_1_CURRENT_OUT_OF_RANGE", 128 }, { "DYEING_HEAD_ZONE_1_OVERTEMPERATURE", 110 }, @@ -463,14 +570,31 @@ static const ProtobufCEnumValueIndex event_type__enum_values_by_name[294] = { "DYEING_HEAD_ZONE_4_OVERTEMPERATURE", 113 }, { "DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_A", 119 }, { "DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_B", 125 }, - { "DYEING_HEAD_ZONE_5_6_CURRENT_LOOP_BREAK", 137 }, - { "DYEING_HEAD_ZONE_5_6_CURRENT_OUT_OF_RANGE", 132 }, + { "DYEING_HEAD_ZONE_5_CURRENT_LOOP_BREAK", 137 }, + { "DYEING_HEAD_ZONE_5_CURRENT_OUT_OF_RANGE", 132 }, { "DYEING_HEAD_ZONE_5_OVERTEMPERATURE", 114 }, { "DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_A", 120 }, { "DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_B", 126 }, + { "DYEING_HEAD_ZONE_6_CURRENT_LOOP_BREAK", 178 }, + { "DYEING_HEAD_ZONE_6_CURRENT_OUT_OF_RANGE", 171 }, { "DYEING_HEAD_ZONE_6_OVERTEMPERATURE", 115 }, { "DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_A", 121 }, { "DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_B", 127 }, + { "DYEING_HEAD_ZONE_7_CURRENT_LOOP_BREAK", 179 }, + { "DYEING_HEAD_ZONE_7_CURRENT_OUT_OF_RANGE", 172 }, + { "DYEING_HEAD_ZONE_7_OVERTEMPERATURE", 153 }, + { "DYEING_HEAD_ZONE_7_UNDERTEMPERATURE_A", 159 }, + { "DYEING_HEAD_ZONE_7_UNDERTEMPERATURE_B", 165 }, + { "DYEING_HEAD_ZONE_8_CURRENT_LOOP_BREAK", 180 }, + { "DYEING_HEAD_ZONE_8_CURRENT_OUT_OF_RANGE", 173 }, + { "DYEING_HEAD_ZONE_8_OVERTEMPERATURE", 154 }, + { "DYEING_HEAD_ZONE_8_UNDERTEMPERATURE_A", 160 }, + { "DYEING_HEAD_ZONE_8_UNDERTEMPERATURE_B", 166 }, + { "DYEING_HEAD_ZONE_9_CURRENT_LOOP_BREAK", 181 }, + { "DYEING_HEAD_ZONE_9_CURRENT_OUT_OF_RANGE", 174 }, + { "DYEING_HEAD_ZONE_9_OVERTEMPERATURE", 155 }, + { "DYEING_HEAD_ZONE_9_UNDERTEMPERATURE_A", 161 }, + { "DYEING_HEAD_ZONE_9_UNDERTEMPERATURE_B", 167 }, { "ELECTRICAL_CABINET_FANS_RPM_TOO_LOW", 26 }, { "ELECTRICAL_CABINET_FANS_STOPPED", 27 }, { "ELECTRICAL_CABINET_OVERTEMPERATURE", 33 }, @@ -488,9 +612,9 @@ static const ProtobufCEnumValueIndex event_type__enum_values_by_name[294] = { "FRONT_COVER_2_OPEN", 18 }, { "FRONT_COVER_3_OPEN", 19 }, { "FRONT_COVER_4_OPEN", 20 }, - { "INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT", 288 }, - { "INK_CARTRIDGE_RFID_TIMEOUT", 289 }, - { "INSUFFICIENT_AIR_FLOW", 286 }, + { "INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT", 352 }, + { "INK_CARTRIDGE_RFID_TIMEOUT", 353 }, + { "INSUFFICIENT_AIR_FLOW", 336 }, { "JOB_ABORTED", 12 }, { "JOB_COMPLETED", 14 }, { "JOB_FAILED", 13 }, @@ -514,48 +638,52 @@ static const ProtobufCEnumValueIndex event_type__enum_values_by_name[294] = { "MACHINE_STATE_INITIAL_BLOWER_FAILED", 30 }, { "MACHINE_STATE_NO_CFG_FILE", 28 }, { "MACHINE_STATE_NO_THREAD_DETECTED", 86 }, - { "MID_TANK_1_EMPTY", 255 }, - { "MID_TANK_1_FILL_TIMEOUT", 271 }, - { "MID_TANK_1_LOW_LEVEL", 247 }, - { "MID_TANK_1_OVERFLOW", 263 }, - { "MID_TANK_2_EMPTY", 256 }, - { "MID_TANK_2_FILL_TIMEOUT", 272 }, - { "MID_TANK_2_LOW_LEVEL", 248 }, - { "MID_TANK_2_OVERFLOW", 264 }, - { "MID_TANK_3_EMPTY", 257 }, - { "MID_TANK_3_FILL_TIMEOUT", 273 }, - { "MID_TANK_3_LOW_LEVEL", 249 }, - { "MID_TANK_3_OVERFLOW", 265 }, - { "MID_TANK_4_EMPTY", 258 }, - { "MID_TANK_4_FILL_TIMEOUT", 274 }, - { "MID_TANK_4_LOW_LEVEL", 250 }, - { "MID_TANK_4_OVERFLOW", 266 }, - { "MID_TANK_5_EMPTY", 259 }, - { "MID_TANK_5_FILL_TIMEOUT", 275 }, - { "MID_TANK_5_LOW_LEVEL", 251 }, - { "MID_TANK_5_OVERFLOW", 267 }, - { "MID_TANK_6_EMPTY", 260 }, - { "MID_TANK_6_FILL_TIMEOUT", 276 }, - { "MID_TANK_6_LOW_LEVEL", 252 }, - { "MID_TANK_6_OVERFLOW", 268 }, - { "MID_TANK_7_EMPTY", 261 }, - { "MID_TANK_7_FILL_TIMEOUT", 277 }, - { "MID_TANK_7_LOW_LEVEL", 253 }, - { "MID_TANK_7_OVERFLOW", 269 }, - { "MID_TANK_8_EMPTY", 262 }, - { "MID_TANK_8_FILL_TIMEOUT", 278 }, - { "MID_TANK_8_LOW_LEVEL", 254 }, - { "MID_TANK_8_OVERFLOW", 270 }, - { "MIXER_CURRENT_LOOP_BREAK", 158 }, - { "MIXER_CURRENT_OUT_OF_RANGE", 157 }, - { "MIXER_OVERTEMPERATURE", 153 }, - { "MIXER_THERMAL_CUTOFF", 156 }, - { "MIXER_UNDERTEMPERATURE_A", 154 }, - { "MIXER_UNDERTEMPERATURE_B", 155 }, - { "NO_AIR_PRESSURE", 282 }, - { "NO_WASTE_CARTRIDGE_AVAILABLE", 290 }, + { "MID_TANK_1_EMPTY", 305 }, + { "MID_TANK_1_FILL_TIMEOUT", 321 }, + { "MID_TANK_1_LOW_LEVEL", 297 }, + { "MID_TANK_1_OVERFLOW", 313 }, + { "MID_TANK_2_EMPTY", 306 }, + { "MID_TANK_2_FILL_TIMEOUT", 322 }, + { "MID_TANK_2_LOW_LEVEL", 298 }, + { "MID_TANK_2_OVERFLOW", 314 }, + { "MID_TANK_3_EMPTY", 307 }, + { "MID_TANK_3_FILL_TIMEOUT", 323 }, + { "MID_TANK_3_LOW_LEVEL", 299 }, + { "MID_TANK_3_OVERFLOW", 315 }, + { "MID_TANK_4_EMPTY", 308 }, + { "MID_TANK_4_FILL_TIMEOUT", 324 }, + { "MID_TANK_4_LOW_LEVEL", 300 }, + { "MID_TANK_4_OVERFLOW", 316 }, + { "MID_TANK_5_EMPTY", 309 }, + { "MID_TANK_5_FILL_TIMEOUT", 325 }, + { "MID_TANK_5_LOW_LEVEL", 301 }, + { "MID_TANK_5_OVERFLOW", 317 }, + { "MID_TANK_6_EMPTY", 310 }, + { "MID_TANK_6_FILL_TIMEOUT", 326 }, + { "MID_TANK_6_LOW_LEVEL", 302 }, + { "MID_TANK_6_OVERFLOW", 318 }, + { "MID_TANK_7_EMPTY", 311 }, + { "MID_TANK_7_FILL_TIMEOUT", 327 }, + { "MID_TANK_7_LOW_LEVEL", 303 }, + { "MID_TANK_7_OVERFLOW", 319 }, + { "MID_TANK_8_EMPTY", 312 }, + { "MID_TANK_8_FILL_TIMEOUT", 328 }, + { "MID_TANK_8_LOW_LEVEL", 304 }, + { "MID_TANK_8_OVERFLOW", 320 }, + { "MIXER_CURRENT_LOOP_BREAK", 208 }, + { "MIXER_CURRENT_OUT_OF_RANGE", 207 }, + { "MIXER_OVERTEMPERATURE", 203 }, + { "MIXER_THERMAL_CUTOFF", 206 }, + { "MIXER_UNDERTEMPERATURE_A", 204 }, + { "MIXER_UNDERTEMPERATURE_B", 205 }, + { "NO_AIR_PRESSURE", 332 }, + { "NO_WASTE_CARTRIDGE_AVAILABLE", 354 }, { "None", 0 }, { "POWER_UP_BIT_FAILURE", 15 }, + { "PRE_COOLER_FAN_1_RPM_TOO_LOW", 344 }, + { "PRE_COOLER_FAN_1_STOPPED", 338 }, + { "PRE_COOLER_FAN_2_RPM_TOO_LOW", 345 }, + { "PRE_COOLER_FAN_2_STOPPED", 339 }, { "PULLER_DANCER_MOTOR_OVERCURRENT", 73 }, { "PULLER_DANCER_MOTOR_OVERTEMPERATURE", 76 }, { "PULLER_DANCER_MOTOR_STALL", 79 }, @@ -588,12 +716,12 @@ static const ProtobufCEnumValueIndex event_type__enum_values_by_name[294] = { "THREAD_TENSION_CONTROL_FAILURE_WINDER_DANCER", 85 }, { "UNINTENDED_RESET", 35 }, { "UNSPECIFIED", 31 }, - { "VOC_SENSOR_ALARM_SLOPE", 287 }, - { "VOC_SENSOR_ALARM_TIME", 284 }, - { "WASTE_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT", 292 }, - { "WASTE_CARTRIDGE_RFID_TIMEOUT", 293 }, - { "WASTE_CONTAINER_EMPTYING_TIMEOUT", 281 }, - { "WASTE_CONTAINER_OVERFLOW", 283 }, + { "VOC_SENSOR_ALARM_SLOPE", 337 }, + { "VOC_SENSOR_ALARM_TIME", 334 }, + { "WASTE_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT", 356 }, + { "WASTE_CARTRIDGE_RFID_TIMEOUT", 357 }, + { "WASTE_CONTAINER_EMPTYING_TIMEOUT", 331 }, + { "WASTE_CONTAINER_OVERFLOW", 333 }, { "WINDER_CONE_DOES_NOT_EXIST", 38 }, { "WINDER_DANCER_MOTOR_OVERCURRENT", 72 }, { "WINDER_DANCER_MOTOR_OVERTEMPERATURE", 75 }, @@ -611,9 +739,9 @@ const ProtobufCEnumDescriptor event_type__descriptor = "EventType", "EventType", "", - 294, + 358, event_type__enum_values_by_number, - 294, + 358, event_type__enum_values_by_name, 11, event_type__value_ranges, diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.h index 8bea8b3e9..fe8060fb7 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.h +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.h @@ -152,12 +152,12 @@ typedef enum _EventType { EVENT_TYPE__DYEING_HEAD_ZONE_2_CURRENT_OUT_OF_RANGE = 5019, EVENT_TYPE__DYEING_HEAD_ZONE_3_CURRENT_OUT_OF_RANGE = 5020, EVENT_TYPE__DYEING_HEAD_ZONE_4_CURRENT_OUT_OF_RANGE = 5021, - EVENT_TYPE__DYEING_HEAD_ZONE_5_6_CURRENT_OUT_OF_RANGE = 5022, + EVENT_TYPE__DYEING_HEAD_ZONE_5_CURRENT_OUT_OF_RANGE = 5022, EVENT_TYPE__DYEING_HEAD_ZONE_1_CURRENT_LOOP_BREAK = 5023, EVENT_TYPE__DYEING_HEAD_ZONE_2_CURRENT_LOOP_BREAK = 5024, EVENT_TYPE__DYEING_HEAD_ZONE_3_CURRENT_LOOP_BREAK = 5025, EVENT_TYPE__DYEING_HEAD_ZONE_4_CURRENT_LOOP_BREAK = 5026, - EVENT_TYPE__DYEING_HEAD_ZONE_5_6_CURRENT_LOOP_BREAK = 5027, + EVENT_TYPE__DYEING_HEAD_ZONE_5_CURRENT_LOOP_BREAK = 5027, EVENT_TYPE__DYEING_HEAD_THERMAL_CUTOFF = 5028, EVENT_TYPE__DYEING_HEAD_COVER_OPEN_TIMEOUT = 5029, EVENT_TYPE__DYEING_HEAD_COVER_CLOSE_TIMEOUT = 5030, @@ -173,6 +173,56 @@ typedef enum _EventType { EVENT_TYPE__DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERTEMPERATURE = 5040, EVENT_TYPE__DYEING_HEAD_CLEANING_HEAD_MOTOR_STALL = 5041, EVENT_TYPE__DYEING_HEAD_CLEANING_HEAD_MOTOR_UNDERVOLTAGE = 5042, + EVENT_TYPE__DYEING_HEAD_ZONE_7_OVERTEMPERATURE = 5043, + EVENT_TYPE__DYEING_HEAD_ZONE_8_OVERTEMPERATURE = 5044, + EVENT_TYPE__DYEING_HEAD_ZONE_9_OVERTEMPERATURE = 5045, + EVENT_TYPE__DYEING_HEAD_ZONE_10_OVERTEMPERATURE = 5046, + EVENT_TYPE__DYEING_HEAD_ZONE_11_OVERTEMPERATURE = 5047, + EVENT_TYPE__DYEING_HEAD_ZONE_12_OVERTEMPERATURE = 5048, + EVENT_TYPE__DYEING_HEAD_ZONE_7_UNDERTEMPERATURE_A = 5049, + EVENT_TYPE__DYEING_HEAD_ZONE_8_UNDERTEMPERATURE_A = 5050, + EVENT_TYPE__DYEING_HEAD_ZONE_9_UNDERTEMPERATURE_A = 5051, + EVENT_TYPE__DYEING_HEAD_ZONE_10_UNDERTEMPERATURE_A = 5052, + EVENT_TYPE__DYEING_HEAD_ZONE_11_UNDERTEMPERATURE_A = 5053, + EVENT_TYPE__DYEING_HEAD_ZONE_12_UNDERTEMPERATURE_A = 5054, + EVENT_TYPE__DYEING_HEAD_ZONE_7_UNDERTEMPERATURE_B = 5055, + EVENT_TYPE__DYEING_HEAD_ZONE_8_UNDERTEMPERATURE_B = 5056, + EVENT_TYPE__DYEING_HEAD_ZONE_9_UNDERTEMPERATURE_B = 5057, + EVENT_TYPE__DYEING_HEAD_ZONE_10_UNDERTEMPERATURE_B = 5058, + EVENT_TYPE__DYEING_HEAD_ZONE_11_UNDERTEMPERATURE_B = 5059, + EVENT_TYPE__DYEING_HEAD_ZONE_12_UNDERTEMPERATURE_B = 5060, + EVENT_TYPE__DYEING_HEAD_ZONE_6_CURRENT_OUT_OF_RANGE = 5061, + EVENT_TYPE__DYEING_HEAD_ZONE_7_CURRENT_OUT_OF_RANGE = 5062, + EVENT_TYPE__DYEING_HEAD_ZONE_8_CURRENT_OUT_OF_RANGE = 5063, + EVENT_TYPE__DYEING_HEAD_ZONE_9_CURRENT_OUT_OF_RANGE = 5064, + EVENT_TYPE__DYEING_HEAD_ZONE_10_CURRENT_OUT_OF_RANGE = 5065, + EVENT_TYPE__DYEING_HEAD_ZONE_11_CURRENT_OUT_OF_RANGE = 5066, + EVENT_TYPE__DYEING_HEAD_ZONE_12_CURRENT_OUT_OF_RANGE = 5067, + EVENT_TYPE__DYEING_HEAD_ZONE_6_CURRENT_LOOP_BREAK = 5068, + EVENT_TYPE__DYEING_HEAD_ZONE_7_CURRENT_LOOP_BREAK = 5069, + EVENT_TYPE__DYEING_HEAD_ZONE_8_CURRENT_LOOP_BREAK = 5070, + EVENT_TYPE__DYEING_HEAD_ZONE_9_CURRENT_LOOP_BREAK = 5071, + EVENT_TYPE__DYEING_HEAD_ZONE_10_CURRENT_LOOP_BREAK = 5072, + EVENT_TYPE__DYEING_HEAD_ZONE_11_CURRENT_LOOP_BREAK = 5073, + EVENT_TYPE__DYEING_HEAD_ZONE_12_CURRENT_LOOP_BREAK = 5074, + EVENT_TYPE__DYEING_HEAD_BLOWER_1_OVERTEMPERATURE = 5075, + EVENT_TYPE__DYEING_HEAD_BLOWER_2_OVERTEMPERATURE = 5076, + EVENT_TYPE__DYEING_HEAD_BLOWER_1_UNDERTEMPERATURE_A = 5077, + EVENT_TYPE__DYEING_HEAD_BLOWER_2_UNDERTEMPERATURE_A = 5078, + EVENT_TYPE__DYEING_HEAD_BLOWER_1_UNDERTEMPERATURE_B = 5079, + EVENT_TYPE__DYEING_HEAD_BLOWER_2_UNDERTEMPERATURE_B = 5080, + EVENT_TYPE__DYEING_HEAD_BLOWER_1_CURRENT_OUT_OF_RANGE = 5081, + EVENT_TYPE__DYEING_HEAD_BLOWER_2_CURRENT_OUT_OF_RANGE = 5082, + EVENT_TYPE__DYEING_HEAD_BLOWER_1_CURRENT_LOOP_BREAK = 5083, + EVENT_TYPE__DYEING_HEAD_BLOWER_2_CURRENT_LOOP_BREAK = 5084, + EVENT_TYPE__DYEING_HEAD_BLOWER_1_FAN_STOPPED = 5085, + EVENT_TYPE__DYEING_HEAD_BLOWER_2_FAN_STOPPED = 5086, + EVENT_TYPE__DYEING_HEAD_BLOWER_1_FAN_RPM_TOO_LOW = 5087, + EVENT_TYPE__DYEING_HEAD_BLOWER_2_FAN_RPM_TOO_LOW = 5088, + EVENT_TYPE__DYEING_HEAD_RIGHT_ACTUATOR_UP_TIMEOUT = 5089, + EVENT_TYPE__DYEING_HEAD_LEFT_ACTUATOR_UP_TIMEOUT = 5090, + EVENT_TYPE__DYEING_HEAD_RIGHT_ACTUATOR_DOWN_TIMEOUT = 5091, + EVENT_TYPE__DYEING_HEAD_LEFT_ACTUATOR_DOWN_TIMEOUT = 5092, EVENT_TYPE__MIXER_OVERTEMPERATURE = 6000, EVENT_TYPE__MIXER_UNDERTEMPERATURE_A = 6001, EVENT_TYPE__MIXER_UNDERTEMPERATURE_B = 6002, @@ -308,6 +358,20 @@ typedef enum _EventType { EVENT_TYPE__CHILLER_DRY_CONTACT = 9006, EVENT_TYPE__INSUFFICIENT_AIR_FLOW = 9007, EVENT_TYPE__VOC_SENSOR_ALARM_SLOPE = 9008, + EVENT_TYPE__PRE_COOLER_FAN_1_STOPPED = 9009, + EVENT_TYPE__PRE_COOLER_FAN_2_STOPPED = 9010, + EVENT_TYPE__COOLER_FAN_1_STOPPED = 9011, + EVENT_TYPE__COOLER_FAN_2_STOPPED = 9012, + EVENT_TYPE__COOLER_FAN_3_STOPPED = 9013, + EVENT_TYPE__COOLER_FAN_4_STOPPED = 9014, + EVENT_TYPE__PRE_COOLER_FAN_1_RPM_TOO_LOW = 9015, + EVENT_TYPE__PRE_COOLER_FAN_2_RPM_TOO_LOW = 9016, + EVENT_TYPE__COOLER_FAN_1_RPM_TOO_LOW = 9017, + EVENT_TYPE__COOLER_FAN_2_RPM_TOO_LOW = 9018, + EVENT_TYPE__COOLER_FAN_3_RPM_TOO_LOW = 9019, + EVENT_TYPE__COOLER_FAN_4_RPM_TOO_LOW = 9020, + EVENT_TYPE__COOLER_TEMPERATURE_TOO_HIGH = 9021, + EVENT_TYPE__COOLER_TEMPERATURE_TOO_LOW = 9022, EVENT_TYPE__INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT = 10000, EVENT_TYPE__INK_CARTRIDGE_RFID_TIMEOUT = 10001, EVENT_TYPE__NO_WASTE_CARTRIDGE_AVAILABLE = 10002, diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h index 51697b504..c827bd4d6 100644 --- a/Software/Embedded_SW/Embedded/DataDef.h +++ b/Software/Embedded_SW/Embedded/DataDef.h @@ -21,12 +21,12 @@ //#define WATCHDOG -#define FPGA_WATCHDOG_DISABLE +//#define FPGA_WATCHDOG_DISABLE //#define USE_POWERSTEP01 -#define Use_Head_Card //for real card only //#define SPECIAL_DISPENSERS +#define Use_Head_Card //for real card only #define Use_WHS_Card //for real card only //#define Test_headCard_With_DispCard_I2C4_Add0xE2_DispID_0 @@ -372,6 +372,9 @@ typedef enum HEAD_TYPE_STAPLE_SPUN, }HEAD_TYPE; +extern uint8_t Head_Type; + + typedef enum { DISP_TYPE_UNKNOWN, diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c index f2f4ce7ae..af326b4ed 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c @@ -421,17 +421,18 @@ bool FPGA_Read_limit_Switches(FPGA_GPI_ENUM Limit_Switch) case GPI_LS_DH_CLEAN_DOWN: LM_Status = Ls_Dryer_Dh.bits.F1_LS_DH_CLEAN_DOWN; break; -#ifdef Use_Head_Card case HEADCARD_COVER_LS_FRONT: - LM_Status = Head_I2C_EXP4_0x46.bits.INPUT_LS_FRONT; + if(Head_Type == HEAD_TYPE_SYLKO) + LM_Status = Head_I2C_EXP4_0x46.bits.INPUT_LS_FRONT; break; case HEADCARD_COVER_LS_REAR: - LM_Status = Head_I2C_EXP4_0x46.bits.INPUT_LS_FRONT; + if(Head_Type == HEAD_TYPE_SYLKO) + LM_Status = Head_I2C_EXP4_0x46.bits.INPUT_LS_FRONT; break; case HEADCARD_COVER_LS_UPPER: - LM_Status = Head_I2C_EXP4_0x46.bits.INPUT_LS_FRONT; + if(Head_Type == HEAD_TYPE_SYLKO) + LM_Status = Head_I2C_EXP4_0x46.bits.INPUT_LS_FRONT; break; -#endif default : LM_Status = NO_LIMIT; break; @@ -511,11 +512,12 @@ uint32_t DeActivateCoolerPump() //WHS - Pump the waste accumulated in cooler to uint32_t MagnetControlId = 0xFF; uint32_t MagnetCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag) { -#ifdef Use_Head_Card - HeadCard_HeadMagnet_Disable(); -#else - MotorStop(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,Hard_Hiz ); -#endif + + if(Head_Type == HEAD_TYPE_SYLKO) + HeadCard_HeadMagnet_Disable(); + else + MotorStop(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,Hard_Hiz ); + if (SafeRemoveControlCallback(MagnetControlId, MagnetCallBackFunction )==OK) MagnetControlId = 0xFF; else @@ -528,17 +530,17 @@ uint32_t ActivateHeadMagnet() { Report("ActivateHeadMagnet - Close the lid magnet",__FILE__,__LINE__,(int)HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,RpWarning,(int)DH_LID_OPEN,0); //Task_sleep(500); -#ifdef Use_Head_Card - HeadCard_ActivateHeadMagnet(); - -#else - F2_CTRL_Reg.ushort &= ~SPARE_SSR13_CTRL; - F2_CTRL = F2_CTRL_Reg.ushort; - if (isMotorConfigured(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM)) + if(Head_Type == HEAD_TYPE_SYLKO) + HeadCard_ActivateHeadMagnet(); + else { - MotorGoTo(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,DH_LID_CLOSE ); + F2_CTRL_Reg.ushort &= ~SPARE_SSR13_CTRL; + F2_CTRL = F2_CTRL_Reg.ushort; + if (isMotorConfigured(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM)) + { + MotorGoTo(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,DH_LID_CLOSE ); + } } -#endif MagnetControlId = AddControlCallback(NULL, MagnetCallBackFunction, 2* eOneSecond, TemplateDataReadCBFunction,0,0, 0 ); return OK; } @@ -550,19 +552,22 @@ uint32_t HeadCard_HeadMagnet_Disable(); uint32_t DeActivateHeadMagnet() { -#ifdef Use_Head_Card - HeadCard_DeActivateHeadMagnet(); - MagnetControlId = AddControlCallback(NULL, MagnetCallBackFunction, 2* eOneSecond, TemplateDataReadCBFunction,0,0, 0 ); -#else - Report("DeActivateHeadMagnet - open the lid magnet",__FILE__,__LINE__,(int)HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,RpWarning,(int)DH_LID_CLOSE,0); - if (isMotorConfigured(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM)) + if(Head_Type == HEAD_TYPE_SYLKO) { - MotorGoTo(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,DH_LID_OPEN ); - //MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM, DH_LID_OPEN, Motor_Id_to_LS_IdDown[HARDWARE_MOTOR_TYPE__MOTO_RLOADARM], NULL,1000); + HeadCard_DeActivateHeadMagnet(); + MagnetControlId = AddControlCallback(NULL, MagnetCallBackFunction, 2* eOneSecond, TemplateDataReadCBFunction,0,0, 0 ); + } + else + { + Report("DeActivateHeadMagnet - open the lid magnet",__FILE__,__LINE__,(int)HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,RpWarning,(int)DH_LID_CLOSE,0); + if (isMotorConfigured(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM)) + { + MotorGoTo(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM,DH_LID_OPEN ); + //MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_RLOADARM, DH_LID_OPEN, Motor_Id_to_LS_IdDown[HARDWARE_MOTOR_TYPE__MOTO_RLOADARM], NULL,1000); + } + F2_CTRL_Reg.ushort |= SPARE_SSR13_CTRL; + F2_CTRL = F2_CTRL_Reg.ushort; } - F2_CTRL_Reg.ushort |= SPARE_SSR13_CTRL; - F2_CTRL = F2_CTRL_Reg.ushort; -#endif Task_sleep(500); return OK; } diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c b/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c index 9062c79ca..57f96fbbf 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c +++ b/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c @@ -106,152 +106,147 @@ bool isHeater(HardwarePidControlType HeaterId) uint32_t ActivateHeater (int HeaterId) { assert(isHeater(HeaterIdtoHeaterpid[HeaterId])); -#ifdef Use_Head_Card - if (HeaterId>HEATER_TYPE__DryerSecondaryHeater) - { - HeadCard_Control_Heaters(HeaterTypetoHeadHeater[HeaterId],ON); - //Activate_Head_Card_Heaters(HeaterTypetoHeadHeater[HeaterId]); - } - else - { //F2_CTRL |= portMap[HeaterId].m_pin; - F2_CTRL_Reg.ushort |= portMap[HeaterId].m_pin; - F2_CTRL = F2_CTRL_Reg.ushort; - } - -#else - if (HeaterId >= HEATER_TYPE__HeaterZone7) return OK; - if (HeaterId == HEATER_TYPE__DryerAirHeater) { return OK; } -#ifndef EVALUATION_BOARD - if(HeaterId == HEATER_TYPE__HeaterZone5) - { - //F1_gpo_01 |= portMap[HeaterId].m_pin; - F1_GPO_Reg.ushort |= portMap[HeaterId].m_pin; - F1_gpo_01 = F1_GPO_Reg.ushort; - - } - else if(HeaterId == HEATER_TYPE__HeaterZone6) - { - //F3_GPO_01_bus |= portMap[HeaterId].m_pin; - F3_GPO_01_Reg.ushort |= portMap[HeaterId].m_pin; - F3_GPO_01_bus = F3_GPO_01_Reg.ushort; - - } - else + if (HeaterId<=HEATER_TYPE__DryerSecondaryHeater) { - //F2_CTRL |= portMap[HeaterId].m_pin; F2_CTRL_Reg.ushort |= portMap[HeaterId].m_pin; F2_CTRL = F2_CTRL_Reg.ushort; } -#endif -//--------------------------------------------------------------------------------------- -// if(HeaterId < HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ1) // Turn On FPGA LED -// F3_GPO_01_bus |= (0x01 << HeaterId); -// else -// F3_GPO_01_bus |= BIT4; - -// if (HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ1) -// STATUS_GREEN_LED_ON; -// if (HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ2) -// ACTIVITY_RED_LED_ON; -// if (HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ3) -// COMM_RED_LED_ON; - - //--------------------------------------------------------------------------------------- - - portMap[HeaterId].Active = true; + else + { //F2_CTRL |= portMap[HeaterId].m_pin; + if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) + HeadCard_Control_Heaters(HeaterTypetoHeadHeater[HeaterId],ON); + else + { + if (HeaterId >= HEATER_TYPE__HeaterZone7) return OK; + #ifndef EVALUATION_BOARD + if(HeaterId == HEATER_TYPE__HeaterZone5) + { + //F1_gpo_01 |= portMap[HeaterId].m_pin; + F1_GPO_Reg.ushort |= portMap[HeaterId].m_pin; + F1_gpo_01 = F1_GPO_Reg.ushort; - //--------------------------------------------------------------------------------------- + } + else if(HeaterId == HEATER_TYPE__HeaterZone6) + { + //F3_GPO_01_bus |= portMap[HeaterId].m_pin; + F3_GPO_01_Reg.ushort |= portMap[HeaterId].m_pin; + F3_GPO_01_bus = F3_GPO_01_Reg.ushort; - HeaterActive |= 1 << HeaterId; + } + else + { + //F2_CTRL |= portMap[HeaterId].m_pin; + F2_CTRL_Reg.ushort |= portMap[HeaterId].m_pin; + F2_CTRL = F2_CTRL_Reg.ushort; + } + #endif + //--------------------------------------------------------------------------------------- + // if(HeaterId < HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ1) // Turn On FPGA LED + // F3_GPO_01_bus |= (0x01 << HeaterId); + // else + // F3_GPO_01_bus |= BIT4; -// } ----------------------------------------- -#endif - //--------------------------------------------------------------------------------------- + // if (HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ1) + // STATUS_GREEN_LED_ON; + // if (HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ2) + // ACTIVITY_RED_LED_ON; + // if (HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ3) + // COMM_RED_LED_ON; + //--------------------------------------------------------------------------------------- + portMap[HeaterId].Active = true; + //--------------------------------------------------------------------------------------- + HeaterActive |= 1 << HeaterId; + // } ----------------------------------------- + //--------------------------------------------------------------------------------------- + } + //Activate_Head_Card_Heaters(HeaterTypetoHeadHeater[HeaterId]); + } return OK; } uint32_t DeActivateHeater (int HeaterId) { assert(isHeater(HeaterIdtoHeaterpid[HeaterId])); -#ifdef Use_Head_Card - if (HeaterId>HEATER_TYPE__DryerSecondaryHeater) - { - HeadCard_Control_Heaters(HeaterTypetoHeadHeater[HeaterId],OFF); - //Deactivate_Head_Card_Heaters(HeaterTypetoHeadHeater[HeaterId]); - } - else + if (HeaterId<=HEATER_TYPE__DryerSecondaryHeater) { //F2_CTRL &= ~portMap[HeaterId].m_pin; F2_CTRL_Reg.ushort &= ~portMap[HeaterId].m_pin; F2_CTRL = F2_CTRL_Reg.ushort; } -#else - if (HeaterId >= HEATER_TYPE__HeaterZone7) return OK; - -#ifndef EVALUATION_BOARD - if(HeaterId == HEATER_TYPE__HeaterZone5) - { - //F1_gpo_01 &= ~portMap[HeaterId].m_pin; - F1_GPO_Reg.ushort&= ~portMap[HeaterId].m_pin; - F1_gpo_01 = F1_GPO_Reg.ushort; - } - else if(HeaterId == HEATER_TYPE__HeaterZone6) - { - //F3_GPO_01_bus &= ~portMap[HeaterId].m_pin; - F3_GPO_01_Reg.ushort &= ~portMap[HeaterId].m_pin; - F3_GPO_01_bus = F3_GPO_01_Reg.ushort; - } else { - //F2_CTRL &= ~portMap[HeaterId].m_pin; - F2_CTRL_Reg.ushort &= ~portMap[HeaterId].m_pin; - F2_CTRL = F2_CTRL_Reg.ushort; - } -#endif -//--------------------------------------------------------------------------------------- -// if(HeaterId < HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ1) // Turn Off FPGA LED -// F3_GPO_01_bus &= ~(0x01 << HeaterId); -// else -// F3_GPO_01_bus &= ~BIT4; - -// if (HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ1) -// STATUS_GREEN_LED_OFF; -// if (HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ2) -// ACTIVITY_RED_LED_OFF; -// if (HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ3) -// COMM_RED_LED_OFF; - //HeaterActive = false; - //--------------------------------------------------------------------------------------- - portMap[HeaterId].Active = false; - - HeaterActive &= ~(1 << HeaterId); + if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) + HeadCard_Control_Heaters(HeaterTypetoHeadHeater[HeaterId],OFF); + else + { + if (HeaterId >= HEATER_TYPE__HeaterZone7) return OK; +#ifndef EVALUATION_BOARD + if(HeaterId == HEATER_TYPE__HeaterZone5) + { + //F1_gpo_01 &= ~portMap[HeaterId].m_pin; + F1_GPO_Reg.ushort&= ~portMap[HeaterId].m_pin; + F1_gpo_01 = F1_GPO_Reg.ushort; + } + else if(HeaterId == HEATER_TYPE__HeaterZone6) + { + //F3_GPO_01_bus &= ~portMap[HeaterId].m_pin; + F3_GPO_01_Reg.ushort &= ~portMap[HeaterId].m_pin; + F3_GPO_01_bus = F3_GPO_01_Reg.ushort; + } + else + { + //F2_CTRL &= ~portMap[HeaterId].m_pin; + F2_CTRL_Reg.ushort &= ~portMap[HeaterId].m_pin; + F2_CTRL = F2_CTRL_Reg.ushort; + //--------------------------------------------------------------------------------------- + // if(HeaterId < HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ1) // Turn Off FPGA LED + // F3_GPO_01_bus &= ~(0x01 << HeaterId); + // else + // F3_GPO_01_bus &= ~BIT4; - // } ----------------------------------------- + // if (HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ1) + // STATUS_GREEN_LED_OFF; + // if (HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ2) + // ACTIVITY_RED_LED_OFF; + // if (HeaterId == HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ3) + // COMM_RED_LED_OFF; + //HeaterActive = false; + //--------------------------------------------------------------------------------------- + portMap[HeaterId].Active = false; + HeaterActive &= ~(1 << HeaterId); + // } ----------------------------------------- + } #endif + } + //Deactivate_Head_Card_Heaters(HeaterTypetoHeadHeater[HeaterId]); + } + return OK; } bool GetHeaterState (int HeaterId) { assert(isHeater(HeaterIdtoHeaterpid[HeaterId])); -#ifdef Use_Head_Card if (HeaterId<=HEATER_TYPE__DryerSecondaryHeater) { return portMap[HeaterId].Active; } else { - return(Get_HeadCard_Heater_State(HeaterTypetoHeadHeater[HeaterId])); + if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) + { + return(Get_HeadCard_Heater_State(HeaterTypetoHeadHeater[HeaterId])); + } + else + { + return portMap[HeaterId].Active; + } } - -#else - return portMap[HeaterId].Active; -#endif } diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c index c5511e745..9d7cdbe4c 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c +++ b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c @@ -177,36 +177,38 @@ int TemperatureSensorRead(TEMPERATURE_SENSOR_ID_ENUM SensorId) return TempSensorResponse[SensorId].Temperature_C_mult_by_100; } -#ifndef Use_Head_Card -int TemperatureListString(char* str) -{ - int len; - len = usnprintf(str, 150, "Prepare H1: %d H2: %d H3: %d H4: %d H5: %d H6: %d D1: %d D2: %d D3: %d M: %d",TempSensorResponse[TEMP_SENSE_ANALOG_DYEINGH_TEMP1].Temperature_C_mult_by_100/100, - TempSensorResponse[TEMP_SENSE_ANALOG_DYEINGH_TEMP2].Temperature_C_mult_by_100/100,TempSensorResponse[TEMP_SENSE_ANALOG_DYEINGH_TEMP3].Temperature_C_mult_by_100/100, - TempSensorResponse[TEMP_SENSE_ANALOG_DYEINGH_TEMP4].Temperature_C_mult_by_100/100,TempSensorResponse[TEMP_SENSE_ANALOG_DYEINGH_TEMP5].Temperature_C_mult_by_100/100, - TempSensorResponse[HEAD6_PT100].Temperature_C_mult_by_100/100,TempSensorResponse[TEMP_SENSE_ANALOG_DRYER_TEMP1].Temperature_C_mult_by_100/100, - TempSensorResponse[TEMP_SENSE_ANALOG_DRYER_TEMP2].Temperature_C_mult_by_100/100,TempSensorResponse[TEMP_SENSE_ANALOG_DRYER_TEMP3].Temperature_C_mult_by_100/100 - ,TempSensorResponse[MIXER_PT100].Temperature_C_mult_by_100/100); - //Prepare H1: 78 H2: 111 H3: 137 H4: 135 H5: 144 H6: 75 D1: 120 D2: 167 D3: 158 M: 129 - return len; -} -#else int TemperatureListString(char* str) { int len; + if(Head_Type == HEAD_TYPE_SYLKO) + { + len = usnprintf(str, 160, "Prepare H1: ,%d, H2: ,%d, H3: ,%d, H4: ,%d, H5: ,%d, H6: ,%d, H7: ,%d, H8: ,%d, H9: ,%d, H10: ,%d, H11: ,%d, H12: ,%d, M: ,%d, D: ,%d,", + TempSensorResponse[HEAD_PT100_ZONE_1_0X80_0].Temperature_C_mult_by_100/100, TempSensorResponse[HEAD_PT100_ZONE_2_0X80_1].Temperature_C_mult_by_100/100, + TempSensorResponse[HEAD_PT100_ZONE_3_0X82_0].Temperature_C_mult_by_100/100, TempSensorResponse[HEAD_PT100_ZONE_4_0X82_1].Temperature_C_mult_by_100/100, + TempSensorResponse[HEAD_PT100_ZONE_5_0X84_0].Temperature_C_mult_by_100/100, TempSensorResponse[HEAD_PT100_ZONE_6_0X84_1].Temperature_C_mult_by_100/100, + TempSensorResponse[HEAD_PT100_ZONE_7_0X86_0].Temperature_C_mult_by_100/100, TempSensorResponse[HEAD_PT100_ZONE_8_0X86_1].Temperature_C_mult_by_100/100, + TempSensorResponse[HEAD_PT100_ZONE_9_0X88_0].Temperature_C_mult_by_100/100, TempSensorResponse[HEAD_PT100_ZONE_10_0X88_1].Temperature_C_mult_by_100/100, + TempSensorResponse[HEAD_PT100_ZONE_11_0X8A_0].Temperature_C_mult_by_100/100,TempSensorResponse[HEAD_PT100_ZONE_12_0X8A_1].Temperature_C_mult_by_100/100, + TempSensorResponse[HEAD_PT100_MIXER_0X8E_0].Temperature_C_mult_by_100/100, TempSensorResponse[TEMP_SENSE_ANALOG_DRYER_TEMP1].Temperature_C_mult_by_100/100); + + } + else if(Head_Type == HEAD_TYPE_SYLKO_WITHOUT_CARD) + { + len = usnprintf(str, 150, "Prepare H1: %d H2: %d H3: %d H4: %d H5: %d H6: %d D1: %d D2: %d D3: %d M: %d",TempSensorResponse[TEMP_SENSE_ANALOG_DYEINGH_TEMP1].Temperature_C_mult_by_100/100, + TempSensorResponse[TEMP_SENSE_ANALOG_DYEINGH_TEMP2].Temperature_C_mult_by_100/100,TempSensorResponse[TEMP_SENSE_ANALOG_DYEINGH_TEMP3].Temperature_C_mult_by_100/100, + TempSensorResponse[TEMP_SENSE_ANALOG_DYEINGH_TEMP4].Temperature_C_mult_by_100/100,TempSensorResponse[TEMP_SENSE_ANALOG_DYEINGH_TEMP5].Temperature_C_mult_by_100/100, + TempSensorResponse[HEAD6_PT100].Temperature_C_mult_by_100/100,TempSensorResponse[TEMP_SENSE_ANALOG_DRYER_TEMP1].Temperature_C_mult_by_100/100, + TempSensorResponse[TEMP_SENSE_ANALOG_DRYER_TEMP2].Temperature_C_mult_by_100/100,TempSensorResponse[TEMP_SENSE_ANALOG_DRYER_TEMP3].Temperature_C_mult_by_100/100 + ,TempSensorResponse[MIXER_PT100].Temperature_C_mult_by_100/100); + //Prepare H1: 78 H2: 111 H3: 137 H4: 135 H5: 144 H6: 75 D1: 120 D2: 167 D3: 158 M: 129 + } + else + { + len = usnprintf(str, 150, "Unknown head type"); + } - len = usnprintf(str, 160, "Prepare H1: ,%d, H2: ,%d, H3: ,%d, H4: ,%d, H5: ,%d, H6: ,%d, H7: ,%d, H8: ,%d, H9: ,%d, H10: ,%d, H11: ,%d, H12: ,%d, M: ,%d, D: ,%d,", - TempSensorResponse[HEAD_PT100_ZONE_1_0X80_0].Temperature_C_mult_by_100/100, TempSensorResponse[HEAD_PT100_ZONE_2_0X80_1].Temperature_C_mult_by_100/100, - TempSensorResponse[HEAD_PT100_ZONE_3_0X82_0].Temperature_C_mult_by_100/100, TempSensorResponse[HEAD_PT100_ZONE_4_0X82_1].Temperature_C_mult_by_100/100, - TempSensorResponse[HEAD_PT100_ZONE_5_0X84_0].Temperature_C_mult_by_100/100, TempSensorResponse[HEAD_PT100_ZONE_6_0X84_1].Temperature_C_mult_by_100/100, - TempSensorResponse[HEAD_PT100_ZONE_7_0X86_0].Temperature_C_mult_by_100/100, TempSensorResponse[HEAD_PT100_ZONE_8_0X86_1].Temperature_C_mult_by_100/100, - TempSensorResponse[HEAD_PT100_ZONE_9_0X88_0].Temperature_C_mult_by_100/100, TempSensorResponse[HEAD_PT100_ZONE_10_0X88_1].Temperature_C_mult_by_100/100, - TempSensorResponse[HEAD_PT100_ZONE_11_0X8A_0].Temperature_C_mult_by_100/100,TempSensorResponse[HEAD_PT100_ZONE_12_0X8A_1].Temperature_C_mult_by_100/100, - TempSensorResponse[HEAD_PT100_MIXER_0X8E_0].Temperature_C_mult_by_100/100, TempSensorResponse[TEMP_SENSE_ANALOG_DRYER_TEMP1].Temperature_C_mult_by_100/100); - //Prepare H1: 78 H2: 111 H3: 137 H4: 135 H5: 144 H6: 75 D1: 120 D2: 167 D3: 158 M: 129 return len; } -#endif uint32_t Filter_Temparature_Measurement(TEMPERATURE_SENSOR_ID_ENUM SensorId, int32_t Current_Measurement_C, uint32_t NoOfAvrSamples) diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.h b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.h index a8ef720ad..0b2c60822 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.h +++ b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.h @@ -34,7 +34,7 @@ HEAD_PT100_ZONE_5_0X84_0, //4 HEAD_PT100_ZONE_7_0X86_0, //6 HEAD_PT100_ZONE_9_0X88_0, //8 HEAD_PT100_ZONE_11_0X8A_0, //10 -HEAD_PT100_AIR_HEATER_1_0X8C_0, //12 +HEAD_PT100_AIR_HEATER_1_0X8C_0, //12 OUT!!!!! HEAD_PT100_MIXER_0X8E_0, //14 //Select 1 HEAD_PT100_ZONE_2_0X80_1, //1 @@ -43,7 +43,7 @@ HEAD_PT100_ZONE_6_0X84_1, //5 HEAD_PT100_ZONE_8_0X86_1, //7 HEAD_PT100_ZONE_10_0X88_1, //9 HEAD_PT100_ZONE_12_0X8A_1, //11 -HEAD_PT100_AIR_HEATER_2_0X8C_1, //13 +HEAD_PT100_AIR_HEATER_2_0X8C_1, //13 IN!!!! HEAD_PT100_RESERVE_0X8E_1, //15 //WHS Card 4 channels for temperature measuring @@ -62,13 +62,13 @@ WHS_PT100_4_0X82_1, #warning assuming that we won't use whs card without head card.. -#if defined(Use_WHS_Card) +//#if defined(Use_WHS_Card) #define MAX_TANGO_TEMPERATURE_SENSOR_ID MAX_WHS_CARD_TEMP_SENS_ID // WHS + Head cards -#elif defined(Use_Head_Card) +/*#elif defined(Use_Head_Card) #define MAX_TANGO_TEMPERATURE_SENSOR_ID MAX_HEAD_CARD_TEMP_SENS_ID #else #define MAX_TANGO_TEMPERATURE_SENSOR_ID MAX_MAIN_CARD_TEMP_SENS_ID -#endif +#endif*/ typedef enum { @@ -166,9 +166,7 @@ uint32_t CalculateTemperatures(TEMPERATURE_SENSOR_ID_ENUM SensorId, uint32_t Dat int TemperatureSensorRead(TEMPERATURE_SENSOR_ID_ENUM SensorId); // read from buffer -#ifndef Use_Head_Card int TemperatureListString(char* str); -#endif //The temparature will be at: //TempSensorResponse[TEMP_SENSE_ANALOG_DYEINGH_TEMP1].Temperature_C_mult_by_100 diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c index a9fcd4420..123f3f1e9 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c @@ -412,25 +412,22 @@ uint32_t Heaters_Current_Bits[9];//just for debug void Enable_Reading_Heaters_Current(HEATERS_CURRENT Heater_ID) //0-8 { -#ifdef Use_Head_Card - return; -#endif + if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) + return; assert (Heater_ID<NUM_OF_CURRENT_HEATERS); Heaters_Current_Read_Enable[Heater_ID] = true; } void Disable_Reading_Heaters_Current(HEATERS_CURRENT Heater_ID) //0-8 { -#ifdef Use_Head_Card - return; -#endif + if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) + return; assert (Heater_ID<NUM_OF_CURRENT_HEATERS); Heaters_Current_Read_Enable[Heater_ID] = false; } bool Get_Heater_Current_Reading_State(HEATERS_CURRENT Heater_ID) //0-8 { -#ifdef Use_Head_Card - return; -#endif + if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) + return false; assert (Heater_ID<NUM_OF_CURRENT_HEATERS); return Heaters_Current_Read_Enable[Heater_ID]; } @@ -438,9 +435,8 @@ bool Get_Heater_Current_Reading_State(HEATERS_CURRENT Heater_ID) //0-8 uint32_t Read_Heaters_Current(HEATERS_CURRENT Heater_ID) //0-8 { uint32_t Status = OK; -#ifdef Use_Head_Card - return 0; -#endif + if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) + return 0; assert (Heater_ID<NUM_OF_CURRENT_HEATERS); if (Heaters_Current_Read_Enable[Heater_ID] == true) diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.c index 55e902f24..691513452 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.c @@ -359,9 +359,8 @@ uint32_t HeadCard_Read_Cover_LS()// if(HeadCard_Activate_Cover_LS == true) { - #ifdef Use_Head_Card - Head_Read_IO_Reg(0x46, HIGH);//READ HEAD CARD LS - #endif + if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) + Head_Read_IO_Reg(0x46, HIGH);//READ HEAD CARD LS } return status; diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.c index 21d6feed9..c2ac5fd66 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.c @@ -136,32 +136,32 @@ uint32_t HeadCard_Control_Heaters(HEADCARD_HEATERS_ENUM Heater_ID, bool Pwr_Cmd) case HEADCARD_UPPER_HIT_IN1: Head_I2C_EXP1_0x40.bits.OUTPUT_ON_HTIN1 = Pwr_Cmd; //status |= Head_Write_IO_Reg(0x40,HIGH); - break; - case HEADCARD_UPPER_HIT_IN2: +// break; +// case HEADCARD_UPPER_HIT_IN2: Head_I2C_EXP1_0x40.bits.OUTPUT_ON_HTIN2 = Pwr_Cmd; //status |= Head_Write_IO_Reg(0x40,HIGH); - break; - case HEADCARD_UPPER_HIT_IN3: +// break; +// case HEADCARD_UPPER_HIT_IN3: Head_I2C_EXP1_0x40.bits.OUTPUT_ON_HTIN3 = Pwr_Cmd; //status |= Head_Write_IO_Reg(0x40,HIGH); - break; - case HEADCARD_UPPER_HIT_IN4: +// break; +// case HEADCARD_UPPER_HIT_IN4: Head_I2C_EXP1_0x40.bits.OUTPUT_ON_HTIN4 = Pwr_Cmd; //status |= Head_Write_IO_Reg(0x40,HIGH); break; case HEADCARD_UPPER_HIT_OUT1: Head_I2C_EXP2_0x42.bits.OUTPUT_ON_HTOT1 = Pwr_Cmd; //status |= Head_Write_IO_Reg(0x42,LOW); - break; - case HEADCARD_UPPER_HIT_OUT2: +// break; +// case HEADCARD_UPPER_HIT_OUT2: Head_I2C_EXP2_0x42.bits.OUTPUT_ON_HTOT2 = Pwr_Cmd; //status |= Head_Write_IO_Reg(0x42,LOW); - break; - case HEADCARD_UPPER_HIT_OUT3: +// break; +// case HEADCARD_UPPER_HIT_OUT3: Head_I2C_EXP2_0x42.bits.OUTPUT_ON_HTOT3 = Pwr_Cmd; //status |= Head_Write_IO_Reg(0x42,LOW); - break; - case HEADCARD_UPPER_HIT_OUT4: +// break; +// case HEADCARD_UPPER_HIT_OUT4: Head_I2C_EXP2_0x42.bits.OUTPUT_ON_HTOT4 = Pwr_Cmd; //status |= Head_Write_IO_Reg(0x42,LOW); break; diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/PT100/Head_PT100_ADC.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/PT100/Head_PT100_ADC.c index ca645444e..3cc1a0fa3 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/PT100/Head_PT100_ADC.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/PT100/Head_PT100_ADC.c @@ -87,7 +87,7 @@ uint32_t I2C_Write_SensorId(uint32_t I2C_ID, TEMPERATURE_SENSOR_ID_ENUM SensorId I2C_ADC_ADS122C04_SLAVE_ADD = SensorId_To_SlaveAdd(SensorId); status |= I2C_Write(I2C_ID, I2C_ADC_ADS122C04_SLAVE_ADD, I2C_Write_buf, No_BytesToWrite); if (status) - Report("I2C_Write_SensorId error", __FILE__,Task_self(),status, RpMessage,SensorId, 0); + Report("I2C_Write_SensorId error", __FILE__,Arb_Loss_Count,status, RpMessage,SensorId, 0); return status; } @@ -211,7 +211,7 @@ uint32_t HeadADCPT100_SendReadDataCommand(TEMPERATURE_SENSOR_ID_ENUM SensorId) Status |= I2C_Read_SensorId(I2C_ID_HEAD_CARD, SensorId, temp, 3); if (Status) - Report("HeadADCPT100_SendReadDataCommand error", __FILE__,Task_self(),Status, RpMessage,SensorId, 0); + Report("HeadADCPT100_SendReadDataCommand error", __FILE__,Arb_Loss_Count,Status, RpMessage,SensorId, 0); //First send the MSB so we need to reorder the bytes Data_ADC_Head = temp[0]; diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C.h index bb6d934de..efb46c5be 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C.h +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C.h @@ -8,6 +8,7 @@ #ifndef DRIVERS_I2C_COMMUNICATION_I2C_H_ #define DRIVERS_I2C_COMMUNICATION_I2C_H_ +extern uint32_t Arb_Loss_Count; #define I2C_BUSY_DELAY 5000//15000 diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c index 6152d32ac..ecd598f88 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Comm.c @@ -110,7 +110,7 @@ uint32_t I2C_WriteBuff(uint32_t I2C_BASE, unsigned char addr, unsigned char* dat if (status == I2C_MASTER_ERR_ARB_LOST) { - if (Arb_Loss_Count++ > 100) + if (Arb_Loss_Count++ > 10) { Arb_Loss_Count= 0; Init_All_I2C(); @@ -118,7 +118,11 @@ uint32_t I2C_WriteBuff(uint32_t I2C_BASE, unsigned char addr, unsigned char* dat } } else - Arb_Loss_Count = 0; + { + if (Arb_Loss_Count) + Report("Resetting count ", __FILE__,Arb_Loss_Count,status, RpMessage,Task_self(), 0); + // Arb_Loss_Count = 0; + } return status; } @@ -186,7 +190,7 @@ uint32_t I2C_ReadBuff(uint32_t I2C_BASE, unsigned char addr, unsigned char* data } if (status == I2C_MASTER_ERR_ARB_LOST) { - if (Arb_Loss_Count++ > 100) + if (Arb_Loss_Count++ > 10) { Arb_Loss_Count= 0; Init_All_I2C(); @@ -194,7 +198,11 @@ uint32_t I2C_ReadBuff(uint32_t I2C_BASE, unsigned char addr, unsigned char* data } } else - Arb_Loss_Count = 0; + { + if (Arb_Loss_Count) + Report("Resetting count ", __FILE__,Arb_Loss_Count,status, RpMessage,Task_self(), 0); + //Arb_Loss_Count = 0; + } return status; } diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c index 36910cee6..8af9a8576 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c @@ -73,11 +73,15 @@ void Trigger_Heater_Current_Read(void) { I2C_ReadingMessageStruc I2C_ReadingMessage; uint8_t Heater_i=0; -#ifdef Use_Head_Card - // for (Heater_i = 0;Heater_i < HEAD_NUM_OF_ADC;Heater_i++)//No need - reads all inputs at the same time -#else - for (Heater_i = 0;Heater_i < NUM_OF_CURRENT_HEATERS;Heater_i++) -#endif + uint8_t Heater_Lim=0; + if(Head_Type == HEAD_TYPE_SYLKO_WITHOUT_CARD) + Heater_Lim = NUM_OF_CURRENT_HEATERS; + if(Head_Type == HEAD_TYPE_SYLKO) + Heater_Lim = HEAD_NUM_OF_ADC; + if(Head_Type == HEAD_TYPE_STAPLE_SPUN) + Heater_Lim = HEAD_NUM_OF_ADC; + + // for (Heater_i = 0;Heater_i < Heater_Lim;Heater_i++)//No need - reads all inputs at the same time { I2C_ReadingMessage.messageId = Heater_Current_Reading; I2C_ReadingMessage.parameter = Heater_i; @@ -361,15 +365,11 @@ void I2C_ReadingTask(UArg arg0, UArg arg1) break; case Heater_Current_Reading: //Report("Read_Heaters_Current",__FILE__,__LINE__,255,RpWarning,0,0); -#ifdef Use_Head_Card - Read_Head_ADC(I2C_ReadingMessage.parameter); -#else - Read_Heaters_Current(I2C_ReadingMessage.parameter); -#endif + if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) + Read_Head_ADC(I2C_ReadingMessage.parameter); + else + Read_Heaters_Current(I2C_ReadingMessage.parameter); break; - -#ifdef Use_Head_Card - case PT100_Reading: Set_HeadCard_PT100(); break; @@ -380,12 +380,7 @@ void I2C_ReadingTask(UArg arg0, UArg arg1) Head_Read_IO_Reg(0x46, HIGH);//READ HEAD CARD LS break; case Outputs_Writing: - break; -#endif - -#ifdef Use_WHS_Card - case WHS_PT100_Reading: for (Sensor_i = WHS_PT100_1_0X80_0; Sensor_i <= WHS_PT100_4_0X82_1; Sensor_i++) { @@ -465,10 +460,6 @@ void I2C_ReadingTask(UArg arg0, UArg arg1) case WHS_I2C_EEPROM_READ: // WHS_I2C_EEprom_Read(I2C_ReadingMessage.parameter, I2C_ReadingMessage.parameter2, I2C_ReadingMessage.parameter3); break; - - -#endif - default: break; } diff --git a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c index a8a8cd2b9..59405be76 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c +++ b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c @@ -177,11 +177,10 @@ void Valve_Command(Valves_t Valve_Id) //1 - OPEN, 0 - CLOSE F1_GPO_Reg.bits.F1_VALVE_WASTE_TANK = ValveRequest[Valve_Id].Direction; break; case VALVE_MIXCHIP_WASTECH: -#ifdef Use_Head_Card - HeadCard_Valve_Control(ValveRequest[Valve_Id].Direction); -#else + if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) + HeadCard_Valve_Control(ValveRequest[Valve_Id].Direction); + else F1_GPO_Reg.bits.F1_VALVE_MIXCHIP_WASTECH = ValveRequest[Valve_Id].Direction; -#endif break; case VALVE_DISPENSER_1: diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c index c432edba0..426615f4f 100644 --- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c +++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c @@ -772,13 +772,7 @@ uint32_t AlarmHandlingConsequentActions(uint32_t AlarmId, DebugLogCategory Sever JobEndReasonEnum AlarmHandlingPrepareJob(void *CurrentJob) { //JobTicket* JobTicket = CurrentJob; - /*EventType HeaterEventType[HEATER_TYPE_MAX_HEATERS] = {EVENT_TYPE__DRYER_ZONE_1_OVERTEMPERATURE,EVENT_TYPE__DRYER_ZONE_2_OVERTEMPERATURE,EVENT_TYPE__DRYER_ZONE_1_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_ZONE_1_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_ZONE_2_OVERTEMPERATURE, - EVENT_TYPE__DYEING_HEAD_ZONE_3_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_ZONE_4_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_ZONE_5_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_ZONE_6_OVERTEMPERATURE, - EVENT_TYPE__MIXER_OVERTEMPERATURE}; - EventType HeaterEventTypeUnder[HEATER_TYPE_MAX_HEATERS] = {EVENT_TYPE__DRYER_ZONE_1_UNDERTEMPERATURE_B,EVENT_TYPE__DRYER_ZONE_2_UNDERTEMPERATURE_B,EVENT_TYPE__DRYER_ZONE_1_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_B, - EVENT_TYPE__DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_B, - EVENT_TYPE__MIXER_UNDERTEMPERATURE_B};*/ - int Dispenser_i,Alarm_i,Heater_i,AlarmId=0; + int Dispenser_i,Alarm_i,Heater_i,AlarmId=0; HeaterState HeaterState; //for (Dispenser_i = 0;Dispenser_i < MAX_SYSTEM_DISPENSERS;Dispenser_i++) diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c index e4681adfc..71ed7a97b 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c @@ -538,6 +538,8 @@ void DiagnosticOneSecCollection(void) DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone10, MillisecGetTemperatures(HEAD_PT100_ZONE_10_0X88_1)); DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone11, MillisecGetTemperatures(HEAD_PT100_ZONE_11_0X8A_0)); DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone12, MillisecGetTemperatures(HEAD_PT100_ZONE_12_0X8A_1)); + DiagnosticLoadTemperature(HEATER_TYPE__HeadCoverHeater1, MillisecGetTemperatures(HEAD_PT100_AIR_HEATER_2_0X8C_1)); + DiagnosticLoadTemperature(HEATER_TYPE__HeadCoverHeater2, MillisecGetTemperatures(HEAD_PT100_AIR_HEATER_1_0X8C_0)); #else DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__MixerHeater, MillisecGetTemperatures( MIXER_PT100)); DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__HeadHeaterZ1, MillisecGetTemperatures(TEMP_SENSE_ANALOG_DYEINGH_TEMP1)); @@ -719,6 +721,9 @@ void SendDiagnostics(void) DiagnosticsMonitor.headzone10temperature = HeaterTemperature[HEATER_TYPE__HeaterZone10]; DiagnosticsMonitor.headzone11temperature = HeaterTemperature[HEATER_TYPE__HeaterZone11]; DiagnosticsMonitor.headzone12temperature = HeaterTemperature[HEATER_TYPE__HeaterZone12]; + DiagnosticsMonitor.headcoverheater1temperature = HeaterTemperature[HEATER_TYPE__HeadCoverHeater1]; + DiagnosticsMonitor.headcoverheater2temperature = HeaterTemperature[HEATER_TYPE__HeadCoverHeater2]; + #endif DiagnosticsMonitor.dryerzone1temperature = HeaterTemperature[HEATER_TYPE__DryerAirHeater]; DiagnosticsMonitor.dryerzone2temperature = HeaterTemperature[HEATER_TYPE__DryerMainHeater]; @@ -738,6 +743,8 @@ void SendDiagnostics(void) DiagnosticsMonitor.n_headzone10temperature = HeaterCounterIndex[HEATER_TYPE__HeaterZone10]; DiagnosticsMonitor.n_headzone11temperature = HeaterCounterIndex[HEATER_TYPE__HeaterZone11]; DiagnosticsMonitor.n_headzone12temperature = HeaterCounterIndex[HEATER_TYPE__HeaterZone12]; + DiagnosticsMonitor.n_headcoverheater1temperature = HeaterCounterIndex[HEATER_TYPE__HeadCoverHeater1]; + DiagnosticsMonitor.n_headcoverheater2temperature = HeaterCounterIndex[HEATER_TYPE__HeadCoverHeater2]; #endif DiagnosticsMonitor.n_dryerzone1temperature = HeaterCounterIndex[HEATER_TYPE__DryerAirHeater]; DiagnosticsMonitor.n_dryerzone2temperature = HeaterCounterIndex[HEATER_TYPE__DryerMainHeater]; diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c index 071270e3a..76cb9afbe 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c @@ -300,7 +300,7 @@ uint32_t EmbeddedParametersInit(void) } else { - if (LoadConfigurationParamsFromFile()!=OK) + if (LoadConfigurationParamsFromFile(false)!=OK) { LoadConfigurationParameters(0); Report("LoadConfigurationParameters default", __FILE__,__LINE__,0, RpMessage, Fresult, 0); @@ -695,7 +695,7 @@ void HWSystemResetRequest(MessageContainer* requestContainer) } uint32_t FlashInitResults[5] = {0,0,0,0,0}; -uint32_t LoadConfigurationParamsFromFile(void) +uint32_t LoadConfigurationParamsFromFile(bool Initialize) { FRESULT Fresult = FR_OK; uint8_t* buffer = NULL; @@ -715,7 +715,8 @@ uint32_t LoadConfigurationParamsFromFile(void) EraseFlashSection(EMBEDDED_PARAMETERS_MAP_IN_FLASH,Bytes+4); ReadAppAndProgram(EMBEDDED_PARAMETERS_MAP_IN_FLASH, 4,&Bytes); ReadAppAndProgram(EMBEDDED_PARAMETERS_MAP_IN_FLASH+4, Bytes, buffer); - EmbeddedParametersInit(); + if (Initialize) + EmbeddedParametersInit(); } return Fresult; } diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h index 538204f0b..5fd8588af 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h @@ -16,7 +16,7 @@ extern uint32_t MachineCalibrationDataRequestFunc(MessageContainer* requestConta extern void HWSystemResetRequest(MessageContainer* requestContainer); uint32_t HWConfigurationInit(void); void FlashInitAndLoad(void); -uint32_t LoadConfigurationParamsFromFile(void); +uint32_t LoadConfigurationParamsFromFile(bool Initialize); extern HardwareBlower BlowerCfg; extern bool DataUpdated; diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index 3baa81193..6b7a01103 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -80,10 +80,10 @@ HeaterControlConfig_t HeaterPIDConfig[HEATER_TYPE_MAX_HEATERS] = {0,0,0,0,0,0,0 /******************** GLOBAL PARAMETERS ********************************************/ HeaterCommand HeaterCmd[HEATER_TYPE_MAX_HEATERS]; -uint32_t ControlIdtoHeaterId [HEATER_TYPE_MAX_HEATERS] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; -uint32_t ControlIdtoMaxHeaterId [HEATER_TYPE_MAX_HEATERS] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; -uint32_t OverHeatCounter [HEATER_TYPE_MAX_HEATERS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; -uint32_t UnderHeatCounter [HEATER_TYPE_MAX_HEATERS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; +uint32_t ControlIdtoHeaterId [HEATER_TYPE_MAX_HEATERS] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; +uint32_t ControlIdtoMaxHeaterId [HEATER_TYPE_MAX_HEATERS] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; +uint32_t OverHeatCounter [HEATER_TYPE_MAX_HEATERS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; +uint32_t UnderHeatCounter [HEATER_TYPE_MAX_HEATERS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; uint32_t MainDryerHeaterMaxTempControl = 0xFF; uint32_t SecondDryerHeaterMaxTempControl = 0xFF; uint32_t DisasterControlId = 0xFF; @@ -96,7 +96,7 @@ uint32_t DisasterControlId = 0xFF; #ifdef Use_Head_Card uint32_t HeaterId2PT100Id[HEATER_TYPE_MAX_HEATERS] = {DRYER_AIR_PT100,DRYER_MAIN_PT100,DRYER_SECONDARY_PT100,HEAD_PT100_ZONE_1_0X80_0, HEAD_PT100_ZONE_2_0X80_1, HEAD_PT100_ZONE_3_0X82_0, HEAD_PT100_ZONE_4_0X82_1, HEAD_PT100_ZONE_5_0X84_0, HEAD_PT100_ZONE_6_0X84_1,HEAD_PT100_MIXER_0X8E_0, HEAD_PT100_ZONE_7_0X86_0, HEAD_PT100_ZONE_8_0X86_1, - HEAD_PT100_ZONE_9_0X88_0, HEAD_PT100_ZONE_10_0X88_1, HEAD_PT100_ZONE_11_0X8A_0, HEAD_PT100_ZONE_12_0X8A_1,HEAD_PT100_AIR_HEATER_1_0X8C_0,HEAD_PT100_AIR_HEATER_2_0X8C_1 }; + HEAD_PT100_ZONE_9_0X88_0, HEAD_PT100_ZONE_10_0X88_1, HEAD_PT100_ZONE_11_0X8A_0, HEAD_PT100_ZONE_12_0X8A_1,HEAD_PT100_AIR_HEATER_2_0X8C_1,HEAD_PT100_AIR_HEATER_1_0X8C_0 }; HEATERS_CURRENT HeaterId2CurrentId[HEATER_TYPE_MAX_HEATERS] = {NUM_OF_CURRENT_HEATERS,HEATER_DRYER_CURRENT_1,HEATER_DRYER_CURRENT_2,HEAD_CURRENT_ZONE_1, HEAD_CURRENT_ZONE_2, HEAD_CURRENT_ZONE_3, HEAD_CURRENT_ZONE_4, HEAD_CURRENT_ZONE_5, HEAD_CURRENT_ZONE_6, HEAD_CURRENT_MIXER, HEAD_CURRENT_ZONE_7, HEAD_CURRENT_ZONE_8, HEAD_CURRENT_ZONE_9, HEAD_CURRENT_ZONE_10, HEAD_CURRENT_ZONE_11, HEAD_CURRENT_ZONE_12,HEAD_CURRENT_HTIN_1,HEAD_CURRENT_HTOT_1}; @@ -107,14 +107,14 @@ HEATERS_CURRENT HeaterId2CurrentId[HEATER_TYPE_MAX_HEATERS] = {NUM_OF_CURRENT_HE uint32_t DryerInternalPT100Id = DRYER_AIR_PT100; bool HeatersRestart = false; -bool HeaterMaxTempFlag[HEATER_TYPE_MAX_HEATERS] = {false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false}; -bool HeaterMinTempFlag[HEATER_TYPE_MAX_HEATERS] = {true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true}; +bool HeaterMaxTempFlag[HEATER_TYPE_MAX_HEATERS] = {false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false}; +bool HeaterMinTempFlag[HEATER_TYPE_MAX_HEATERS] = {true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true}; uint32_t OutputProportionalSingleStep = 0; //A/C Heaters step size from one decision point to another - in cpu clocks. 120000 = 1 millisecod uint32_t Heater_timerBase = TIMER2_BASE; //Timer handle uint32_t OutputProportionalCycleTime = 0; //A/C Heaters Cycle time in milliseconds - one for all heaters char TimeSliceAllocation[MAX_TIMESLICES] = {0xFF}; -int DCTimeSliceAllocation[HEATER_TYPE_MAX_HEATERS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; +int DCTimeSliceAllocation[HEATER_TYPE_MAX_HEATERS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; bool TimerActivated = false; char ACheatstr[100]; @@ -124,19 +124,22 @@ Mailbox_Handle HeatersControlMsgQ = NULL; //bool DCInitialHeating[HEATER_TYPE_MAX_HEATERS] = {true}; bool HeaterReady[HEATER_TYPE_MAX_HEATERS] = {true}; bool HeaterAtTemp[HEATER_TYPE_MAX_HEATERS] = {true}; -uint32_t HeaterPreviousRead[HEATER_TYPE_MAX_HEATERS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; //A/C Heaters Cycle time in milliseconds - one for all heaters +uint32_t HeaterPreviousRead[HEATER_TYPE_MAX_HEATERS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; //A/C Heaters Cycle time in milliseconds - one for all heaters EventType HeaterEventType[HEATER_TYPE_MAX_HEATERS] = {EVENT_TYPE__DRYER_ZONE_1_OVERTEMPERATURE,EVENT_TYPE__DRYER_ZONE_2_OVERTEMPERATURE,EVENT_TYPE__DRYER_ZONE_1_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_ZONE_1_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_ZONE_2_OVERTEMPERATURE, EVENT_TYPE__DYEING_HEAD_ZONE_3_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_ZONE_4_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_ZONE_5_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_ZONE_6_OVERTEMPERATURE, - EVENT_TYPE__MIXER_OVERTEMPERATURE,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None}; + EVENT_TYPE__MIXER_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_ZONE_7_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_ZONE_8_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_ZONE_9_OVERTEMPERATURE, + EVENT_TYPE__DYEING_HEAD_ZONE_10_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_ZONE_11_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_ZONE_12_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_BLOWER_1_OVERTEMPERATURE,EVENT_TYPE__DYEING_HEAD_BLOWER_2_OVERTEMPERATURE}; EventType HeaterUnderEventType[HEATER_TYPE_MAX_HEATERS] = {EVENT_TYPE__DRYER_ZONE_1_UNDERTEMPERATURE_A,EVENT_TYPE__DRYER_ZONE_2_UNDERTEMPERATURE_A,EVENT_TYPE__DRYER_ZONE_1_UNDERTEMPERATURE_A,EVENT_TYPE__DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_A,EVENT_TYPE__DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_A, EVENT_TYPE__DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_A,EVENT_TYPE__DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_A,EVENT_TYPE__DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_A,EVENT_TYPE__DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_A, - EVENT_TYPE__MIXER_UNDERTEMPERATURE_A,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None}; + EVENT_TYPE__MIXER_UNDERTEMPERATURE_A,EVENT_TYPE__DYEING_HEAD_ZONE_7_UNDERTEMPERATURE_A,EVENT_TYPE__DYEING_HEAD_ZONE_8_UNDERTEMPERATURE_A,EVENT_TYPE__DYEING_HEAD_ZONE_9_UNDERTEMPERATURE_A,EVENT_TYPE__DYEING_HEAD_ZONE_10_UNDERTEMPERATURE_A,EVENT_TYPE__DYEING_HEAD_ZONE_11_UNDERTEMPERATURE_A, + EVENT_TYPE__DYEING_HEAD_ZONE_12_UNDERTEMPERATURE_A,EVENT_TYPE__DYEING_HEAD_BLOWER_1_UNDERTEMPERATURE_A,EVENT_TYPE__DYEING_HEAD_BLOWER_2_UNDERTEMPERATURE_A}; EventType HeaterUnderEventType_B[HEATER_TYPE_MAX_HEATERS] = {EVENT_TYPE__DRYER_ZONE_1_UNDERTEMPERATURE_B,EVENT_TYPE__DRYER_ZONE_2_UNDERTEMPERATURE_B,EVENT_TYPE__DRYER_ZONE_1_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_B, EVENT_TYPE__DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_B, - EVENT_TYPE__MIXER_UNDERTEMPERATURE_B,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None,EVENT_TYPE__None}; + EVENT_TYPE__MIXER_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_ZONE_7_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_ZONE_8_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_ZONE_9_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_ZONE_10_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_ZONE_11_UNDERTEMPERATURE_B, + EVENT_TYPE__DYEING_HEAD_ZONE_12_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_BLOWER_1_UNDERTEMPERATURE_B,EVENT_TYPE__DYEING_HEAD_BLOWER_2_UNDERTEMPERATURE_B}; -int HeaterDisasterCounter[HEATER_TYPE_MAX_HEATERS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; +int HeaterDisasterCounter[HEATER_TYPE_MAX_HEATERS] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; #define DISASTER_COUNTER_LIMIT 10 /******************** FUNCTIONS ********************************************/ @@ -1447,7 +1450,7 @@ uint32_t HeatersControlLoop(uint32_t tick) } } } - for ( DcHeaterId = HEATER_TYPE__HeaterZone1; DcHeaterId<= HEATER_TYPE__HeaterZone12;DcHeaterId++) + for ( DcHeaterId = HEATER_TYPE__HeaterZone1; DcHeaterId<= HEATER_TYPE__HeadCoverHeater2;DcHeaterId++) { if (HeaterDisasterCounter[DcHeaterId] >= DISASTER_COUNTER_LIMIT) { diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c index 1984420f3..f43cf8c56 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c @@ -291,7 +291,6 @@ void IDS_Dispenser_Content_Init (void) Report("IDS_Dispenser load data ",__FILE__,i,(int)IDS_Dispenser_Data[i].totalconsumedinnanolitter,RpWarning,(int)IDS_Dispenser_Data[i].consumedinnanolitter,0); } dispenser_data__free_unpacked(StoredDispenserData,NULL); - free (buffer); } //Report("IDS_Dispenser load data ",__FILE__,__LINE__,(int)Bytes,RpWarning,(int)IDS_Dispenser_Data[0].nanolitterperpulse*100,0); return; diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c index 1ea37a07e..802344bf3 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c @@ -494,6 +494,7 @@ uint32_t IDS_ReCheck_Pressure_Callback(uint32_t DispenserId, uint32_t ReadValue) Report("Pulling dispenser down result",__FILE__,DispenserId,(int)(GetDispenserPressure(DispenserId)*100),RpWarning,200,0); SafeRemoveControlCallback(GetControlLowDevice_i(), IDS_ReCheck_Pressure_Callback ); + return OK; } uint32_t IDS_Check_Pressure_Callback(uint32_t DispenserId, uint32_t ReadValue) { diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c index ad9d75941..708b11342 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c @@ -234,8 +234,17 @@ JobDescriptionFileBrushStop *FirstBrushStop = NULL; DispenserUsedInJob[Dispenser_i] = false; } n_segments = 0; - if (EnableCleaning == true) + if (MotorsCfg[DispenserIdToMotorId[CLEANER_DISPENSER]].hardwaremotortype == DispenserIdToMotorId[CLEANER_DISPENSER]) + { DispenserUsedInJob[CLEANER_DISPENSER] = true; + EnableCleaning = true; + } + else + { + DispenserUsedInJob[CLEANER_DISPENSER] = false; + EnableCleaning = false; + } + if (JobTicket->enablelubrication == true) { //DispenserUsedInJob[LUBRICANT_DISPENSER] = true; diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index b9bbf3aab..bac3ba1d0 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -401,8 +401,9 @@ CallbackCounter++; //MotorMovetoLimitSwitch (HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID,1-MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID].directionthreadwize, 200, Motor_Id_to_LS_IdUp[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID], Thread_Load_HomingCallback,10000); MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID, 0, Motor_Id_to_LS_IdUp[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID], Thread_Load_HomingCallback,10000); +#ifdef Use_Head_Card HeadCard_Actuators_Control(ACTOT, LOW,true); - +#endif return OK; } uint32_t Thread_Load_Lift_Dancers(void) @@ -510,8 +511,9 @@ CallbackCounter++; // MotorMovetoLimitSwitch (HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID].directionthreadwize, 200, Motor_Id_to_LS_IdDown[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID], Thread_Load_HomingCallback,10000); MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID, 2, Motor_Id_to_LS_IdDown[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID], Thread_Load_HomingCallback,10000); +#ifdef Use_Head_Card HeadCard_Actuators_Control(ACTOT, LOW,false); - +#endif return OK; } uint32_t Thread_Load_Resume_Heating(void) |