VladislavOstapov/sdp-scheduler
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправлено время скапывания для пассивации

Browse Source
This commit is contained in:
VladislavOstapov 2023-02-18 16:21:06 +03:00
parent 61d649b06d
commit 157c0cb9e6
1 changed files with 52 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
utils.c
View File

@ -538,6 +538,7 @@ void create_operation(struct robot_code *code, short barrel_id, const short star
code->code[cmd_index++] = ROBOT_CMD_SET_LOCK_ZONE(ZONE_PASSIVATION); code->code[cmd_index++] = ROBOT_CMD_SET_LOCK_ZONE(ZONE_PASSIVATION);
} }
code->code[cmd_index++] = ROBOT_CMD_UP_WITH_BARREL(); code->code[cmd_index++] = ROBOT_CMD_UP_WITH_BARREL();
code->code[cmd_index++] = ROBOT_CMD_WAIT(hla_time_washing_2);
code->code[cmd_index++] = ROBOT_CMD_MOVE_TO_ZONE_WITH_BARREL(ZONE_PASSIVATION); code->code[cmd_index++] = ROBOT_CMD_MOVE_TO_ZONE_WITH_BARREL(ZONE_PASSIVATION);
code->code[cmd_index++] = ROBOT_CMD_DOWN_WITH_BARREL(); code->code[cmd_index++] = ROBOT_CMD_DOWN_WITH_BARREL();
@ -656,70 +657,65 @@ void create_operation(struct robot_code *code, short barrel_id, const short star
code->code[cmd_index++] = ROBOT_CMD_UP(); code->code[cmd_index++] = ROBOT_CMD_UP();
code->code[cmd_index++] = ROBOT_CMD_DOWN(); code->code[cmd_index++] = ROBOT_CMD_DOWN();
} else { } else {
if (dest_zone != 0) { // установка времени ожидания барабана
short tmp = -1;
if (barrel_id >= 0) {
if (!barrels[barrel_id].flags.is_empty) {
switch (dest_zone) {
case ZONE_DEGREASING:
tmp = barrels[barrel_id].time_degreasing;
break;
// установка времени ожидания барабана case ZONE_ETCHING_1:
short tmp = -1; case ZONE_ETCHING_2:
if (barrel_id >= 0) { tmp = barrels[barrel_id].time_etching;
if (!barrels[barrel_id].flags.is_empty) { break;
switch (dest_zone) {
case ZONE_DEGREASING:
tmp = barrels[barrel_id].time_degreasing;
break;
case ZONE_ETCHING_1: case ZONE_GALVANIZING_1:
case ZONE_ETCHING_2: case ZONE_GALVANIZING_2:
tmp = barrels[barrel_id].time_etching; case ZONE_GALVANIZING_3:
break; case ZONE_GALVANIZING_4:
case ZONE_GALVANIZING_5:
case ZONE_GALVANIZING_6:
case ZONE_GALVANIZING_7:
case ZONE_GALVANIZING_8:
tmp = barrels[barrel_id].time_galvanizing;
break;
case ZONE_GALVANIZING_1: case ZONE_WASHING_1A:
case ZONE_GALVANIZING_2: tmp = barrels[barrel_id].time_washing_1a;
case ZONE_GALVANIZING_3: break;
case ZONE_GALVANIZING_4: case ZONE_WASHING_2A:
case ZONE_GALVANIZING_5: tmp = barrels[barrel_id].time_washing_2a;
case ZONE_GALVANIZING_6: break;
case ZONE_GALVANIZING_7: case ZONE_WASHING_3A:
case ZONE_GALVANIZING_8: tmp = barrels[barrel_id].time_washing_3a;
tmp = barrels[barrel_id].time_galvanizing; break;
break; case ZONE_WASHING_4A:
tmp = barrels[barrel_id].time_washing_4a;
break;
case ZONE_WASHING_1A: case ZONE_WASHING_1B:
tmp = barrels[barrel_id].time_washing_1a; tmp = barrels[barrel_id].time_washing_1b;
break; break;
case ZONE_WASHING_2A: case ZONE_WASHING_2B:
tmp = barrels[barrel_id].time_washing_2a; tmp = barrels[barrel_id].time_washing_2b;
break; break;
case ZONE_WASHING_3A: case ZONE_WASHING_3B:
tmp = barrels[barrel_id].time_washing_3a; tmp = barrels[barrel_id].time_washing_3b;
break; break;
case ZONE_WASHING_4A: case ZONE_WASHING_4B:
tmp = barrels[barrel_id].time_washing_4a; tmp = barrels[barrel_id].time_washing_4b;
break; break;
case ZONE_WASHING_1B:
tmp = barrels[barrel_id].time_washing_1b;
break;
case ZONE_WASHING_2B:
tmp = barrels[barrel_id].time_washing_2b;
break;
case ZONE_WASHING_3B:
tmp = barrels[barrel_id].time_washing_3b;
break;
case ZONE_WASHING_4B:
tmp = barrels[barrel_id].time_washing_4b;
break;
}
} else {
tmp = 0;
} }
} }
}
if (tmp >= 0) { if (tmp >= 0) {
if (tmp > 8000) { if (tmp > 8000) {
tmp = 8000; tmp = 8000;
}
code->code[cmd_index++] = ROBOT_CMD_TMR_SET(tmp);
} }
code->code[cmd_index++] = ROBOT_CMD_TMR_SET(tmp);
} }
} }
} }