Oleg
/
DVRLastVersionsCompare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0127 Does not work

Browse Source
master
Oleg 7 months ago
parent 59a24e06fe
commit 5fc60e60df
7 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File

6
.cproject
Unescape Escape View File

@ -13,7 +13,7 @@
</extensions> </extensions>
</storageModule> </storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0"> <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=""> <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"> <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"> <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>
<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"> <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.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.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="${SRC_ROOT}/sys/build/Debug/framework.out" 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 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"> <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"/> <listOptionValue builtIn="false" value="libc.a"/>

2
FRAM/FRAMConfigurationParameters.cpp
Unescape Escape View File

@ -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); add_float( 0, &sys_config->phase_alert_monitor.current_invertor_overload_level_2.period, 10.0);
// //
// current invertor overload level 3 150% 1ms // 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); add_float( 0, &sys_config->phase_alert_monitor.current_invertor_overload_level_3.period, 0.004);
// //
// current input overload level 1 110% 60s // current input overload level 1 110% 60s

2
SYSCTRL/AlgorithmWork.cpp
Unescape Escape View File

@ -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_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 = 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_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_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_direct = FP_ZERO;
//m_env.drc_negative_voltage_cell_quadrature = FP_ZERO; //m_env.drc_negative_voltage_cell_quadrature = FP_ZERO;

8
SYSCTRL/SystemConfigurator.h
Unescape Escape View File

@ -53,10 +53,10 @@ namespace SYSCTRL
#if TYPECONTROL == DIRECTREVERSECONTROL #if TYPECONTROL == DIRECTREVERSECONTROL
#define HEADER_CLASS_ID ((int16_t)(0x0FB0)) #define HEADER_CLASS_ID ((int16_t)(0x0C00))
#define HEADER_PART_ID ((int16_t)(0x0FB0)) #define HEADER_PART_ID ((int16_t)(0x0C00))
#define HEADER_SOFTWARE_VERSION ((int16_t)(0x0FB0)) #define HEADER_SOFTWARE_VERSION ((int16_t)(0x0C00))
#define FOOTER_FOOT ((int16_t)(0x0FB0)) #define FOOTER_FOOT ((int16_t)(0x0C00))
#endif #endif

30
SYSCTRL/SystemControlExecute.cpp
Unescape Escape View File

@ -1078,7 +1078,7 @@ void SystemControl::_execute_operational()
m_environment.drc_current_cell_beta, m_environment.drc_current_cell_beta,
m_environment.drc_current_cell_direct, m_environment.drc_current_cell_direct,
m_environment.drc_current_cell_quadrature); m_environment.drc_current_cell_quadrature);
// /* //
m_environment.drc_direct_voltage_decomposer.execute(m_environment.voltage_load_a, m_environment.drc_direct_voltage_decomposer.execute(m_environment.voltage_load_a,
m_environment.voltage_load_b, m_environment.voltage_load_b,
m_environment.voltage_load_c, 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_a.reactive,
m_environment.main_abc_reverse_orts.phase_b.reactive, m_environment.main_abc_reverse_orts.phase_b.reactive,
m_environment.main_abc_reverse_orts.phase_c.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_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_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; m_environment.drc_negative_voltage_load_quadrature = m_environment.drc_back_voltage_decomposer.quadrature;
//
#endif
#endif

2
SYSCTRL/SystemEnvironment.cpp
Unescape Escape View File

@ -220,7 +220,7 @@ SystemEnvironment::SystemEnvironment():
// //
drc_positive_voltage_load_direct(FP_ZERO), drc_positive_voltage_load_direct(FP_ZERO),
drc_positive_voltage_load_quadrature(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_negative_voltage_load_quadrature(FP_ZERO),
// //
drc_current_load_alpha(FP_ZERO), drc_current_load_alpha(FP_ZERO),

2
SYSCTRL/SystemEnvironment.h
Unescape Escape View File

@ -738,7 +738,7 @@ public:
// //
float drc_positive_voltage_load_direct; float drc_positive_voltage_load_direct;
float drc_positive_voltage_load_quadrature; 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_negative_voltage_load_quadrature;
// //
float drc_current_load_alpha; float drc_current_load_alpha;

Write Preview
Loading…
Cancel
Save