From c9a124e1c83fe2b15351bb886a302fc52b52d4c5 Mon Sep 17 00:00:00 2001 From: Alex Warm Date: Tue, 5 Mar 2019 14:48:22 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B1=D0=BE=D1=80=D0=BA=D0=B0=2019030514?= =?UTF-8?q?48?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- braker.tc | 2 +- global.th | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/braker.tc b/braker.tc index 348af86..837024d 100644 --- a/braker.tc +++ b/braker.tc @@ -80,7 +80,7 @@ void braker_proc(unsigned char number) d("Бракиратор #"+str(number)+" выключен по таймауту ["+str(sys.timercountms - brakers[num].OnTime)+"/"+str(timeout)+"]ms"); brakers[num].OnTime = 0; }else{ // проверка статуса порта - if (getPinState(brakers[num].config->DropPort)){ + if (brakers[num].config->DropPort>0 && getPinState(brakers[num].config->DropPort)){ relay_set(brakers[num].config->Relay,false); brakers[num].State = false; d("Бракиратор #"+str(number)+" выключен по сигналу сброса через "+str(sys.timercountms - brakers[num].OnTime)+"ms"); diff --git a/global.th b/global.th index 5e8c22a..00d8b91 100644 --- a/global.th +++ b/global.th @@ -9,7 +9,7 @@ #message "link global not defined" #endif -#define VERSION "2.0b_1903041604" +#define VERSION "2.0b_1903051448" #define MAX_FIFO_SIZE 20 #define BRAKER_COUNT 3 @@ -128,3 +128,4 @@ extern BrakerProcess brakers[BRAKER_COUNT]; +