From 26ffa9359211ff07573ddfd39fc57b53118afc81 Mon Sep 17 00:00:00 2001 From: VladislavOstapov Date: Sat, 11 Mar 2023 16:43:36 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BC=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=D0=B0=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D0=BE=D0=B5=20=D0=BA=D0=BE=D0=BB=D0=B8=D1=87=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=B2=D0=BE=20=D0=B1=D0=B0=D1=80=D0=B0=D0=B1=D0=B0?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=20(12)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scheduler.c | 7 +++++-- utils.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scheduler.c b/scheduler.c index d69066d..e1b4459 100644 --- a/scheduler.c +++ b/scheduler.c @@ -121,6 +121,11 @@ void scheduler_main() robot1_code.PC = -1; robot2_code.PC = -1; + scheduler_start_signal = 0; + scheduler_stage = 0; + } + + if (!scheduler_en) { for (short i = 0; i < BARRELS_COUNT; i++) { // после рестарта планировщика надо всем барабаном убрать робота, // всех кто сверху удалить @@ -130,8 +135,6 @@ void scheduler_main() barrels[i].flags.is_exist = 0; } } - scheduler_start_signal = 0; - scheduler_stage = 0; } // программный таймер, применяется ко всем существующим барабанам во всех режимах diff --git a/utils.h b/utils.h index 396e90f..1934b2c 100644 --- a/utils.h +++ b/utils.h @@ -30,7 +30,7 @@ enum Zones { }; -#define BARRELS_COUNT 10 +#define BARRELS_COUNT 12 union barrel_flags { short raw_word;