From cf58cd5b7785ccc3ef5734db0d08f8d0e31bdfc1 Mon Sep 17 00:00:00 2001 From: Oleg Date: Mon, 15 Apr 2024 15:45:36 +0300 Subject: [PATCH] 0322 Works --- SYSCTRL/Hardcode.cpp | 6 +++--- SYSCTRL/SystemConfigurator.h | 8 ++++---- SYSCTRL/SystemControlExecute.cpp | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/SYSCTRL/Hardcode.cpp b/SYSCTRL/Hardcode.cpp index 6466fef..c973d42 100644 --- a/SYSCTRL/Hardcode.cpp +++ b/SYSCTRL/Hardcode.cpp @@ -233,9 +233,9 @@ void SystemControl::get_hard_code_configuration() // // Generator ABC // - //m_system_configuration.generator_abc.amplitude = 1.0; - //m_system_configuration.generator_abc.frequency = 2.0*FP_PI*50.0; - //m_system_configuration.generator_abc.phase_shift = 0.0; + m_system_configuration.generator_abc.amplitude = 1.0; + m_system_configuration.generator_abc.frequency = 2.0*FP_PI*50.0; + m_system_configuration.generator_abc.phase_shift = 0.0; // diff --git a/SYSCTRL/SystemConfigurator.h b/SYSCTRL/SystemConfigurator.h index 7019ffb..902ae56 100644 --- a/SYSCTRL/SystemConfigurator.h +++ b/SYSCTRL/SystemConfigurator.h @@ -66,10 +66,10 @@ namespace SYSCTRL #if TYPECONTROL == DIRECTREVERSECONTROL -#define HEADER_CLASS_ID ((int16_t)(0xAAAA)) -#define HEADER_PART_ID ((int16_t)(0xAAAA)) -#define HEADER_SOFTWARE_VERSION ((int16_t)(0xAAAA)) -#define FOOTER_FOOT ((int16_t)(0xAAAA)) +#define HEADER_CLASS_ID ((int16_t)(0x0000)) +#define HEADER_PART_ID ((int16_t)(0x0000)) +#define HEADER_SOFTWARE_VERSION ((int16_t)(0x0000)) +#define FOOTER_FOOT ((int16_t)(0x0000)) #endif diff --git a/SYSCTRL/SystemControlExecute.cpp b/SYSCTRL/SystemControlExecute.cpp index d5ab151..98c1e40 100644 --- a/SYSCTRL/SystemControlExecute.cpp +++ b/SYSCTRL/SystemControlExecute.cpp @@ -497,12 +497,14 @@ void SystemControl::_execute_operational() !m_environment.system_fault.boolbit.b0 & m_environment.input_discrete.signal.hw_dvr_ready & m_environment.input_discrete.signal.bypass_ready & - (bool)m_environment.external_km1_on.signal.is_on); + //(bool)m_environment.external_q1_on.signal.is_on); + turnQ1On); SYSCTRL::TriggerRegister::setReset(m_km1_external_command_trigger, (m_environment.system_fault.boolbit.b0 & m_environment.auxiliary_km2.state.signal.is_on) | !m_environment.input_discrete.signal.hw_dvr_ready | !m_environment.input_discrete.signal.bypass_ready | - (bool)m_environment.external_km1_off.signal.is_on); + //(bool)m_environment.external_q1_off.signal.is_on); + !turnQ1On); SYSCTRL::TriggerRegister::execute_reset_priority(m_km1_external_command_trigger); //<> // @@ -525,14 +527,12 @@ void SystemControl::_execute_operational() !m_environment.system_fault.boolbit.b0 & m_environment.input_discrete.signal.hw_dvr_ready & m_environment.input_discrete.signal.bypass_ready & - //(bool)m_environment.external_q1_on.signal.is_on); - turnQ1On); + (bool)m_environment.external_q1_on.signal.is_on); SYSCTRL::TriggerRegister::setReset(m_q1_external_command_trigger, (m_environment.system_fault.boolbit.b0 & m_environment.auxiliary_km2.state.signal.is_on) | !m_environment.input_discrete.signal.hw_dvr_ready | !m_environment.input_discrete.signal.bypass_ready | - //(bool)m_environment.external_q1_off.signal.is_on); - !turnQ1On); + (bool)m_environment.external_q1_off.signal.is_on); SYSCTRL::TriggerRegister::execute_reset_priority(m_q1_external_command_trigger); //<>