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

0322 Works

Browse Source
master
Oleg 7 months ago
parent b7502b24a0
commit cf58cd5b77
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

6
SYSCTRL/Hardcode.cpp
Unescape Escape View File

@ -233,9 +233,9 @@ void SystemControl::get_hard_code_configuration()
// //
// Generator ABC // Generator ABC
// //
//m_system_configuration.generator_abc.amplitude = 1.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.frequency = 2.0*FP_PI*50.0;
//m_system_configuration.generator_abc.phase_shift = 0.0; m_system_configuration.generator_abc.phase_shift = 0.0;
// //

8
SYSCTRL/SystemConfigurator.h
Unescape Escape View File

@ -66,10 +66,10 @@ namespace SYSCTRL
#if TYPECONTROL == DIRECTREVERSECONTROL #if TYPECONTROL == DIRECTREVERSECONTROL
#define HEADER_CLASS_ID ((int16_t)(0xAAAA)) #define HEADER_CLASS_ID ((int16_t)(0x0000))
#define HEADER_PART_ID ((int16_t)(0xAAAA)) #define HEADER_PART_ID ((int16_t)(0x0000))
#define HEADER_SOFTWARE_VERSION ((int16_t)(0xAAAA)) #define HEADER_SOFTWARE_VERSION ((int16_t)(0x0000))
#define FOOTER_FOOT ((int16_t)(0xAAAA)) #define FOOTER_FOOT ((int16_t)(0x0000))
#endif #endif

12
SYSCTRL/SystemControlExecute.cpp
Unescape Escape View File

@ -497,12 +497,14 @@ void SystemControl::_execute_operational()
!m_environment.system_fault.boolbit.b0 & !m_environment.system_fault.boolbit.b0 &
m_environment.input_discrete.signal.hw_dvr_ready & m_environment.input_discrete.signal.hw_dvr_ready &
m_environment.input_discrete.signal.bypass_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, SYSCTRL::TriggerRegister::setReset(m_km1_external_command_trigger,
(m_environment.system_fault.boolbit.b0 & m_environment.auxiliary_km2.state.signal.is_on) | (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.hw_dvr_ready |
!m_environment.input_discrete.signal.bypass_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); 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.system_fault.boolbit.b0 &
m_environment.input_discrete.signal.hw_dvr_ready & m_environment.input_discrete.signal.hw_dvr_ready &
m_environment.input_discrete.signal.bypass_ready & m_environment.input_discrete.signal.bypass_ready &
//(bool)m_environment.external_q1_on.signal.is_on); (bool)m_environment.external_q1_on.signal.is_on);
turnQ1On);
SYSCTRL::TriggerRegister::setReset(m_q1_external_command_trigger, SYSCTRL::TriggerRegister::setReset(m_q1_external_command_trigger,
(m_environment.system_fault.boolbit.b0 & m_environment.auxiliary_km2.state.signal.is_on) | (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.hw_dvr_ready |
!m_environment.input_discrete.signal.bypass_ready | !m_environment.input_discrete.signal.bypass_ready |
//(bool)m_environment.external_q1_off.signal.is_on); (bool)m_environment.external_q1_off.signal.is_on);
!turnQ1On);
SYSCTRL::TriggerRegister::execute_reset_priority(m_q1_external_command_trigger); SYSCTRL::TriggerRegister::execute_reset_priority(m_q1_external_command_trigger);
//<> //<>

Write Preview
Loading…
Cancel
Save