From 59a24e06fe5e7b69eb562f06d9570f9879828fec Mon Sep 17 00:00:00 2001 From: Oleg Date: Mon, 15 Apr 2024 15:40:54 +0300 Subject: [PATCH] 1220 Does not work --- FRAM/FRAMConfigurationParameters.cpp | 18 +++++++++--------- SYSCTRL/PhaseAlertMonitor.cpp | 21 +++++++++++---------- SYSCTRL/SystemConfigurator.h | 8 ++++---- SYSCTRL/SystemControlExecute.cpp | 2 +- SYSCTRL/SystemDefinitions.h | 12 ++++++------ 5 files changed, 31 insertions(+), 30 deletions(-) diff --git a/FRAM/FRAMConfigurationParameters.cpp b/FRAM/FRAMConfigurationParameters.cpp index b3f7e8d..854fa44 100644 --- a/FRAM/FRAMConfigurationParameters.cpp +++ b/FRAM/FRAMConfigurationParameters.cpp @@ -189,39 +189,39 @@ void FRAMDATABASE::register_configuration_parameters(SYSCTRL::SystemControlConfi add_float( 0, &sys_config->phase_alert_monitor.voltage_decrease_level_3.period, 2.0); // // current overload level 1 120% 60s - add_float( 0, &sys_config->phase_alert_monitor.current_overload_level_1.level, 30.0 * 14.4); + add_float( 0, &sys_config->phase_alert_monitor.current_overload_level_1.level, 250 * 1.1); add_float( 0, &sys_config->phase_alert_monitor.current_overload_level_1.period, 60.0); // // current overload level 2 130% 10s - add_float( 0, &sys_config->phase_alert_monitor.current_overload_level_2.level, 30.0 * 15.6);//30.0*15.6 + add_float( 0, &sys_config->phase_alert_monitor.current_overload_level_2.level, 250 * 1.2); add_float( 0, &sys_config->phase_alert_monitor.current_overload_level_2.period, 10.0); // // current overload level 3 150% 1ms - add_float( 0, &sys_config->phase_alert_monitor.current_overload_level_3.level, 30.0 * 18.0); + add_float( 0, &sys_config->phase_alert_monitor.current_overload_level_3.level, 250 * 1.3); add_float( 0, &sys_config->phase_alert_monitor.current_overload_level_3.period, 0.004); // // current invertor overload level 1 110% 60s - add_float( 0, &sys_config->phase_alert_monitor.current_invertor_overload_level_1.level, 13.2); + add_float( 0, &sys_config->phase_alert_monitor.current_invertor_overload_level_1.level, 79 * 1.1); add_float( 0, &sys_config->phase_alert_monitor.current_invertor_overload_level_1.period, 60.0); // // current invertor overload level 2 130% 10s - add_float( 0, &sys_config->phase_alert_monitor.current_invertor_overload_level_2.level, 15.6); + add_float( 0, &sys_config->phase_alert_monitor.current_invertor_overload_level_2.level, 79 * 1.2); 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, 18.0); + 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.period, 0.004); // // current input overload level 1 110% 60s - add_float( 0, &sys_config->phase_alert_monitor.current_input_overload_level_1.level, 99.0); + add_float( 0, &sys_config->phase_alert_monitor.current_input_overload_level_1.level, 131.0 * 1.1); add_float( 0, &sys_config->phase_alert_monitor.current_input_overload_level_1.period, 60.0); // // current input overload level 2 130% 10s - add_float( 0, &sys_config->phase_alert_monitor.current_input_overload_level_2.level, 117.0); + add_float( 0, &sys_config->phase_alert_monitor.current_input_overload_level_2.level, 131.0 * 1.2); add_float( 0, &sys_config->phase_alert_monitor.current_input_overload_level_2.period, 10.0); // // current input overload level 3 150% 1ms - add_float( 0, &sys_config->phase_alert_monitor.current_input_overload_level_3.level, 135.0); + add_float( 0, &sys_config->phase_alert_monitor.current_input_overload_level_3.level, 131.0 * 1.3); add_float( 0, &sys_config->phase_alert_monitor.current_input_overload_level_3.period, 0.004); //<> diff --git a/SYSCTRL/PhaseAlertMonitor.cpp b/SYSCTRL/PhaseAlertMonitor.cpp index e06c050..45b7dfb 100644 --- a/SYSCTRL/PhaseAlertMonitor.cpp +++ b/SYSCTRL/PhaseAlertMonitor.cpp @@ -318,17 +318,18 @@ void PhaseAlertMonitor::_execute_operational(float urmsa, float urmsb, float urm m_voltage_bc_exceed_level_4.execute(urmsb); m_voltage_ca_exceed_level_4.execute(urmsc); /* - m_voltage_a_decrease_level_1.execute(urmsa); - m_voltage_b_decrease_level_1.execute(urmsb); - m_voltage_c_decrease_level_1.execute(urmsc); + m_voltage_ab_decrease_level_1.execute(urmsa); + m_voltage_bc_decrease_level_1.execute(urmsb); + m_voltage_ca_decrease_level_1.execute(urmsc); - m_voltage_a_decrease_level_2.execute(urmsa); - m_voltage_b_decrease_level_2.execute(urmsb); - m_voltage_c_decrease_level_2.execute(urmsc); - - m_voltage_a_decrease_level_3.execute(urmsa); - m_voltage_b_decrease_level_3.execute(urmsb); - m_voltage_c_decrease_level_3.execute(urmsc); + m_voltage_ab_decrease_level_2.execute(urmsa); + m_voltage_bc_decrease_level_2.execute(urmsb); + m_voltage_ca_decrease_level_2.execute(urmsc); +*/ +/* + m_voltage_ab_decrease_level_3.execute(urmsa); + m_voltage_bc_decrease_level_3.execute(urmsb); + m_voltage_ca_decrease_level_3.execute(urmsc); */ m_current_a_overload_level_1.execute(irmsa); m_current_b_overload_level_1.execute(irmsb); diff --git a/SYSCTRL/SystemConfigurator.h b/SYSCTRL/SystemConfigurator.h index 68e82cd..d676108 100644 --- a/SYSCTRL/SystemConfigurator.h +++ b/SYSCTRL/SystemConfigurator.h @@ -53,10 +53,10 @@ namespace SYSCTRL #if TYPECONTROL == DIRECTREVERSECONTROL -#define HEADER_CLASS_ID ((int16_t)(0x0010)) -#define HEADER_PART_ID ((int16_t)(0x0010)) -#define HEADER_SOFTWARE_VERSION ((int16_t)(0x0010)) -#define FOOTER_FOOT ((int16_t)(0x0010)) +#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)) #endif diff --git a/SYSCTRL/SystemControlExecute.cpp b/SYSCTRL/SystemControlExecute.cpp index 63d9650..d3a02ab 100644 --- a/SYSCTRL/SystemControlExecute.cpp +++ b/SYSCTRL/SystemControlExecute.cpp @@ -596,7 +596,7 @@ void SystemControl::_execute_operational() m_environment.system_faults_register.equipment.signal.km1 = m_km1_control_fault.status.signal.fault; m_environment.system_faults_register.equipment.signal.km2 = m_km2_control_fault.status.signal.fault; m_environment.system_faults_register.equipment.signal.km3 = m_km3_control_fault.status.signal.fault; - //m_environment.system_faults_register.equipment.signal.sync_to_grid = !m_pll_abc_input_voltage.get_sync() & m_environment.input_discrete.signal.auxiliary_q1; + m_environment.system_faults_register.equipment.signal.sync_to_grid = !m_pll_abc_input_voltage.get_sync() & m_environment.input_discrete.signal.auxiliary_q1; } diff --git a/SYSCTRL/SystemDefinitions.h b/SYSCTRL/SystemDefinitions.h index d05c40e..48fcfe3 100644 --- a/SYSCTRL/SystemDefinitions.h +++ b/SYSCTRL/SystemDefinitions.h @@ -138,7 +138,7 @@ union BoolRegister #define CURRENT_LIMIT_RMS (float)(100.0) #define CURRENT_PFC_RMS (float)(0.0) -#define GRID_VOLTAGE_REFERENCE (float)(6000.0) +#define GRID_VOLTAGE_REFERENCE (float)(5700.0) //6000 #define GRID_VOLTAGE_HIGH_LIMIT (float)(6600.0) #define CELL_DC_VOLTAGE_REFERENCE (float)(5.0*950.0) @@ -285,13 +285,13 @@ union BoolRegister #define NOMINAL_GRID_VOLTAGE (float)6000.0 -#define PROTECTION_EXCEED_VOLTAGE_LEVEL_1_PERCENT (float)10.0 -#define PROTECTION_EXCEED_VOLTAGE_LEVEL_2_PERCENT (float)15.0 -#define PROTECTION_EXCEED_VOLTAGE_LEVEL_3_PERCENT (float)20.0 -#define PROTECTION_EXCEED_VOLTAGE_LEVEL_4_PERCENT (float)50.0 +#define PROTECTION_EXCEED_VOLTAGE_LEVEL_1_PERCENT (float)35.0 // 10.0 was changed to 35.0 +#define PROTECTION_EXCEED_VOLTAGE_LEVEL_2_PERCENT (float)35.0 // 15.0 was changed to 35.0 +#define PROTECTION_EXCEED_VOLTAGE_LEVEL_3_PERCENT (float)35.0 // 25.0 was changed to 35.0 +#define PROTECTION_EXCEED_VOLTAGE_LEVEL_4_PERCENT (float)20.0 // 50.0 was changed to 20.0 #define PROTECTION_DECREASE_VOLTAGE_LEVEL_1_PERCENT (float)15.0 #define PROTECTION_DECREASE_VOLTAGE_LEVEL_2_PERCENT (float)25.0 -#define PROTECTION_DECREASE_VOLTAGE_LEVEL_3_PERCENT (float)35.0 +#define PROTECTION_DECREASE_VOLTAGE_LEVEL_3_PERCENT (float)40.0 // 35.0 was changed to 40.0