From 7c1062a6d9d88bdeebde829cab8b32db9bfeeaab Mon Sep 17 00:00:00 2001
From: Razvalyaev <wot890089@mail.ru>
Date: Thu, 5 Feb 2026 10:14:29 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BE=D1=80=D0=B8=D0=B3=D0=B8=D0=BD=D0=B0=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BD=D1=83=D1=8E=20=D0=BF=D0=BB=D0=B0=D1=82=D1=83=20?=
 =?UTF-8?q?=D0=A3=D0=9F=D0=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UPP/Core/Configs/upp_config.h                 |   4 +-
 UPP/Core/PowerMonitor/power_monitor.c         |   3 +-
 UPP/Core/Src/main.c                           |   4 +-
 UPP/Core/UPP/upp_main.c                       |  37 +++++++++++++++---
 UPP/Core/UPP/upp_status.c                     |   2 +-
 UPP/MDK-ARM/UPP.uvoptx                        |  33 ++++++++++++++--
 .../Modbus Карта.docx                    | Bin 14614 -> 14637 bytes
 7 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/UPP/Core/Configs/upp_config.h b/UPP/Core/Configs/upp_config.h
index 35d0cb0..39bd452 100644
--- a/UPP/Core/Configs/upp_config.h
+++ b/UPP/Core/Configs/upp_config.h
@@ -22,9 +22,9 @@
   * @{
   */
 
-//#define UPP_DISABLE_ERROR_BLOCK ///< Отключить блокировку УПП при ошибках
+#define UPP_DISABLE_ERROR_BLOCK ///< Отключить блокировку УПП при ошибках
 //#define UPP_SIMULATE_I ///< Симулировт токи (Iref/2) а не брать с АЦП
-#define UPP_DISABLE_PROTECT_BOARDPOWER ///< Отключить проверки питания плат (+24, +5 В)
+//#define UPP_DISABLE_PROTECT_BOARDPOWER ///< Отключить проверки питания плат (+24, +5 В)
 //#define UPP_DISABLE_PROTECT_LOSS_PHASE ///< Отключить проверки на потерянные фазы
 
 //#define ZC_DISABLE_HYSTERESIS_DEBOUNCE ///< Отключить гиситерезис и дребезг на определении перехода через ноль
diff --git a/UPP/Core/PowerMonitor/power_monitor.c b/UPP/Core/PowerMonitor/power_monitor.c
index beb12c7..f1cdc9f 100644
--- a/UPP/Core/PowerMonitor/power_monitor.c
+++ b/UPP/Core/PowerMonitor/power_monitor.c
@@ -216,8 +216,7 @@ void PowerMonitor_FastCalc(PowerMonitor_t *hpm)
     }
   }  
   
-  if(hpm->f.isI)
-    Protect_Fast(&hpm->measured, u2f(PARAM_INTERNAL->pm.lImaxAmp, 100));
+  Protect_Fast(&hpm->measured, u2f(PARAM_INTERNAL->pm.lImaxAmp, 100));
   
   /* Вообще фильтры должны рабтоать синхронно, но на всякий синхронизация */
   //__SynchAvgFilters(hpm);
diff --git a/UPP/Core/Src/main.c b/UPP/Core/Src/main.c
index e231ae7..d9df347 100644
--- a/UPP/Core/Src/main.c
+++ b/UPP/Core/Src/main.c
@@ -107,8 +107,8 @@ int main(void)
   MX_GPIO_Init();
   MX_DMA_Init();
   MX_ADC3_Init();
-  MX_USART3_UART_Init();
-  MX_CAN1_Init();
+  MX_USART3_UART_Init(); 
+  //MX_CAN1_Init();
   MX_IWDG_Init();
   MX_TIM1_Init();
   MX_TIM3_Init();
diff --git a/UPP/Core/UPP/upp_main.c b/UPP/Core/UPP/upp_main.c
index 1122afc..ad318a8 100644
--- a/UPP/Core/UPP/upp_main.c
+++ b/UPP/Core/UPP/upp_main.c
@@ -75,11 +75,16 @@ int UPP_PreWhile(void)
   dbg_polarity = 0;
 #endif
 
-  UPP_DO.CEN(ENABLE);
+//  UPP_DO.CEN(ENABLE);
   MODBUS_SlaveStart(&hmodbus1, NULL);
   return 0;
 }
 
+int test_cen = 0;
+int test_err = 0;
+int test_work = 0;
+int test_ready = 0;
+
 /** 
   * @brief    Основной цикл УПП.
   * @return   0 - если ОК, >1 если ошибка.
@@ -107,17 +112,32 @@ int UPP_While(void)
     razgon_done = 0;
 #endif
     
+//    if(test_cen)
+//      UPP_DO.CEN(ENABLE);
+//    else
+//      UPP_DO.CEN(DISABLE);
+//    
+//    if(test_err)
+//      UPP_DO.Error(ENABLE);
+//    else
+//      UPP_DO.Error(DISABLE);
+//    
+//    if(test_work)
+//      UPP_DO.Work(ENABLE);
+//    else
+//      UPP_DO.Work(DISABLE);
+//    
+//    if(test_ready)
+//      UPP_DO.Ready(ENABLE);
+//    else
+//      UPP_DO.Ready(DISABLE);
+      
     // Обрабока ошибок и выставление итоговой Ошибки
     UPP_Errors_Handle();
     // Контроль парамеров
     UPP_Params_Control();
     
     
-#ifndef UPP_DISABLE_ERROR_BLOCK
-    // если ошибка вызываем СТОП
-    upp.call->stop = (errors.common != Err_None);
-#endif
-    
     // Сброс на дефолтные по запросу
     if(upp.call->set_default_pui || upp.call->set_default_internal)
     {
@@ -127,6 +147,11 @@ int UPP_While(void)
     }
     
     
+#ifndef UPP_DISABLE_ERROR_BLOCK
+    // если ошибка вызываем СТОП
+    upp.call->stop = (errors.common != Err_None);
+#endif
+    
     // Если СТОП - переходим в ошибку
     if (upp.call->stop)
       upp.workmode = UPP_Error;
diff --git a/UPP/Core/UPP/upp_status.c b/UPP/Core/UPP/upp_status.c
index ed27e20..d28d285 100644
--- a/UPP/Core/UPP/upp_status.c
+++ b/UPP/Core/UPP/upp_status.c
@@ -1,7 +1,7 @@
 /**
 ******************************************************************************
 * @file upp_status.c
-* @brief Модуль определяющий состояние УПП
+* @brief Модуль определяющий состояние УПП (Input Регистры)
 ******************************************************************************
 * @details
 ******************************************************************************/
diff --git a/UPP/MDK-ARM/UPP.uvoptx b/UPP/MDK-ARM/UPP.uvoptx
index 9c4b273..1f577c5 100644
--- a/UPP/MDK-ARM/UPP.uvoptx
+++ b/UPP/MDK-ARM/UPP.uvoptx
@@ -75,7 +75,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -135,7 +135,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>JL2CM3</Key>
-          <Name>-U -O14 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight JTAG-DP") -D00(4BA00477) -L00(4) -N01("Unknown JTAG device") -D01(06413041) -L01(5) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F427ZGTx$CMSIS\Flash\STM32F4xx_1024.FLM)</Name>
+          <Name>-U-O14 -O14 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight JTAG-DP") -D00(4BA00477) -L00(4) -N01("Unknown JTAG device") -D01(790007A3) -L01(5) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F427ZGTx$CMSIS\Flash\STM32F4xx_1024.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -155,13 +155,38 @@
           <WinNumber>1</WinNumber>
           <ItemText>uwTick,0x0A</ItemText>
         </Ww>
+        <Ww>
+          <count>1</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>upp,0x0A</ItemText>
+        </Ww>
+        <Ww>
+          <count>2</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>test_cen,0x0A</ItemText>
+        </Ww>
+        <Ww>
+          <count>3</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>test_err,0x0A</ItemText>
+        </Ww>
+        <Ww>
+          <count>4</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>test_work,0x0A</ItemText>
+        </Ww>
+        <Ww>
+          <count>5</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>test_ready,0x0A</ItemText>
+        </Ww>
       </WatchWindow1>
       <Tracepoint>
         <THDelay>0</THDelay>
       </Tracepoint>
       <DebugFlag>
         <trace>0</trace>
-        <periodic>0</periodic>
+        <periodic>1</periodic>
         <aLwin>1</aLwin>
         <aCover>0</aCover>
         <aSer1>0</aSer1>
@@ -262,7 +287,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
diff --git a/Информация для программиста (УПП СП СЭД)/Modbus Карта.docx b/Информация для программиста (УПП СП СЭД)/Modbus Карта.docx
index f2e7e6f9e394cca87141a7485a7cebee5ac5404c..3fbecf6117a75a713de4a28ea5d41f9d61bc1ada 100644
GIT binary patch
delta 5636
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
P&O)6?vf`LX{G0p_&&;8S

delta 5559
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
F007Hxf}{Wd