From df31f6a61d89c657b1cdf8a8448aa04d9e299df0 Mon Sep 17 00:00:00 2001
From: seklyuts <seklyuts@diakont.com>
Date: Wed, 3 Jul 2024 13:42:02 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B5=20=D0=B2=D1=8B=D0=BA=D0=BB=D1=8E?=
 =?UTF-8?q?=D1=87=D0=B0=D0=B5=D0=BC=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=BF=D1=80=D1=8F=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B7=D0=B8=D0=BB=D0=BE=D1=81=D1=8C=20=D1=83=D0=B6?=
 =?UTF-8?q?=D0=B5=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Projects/epwm_test_biss_c_cpu2/src/rele.c | 20 +++++++++++++-------
 Projects/epwm_test_biss_c_cpu2/src/rele.h |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Projects/epwm_test_biss_c_cpu2/src/rele.c b/Projects/epwm_test_biss_c_cpu2/src/rele.c
index 25698ef..f4d0c9a 100644
--- a/Projects/epwm_test_biss_c_cpu2/src/rele.c
+++ b/Projects/epwm_test_biss_c_cpu2/src/rele.c
@@ -7,6 +7,7 @@
 #include "f28x_project.h"
 #include "sdfm.h"
 #include "vector.h"
+#include "gpio_init.h"
 #include "rele.h"
 
 
@@ -38,14 +39,19 @@ void rele_run(int16_t UdcFiltered)
         Rele.Error = 0;
     }
     else {
-        if(Rele.ReleCounter == 0) Rele.Udc = UdcFiltered;
-        if(Rele.ReleCounter < Rele.CounterMax) {Rele.ReleCounter++; vectorFault();}
-        else
-        {
-            if((UdcFiltered - Rele.Udc ) < Rele.UdcDiff)
+
+        if(Rele.Error) vectorFault();
+        else {
+            if(Rele.ReleCounter == 0) Rele.Udc = UdcFiltered;
+            if(Rele.ReleCounter < Rele.CounterMax) {Rele.ReleCounter++; vectorFault();}
+            else if(Rele.ReleCounter == Rele.CounterMax)
             {
-                vectorFault();
-                Rele.Error = 1;
+                Rele.ReleCounter++;
+                if((UdcFiltered - Rele.Udc ) < Rele.UdcDiff)
+                {
+                    vectorFault();
+                    Rele.Error = 1;
+                }
             }
         }
     }
diff --git a/Projects/epwm_test_biss_c_cpu2/src/rele.h b/Projects/epwm_test_biss_c_cpu2/src/rele.h
index ed88ce0..7ada066 100644
--- a/Projects/epwm_test_biss_c_cpu2/src/rele.h
+++ b/Projects/epwm_test_biss_c_cpu2/src/rele.h
@@ -8,7 +8,7 @@
 #ifndef SRC_RELE_H_
 #define SRC_RELE_H_
 
-#define RELE_COUNTER_MAX            30
+#define RELE_COUNTER_MAX            6500
 #define RELE_UDC_DIFF_VOLT          5.0
 #define RELE_UDC_DIFF               (RELE_UDC_DIFF_VOLT*BIT_MAX/FACTOR_VDC)