Исправление ночного режима, мелкие исправления логики

This commit is contained in:
2023-02-12 20:47:08 +03:00
parent 2297d7c7a9
commit ee7658b131
4 changed files with 29 additions and 16 deletions

View File

@@ -57,9 +57,9 @@ char scheduler_start_signal = 1;
char auto_mode_pause = 0;
char hla_night_mode = 0;
short hla_exchange_zone = ZONE_GALVANIZING_1;
short hla_exchange_zone = ZONE_GALVANIZING_2;
short hla_disabled_zones = 0;
short hla_disabled_zones = DISABLED_GAL_1 | DISABLED_GAL_2;
short etching_zone = -2, galvanizing_zone = -2;
@@ -228,7 +228,7 @@ static void showAll() {
image_init();
image_draw_borders();
char tmp[64];
sprintf(tmp, "Lock1=%2d Lock2=%2d E=%d G=%d", robot1_lock_zone, robot2_lock_zone, etching_zone, galvanizing_zone);
sprintf(tmp, "Lock2=%2d Lock1=%2d FNZ=%d", robot2_lock_zone, robot1_lock_zone, get_first_night_zone());
image_insert_sprite(0, 2, tmp);
collectBarrelsStatistic();
@@ -245,8 +245,7 @@ static void showAll() {
char flag_r = ' ';
if (b.flags.is_night) {
flag_r = 'n';
}
if (b.flags.is_empty) {
} else if (b.flags.is_empty) {
flag_r = 'e';
}