maisvendoo · avilkinnick · May 12, 2026 · May 14, 2026 · May 14, 2026 · May 14, 2026
diff --git a/chs2t-autopilot/CMakeLists.txt b/chs2t-autopilot/CMakeLists.txt
@@ -23,6 +23,7 @@ find_package(Journal ${RRS_VERSION} REQUIRED)
 find_package(filesystem ${RRS_VERSION} REQUIRED)
 find_package(device ${RRS_VERSION} REQUIRED)
 find_package(vehicle ${RRS_VERSION} REQUIRED)
+find_package(core ${RRS_VERSION} REQUIRED)
 
 # Пути к заголовкам и сорцам
 file (GLOB INCLUDES "./include/*.h")
@@ -42,3 +43,4 @@ target_link_libraries (${TARGET} physics)
 target_link_libraries (${TARGET} vehicle)
 target_link_libraries (${TARGET} device)
 target_link_libraries (${TARGET} filesystem)
+target_link_libraries (${TARGET} core)
diff --git a/chs2t-autopilot/src/chs2t-autopilot.cpp b/chs2t-autopilot/src/chs2t-autopilot.cpp
@@ -1,5 +1,7 @@
 #include    <chs2t-autopilot.h>
 
+#include    <core/get_module.h>
+
 //------------------------------------------------------------------------------
 //
 //------------------------------------------------------------------------------
@@ -48,6 +50,8 @@ void CHS2TAutopilot::initAutoBrakeControl(const QString &config_name,
 //------------------------------------------------------------------------------
 void CHS2TAutopilot::preStep(state_vector_t &Y, double t)
 {
+    (void)t;
+
     auto_feedback = dynamic_cast<chs2t_feedback_t *>(feedback);
 
     if (auto_feedback == nullptr)
@@ -163,6 +167,9 @@ void CHS2TAutopilot::ode_system(const state_vector_t &Y,
                                 state_vector_t &dYdt,
                                 double t)
 {
+    (void)Y;
+    (void)t;
+
     dYdt[0] = Ki * dv;
 }
 
@@ -280,4 +287,4 @@ void CHS2TAutopilot::slotPosDelay()
     }
 }
 
-GET_AUTOPILOT(CHS2TAutopilot)
+GET_MODULE(CHS2TAutopilot)
diff --git a/chs2t-equipment/include/alsn-ukbm.h b/chs2t-equipment/include/alsn-ukbm.h
@@ -86,11 +86,11 @@ class SafetyDevice : public Device
 
     Timer *safety_timer;
 
-    void preStep(state_vector_t &Y, double t);
+    virtual void preStep(state_vector_t &Y, double t) override;
 
-    void ode_system(const state_vector_t &Y, state_vector_t &dYdt, double t);
+    virtual void ode_system(const state_vector_t &Y, state_vector_t &dYdt, double t) override;
 
-    void load_config(CfgReader &cfg);
+    virtual void load_config(CfgReader &cfg) override;
 
     void alsn_process(int code_alsn);
 

diff --git a/chs2t-equipment/include/ampermeters-state.h b/chs2t-equipment/include/ampermeters-state.h
@@ -1,22 +1,14 @@
-#ifndef AMPERMETERS_STATE_H
-#define AMPERMETERS_STATE_H
+#ifndef     AMPERMETERS_STATE_H
+#define     AMPERMETERS_STATE_H
 
 //-----------------------------------------------------------------------------
 //
 //-----------------------------------------------------------------------------
 struct ampermeters_state_t
 {
-    bool    is12on;
-    bool    is34on;
-    bool    is56on;
-
-    ampermeters_state_t()
-        : is12on(false)
-        , is34on(false)
-        , is56on(false)
-    {
-
-    }
+    bool is12on{false};
+    bool is34on{false};
+    bool is56on{false};
 };
 
 #endif // AMPERMETERS_STATE_H
diff --git a/chs2t-equipment/src/alsn-ukbm.cpp b/chs2t-equipment/src/alsn-ukbm.cpp
@@ -51,7 +51,7 @@ void SafetyDevice::preStep(state_vector_t &Y, double t)
         return;
     }
 
-    if (is_red.getState() && v_kmh > 20.0)
+    if (is_red.getState() && v_kmh > 21.0)
         return;
 
     if (code_alsn < old_code_alsn)
@@ -71,7 +71,7 @@ void SafetyDevice::preStep(state_vector_t &Y, double t)
             epk_state.reset();
             lamp_on(RED_LAMP);
 
-            if (v_kmh > 20.0)
+            if (v_kmh > 21.0)
             {
                 return;
             }
@@ -106,7 +106,7 @@ void SafetyDevice::preStep(state_vector_t &Y, double t)
 
     if (code_alsn == 1)
     {
-        if (v_kmh > 60.0)
+        if (v_kmh > 61.0)
         {
             epk_state.reset();
             return;
@@ -124,7 +124,7 @@ void SafetyDevice::preStep(state_vector_t &Y, double t)
 
     if (code_alsn == 2)
     {
-        if (v_kmh > 60.0)
+        if (v_kmh > 61.0)
         {
             if (!safety_timer->isStarted())
                 safety_timer->start();

diff --git a/chs2t/CMakeLists.txt b/chs2t/CMakeLists.txt
@@ -14,6 +14,7 @@ find_package(Journal ${RRS_VERSION} REQUIRED)
 find_package(filesystem ${RRS_VERSION} REQUIRED)
 find_package(device ${RRS_VERSION} REQUIRED)
 find_package(vehicle ${RRS_VERSION} REQUIRED)
+find_package(core ${RRS_VERSION} REQUIRED)
 
 file (GLOB INCLUDES "./include/*.h")
 file (GLOB EQP_INCLUDES "../chs2t-equipment/include/*.h")
@@ -32,3 +33,4 @@ target_link_libraries (${TARGET} Journal)
 target_link_libraries (${TARGET} filesystem)
 target_link_libraries (${TARGET} device)
 target_link_libraries (${TARGET} vehicle)
+target_link_libraries (${TARGET} core)
diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h
@@ -13,31 +13,61 @@
 #ifndef     CHS2T_H
 #define     CHS2T_H
 
-#include    "vehicle-api.h"
+#include    <vehicle.h>
+#include    <datetime.h>
 
 #include    "switchers-panel.h"
 #include    "km-21kr2.h"
-#include    "stepswitch.h"
-#include    "pusk-rez.h"
-#include    "motor.h"
-#include    "overload-relay.h"
-#include    "electropneumovalve-emergency.h"
-#include    "electropneumovalve-release.h"
-#include    "dako.h"
-#include    "generator.h"
-#include    "pulse-converter.h"
-#include    "brake-regulator.h"
-#include    "handle-edt.h"
-#include    "motor-fan-dc.h"
-#include    "blinds.h"
-#include    "hardware-signals.h"
-#include    "convert-physics-to-modbus.h"
-#include    "sl2m.h"
-#include    "energy-counter.h"
-#include    "alsn-ukbm.h"
 
 #include    <chs2t-autopilot-types.h>
 
+class       AirDistributor;
+class       AutoTrainStop;
+class       Blinds;
+class       BrakeCrane;
+class       BrakeMech;
+class       BrakeRegulator;
+class       CoilALSN;
+class       Coupling;
+class       DCMotorCompressor;
+class       DCMotorFan;
+class       Dako;
+class       DecoderALSN;
+class       EPBControl;
+class       EPBConverter;
+class       ElectroAirDistributor;
+class       ElectroPneumoValveEmergency;
+class       ElectroPneumoValveRelease;
+class       EnergyCounter;
+class       Generator;
+class       HandleEDT;
+class       LocoCrane;
+class       Motor;
+class       OperatingRod;
+class       OverloadRelay;
+class       Pantograph;
+class       PhysToModbus;
+class       PneumoAngleCock;
+class       PneumoCombineCrane;
+class       PneumoHose;
+class       PneumoHoseEPB;
+class       PneumoRelay;
+class       PneumoShutoffValve;
+class       PneumoSplitter;
+class       PressureRegulator;
+class       ProtectiveDevice;
+class       PulseConverter;
+class       PuskRez;
+class       Registrator;
+class       Reservoir;
+class       SL2M;
+class       SafetyDevice;
+class       SandingSystem;
+class       SwitchingValve;
+class       SpeedMap;
+class       StepSwitch;
+class       TrainHorn;
+
 /*!
  * \class
  * \brief Основной класс, описывающий весь электровоз
@@ -56,7 +86,7 @@ class CHS2T : public Vehicle
     ~CHS2T();
 
     /// Инициализация тормозных приборов
-    void initBrakeDevices(double p0, double pBP, double pFL) override;
+    virtual void initBrakeDevices(double p0, double pBP, double pFL) override;
 
 private:
 

diff --git a/chs2t/src/chs2t-init-autopilot.cpp b/chs2t/src/chs2t-init-autopilot.cpp
@@ -1,4 +1,8 @@
 #include    <chs2t.h>
+
+#include    <epb-2line-control.h>
+#include    <core/load_module.h>
+
 #include    <QDir>
 
 //------------------------------------------------------------------------------
@@ -10,9 +14,10 @@ void CHS2T::initAutopilot(const QString &modules_dir,
     // Модули автоведения
     for (auto cab_idx : {CAB1, CAB2})
     {
-        Autopilot *autopilot = loadAutopilot(modules_dir + QDir::separator()
-                                             + custom_modules_dir + QDir::separator() +
-                                             autopilot_module_name);
+        Autopilot* autopilot = LOAD_MODULE(Autopilot,
+            modules_dir + QDir::separator() +
+            custom_modules_dir + QDir::separator() +
+            autopilot_module_name);
 
         if (autopilot != nullptr)
         {
@@ -25,15 +30,16 @@ void CHS2T::initAutopilot(const QString &modules_dir,
             autopilot_switcher[cab_idx].setKeySymbolOff(KEY_F);
             autopilot_switcher[cab_idx].setControl(&pressed_keys);
 
+            auto_feedback[cab_idx] = new chs2t_feedback_t();
+            autopilot->setFeedback(auto_feedback[cab_idx]);
+
             connect(autopilot, &Autopilot::sigInitTrainParams, this, &CHS2T::slotInitTrainForAutopilot);
 
             this->autopilot.push_back(autopilot);
 
-            auto_feedback[cab_idx] = new chs2t_feedback_t();
-
             connect(pantCtrlTimer, &Timer::process, this, &CHS2T::slotPantCtrl);
-        }        
-    }    
+        }
+    }
 }
 
 //------------------------------------------------------------------------------

diff --git a/chs2t/src/chs2t-init-autostart.cpp b/chs2t/src/chs2t-init-autostart.cpp
@@ -1,5 +1,9 @@
 #include    <chs2t.h>
 
+#include    <automatic-train-stop.h>
+#include    <pantograph.h>
+#include    <protective-device.h>
+
 //------------------------------------------------------------------------------
 //
 //------------------------------------------------------------------------------
@@ -162,7 +166,7 @@ void CHS2T::slotAutostart()
 
     if (auto_start_autopilot)
     {
-        autopilot_switcher[autostart_cab].set();        
+        autopilot_switcher[autostart_cab].set();
     }
 }
 

diff --git a/chs2t/src/chs2t-init-brake-devices.cpp b/chs2t/src/chs2t-init-brake-devices.cpp
@@ -1,5 +1,16 @@
 #include    "chs2t.h"
 
+#include    <airdistributor.h>
+#include    <automatic-train-stop.h>
+#include    <brake-crane.h>
+#include    <electro-airdistributor.h>
+#include    <loco-crane.h>
+#include    <pneumo-anglecock.h>
+#include    <pneumo-combine-crane.h>
+#include    <pneumo-hose.h>
+#include    <pneumo-hose-epb.h>
+#include    <reservoir.h>
+
 #include    "filesystem.h"
 
 //------------------------------------------------------------------------

diff --git a/chs2t/src/chs2t-init-brakes-control.cpp b/chs2t/src/chs2t-init-brakes-control.cpp
@@ -1,5 +1,20 @@
 #include    "chs2t.h"
 
+#include    "dako.h"
+#include    "electropneumovalve-emergency.h"
+#include    "electropneumovalve-release.h"
+#include    "handle-edt.h"
+
+#include    <brake-crane.h>
+#include    <loco-crane.h>
+#include    <pneumo-combine-crane.h>
+#include    <pneumo-relay.h>
+#include    <pneumo-shutoff-valve.h>
+#include    <pneumo-splitter.h>
+#include    <pneumo-switching-valve.h>
+#include    <reservoir.h>
+#include    <core/load_module.h>
+
 #include    <QDir>
 
 //------------------------------------------------------------------------
@@ -18,12 +33,12 @@ void CHS2T::initBrakesControl(const QString& modules_dir, const QString& custom_
         combine_crane[cab_idx]->read_config("pneumo-combine-crane");
 
         // Поездной кран машиниста
-        brake_crane[cab_idx] = loadBrakeCrane(
+        brake_crane[cab_idx] = LOAD_MODULE(BrakeCrane,
             modules_dir + QDir::separator() + brake_crane_module_name);
         brake_crane[cab_idx]->read_config(brake_crane_config_name);
 
         // Кран вспомогательного тормоза
-        loco_crane[cab_idx] = loadLocoCrane(
+        loco_crane[cab_idx] = LOAD_MODULE(LocoCrane,
             modules_dir + QDir::separator() + loco_crane_module_name);
         loco_crane[cab_idx]->read_config(loco_crane_config_name);
 

diff --git a/chs2t/src/chs2t-init-brakes-epb.cpp b/chs2t/src/chs2t-init-brakes-epb.cpp
@@ -1,5 +1,8 @@
 #include    "chs2t.h"
 
+#include    <epb-2line-control.h>
+#include    <epb-converter.h>
+
 //------------------------------------------------------------------------
 //
 //------------------------------------------------------------------------

diff --git a/chs2t/src/chs2t-init-brakes-equipment.cpp b/chs2t/src/chs2t-init-brakes-equipment.cpp
@@ -1,5 +1,13 @@
 #include    "chs2t.h"
 
+#include    <airdistributor.h>
+#include    <brake-mech.h>
+#include    <electro-airdistributor.h>
+#include    <pneumo-anglecock.h>
+#include    <pneumo-hose-epb.h>
+#include    <reservoir.h>
+#include    <core/load_module.h>
+
 #include    <QDir>
 
 //------------------------------------------------------------------------
@@ -13,11 +21,12 @@ void CHS2T::initBrakesEquipment(const QString& modules_dir, const QString& custo
     brakepipe->setLeakCoeff(3e-6);
 
     // Воздухораспределитель
-    air_dist = loadAirDistributor(modules_dir + QDir::separator() + airdist_module_name);
+    air_dist = LOAD_MODULE(AirDistributor, modules_dir + QDir::separator() + airdist_module_name);
     air_dist->read_config(airdist_config_name);
 
     // Электровоздухораспределитель
-    electro_air_dist = loadElectroAirDistributor(modules_dir + QDir::separator() + electro_airdist_module_name);
+    electro_air_dist = LOAD_MODULE(ElectroAirDistributor,
+        modules_dir + QDir::separator() + electro_airdist_module_name);
     electro_air_dist->read_config(electro_airdist_config_name);
 
     // Запасный резервуар
@@ -45,11 +54,13 @@ void CHS2T::initBrakesEquipment(const QString& modules_dir, const QString& custo
     anglecock_bp_bwd->setPipeVolume(volume_bp);
 
     // Рукава тормозной магистрали
-    hose_bp_fwd = loadPneumoHoseEPB(modules_dir + QDir::separator() + "hose369a");
+    hose_bp_fwd = LOAD_MODULE(PneumoHoseEPB,
+        modules_dir + QDir::separator() + "hose369a");
     hose_bp_fwd->read_config("pneumo-hose-BP369a-loco");
     forward_connectors.push_back(hose_bp_fwd);
 
-    hose_bp_bwd = loadPneumoHoseEPB(modules_dir + QDir::separator() + "hose369a");
+    hose_bp_bwd = LOAD_MODULE(PneumoHoseEPB,
+        modules_dir + QDir::separator() + "hose369a");
     hose_bp_bwd->read_config("pneumo-hose-BP369a-loco");
     backward_connectors.push_back(hose_bp_bwd);
 }