0322 Works

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;
 
 
     //

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
 
 

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);
     //<>