From 5fc60e60df03a7b1523970c57cb8ae4faff8225e Mon Sep 17 00:00:00 2001
From: Oleg <petruhin@ru-drive.com>
Date: Mon, 15 Apr 2024 15:42:14 +0300
Subject: [PATCH] 0127 Does not work

---
 .cproject                            |  6 +++---
 FRAM/FRAMConfigurationParameters.cpp |  2 +-
 SYSCTRL/AlgorithmWork.cpp            |  2 +-
 SYSCTRL/SystemConfigurator.h         |  8 ++++----
 SYSCTRL/SystemControlExecute.cpp     | 30 ++++++++++++++++++++++++----
 SYSCTRL/SystemEnvironment.cpp        |  2 +-
 SYSCTRL/SystemEnvironment.h          |  2 +-
 7 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/.cproject b/.cproject
index 31819a2..b6924c1 100644
--- a/.cproject
+++ b/.cproject
@@ -13,7 +13,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="out" artifactName="${SRC_ROOT}/sys/build/Debug/framework" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.C2000.Debug.2040603795" name="Debug" parent="com.ti.ccstudio.buildDefinitions.C2000.Debug">
+				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.C2000.Debug.2040603795" name="Debug" parent="com.ti.ccstudio.buildDefinitions.C2000.Debug">
 					<folderInfo id="com.ti.ccstudio.buildDefinitions.C2000.Debug.2040603795." name="/" resourcePath="">
 						<toolChain id="com.ti.ccstudio.buildDefinitions.C2000_21.6.exe.DebugToolchain.830787211" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.C2000_21.6.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.C2000_21.6.exe.linkerDebug.1778512584">
 							<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.1197154302" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
@@ -68,8 +68,8 @@
 							</tool>
 							<tool id="com.ti.ccstudio.buildDefinitions.C2000_21.6.exe.linkerDebug.1778512584" name="C2000 Linker" superClass="com.ti.ccstudio.buildDefinitions.C2000_21.6.exe.linkerDebug">
 								<option id="com.ti.ccstudio.buildDefinitions.C2000_21.6.linkerID.STACK_SIZE.1215847210" name="Set C system stack size (--stack_size, -stack)" superClass="com.ti.ccstudio.buildDefinitions.C2000_21.6.linkerID.STACK_SIZE" value="0x100" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.C2000_21.6.linkerID.MAP_FILE.569103737" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.C2000_21.6.linkerID.MAP_FILE" value="&quot;${SRC_ROOT}/sys/build/Debug/framework.map&quot;" valueType="string"/>
-								<option id="com.ti.ccstudio.buildDefinitions.C2000_21.6.linkerID.OUTPUT_FILE.167409769" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.C2000_21.6.linkerID.OUTPUT_FILE" value="${SRC_ROOT}/sys/build/Debug/framework.out" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.C2000_21.6.linkerID.MAP_FILE.569103737" name="Link information (map) listed into &lt;file&gt; (--map_file, -m)" superClass="com.ti.ccstudio.buildDefinitions.C2000_21.6.linkerID.MAP_FILE" value="&quot;${ProjName}.map&quot;" valueType="string"/>
+								<option id="com.ti.ccstudio.buildDefinitions.C2000_21.6.linkerID.OUTPUT_FILE.167409769" name="Specify output file name (--output_file, -o)" superClass="com.ti.ccstudio.buildDefinitions.C2000_21.6.linkerID.OUTPUT_FILE" value="${ProjName}.out" valueType="string"/>
 								<option id="com.ti.ccstudio.buildDefinitions.C2000_21.6.linkerID.HEAP_SIZE.60955433" name="Heap size for C/C++ dynamic memory allocation (--heap_size, -heap)" superClass="com.ti.ccstudio.buildDefinitions.C2000_21.6.linkerID.HEAP_SIZE" value="0x100" valueType="string"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.C2000_21.6.linkerID.LIBRARY.1339269017" name="Include library file or command file as input (--library, -l)" superClass="com.ti.ccstudio.buildDefinitions.C2000_21.6.linkerID.LIBRARY" valueType="libs">
 									<listOptionValue builtIn="false" value="libc.a"/>
diff --git a/FRAM/FRAMConfigurationParameters.cpp b/FRAM/FRAMConfigurationParameters.cpp
index 854fa44..1e4cadc 100644
--- a/FRAM/FRAMConfigurationParameters.cpp
+++ b/FRAM/FRAMConfigurationParameters.cpp
@@ -209,7 +209,7 @@ void FRAMDATABASE::register_configuration_parameters(SYSCTRL::SystemControlConfi
     add_float( 0, &sys_config->phase_alert_monitor.current_invertor_overload_level_2.period, 10.0);
     //
     // current invertor overload level 3 150% 1ms
-    add_float( 0, &sys_config->phase_alert_monitor.current_invertor_overload_level_3.level, 79 * 3.2);
+    add_float( 0, &sys_config->phase_alert_monitor.current_invertor_overload_level_3.level, 79 * 5.79);
     add_float( 0, &sys_config->phase_alert_monitor.current_invertor_overload_level_3.period, 0.004);
     //
     // current input overload level 1 110% 60s
diff --git a/SYSCTRL/AlgorithmWork.cpp b/SYSCTRL/AlgorithmWork.cpp
index b4a5d70..b64ae9f 100644
--- a/SYSCTRL/AlgorithmWork.cpp
+++ b/SYSCTRL/AlgorithmWork.cpp
@@ -360,7 +360,7 @@ void AlgorithmWork::_execute_run()
     m_env.drc_positive_voltage_cell_direct = m_env.drc_positive_voltage_controller_direct.execute(m_env.drc_voltage_reference_load_direct, m_env.drc_positive_voltage_load_direct);
     //m_env.drc_positive_voltage_cell_quadrature = m_env.drc_positive_voltage_controller_quadrature.execute(m_env.drc_voltage_reference_load_quadrature, m_env.drc_positive_voltage_load_quadrature);
     m_env.drc_positive_voltage_cell_quadrature = FP_ZERO;
-    m_env.drc_negative_voltage_cell_direct = m_env.drc_negative_voltage_controller_direct.execute(m_env.drc_voltage_reference_zero, m_env.drc_negaative_voltage_load_direct);
+    m_env.drc_negative_voltage_cell_direct = m_env.drc_negative_voltage_controller_direct.execute(m_env.drc_voltage_reference_zero, m_env.drc_negative_voltage_load_direct);
     m_env.drc_negative_voltage_cell_quadrature = m_env.drc_negative_voltage_controller_quadrature.execute(m_env.drc_voltage_reference_zero, m_env.drc_negative_voltage_load_quadrature);
     //m_env.drc_negative_voltage_cell_direct = FP_ZERO;
     //m_env.drc_negative_voltage_cell_quadrature = FP_ZERO;
diff --git a/SYSCTRL/SystemConfigurator.h b/SYSCTRL/SystemConfigurator.h
index d676108..59537ae 100644
--- a/SYSCTRL/SystemConfigurator.h
+++ b/SYSCTRL/SystemConfigurator.h
@@ -53,10 +53,10 @@ namespace SYSCTRL
 
 
 #if TYPECONTROL == DIRECTREVERSECONTROL
-#define HEADER_CLASS_ID            ((int16_t)(0x0FB0))
-#define HEADER_PART_ID             ((int16_t)(0x0FB0))
-#define HEADER_SOFTWARE_VERSION    ((int16_t)(0x0FB0))
-#define FOOTER_FOOT                ((int16_t)(0x0FB0))
+#define HEADER_CLASS_ID            ((int16_t)(0x0C00))
+#define HEADER_PART_ID             ((int16_t)(0x0C00))
+#define HEADER_SOFTWARE_VERSION    ((int16_t)(0x0C00))
+#define FOOTER_FOOT                ((int16_t)(0x0C00))
 #endif
 
 
diff --git a/SYSCTRL/SystemControlExecute.cpp b/SYSCTRL/SystemControlExecute.cpp
index d3a02ab..5e1b5fa 100644
--- a/SYSCTRL/SystemControlExecute.cpp
+++ b/SYSCTRL/SystemControlExecute.cpp
@@ -1078,7 +1078,7 @@ void SystemControl::_execute_operational()
                                             m_environment.drc_current_cell_beta,
                                             m_environment.drc_current_cell_direct,
                                             m_environment.drc_current_cell_quadrature);
-    //
+/*    //
     m_environment.drc_direct_voltage_decomposer.execute(m_environment.voltage_load_a,
                                                         m_environment.voltage_load_b,
                                                         m_environment.voltage_load_c,
@@ -1098,14 +1098,36 @@ void SystemControl::_execute_operational()
                                                       m_environment.main_abc_reverse_orts.phase_a.reactive,
                                                       m_environment.main_abc_reverse_orts.phase_b.reactive,
                                                       m_environment.main_abc_reverse_orts.phase_c.reactive);
+*/    //
+
+    m_environment.drc_direct_voltage_decomposer.execute(m_environment.voltage_load_a - m_environment.drc_negative_voltage_load_direct * m_environment.main_abc_reverse_orts.phase_a.active + m_environment.drc_negative_voltage_load_quadrature * m_environment.main_abc_reverse_orts.phase_a.reactive,
+                                                        m_environment.voltage_load_b - m_environment.drc_negative_voltage_load_direct * m_environment.main_abc_reverse_orts.phase_b.active + m_environment.drc_negative_voltage_load_quadrature * m_environment.main_abc_reverse_orts.phase_b.reactive,
+                                                        m_environment.voltage_load_c - m_environment.drc_negative_voltage_load_direct * m_environment.main_abc_reverse_orts.phase_c.active + m_environment.drc_negative_voltage_load_quadrature * m_environment.main_abc_reverse_orts.phase_c.reactive,
+                                                        m_environment.main_abc_orts.phase_a.active,
+                                                        m_environment.main_abc_orts.phase_b.active,
+                                                        m_environment.main_abc_orts.phase_c.active,
+                                                        m_environment.main_abc_orts.phase_a.reactive,
+                                                        m_environment.main_abc_orts.phase_b.reactive,
+                                                        m_environment.main_abc_orts.phase_c.reactive);
+    //
+    m_environment.drc_back_voltage_decomposer.execute(m_environment.voltage_load_a - m_environment.drc_positive_voltage_load_direct * m_environment.main_abc_orts.phase_a.active + m_environment.drc_positive_voltage_load_quadrature * m_environment.main_abc_orts.phase_a.reactive,
+                                                      m_environment.voltage_load_b - m_environment.drc_positive_voltage_load_direct * m_environment.main_abc_orts.phase_b.active + m_environment.drc_positive_voltage_load_quadrature * m_environment.main_abc_orts.phase_b.reactive,
+                                                      m_environment.voltage_load_c - m_environment.drc_positive_voltage_load_direct * m_environment.main_abc_orts.phase_c.active + m_environment.drc_positive_voltage_load_quadrature * m_environment.main_abc_orts.phase_c.reactive,
+                                                      m_environment.main_abc_reverse_orts.phase_a.active,
+                                                      m_environment.main_abc_reverse_orts.phase_b.active,
+                                                      m_environment.main_abc_reverse_orts.phase_c.active,
+                                                      m_environment.main_abc_reverse_orts.phase_a.reactive,
+                                                      m_environment.main_abc_reverse_orts.phase_b.reactive,
+                                                      m_environment.main_abc_reverse_orts.phase_c.reactive);
+
+
     //
     m_environment.drc_positive_voltage_load_direct = m_environment.drc_direct_voltage_decomposer.direct;
     m_environment.drc_positive_voltage_load_quadrature = m_environment.drc_direct_voltage_decomposer.quadrature;
-    m_environment.drc_negaative_voltage_load_direct = m_environment.drc_back_voltage_decomposer.direct;
+    m_environment.drc_negative_voltage_load_direct = m_environment.drc_back_voltage_decomposer.direct;
     m_environment.drc_negative_voltage_load_quadrature = m_environment.drc_back_voltage_decomposer.quadrature;
-    //
-#endif
 
+#endif
 
 
 
diff --git a/SYSCTRL/SystemEnvironment.cpp b/SYSCTRL/SystemEnvironment.cpp
index d77e840..4e249fa 100644
--- a/SYSCTRL/SystemEnvironment.cpp
+++ b/SYSCTRL/SystemEnvironment.cpp
@@ -220,7 +220,7 @@ SystemEnvironment::SystemEnvironment():
         //
         drc_positive_voltage_load_direct(FP_ZERO),
         drc_positive_voltage_load_quadrature(FP_ZERO),
-        drc_negaative_voltage_load_direct(FP_ZERO),
+        drc_negative_voltage_load_direct(FP_ZERO),
         drc_negative_voltage_load_quadrature(FP_ZERO),
         //
         drc_current_load_alpha(FP_ZERO),
diff --git a/SYSCTRL/SystemEnvironment.h b/SYSCTRL/SystemEnvironment.h
index b6810b2..46e5bb7 100644
--- a/SYSCTRL/SystemEnvironment.h
+++ b/SYSCTRL/SystemEnvironment.h
@@ -738,7 +738,7 @@ public:
     //
     float drc_positive_voltage_load_direct;
     float drc_positive_voltage_load_quadrature;
-    float drc_negaative_voltage_load_direct;
+    float drc_negative_voltage_load_direct;
     float drc_negative_voltage_load_quadrature;
     //
     float drc_current_load_alpha;