From 44b430900cf32dab60382f3265f8dbc2d9fcbad1 Mon Sep 17 00:00:00 2001 From: Mikhail Arepev Date: Tue, 12 May 2026 22:21:45 +0300 Subject: [PATCH 01/42] =?UTF-8?q?=D0=98=D0=BD=D0=B8=D1=86=D0=B8=D0=B0?= =?UTF-8?q?=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B0=D0=B2=D1=82?= =?UTF-8?q?=D0=BE=D0=BF=D0=B8=D0=BB=D0=BE=D1=82=D0=B0=20=D1=81=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D1=83=20=D1=81=20=D0=BE=D0=B1=D1=80=D0=B0=D1=82=D0=BD?= =?UTF-8?q?=D0=BE=D0=B9=20=D1=81=D0=B2=D1=8F=D0=B7=D1=8C=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/src/chs2t-init-autopilot.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/chs2t/src/chs2t-init-autopilot.cpp b/chs2t/src/chs2t-init-autopilot.cpp index a272ffb..64b9db5 100644 --- a/chs2t/src/chs2t-init-autopilot.cpp +++ b/chs2t/src/chs2t-init-autopilot.cpp @@ -25,12 +25,13 @@ 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); } } From 222247692c952c27da8508946e78f81becce508a Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 06:03:47 +0300 Subject: [PATCH 02/42] =?UTF-8?q?=D0=AF=D0=B2=D0=BD=D0=B0=D1=8F=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BC=D0=B5=D1=82=D0=BA=D0=B0=20override=20=D1=84=D1=83?= =?UTF-8?q?=D0=BD=D0=BA=D1=86=D0=B8=D0=B9=20=D0=B8=20=D0=BD=D0=B5=D0=B8?= =?UTF-8?q?=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D0=B5=D0=BC=D1=8B?= =?UTF-8?q?=D1=85=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B?= =?UTF-8?q?=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t-autopilot/src/chs2t-autopilot.cpp | 5 +++++ chs2t-equipment/include/alsn-ukbm.h | 6 +++--- chs2t/include/chs2t.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/chs2t-autopilot/src/chs2t-autopilot.cpp b/chs2t-autopilot/src/chs2t-autopilot.cpp index 0bda75d..b8c7771 100644 --- a/chs2t-autopilot/src/chs2t-autopilot.cpp +++ b/chs2t-autopilot/src/chs2t-autopilot.cpp @@ -48,6 +48,8 @@ void CHS2TAutopilot::initAutoBrakeControl(const QString &config_name, //------------------------------------------------------------------------------ void CHS2TAutopilot::preStep(state_vector_t &Y, double t) { + (void)t; + auto_feedback = dynamic_cast(feedback); if (auto_feedback == nullptr) @@ -163,6 +165,9 @@ void CHS2TAutopilot::ode_system(const state_vector_t &Y, state_vector_t &dYdt, double t) { + (void)Y; + (void)t; + dYdt[0] = Ki * dv; } diff --git a/chs2t-equipment/include/alsn-ukbm.h b/chs2t-equipment/include/alsn-ukbm.h index 1e90e08..26ae72d 100644 --- 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/include/chs2t.h b/chs2t/include/chs2t.h index 77de22d..a696d6f 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -56,7 +56,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: From d9ff657bcc4576cbac32324d1fd7bf183868875d Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 06:55:01 +0300 Subject: [PATCH 03/42] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D1=80=20alsn-ukbm:=201)=20enum=20=D1=81=20=D0=BB=D0=B0?= =?UTF-8?q?=D0=BC=D0=BF=D0=B0=D0=BC=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=D1=81=D1=91=D0=BD=20=D0=B2=20.cpp=202)=20=D1=85=D0=B5?= =?UTF-8?q?=D0=B4=D1=8D=D1=80=20=D0=B8=20.cpp=20=D0=BD=D0=B0=D0=BF=D1=80?= =?UTF-8?q?=D1=8F=D0=BC=D1=83=D1=8E=20=D0=B2=D0=BA=D0=BB=D1=8E=D1=87=D0=B0?= =?UTF-8?q?=D1=8E=D1=82=20=D0=B2=D1=81=D0=B5=20=D0=BD=D1=83=D0=B6=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8=203)=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BA=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D1=83=20explicit=204)=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=BD=D1=91=D1=81=20=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8E=20=D0=B2=D1=81=D0=B5=D1=85=20=D1=84=D1=83?= =?UTF-8?q?=D0=BD=D0=BA=D1=86=D0=B8=D0=B9=20=D0=B2=20.cpp=205)=20getEPKsta?= =?UTF-8?q?te()=20-=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD=D1=82?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=206)=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=81=D0=BB=D0=BE=D1=82=20onSafetyTimer=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BB=D1=8F=D0=BC=D0=B1=D0=B4=D1=83=207)=20=D1=83=20?= =?UTF-8?q?=D1=82=D0=B0=D0=B9=D0=BC=D0=B5=D1=80=D0=B0=20=D1=83=D1=81=D1=82?= =?UTF-8?q?=D0=B0=D0=BD=D0=B0=D0=B2=D0=BB=D0=B8=D0=B2=D0=B0=D0=B5=D1=82?= =?UTF-8?q?=D1=81=D1=8F=20Qt-=D1=88=D0=BD=D1=8B=D0=B9=20=D1=80=D0=BE=D0=B4?= =?UTF-8?q?=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=20-=20=D1=81=D0=B0=D0=BC=20Safet?= =?UTF-8?q?yDevice=208)=20=D0=B2=20preStep=20=D0=B2=20=D0=B1=D0=BB=D0=BE?= =?UTF-8?q?=D0=BA=D0=B0=D1=85=20=D1=81=20code=5Falsn=20=D0=B7=D0=B0=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=BB=20if=20=D0=BD=D0=B0=20else=20if?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t-equipment/include/alsn-ukbm.h | 96 +++++------- chs2t-equipment/src/alsn-ukbm.cpp | 233 +++++++++++++++++++++------- 2 files changed, 221 insertions(+), 108 deletions(-) diff --git a/chs2t-equipment/include/alsn-ukbm.h b/chs2t-equipment/include/alsn-ukbm.h index 26ae72d..08fa229 100644 --- a/chs2t-equipment/include/alsn-ukbm.h +++ b/chs2t-equipment/include/alsn-ukbm.h @@ -1,66 +1,72 @@ #ifndef ALSN_UKBM_H #define ALSN_UKBM_H -#include "device.h" +#include +#include +#include -enum -{ - RED_LAMP = 0, - RED_YELLOW_LAMP = 1, - YELLOW_LAMP = 2, - GREEN_LAMP = 3, - WHITE_LAMP = 4 -}; +#include + +#include +#include + +class CfgReader; +class Timer; //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ class SafetyDevice : public Device { + Q_OBJECT + public: - SafetyDevice(QObject *parent = Q_NULLPTR); + explicit SafetyDevice(QObject* parent = nullptr); ~SafetyDevice(); - void step(double t, double dt) override; + virtual void step(double t, double dt) override; - /// Прием кода АЛСН - void setAlsnCode(int code_alsn) - { - old_code_alsn = this->code_alsn; - this->code_alsn = code_alsn; - }; + /// Приём кода АЛСН + void setAlsnCode(int code_alsn); - /// Прием состояния РБ - void setRBstate(bool state) { state_RB = state; }; + /// Приём состояния РБ + void setRBstate(bool state); - /// Прием состояния РБС - void setRBSstate(bool state) { state_RBS = state; }; + /// Приём состояния РБС + void setRBSstate(bool state); - /// Прием скорости от скоростемера - void setVelocity(double v) { v_kmh = v * Physics::kmh; } + /// Приём скорости от скоростемера + void setVelocity(double v); - void setKeyEPK(bool key_epk) { this->key_epk = key_epk; } + void setKeyEPK(bool key_epk); /// Выдача состояния цепи удерживающей катушки ЭПК - bool getEPKstate() { return epk_state.getState(); }; + bool getEPKstate() const; - float getGreenLamp() const { return lamps[GREEN_LAMP]; } + float getRedLamp() const; + float getRedYellowLamp() const; + float getYellowLamp() const; + float getGreenLamp() const; + float getWhiteLamp() const; - float getYellowLamp() const { return lamps[YELLOW_LAMP]; } + /// Приём сигнала от переключателя маневрового режима + void setShuntingModeState(bool is_shunting_mode); - float getRedYellowLamp() const { return lamps[RED_YELLOW_LAMP]; } +private: - float getRedLamp() const { return lamps[RED_LAMP]; } + virtual void preStep(state_vector_t& Y, double t) override; - float getWhiteLamp() const { return lamps[WHITE_LAMP]; } + virtual void ode_system(const state_vector_t& Y, state_vector_t& dYdt, double t) override; + + virtual void load_config(CfgReader& cfg) override; + + void alsn_process(int code_alsn); + + void off_all_lamps(); - /// Прием сигнала от переключателя маневрового режима - void setShuntingModeState(bool is_shunting_mode) - { - this->is_shunting_mode = is_shunting_mode; - } + void lamp_on(std::size_t lamp_idx); private: @@ -84,25 +90,9 @@ class SafetyDevice : public Device Trigger epk_state; - Timer *safety_timer; - - virtual void preStep(state_vector_t &Y, double t) override; - - virtual void ode_system(const state_vector_t &Y, state_vector_t &dYdt, double t) override; - - virtual void load_config(CfgReader &cfg) override; - - void alsn_process(int code_alsn); - - void off_all_lamps(); - - void lamp_on(size_t lamp_idx); - - bool is_shunting_mode = false; - -private slots: + Timer* safety_timer; - void onSafetyTimer(); + bool is_shunting_mode; }; #endif // ALSN_UKBM_H diff --git a/chs2t-equipment/src/alsn-ukbm.cpp b/chs2t-equipment/src/alsn-ukbm.cpp index 008d95c..b293e08 100644 --- a/chs2t-equipment/src/alsn-ukbm.cpp +++ b/chs2t-equipment/src/alsn-ukbm.cpp @@ -1,30 +1,50 @@ #include "alsn-ukbm.h" +#include +#include +#include +#include + +#include + +#include +#include + +enum +{ + RED_LAMP, + RED_YELLOW_LAMP, + YELLOW_LAMP, + GREEN_LAMP, + WHITE_LAMP +}; + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ -SafetyDevice::SafetyDevice(QObject *parent) : Device(parent) - , code_alsn(1) - , old_code_alsn(1) - , state_RB(false) - , state_RBS(false) - , state_EPK(false) - , v_kmh(0.0) - , key_epk(false) +SafetyDevice::SafetyDevice(QObject* parent) + : Device{parent} + , code_alsn{1} + , old_code_alsn{1} + , state_RB{false} + , state_RBS{false} + , state_EPK{false} + , v_kmh{0.0} + , key_epk{false} + , is_shunting_mode{false} { epk_state.reset(); - safety_timer = new Timer(45.0, false); - connect(safety_timer, &Timer::process, this, &SafetyDevice::onSafetyTimer); + safety_timer = new Timer{45.0, false, this}; + connect(safety_timer, &Timer::process, [this]() -> void { + epk_state.reset(); + }); } //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ -SafetyDevice::~SafetyDevice() -{ - -} +SafetyDevice::~SafetyDevice() = default; //------------------------------------------------------------------------------ // @@ -35,13 +55,110 @@ void SafetyDevice::step(double t, double dt) Device::step(t, dt); } +//------------------------------------------------------------------------------ +// Приём кода АЛСН +//------------------------------------------------------------------------------ +void SafetyDevice::setAlsnCode(int code_alsn) +{ + old_code_alsn = this->code_alsn; + this->code_alsn = code_alsn; +} + +//------------------------------------------------------------------------------ +// Приём состояния РБ +//------------------------------------------------------------------------------ +void SafetyDevice::setRBstate(bool state) +{ + state_RB = state; +} + +//------------------------------------------------------------------------------ +// Приём состояния РБС +//------------------------------------------------------------------------------ +void SafetyDevice::setRBSstate(bool state) +{ + state_RBS = state; +} + +//------------------------------------------------------------------------------ +// Приём скорости от скоростемера +//------------------------------------------------------------------------------ +void SafetyDevice::setVelocity(double v) +{ + v_kmh = v * Physics::kmh; +} + +//------------------------------------------------------------------------------ +// +//------------------------------------------------------------------------------ +void SafetyDevice::setKeyEPK(bool key_epk) +{ + this->key_epk = key_epk; +} + +//------------------------------------------------------------------------------ +// Выдача состояния цепи удерживающей катушки ЭПК +//------------------------------------------------------------------------------ +bool SafetyDevice::getEPKstate() const +{ + return epk_state.getState(); +} + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ -void SafetyDevice::preStep(state_vector_t &Y, double t) +float SafetyDevice::getRedLamp() const { - Q_UNUSED(Y) - Q_UNUSED(t) + return lamps[RED_LAMP]; +} + +//------------------------------------------------------------------------------ +// +//------------------------------------------------------------------------------ +float SafetyDevice::getRedYellowLamp() const +{ + return lamps[RED_YELLOW_LAMP]; +} + +//------------------------------------------------------------------------------ +// +//------------------------------------------------------------------------------ +float SafetyDevice::getYellowLamp() const +{ + return lamps[YELLOW_LAMP]; +} + +//------------------------------------------------------------------------------ +// +//------------------------------------------------------------------------------ +float SafetyDevice::getGreenLamp() const +{ + return lamps[GREEN_LAMP]; +} + +//------------------------------------------------------------------------------ +// +//------------------------------------------------------------------------------ +float SafetyDevice::getWhiteLamp() const +{ + return lamps[WHITE_LAMP]; +} + +//------------------------------------------------------------------------------ +// Приём сигнала от переключателя маневрового режима +//------------------------------------------------------------------------------ +void SafetyDevice::setShuntingModeState(bool is_shunting_mode) +{ + this->is_shunting_mode = is_shunting_mode; +} + +//------------------------------------------------------------------------------ +// +//------------------------------------------------------------------------------ +void SafetyDevice::preStep(state_vector_t& Y, double t) +{ + (void)Y; + (void)t; // Ничего не делаем при выключенном ЭПК if (!key_epk) @@ -52,10 +169,14 @@ void SafetyDevice::preStep(state_vector_t &Y, double t) } if (is_red.getState() && v_kmh > 20.0) + { return; + } if (code_alsn < old_code_alsn) + { epk_state.reset(); + } // Отрезаем сигнал с дешифратора АЛСН при маневровом режиме if (is_shunting_mode) @@ -79,7 +200,9 @@ void SafetyDevice::preStep(state_vector_t &Y, double t) else { if (!is_red.getState()) + { lamp_on(WHITE_LAMP); + } } } @@ -88,13 +211,13 @@ void SafetyDevice::preStep(state_vector_t &Y, double t) if (code_alsn == 0) { // Отключено, до выяснения реальной логики работы - /*if (v_kmh > 40.0) - { - epk_state.reset(); - return; - }*/ + // if (v_kmh > 40.0) + // { + // epk_state.reset(); + // return; + // } - if ( (!safety_timer->isStarted()) && (v_kmh > 5) ) + if ((!safety_timer->isStarted()) && (v_kmh > 5)) { safety_timer->start(); } @@ -103,8 +226,7 @@ void SafetyDevice::preStep(state_vector_t &Y, double t) safety_timer->stop(); } } - - if (code_alsn == 1) + else if (code_alsn == 1) { if (v_kmh > 60.0) { @@ -112,7 +234,7 @@ void SafetyDevice::preStep(state_vector_t &Y, double t) return; } - if ( (!safety_timer->isStarted()) && (v_kmh > 5) ) + if ((!safety_timer->isStarted()) && (v_kmh > 5)) { safety_timer->start(); } @@ -121,13 +243,14 @@ void SafetyDevice::preStep(state_vector_t &Y, double t) safety_timer->stop(); } } - - if (code_alsn == 2) + else if (code_alsn == 2) { if (v_kmh > 60.0) { if (!safety_timer->isStarted()) + { safety_timer->start(); + } } else { @@ -156,20 +279,23 @@ void SafetyDevice::preStep(state_vector_t &Y, double t) //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ -void SafetyDevice::ode_system(const state_vector_t &Y, - state_vector_t &dYdt, double t) +void SafetyDevice::ode_system( + const state_vector_t& Y, + state_vector_t& dYdt, + double t +) { - Q_UNUSED(Y) - Q_UNUSED(dYdt) - Q_UNUSED(t) + (void)Y; + (void)dYdt; + (void)t; } //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ -void SafetyDevice::load_config(CfgReader &cfg) +void SafetyDevice::load_config(CfgReader& cfg) { - Q_UNUSED(cfg) + (void)cfg; } //------------------------------------------------------------------------------ @@ -179,27 +305,32 @@ void SafetyDevice::alsn_process(int code_alsn) { switch (code_alsn) { - case 1: + case 1: { lamp_on(RED_YELLOW_LAMP); - - break; + return; } - - case 2: + case 2: { lamp_on(YELLOW_LAMP); - - break; + return; } - - case 3: + case 3: { lamp_on(GREEN_LAMP); - - break; + return; + } + default: + { + return; } } + + // TODO: Replace on something like this? + // if (code_alsn >= RED_YELLOW_LAMP && code_alsn <= GREEN_LAMP) + // { + // lamp_on(static_cast(code_alsn)); + // } } //------------------------------------------------------------------------------ @@ -214,16 +345,8 @@ void SafetyDevice::off_all_lamps() //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ -void SafetyDevice::lamp_on(size_t lamp_idx) +void SafetyDevice::lamp_on(std::size_t lamp_idx) { off_all_lamps(); lamps[lamp_idx] = 1.0f; } - -//------------------------------------------------------------------------------ -// -//------------------------------------------------------------------------------ -void SafetyDevice::onSafetyTimer() -{ - epk_state.reset(); -} From ed19a799a65600bf0024de303bb491d5966990ea Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 06:56:50 +0300 Subject: [PATCH 04/42] =?UTF-8?q?ampermeters-state:=201)=20=D1=83=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=BB=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B9=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t-equipment/include/ampermeters-state.h | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/chs2t-equipment/include/ampermeters-state.h b/chs2t-equipment/include/ampermeters-state.h index ebb90fe..70a5ac0 100644 --- 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 From e991a93df684753dec88489fd27639291267be78 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 07:05:39 +0300 Subject: [PATCH 05/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20StepSwitch=20=D1=87=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 4 ++-- chs2t/src/chs2t-init.cpp | 2 ++ chs2t/src/chs2t-process-debug.cpp | 2 ++ chs2t/src/chs2t-process-signals.cpp | 1 + chs2t/src/chs2t-step-autopilot.cpp | 2 ++ chs2t/src/chs2t-step.cpp | 2 ++ 6 files changed, 11 insertions(+), 2 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index a696d6f..e712a96 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -17,7 +17,6 @@ #include "switchers-panel.h" #include "km-21kr2.h" -#include "stepswitch.h" #include "pusk-rez.h" #include "motor.h" #include "overload-relay.h" @@ -30,7 +29,6 @@ #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" @@ -38,6 +36,8 @@ #include +class StepSwitch; + /*! * \class * \brief Основной класс, описывающий весь электровоз diff --git a/chs2t/src/chs2t-init.cpp b/chs2t/src/chs2t-init.cpp index 5bbe6ba..df95fee 100644 --- a/chs2t/src/chs2t-init.cpp +++ b/chs2t/src/chs2t-init.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include "stepswitch.h" + #include //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-process-debug.cpp b/chs2t/src/chs2t-process-debug.cpp index 03936b1..f26a4a5 100644 --- a/chs2t/src/chs2t-process-debug.cpp +++ b/chs2t/src/chs2t-process-debug.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include "stepswitch.h" + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-process-signals.cpp b/chs2t/src/chs2t-process-signals.cpp index 5ab42ae..0d1b1a4 100644 --- a/chs2t/src/chs2t-process-signals.cpp +++ b/chs2t/src/chs2t-process-signals.cpp @@ -1,6 +1,7 @@ #include "chs2t.h" #include "chs2t-signals.h" +#include "stepswitch.h" //------------------------------------------------------------------------------ // diff --git a/chs2t/src/chs2t-step-autopilot.cpp b/chs2t/src/chs2t-step-autopilot.cpp index 6a7b4f1..f67c9dd 100644 --- a/chs2t/src/chs2t-step-autopilot.cpp +++ b/chs2t/src/chs2t-step-autopilot.cpp @@ -1,5 +1,7 @@ #include +#include "stepswitch.h" + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step.cpp b/chs2t/src/chs2t-step.cpp index 95c4a66..6d69784 100644 --- a/chs2t/src/chs2t-step.cpp +++ b/chs2t/src/chs2t-step.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include "stepswitch.h" + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ From 528a7a899807eb51bf8688736c62c3589e3ad97d Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 07:08:07 +0300 Subject: [PATCH 06/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20PuskRez=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7?= =?UTF-8?q?=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 2 +- chs2t/src/chs2t-init.cpp | 1 + chs2t/src/chs2t-step.cpp | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index e712a96..2c33465 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -17,7 +17,6 @@ #include "switchers-panel.h" #include "km-21kr2.h" -#include "pusk-rez.h" #include "motor.h" #include "overload-relay.h" #include "electropneumovalve-emergency.h" @@ -36,6 +35,7 @@ #include +class PuskRez; class StepSwitch; /*! diff --git a/chs2t/src/chs2t-init.cpp b/chs2t/src/chs2t-init.cpp index df95fee..da69781 100644 --- a/chs2t/src/chs2t-init.cpp +++ b/chs2t/src/chs2t-init.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include "pusk-rez.h" #include "stepswitch.h" #include diff --git a/chs2t/src/chs2t-step.cpp b/chs2t/src/chs2t-step.cpp index 6d69784..82a927c 100644 --- a/chs2t/src/chs2t-step.cpp +++ b/chs2t/src/chs2t-step.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include "pusk-rez.h" #include "stepswitch.h" //------------------------------------------------------------------------------ From 25611a8f4206147207105e00759e2d46a1228d53 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 07:32:22 +0300 Subject: [PATCH 07/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20Motor=20=D0=B8=20OverloadRelay=20=D1=87?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 4 ++-- chs2t/src/chs2t-init.cpp | 2 ++ chs2t/src/chs2t-process-debug.cpp | 1 + chs2t/src/chs2t-process-signals.cpp | 1 + chs2t/src/chs2t-process-sounds.cpp | 2 ++ chs2t/src/chs2t-registrate.cpp | 2 ++ chs2t/src/chs2t-step-autopilot.cpp | 1 + chs2t/src/chs2t-step.cpp | 2 ++ 8 files changed, 13 insertions(+), 2 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index 2c33465..0bc46fc 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -17,8 +17,6 @@ #include "switchers-panel.h" #include "km-21kr2.h" -#include "motor.h" -#include "overload-relay.h" #include "electropneumovalve-emergency.h" #include "electropneumovalve-release.h" #include "dako.h" @@ -35,6 +33,8 @@ #include +class Motor; +class OverloadRelay; class PuskRez; class StepSwitch; diff --git a/chs2t/src/chs2t-init.cpp b/chs2t/src/chs2t-init.cpp index da69781..46ac80b 100644 --- a/chs2t/src/chs2t-init.cpp +++ b/chs2t/src/chs2t-init.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include "motor.h" +#include "overload-relay.h" #include "pusk-rez.h" #include "stepswitch.h" diff --git a/chs2t/src/chs2t-process-debug.cpp b/chs2t/src/chs2t-process-debug.cpp index f26a4a5..6264ffa 100644 --- a/chs2t/src/chs2t-process-debug.cpp +++ b/chs2t/src/chs2t-process-debug.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include "motor.h" #include "stepswitch.h" //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-process-signals.cpp b/chs2t/src/chs2t-process-signals.cpp index 0d1b1a4..161e076 100644 --- a/chs2t/src/chs2t-process-signals.cpp +++ b/chs2t/src/chs2t-process-signals.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include "motor.h" #include "chs2t-signals.h" #include "stepswitch.h" diff --git a/chs2t/src/chs2t-process-sounds.cpp b/chs2t/src/chs2t-process-sounds.cpp index e80b565..c516db1 100644 --- a/chs2t/src/chs2t-process-sounds.cpp +++ b/chs2t/src/chs2t-process-sounds.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" + #include "chs2t-signals.h" +#include "motor.h" //------------------------------------------------------------------------------ // diff --git a/chs2t/src/chs2t-registrate.cpp b/chs2t/src/chs2t-registrate.cpp index 81e662b..769b481 100644 --- a/chs2t/src/chs2t-registrate.cpp +++ b/chs2t/src/chs2t-registrate.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include "motor.h" + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step-autopilot.cpp b/chs2t/src/chs2t-step-autopilot.cpp index f67c9dd..821b631 100644 --- a/chs2t/src/chs2t-step-autopilot.cpp +++ b/chs2t/src/chs2t-step-autopilot.cpp @@ -1,5 +1,6 @@ #include +#include "motor.h" #include "stepswitch.h" //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step.cpp b/chs2t/src/chs2t-step.cpp index 82a927c..c7e8916 100644 --- a/chs2t/src/chs2t-step.cpp +++ b/chs2t/src/chs2t-step.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include "motor.h" +#include "overload-relay.h" #include "pusk-rez.h" #include "stepswitch.h" From e7edef557d2feeb9d4730a883d52db9771381218 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 07:35:32 +0300 Subject: [PATCH 08/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20ElectroPneumoValveEmergency=20=D0=B8=20Ele?= =?UTF-8?q?ctroPneumoValveRelease=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20forwa?= =?UTF-8?q?rd-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 4 ++-- chs2t/src/chs2t-init-brakes-control.cpp | 3 +++ chs2t/src/chs2t-step-brakes-control.cpp | 3 +++ chs2t/src/chs2t-step.cpp | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index 0bc46fc..ddd9286 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -17,8 +17,6 @@ #include "switchers-panel.h" #include "km-21kr2.h" -#include "electropneumovalve-emergency.h" -#include "electropneumovalve-release.h" #include "dako.h" #include "generator.h" #include "pulse-converter.h" @@ -33,6 +31,8 @@ #include +class ElectroPneumoValveEmergency; +class ElectroPneumoValveRelease; class Motor; class OverloadRelay; class PuskRez; diff --git a/chs2t/src/chs2t-init-brakes-control.cpp b/chs2t/src/chs2t-init-brakes-control.cpp index 7474f6b..1ac404e 100644 --- a/chs2t/src/chs2t-init-brakes-control.cpp +++ b/chs2t/src/chs2t-init-brakes-control.cpp @@ -1,5 +1,8 @@ #include "chs2t.h" +#include "electropneumovalve-emergency.h" +#include "electropneumovalve-release.h" + #include //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step-brakes-control.cpp b/chs2t/src/chs2t-step-brakes-control.cpp index cd526e6..5208f59 100644 --- a/chs2t/src/chs2t-step-brakes-control.cpp +++ b/chs2t/src/chs2t-step-brakes-control.cpp @@ -1,5 +1,8 @@ #include "chs2t.h" +#include "electropneumovalve-emergency.h" +#include "electropneumovalve-release.h" + //------------------------------------------------------------------------ // //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step.cpp b/chs2t/src/chs2t-step.cpp index c7e8916..729fb57 100644 --- a/chs2t/src/chs2t-step.cpp +++ b/chs2t/src/chs2t-step.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include "electropneumovalve-emergency.h" #include "motor.h" #include "overload-relay.h" #include "pusk-rez.h" From e7c719c973fdeb2cb027bf4bbcdd6993f0c81cf6 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 07:38:57 +0300 Subject: [PATCH 09/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20Dako=20=D0=B8=20Generator=20=D1=87=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 4 ++-- chs2t/src/chs2t-init-brakes-control.cpp | 1 + chs2t/src/chs2t-init.cpp | 1 + chs2t/src/chs2t-process-debug.cpp | 1 + chs2t/src/chs2t-process-signals.cpp | 1 + chs2t/src/chs2t-process-sounds.cpp | 1 + chs2t/src/chs2t-registrate.cpp | 1 + chs2t/src/chs2t-step-brakes-control.cpp | 2 ++ chs2t/src/chs2t-step-edt.cpp | 3 +++ chs2t/src/chs2t-step-pneumo-supply.cpp | 2 ++ chs2t/src/chs2t-step.cpp | 1 + 11 files changed, 16 insertions(+), 2 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index ddd9286..275cb09 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -17,8 +17,6 @@ #include "switchers-panel.h" #include "km-21kr2.h" -#include "dako.h" -#include "generator.h" #include "pulse-converter.h" #include "brake-regulator.h" #include "handle-edt.h" @@ -31,8 +29,10 @@ #include +class Dako; class ElectroPneumoValveEmergency; class ElectroPneumoValveRelease; +class Generator; class Motor; class OverloadRelay; class PuskRez; diff --git a/chs2t/src/chs2t-init-brakes-control.cpp b/chs2t/src/chs2t-init-brakes-control.cpp index 1ac404e..9d4ce5c 100644 --- a/chs2t/src/chs2t-init-brakes-control.cpp +++ b/chs2t/src/chs2t-init-brakes-control.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include "dako.h" #include "electropneumovalve-emergency.h" #include "electropneumovalve-release.h" diff --git a/chs2t/src/chs2t-init.cpp b/chs2t/src/chs2t-init.cpp index 46ac80b..3156466 100644 --- a/chs2t/src/chs2t-init.cpp +++ b/chs2t/src/chs2t-init.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include "generator.h" #include "motor.h" #include "overload-relay.h" #include "pusk-rez.h" diff --git a/chs2t/src/chs2t-process-debug.cpp b/chs2t/src/chs2t-process-debug.cpp index 6264ffa..3a0b2a4 100644 --- a/chs2t/src/chs2t-process-debug.cpp +++ b/chs2t/src/chs2t-process-debug.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include "generator.h" #include "motor.h" #include "stepswitch.h" diff --git a/chs2t/src/chs2t-process-signals.cpp b/chs2t/src/chs2t-process-signals.cpp index 161e076..15e4270 100644 --- a/chs2t/src/chs2t-process-signals.cpp +++ b/chs2t/src/chs2t-process-signals.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include "generator.h" #include "motor.h" #include "chs2t-signals.h" #include "stepswitch.h" diff --git a/chs2t/src/chs2t-process-sounds.cpp b/chs2t/src/chs2t-process-sounds.cpp index c516db1..c885532 100644 --- a/chs2t/src/chs2t-process-sounds.cpp +++ b/chs2t/src/chs2t-process-sounds.cpp @@ -1,6 +1,7 @@ #include "chs2t.h" #include "chs2t-signals.h" +#include "generator.h" #include "motor.h" //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-registrate.cpp b/chs2t/src/chs2t-registrate.cpp index 769b481..4ef61a5 100644 --- a/chs2t/src/chs2t-registrate.cpp +++ b/chs2t/src/chs2t-registrate.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include "generator.h" #include "motor.h" //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step-brakes-control.cpp b/chs2t/src/chs2t-step-brakes-control.cpp index 5208f59..30d8fdd 100644 --- a/chs2t/src/chs2t-step-brakes-control.cpp +++ b/chs2t/src/chs2t-step-brakes-control.cpp @@ -1,7 +1,9 @@ #include "chs2t.h" +#include "dako.h" #include "electropneumovalve-emergency.h" #include "electropneumovalve-release.h" +#include "generator.h" //------------------------------------------------------------------------ // diff --git a/chs2t/src/chs2t-step-edt.cpp b/chs2t/src/chs2t-step-edt.cpp index 2b58eec..f83d620 100644 --- a/chs2t/src/chs2t-step-edt.cpp +++ b/chs2t/src/chs2t-step-edt.cpp @@ -1,5 +1,8 @@ #include "chs2t.h" +#include "dako.h" +#include "generator.h" + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step-pneumo-supply.cpp b/chs2t/src/chs2t-step-pneumo-supply.cpp index 02965eb..3034665 100644 --- a/chs2t/src/chs2t-step-pneumo-supply.cpp +++ b/chs2t/src/chs2t-step-pneumo-supply.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include "dako.h" + //------------------------------------------------------------------------ // //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step.cpp b/chs2t/src/chs2t-step.cpp index 729fb57..4fce81a 100644 --- a/chs2t/src/chs2t-step.cpp +++ b/chs2t/src/chs2t-step.cpp @@ -1,6 +1,7 @@ #include "chs2t.h" #include "electropneumovalve-emergency.h" +#include "generator.h" #include "motor.h" #include "overload-relay.h" #include "pusk-rez.h" From 6611b7fb0f104a65597689551da8a01e80b16f7b Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 07:41:47 +0300 Subject: [PATCH 10/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20PulseConverter=20=D0=B8=20BrakeRegulator?= =?UTF-8?q?=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 4 ++-- chs2t/src/chs2t-init.cpp | 2 ++ chs2t/src/chs2t-step-edt.cpp | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index 275cb09..a360442 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -17,8 +17,6 @@ #include "switchers-panel.h" #include "km-21kr2.h" -#include "pulse-converter.h" -#include "brake-regulator.h" #include "handle-edt.h" #include "motor-fan-dc.h" #include "blinds.h" @@ -29,12 +27,14 @@ #include +class BrakeRegulator; class Dako; class ElectroPneumoValveEmergency; class ElectroPneumoValveRelease; class Generator; class Motor; class OverloadRelay; +class PulseConverter; class PuskRez; class StepSwitch; diff --git a/chs2t/src/chs2t-init.cpp b/chs2t/src/chs2t-init.cpp index 3156466..677d556 100644 --- a/chs2t/src/chs2t-init.cpp +++ b/chs2t/src/chs2t-init.cpp @@ -1,8 +1,10 @@ #include "chs2t.h" +#include "brake-regulator.h" #include "generator.h" #include "motor.h" #include "overload-relay.h" +#include "pulse-converter.h" #include "pusk-rez.h" #include "stepswitch.h" diff --git a/chs2t/src/chs2t-step-edt.cpp b/chs2t/src/chs2t-step-edt.cpp index f83d620..109ae87 100644 --- a/chs2t/src/chs2t-step-edt.cpp +++ b/chs2t/src/chs2t-step-edt.cpp @@ -1,7 +1,9 @@ -#include "chs2t.h" +#include "chs2t.h" +#include "brake-regulator.h" #include "dako.h" #include "generator.h" +#include "pulse-converter.h" //------------------------------------------------------------------------------ // From 156a6166ce91a422dd0cce84e1c6267e450938d1 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 07:47:22 +0300 Subject: [PATCH 11/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20HandleEDT,=20DCMotorFan=20=D0=B8=20Blinds?= =?UTF-8?q?=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 6 +++--- chs2t/src/chs2t-init-brakes-control.cpp | 1 + chs2t/src/chs2t-init-tumblers.cpp | 2 ++ chs2t/src/chs2t-init.cpp | 1 + chs2t/src/chs2t-process-signals.cpp | 2 ++ chs2t/src/chs2t-step-brakes-control.cpp | 1 + chs2t/src/chs2t-step-brakes-epb.cpp | 2 ++ chs2t/src/chs2t-step.cpp | 1 + 8 files changed, 13 insertions(+), 3 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index a360442..b8c57c1 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -17,9 +17,6 @@ #include "switchers-panel.h" #include "km-21kr2.h" -#include "handle-edt.h" -#include "motor-fan-dc.h" -#include "blinds.h" #include "convert-physics-to-modbus.h" #include "sl2m.h" #include "energy-counter.h" @@ -27,11 +24,14 @@ #include +class Blinds; class BrakeRegulator; +class DCMotorFan; class Dako; class ElectroPneumoValveEmergency; class ElectroPneumoValveRelease; class Generator; +class HandleEDT; class Motor; class OverloadRelay; class PulseConverter; diff --git a/chs2t/src/chs2t-init-brakes-control.cpp b/chs2t/src/chs2t-init-brakes-control.cpp index 9d4ce5c..c6d8db7 100644 --- a/chs2t/src/chs2t-init-brakes-control.cpp +++ b/chs2t/src/chs2t-init-brakes-control.cpp @@ -3,6 +3,7 @@ #include "dako.h" #include "electropneumovalve-emergency.h" #include "electropneumovalve-release.h" +#include "handle-edt.h" #include diff --git a/chs2t/src/chs2t-init-tumblers.cpp b/chs2t/src/chs2t-init-tumblers.cpp index 6eae477..663c413 100644 --- a/chs2t/src/chs2t-init-tumblers.cpp +++ b/chs2t/src/chs2t-init-tumblers.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include "handle-edt.h" + //------------------------------------------------------------------------ // //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-init.cpp b/chs2t/src/chs2t-init.cpp index 677d556..bb5d114 100644 --- a/chs2t/src/chs2t-init.cpp +++ b/chs2t/src/chs2t-init.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include "blinds.h" #include "brake-regulator.h" #include "generator.h" #include "motor.h" diff --git a/chs2t/src/chs2t-process-signals.cpp b/chs2t/src/chs2t-process-signals.cpp index 15e4270..cc17b99 100644 --- a/chs2t/src/chs2t-process-signals.cpp +++ b/chs2t/src/chs2t-process-signals.cpp @@ -1,6 +1,8 @@ #include "chs2t.h" +#include "blinds.h" #include "generator.h" +#include "handle-edt.h" #include "motor.h" #include "chs2t-signals.h" #include "stepswitch.h" diff --git a/chs2t/src/chs2t-step-brakes-control.cpp b/chs2t/src/chs2t-step-brakes-control.cpp index 30d8fdd..500632a 100644 --- a/chs2t/src/chs2t-step-brakes-control.cpp +++ b/chs2t/src/chs2t-step-brakes-control.cpp @@ -4,6 +4,7 @@ #include "electropneumovalve-emergency.h" #include "electropneumovalve-release.h" #include "generator.h" +#include "handle-edt.h" //------------------------------------------------------------------------ // diff --git a/chs2t/src/chs2t-step-brakes-epb.cpp b/chs2t/src/chs2t-step-brakes-epb.cpp index 048a993..f05a7be 100644 --- a/chs2t/src/chs2t-step-brakes-epb.cpp +++ b/chs2t/src/chs2t-step-brakes-epb.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include "handle-edt.h" + //------------------------------------------------------------------------ // //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step.cpp b/chs2t/src/chs2t-step.cpp index 4fce81a..e7ad950 100644 --- a/chs2t/src/chs2t-step.cpp +++ b/chs2t/src/chs2t-step.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include "blinds.h" #include "electropneumovalve-emergency.h" #include "generator.h" #include "motor.h" From c2f507815e5d5847fe7754f768a4a8c2a3d1eb79 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 07:50:43 +0300 Subject: [PATCH 12/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20PhysToModbus=20=D0=B8=20SL2M=20=D1=87?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 4 ++-- chs2t/src/chs2t-init-safety-device.cpp | 3 +++ chs2t/src/chs2t-init.cpp | 1 + chs2t/src/chs2t-process-signals.cpp | 1 + chs2t/src/chs2t-process-sounds.cpp | 1 + chs2t/src/chs2t-step-safety-device.cpp | 2 ++ chs2t/src/chs2t.cpp | 4 +++- 7 files changed, 13 insertions(+), 3 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index b8c57c1..f506e19 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -17,8 +17,6 @@ #include "switchers-panel.h" #include "km-21kr2.h" -#include "convert-physics-to-modbus.h" -#include "sl2m.h" #include "energy-counter.h" #include "alsn-ukbm.h" @@ -34,8 +32,10 @@ class Generator; class HandleEDT; class Motor; class OverloadRelay; +class PhysToModbus; class PulseConverter; class PuskRez; +class SL2M; class StepSwitch; /*! diff --git a/chs2t/src/chs2t-init-safety-device.cpp b/chs2t/src/chs2t-init-safety-device.cpp index 4af9f20..bb5b556 100644 --- a/chs2t/src/chs2t-init-safety-device.cpp +++ b/chs2t/src/chs2t-init-safety-device.cpp @@ -1,4 +1,7 @@ #include + +#include "sl2m.h" + #include //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-init.cpp b/chs2t/src/chs2t-init.cpp index bb5d114..455ccf9 100644 --- a/chs2t/src/chs2t-init.cpp +++ b/chs2t/src/chs2t-init.cpp @@ -2,6 +2,7 @@ #include "blinds.h" #include "brake-regulator.h" +#include "convert-physics-to-modbus.h" #include "generator.h" #include "motor.h" #include "overload-relay.h" diff --git a/chs2t/src/chs2t-process-signals.cpp b/chs2t/src/chs2t-process-signals.cpp index cc17b99..504bf8a 100644 --- a/chs2t/src/chs2t-process-signals.cpp +++ b/chs2t/src/chs2t-process-signals.cpp @@ -5,6 +5,7 @@ #include "handle-edt.h" #include "motor.h" #include "chs2t-signals.h" +#include "sl2m.h" #include "stepswitch.h" //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-process-sounds.cpp b/chs2t/src/chs2t-process-sounds.cpp index c885532..6d56cb9 100644 --- a/chs2t/src/chs2t-process-sounds.cpp +++ b/chs2t/src/chs2t-process-sounds.cpp @@ -3,6 +3,7 @@ #include "chs2t-signals.h" #include "generator.h" #include "motor.h" +#include "sl2m.h" //------------------------------------------------------------------------------ // diff --git a/chs2t/src/chs2t-step-safety-device.cpp b/chs2t/src/chs2t-step-safety-device.cpp index 8bfed2c..286c120 100644 --- a/chs2t/src/chs2t-step-safety-device.cpp +++ b/chs2t/src/chs2t-step-safety-device.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include "sl2m.h" + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t.cpp b/chs2t/src/chs2t.cpp index 3aac847..a625ff7 100644 --- a/chs2t/src/chs2t.cpp +++ b/chs2t/src/chs2t.cpp @@ -12,7 +12,9 @@ //------------------------------------------------------------------------------ #include "chs2t.h" + #include "chs2t-signals.h" +#include "convert-physics-to-modbus.h" #include "filesystem.h" @@ -154,7 +156,7 @@ void CHS2T::step(const double& t, const double& dt) registrate(t, dt); - autoStartTimer->step(t, dt); + autoStartTimer->step(t, dt); pantCtrlTimer->step(t, dt); } From e278b2c8e5be356446c4934e33fd124960dbd7c8 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 08:00:08 +0300 Subject: [PATCH 13/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20EnergyCounter=20=D0=B8=20SafetyDevice=20?= =?UTF-8?q?=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 4 ++-- chs2t/src/chs2t-init-safety-device.cpp | 1 + chs2t/src/chs2t-init.cpp | 1 + chs2t/src/chs2t-process-debug.cpp | 1 + chs2t/src/chs2t-process-signals.cpp | 1 + chs2t/src/chs2t-step-autopilot.cpp | 1 + chs2t/src/chs2t-step-safety-device.cpp | 1 + chs2t/src/chs2t-step.cpp | 1 + 8 files changed, 9 insertions(+), 2 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index f506e19..2d4b543 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -17,8 +17,6 @@ #include "switchers-panel.h" #include "km-21kr2.h" -#include "energy-counter.h" -#include "alsn-ukbm.h" #include @@ -28,6 +26,7 @@ class DCMotorFan; class Dako; class ElectroPneumoValveEmergency; class ElectroPneumoValveRelease; +class EnergyCounter; class Generator; class HandleEDT; class Motor; @@ -36,6 +35,7 @@ class PhysToModbus; class PulseConverter; class PuskRez; class SL2M; +class SafetyDevice; class StepSwitch; /*! diff --git a/chs2t/src/chs2t-init-safety-device.cpp b/chs2t/src/chs2t-init-safety-device.cpp index bb5b556..3579f4d 100644 --- a/chs2t/src/chs2t-init-safety-device.cpp +++ b/chs2t/src/chs2t-init-safety-device.cpp @@ -1,5 +1,6 @@ #include +#include "alsn-ukbm.h" #include "sl2m.h" #include diff --git a/chs2t/src/chs2t-init.cpp b/chs2t/src/chs2t-init.cpp index 455ccf9..49e31d9 100644 --- a/chs2t/src/chs2t-init.cpp +++ b/chs2t/src/chs2t-init.cpp @@ -3,6 +3,7 @@ #include "blinds.h" #include "brake-regulator.h" #include "convert-physics-to-modbus.h" +#include "energy-counter.h" #include "generator.h" #include "motor.h" #include "overload-relay.h" diff --git a/chs2t/src/chs2t-process-debug.cpp b/chs2t/src/chs2t-process-debug.cpp index 3a0b2a4..ddb8995 100644 --- a/chs2t/src/chs2t-process-debug.cpp +++ b/chs2t/src/chs2t-process-debug.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include "alsn-ukbm.h" #include "generator.h" #include "motor.h" #include "stepswitch.h" diff --git a/chs2t/src/chs2t-process-signals.cpp b/chs2t/src/chs2t-process-signals.cpp index 504bf8a..fdc71a4 100644 --- a/chs2t/src/chs2t-process-signals.cpp +++ b/chs2t/src/chs2t-process-signals.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include "alsn-ukbm.h" #include "blinds.h" #include "generator.h" #include "handle-edt.h" diff --git a/chs2t/src/chs2t-step-autopilot.cpp b/chs2t/src/chs2t-step-autopilot.cpp index 821b631..bb02b99 100644 --- a/chs2t/src/chs2t-step-autopilot.cpp +++ b/chs2t/src/chs2t-step-autopilot.cpp @@ -1,5 +1,6 @@ #include +#include "alsn-ukbm.h" #include "motor.h" #include "stepswitch.h" diff --git a/chs2t/src/chs2t-step-safety-device.cpp b/chs2t/src/chs2t-step-safety-device.cpp index 286c120..cb9fe29 100644 --- a/chs2t/src/chs2t-step-safety-device.cpp +++ b/chs2t/src/chs2t-step-safety-device.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include "alsn-ukbm.h" #include "sl2m.h" //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step.cpp b/chs2t/src/chs2t-step.cpp index e7ad950..79a49ec 100644 --- a/chs2t/src/chs2t-step.cpp +++ b/chs2t/src/chs2t-step.cpp @@ -2,6 +2,7 @@ #include "blinds.h" #include "electropneumovalve-emergency.h" +#include "energy-counter.h" #include "generator.h" #include "motor.h" #include "overload-relay.h" From beebea84d2d3cdcbf171f57239114413dbdb0334 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 08:27:06 +0300 Subject: [PATCH 14/42] =?UTF-8?q?=D0=92=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20ve?= =?UTF-8?q?hicle-api=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=BE=D1=82?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=BD=D1=83=D0=B6?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8.=20=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20Registrator=20=D0=B8=20TrainHorn=20=D1=87=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 46 +++++++++++++++++++++++++- chs2t/src/chs2t-init-tumblers.cpp | 2 ++ chs2t/src/chs2t-init.cpp | 2 ++ chs2t/src/chs2t-process-signals.cpp | 2 ++ chs2t/src/chs2t-process-sounds.cpp | 2 ++ chs2t/src/chs2t-registrate.cpp | 2 ++ chs2t/src/chs2t-step-autopilot.cpp | 2 ++ chs2t/src/chs2t-step-pneumo-supply.cpp | 2 ++ chs2t/src/chs2t-step.cpp | 2 ++ 9 files changed, 61 insertions(+), 1 deletion(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index 2d4b543..8b42158 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -13,7 +13,49 @@ #ifndef CHS2T_H #define CHS2T_H -#include "vehicle-api.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "switchers-panel.h" #include "km-21kr2.h" @@ -34,9 +76,11 @@ class OverloadRelay; class PhysToModbus; class PulseConverter; class PuskRez; +class Registrator; class SL2M; class SafetyDevice; class StepSwitch; +class TrainHorn; /*! * \class diff --git a/chs2t/src/chs2t-init-tumblers.cpp b/chs2t/src/chs2t-init-tumblers.cpp index 663c413..bdc19d0 100644 --- a/chs2t/src/chs2t-init-tumblers.cpp +++ b/chs2t/src/chs2t-init-tumblers.cpp @@ -2,6 +2,8 @@ #include "handle-edt.h" +#include + //------------------------------------------------------------------------ // //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-init.cpp b/chs2t/src/chs2t-init.cpp index 49e31d9..4fe3031 100644 --- a/chs2t/src/chs2t-init.cpp +++ b/chs2t/src/chs2t-init.cpp @@ -11,6 +11,8 @@ #include "pusk-rez.h" #include "stepswitch.h" +#include + #include //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-process-signals.cpp b/chs2t/src/chs2t-process-signals.cpp index fdc71a4..2a83327 100644 --- a/chs2t/src/chs2t-process-signals.cpp +++ b/chs2t/src/chs2t-process-signals.cpp @@ -9,6 +9,8 @@ #include "sl2m.h" #include "stepswitch.h" +#include + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-process-sounds.cpp b/chs2t/src/chs2t-process-sounds.cpp index 6d56cb9..a25d314 100644 --- a/chs2t/src/chs2t-process-sounds.cpp +++ b/chs2t/src/chs2t-process-sounds.cpp @@ -5,6 +5,8 @@ #include "motor.h" #include "sl2m.h" +#include + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-registrate.cpp b/chs2t/src/chs2t-registrate.cpp index 4ef61a5..beb341f 100644 --- a/chs2t/src/chs2t-registrate.cpp +++ b/chs2t/src/chs2t-registrate.cpp @@ -3,6 +3,8 @@ #include "generator.h" #include "motor.h" +#include + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step-autopilot.cpp b/chs2t/src/chs2t-step-autopilot.cpp index bb02b99..5d53ce8 100644 --- a/chs2t/src/chs2t-step-autopilot.cpp +++ b/chs2t/src/chs2t-step-autopilot.cpp @@ -4,6 +4,8 @@ #include "motor.h" #include "stepswitch.h" +#include + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step-pneumo-supply.cpp b/chs2t/src/chs2t-step-pneumo-supply.cpp index 3034665..2c43c1b 100644 --- a/chs2t/src/chs2t-step-pneumo-supply.cpp +++ b/chs2t/src/chs2t-step-pneumo-supply.cpp @@ -2,6 +2,8 @@ #include "dako.h" +#include + //------------------------------------------------------------------------ // //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step.cpp b/chs2t/src/chs2t-step.cpp index 79a49ec..0375bce 100644 --- a/chs2t/src/chs2t-step.cpp +++ b/chs2t/src/chs2t-step.cpp @@ -9,6 +9,8 @@ #include "pusk-rez.h" #include "stepswitch.h" +#include + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ From d701f0e3cf14d128d7530c53c454b787e9b38a34 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 08:31:26 +0300 Subject: [PATCH 15/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20SpeedMap=20=D0=B8=20SandingSystem=20=D1=87?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 6 ++---- chs2t/src/chs2t-init-safety-device.cpp | 2 ++ chs2t/src/chs2t-init-tumblers.cpp | 1 + chs2t/src/chs2t-init.cpp | 1 + chs2t/src/chs2t-process-debug.cpp | 2 ++ chs2t/src/chs2t-process-signals.cpp | 1 + chs2t/src/chs2t-process-sounds.cpp | 1 + chs2t/src/chs2t-step-autopilot.cpp | 2 ++ chs2t/src/chs2t-step-pneumo-supply.cpp | 1 + chs2t/src/chs2t-step.cpp | 1 + 10 files changed, 14 insertions(+), 4 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index 8b42158..6cf7fa6 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -52,10 +52,6 @@ #include #include #include -#include -#include -#include -#include #include "switchers-panel.h" #include "km-21kr2.h" @@ -79,6 +75,8 @@ class PuskRez; class Registrator; class SL2M; class SafetyDevice; +class SandingSystem; +class SpeedMap; class StepSwitch; class TrainHorn; diff --git a/chs2t/src/chs2t-init-safety-device.cpp b/chs2t/src/chs2t-init-safety-device.cpp index 3579f4d..e91f242 100644 --- a/chs2t/src/chs2t-init-safety-device.cpp +++ b/chs2t/src/chs2t-init-safety-device.cpp @@ -3,6 +3,8 @@ #include "alsn-ukbm.h" #include "sl2m.h" +#include + #include //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-init-tumblers.cpp b/chs2t/src/chs2t-init-tumblers.cpp index bdc19d0..673171f 100644 --- a/chs2t/src/chs2t-init-tumblers.cpp +++ b/chs2t/src/chs2t-init-tumblers.cpp @@ -2,6 +2,7 @@ #include "handle-edt.h" +#include #include //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-init.cpp b/chs2t/src/chs2t-init.cpp index 4fe3031..9ba424f 100644 --- a/chs2t/src/chs2t-init.cpp +++ b/chs2t/src/chs2t-init.cpp @@ -11,6 +11,7 @@ #include "pusk-rez.h" #include "stepswitch.h" +#include #include #include diff --git a/chs2t/src/chs2t-process-debug.cpp b/chs2t/src/chs2t-process-debug.cpp index ddb8995..044fe1d 100644 --- a/chs2t/src/chs2t-process-debug.cpp +++ b/chs2t/src/chs2t-process-debug.cpp @@ -5,6 +5,8 @@ #include "motor.h" #include "stepswitch.h" +#include + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-process-signals.cpp b/chs2t/src/chs2t-process-signals.cpp index 2a83327..6302482 100644 --- a/chs2t/src/chs2t-process-signals.cpp +++ b/chs2t/src/chs2t-process-signals.cpp @@ -9,6 +9,7 @@ #include "sl2m.h" #include "stepswitch.h" +#include #include //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-process-sounds.cpp b/chs2t/src/chs2t-process-sounds.cpp index a25d314..d52def9 100644 --- a/chs2t/src/chs2t-process-sounds.cpp +++ b/chs2t/src/chs2t-process-sounds.cpp @@ -5,6 +5,7 @@ #include "motor.h" #include "sl2m.h" +#include #include //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step-autopilot.cpp b/chs2t/src/chs2t-step-autopilot.cpp index 5d53ce8..750f448 100644 --- a/chs2t/src/chs2t-step-autopilot.cpp +++ b/chs2t/src/chs2t-step-autopilot.cpp @@ -4,6 +4,8 @@ #include "motor.h" #include "stepswitch.h" +#include +#include #include //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step-pneumo-supply.cpp b/chs2t/src/chs2t-step-pneumo-supply.cpp index 2c43c1b..7f1ec96 100644 --- a/chs2t/src/chs2t-step-pneumo-supply.cpp +++ b/chs2t/src/chs2t-step-pneumo-supply.cpp @@ -2,6 +2,7 @@ #include "dako.h" +#include #include //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step.cpp b/chs2t/src/chs2t-step.cpp index 0375bce..8fe3fb7 100644 --- a/chs2t/src/chs2t-step.cpp +++ b/chs2t/src/chs2t-step.cpp @@ -9,6 +9,7 @@ #include "pusk-rez.h" #include "stepswitch.h" +#include #include //------------------------------------------------------------------------------ From a77dc11a86d57a1f5133f95578609ca7b93cdb7c Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 08:36:35 +0300 Subject: [PATCH 16/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20Reservoir=20=D0=B8=20ProtectiveDevice=20?= =?UTF-8?q?=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 5 ++--- chs2t/src/chs2t-init-autostart.cpp | 4 +++- chs2t/src/chs2t-init-brake-devices.cpp | 2 ++ chs2t/src/chs2t-init-brakes-control.cpp | 2 ++ chs2t/src/chs2t-init-brakes-equipment.cpp | 2 ++ chs2t/src/chs2t-init-pneumo-supply.cpp | 2 ++ chs2t/src/chs2t-init.cpp | 1 + chs2t/src/chs2t-load-config.cpp | 2 ++ chs2t/src/chs2t-process-debug.cpp | 1 + chs2t/src/chs2t-process-signals.cpp | 2 ++ chs2t/src/chs2t-process-sounds.cpp | 1 + chs2t/src/chs2t-step-brakes-control.cpp | 2 ++ chs2t/src/chs2t-step-brakes-epb.cpp | 2 ++ chs2t/src/chs2t-step-brakes-equipment.cpp | 2 ++ chs2t/src/chs2t-step-edt.cpp | 2 ++ chs2t/src/chs2t-step-pneumo-supply.cpp | 2 ++ chs2t/src/chs2t-step-safety-device.cpp | 2 ++ chs2t/src/chs2t-step.cpp | 2 ++ chs2t/src/chs2t.cpp | 2 ++ 19 files changed, 36 insertions(+), 4 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index 6cf7fa6..ef8b225 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -49,9 +49,6 @@ #include #include #include -#include -#include -#include #include "switchers-panel.h" #include "km-21kr2.h" @@ -70,9 +67,11 @@ class HandleEDT; class Motor; class OverloadRelay; class PhysToModbus; +class ProtectiveDevice; class PulseConverter; class PuskRez; class Registrator; +class Reservoir; class SL2M; class SafetyDevice; class SandingSystem; diff --git a/chs2t/src/chs2t-init-autostart.cpp b/chs2t/src/chs2t-init-autostart.cpp index 12106f6..002726f 100644 --- a/chs2t/src/chs2t-init-autostart.cpp +++ b/chs2t/src/chs2t-init-autostart.cpp @@ -1,5 +1,7 @@ #include +#include + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ @@ -162,7 +164,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 index 0beab9b..82d40d7 100644 --- a/chs2t/src/chs2t-init-brake-devices.cpp +++ b/chs2t/src/chs2t-init-brake-devices.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include + #include "filesystem.h" //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-init-brakes-control.cpp b/chs2t/src/chs2t-init-brakes-control.cpp index c6d8db7..13ee138 100644 --- a/chs2t/src/chs2t-init-brakes-control.cpp +++ b/chs2t/src/chs2t-init-brakes-control.cpp @@ -5,6 +5,8 @@ #include "electropneumovalve-release.h" #include "handle-edt.h" +#include + #include //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-init-brakes-equipment.cpp b/chs2t/src/chs2t-init-brakes-equipment.cpp index 0d44568..1031c42 100644 --- a/chs2t/src/chs2t-init-brakes-equipment.cpp +++ b/chs2t/src/chs2t-init-brakes-equipment.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include + #include //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-init-pneumo-supply.cpp b/chs2t/src/chs2t-init-pneumo-supply.cpp index b992917..8dfb557 100644 --- a/chs2t/src/chs2t-init-pneumo-supply.cpp +++ b/chs2t/src/chs2t-init-pneumo-supply.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include + //------------------------------------------------------------------------ // //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-init.cpp b/chs2t/src/chs2t-init.cpp index 9ba424f..082d54b 100644 --- a/chs2t/src/chs2t-init.cpp +++ b/chs2t/src/chs2t-init.cpp @@ -11,6 +11,7 @@ #include "pusk-rez.h" #include "stepswitch.h" +#include #include #include diff --git a/chs2t/src/chs2t-load-config.cpp b/chs2t/src/chs2t-load-config.cpp index 3c9f670..a9a7d89 100644 --- a/chs2t/src/chs2t-load-config.cpp +++ b/chs2t/src/chs2t-load-config.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include + //------------------------------------------------------------------------------ // Загрузка данных из конфигурационного файла //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-process-debug.cpp b/chs2t/src/chs2t-process-debug.cpp index 044fe1d..59c0ed9 100644 --- a/chs2t/src/chs2t-process-debug.cpp +++ b/chs2t/src/chs2t-process-debug.cpp @@ -5,6 +5,7 @@ #include "motor.h" #include "stepswitch.h" +#include #include //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-process-signals.cpp b/chs2t/src/chs2t-process-signals.cpp index 6302482..09f648d 100644 --- a/chs2t/src/chs2t-process-signals.cpp +++ b/chs2t/src/chs2t-process-signals.cpp @@ -9,6 +9,8 @@ #include "sl2m.h" #include "stepswitch.h" +#include +#include #include #include diff --git a/chs2t/src/chs2t-process-sounds.cpp b/chs2t/src/chs2t-process-sounds.cpp index d52def9..c4c8c35 100644 --- a/chs2t/src/chs2t-process-sounds.cpp +++ b/chs2t/src/chs2t-process-sounds.cpp @@ -5,6 +5,7 @@ #include "motor.h" #include "sl2m.h" +#include #include #include diff --git a/chs2t/src/chs2t-step-brakes-control.cpp b/chs2t/src/chs2t-step-brakes-control.cpp index 500632a..954de07 100644 --- a/chs2t/src/chs2t-step-brakes-control.cpp +++ b/chs2t/src/chs2t-step-brakes-control.cpp @@ -6,6 +6,8 @@ #include "generator.h" #include "handle-edt.h" +#include + //------------------------------------------------------------------------ // //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step-brakes-epb.cpp b/chs2t/src/chs2t-step-brakes-epb.cpp index f05a7be..af74273 100644 --- a/chs2t/src/chs2t-step-brakes-epb.cpp +++ b/chs2t/src/chs2t-step-brakes-epb.cpp @@ -2,6 +2,8 @@ #include "handle-edt.h" +#include + //------------------------------------------------------------------------ // //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step-brakes-equipment.cpp b/chs2t/src/chs2t-step-brakes-equipment.cpp index a838dab..f5cf08f 100644 --- a/chs2t/src/chs2t-step-brakes-equipment.cpp +++ b/chs2t/src/chs2t-step-brakes-equipment.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include + //------------------------------------------------------------------------ // //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step-edt.cpp b/chs2t/src/chs2t-step-edt.cpp index 109ae87..c57bed3 100644 --- a/chs2t/src/chs2t-step-edt.cpp +++ b/chs2t/src/chs2t-step-edt.cpp @@ -5,6 +5,8 @@ #include "generator.h" #include "pulse-converter.h" +#include + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step-pneumo-supply.cpp b/chs2t/src/chs2t-step-pneumo-supply.cpp index 7f1ec96..367a030 100644 --- a/chs2t/src/chs2t-step-pneumo-supply.cpp +++ b/chs2t/src/chs2t-step-pneumo-supply.cpp @@ -2,6 +2,8 @@ #include "dako.h" +#include +#include #include #include diff --git a/chs2t/src/chs2t-step-safety-device.cpp b/chs2t/src/chs2t-step-safety-device.cpp index cb9fe29..5ab7096 100644 --- a/chs2t/src/chs2t-step-safety-device.cpp +++ b/chs2t/src/chs2t-step-safety-device.cpp @@ -3,6 +3,8 @@ #include "alsn-ukbm.h" #include "sl2m.h" +#include + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step.cpp b/chs2t/src/chs2t-step.cpp index 8fe3fb7..1806804 100644 --- a/chs2t/src/chs2t-step.cpp +++ b/chs2t/src/chs2t-step.cpp @@ -9,6 +9,8 @@ #include "pusk-rez.h" #include "stepswitch.h" +#include +#include #include #include diff --git a/chs2t/src/chs2t.cpp b/chs2t/src/chs2t.cpp index a625ff7..3cb3f5b 100644 --- a/chs2t/src/chs2t.cpp +++ b/chs2t/src/chs2t.cpp @@ -16,6 +16,8 @@ #include "chs2t-signals.h" #include "convert-physics-to-modbus.h" +#include + #include "filesystem.h" //------------------------------------------------------------------------------ From bf33f58bd5fb304bcefbe7606aa9aaa6ba4e3283 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 08:39:18 +0300 Subject: [PATCH 17/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20PressureRegulator=20=D0=B8=20SwitchingValv?= =?UTF-8?q?e=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 4 ++-- chs2t/src/chs2t-init-brakes-control.cpp | 1 + chs2t/src/chs2t-init-pneumo-supply.cpp | 1 + chs2t/src/chs2t-step-brakes-control.cpp | 1 + chs2t/src/chs2t-step-brakes-equipment.cpp | 1 + chs2t/src/chs2t-step-pneumo-supply.cpp | 1 + 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index ef8b225..ef6fe9b 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -47,8 +47,6 @@ #include #include #include -#include -#include #include "switchers-panel.h" #include "km-21kr2.h" @@ -67,6 +65,7 @@ class HandleEDT; class Motor; class OverloadRelay; class PhysToModbus; +class PressureRegulator; class ProtectiveDevice; class PulseConverter; class PuskRez; @@ -75,6 +74,7 @@ class Reservoir; class SL2M; class SafetyDevice; class SandingSystem; +class SwitchingValve; class SpeedMap; class StepSwitch; class TrainHorn; diff --git a/chs2t/src/chs2t-init-brakes-control.cpp b/chs2t/src/chs2t-init-brakes-control.cpp index 13ee138..9e7672f 100644 --- a/chs2t/src/chs2t-init-brakes-control.cpp +++ b/chs2t/src/chs2t-init-brakes-control.cpp @@ -5,6 +5,7 @@ #include "electropneumovalve-release.h" #include "handle-edt.h" +#include #include #include diff --git a/chs2t/src/chs2t-init-pneumo-supply.cpp b/chs2t/src/chs2t-init-pneumo-supply.cpp index 8dfb557..cf43956 100644 --- a/chs2t/src/chs2t-init-pneumo-supply.cpp +++ b/chs2t/src/chs2t-init-pneumo-supply.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step-brakes-control.cpp b/chs2t/src/chs2t-step-brakes-control.cpp index 954de07..fbc1cf9 100644 --- a/chs2t/src/chs2t-step-brakes-control.cpp +++ b/chs2t/src/chs2t-step-brakes-control.cpp @@ -6,6 +6,7 @@ #include "generator.h" #include "handle-edt.h" +#include #include //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step-brakes-equipment.cpp b/chs2t/src/chs2t-step-brakes-equipment.cpp index f5cf08f..8c20364 100644 --- a/chs2t/src/chs2t-step-brakes-equipment.cpp +++ b/chs2t/src/chs2t-step-brakes-equipment.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step-pneumo-supply.cpp b/chs2t/src/chs2t-step-pneumo-supply.cpp index 367a030..d71daa1 100644 --- a/chs2t/src/chs2t-step-pneumo-supply.cpp +++ b/chs2t/src/chs2t-step-pneumo-supply.cpp @@ -2,6 +2,7 @@ #include "dako.h" +#include #include #include #include From 4eae3556532a851f58baba37752b927153f9e0f6 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 08:42:01 +0300 Subject: [PATCH 18/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20PneumoSplitter=20=D0=B8=20PneumoShutoffVal?= =?UTF-8?q?ve=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 4 ++-- chs2t/src/chs2t-init-brakes-control.cpp | 2 ++ chs2t/src/chs2t-init-tumblers.cpp | 1 + chs2t/src/chs2t-load-config.cpp | 1 + chs2t/src/chs2t-process-debug.cpp | 1 + chs2t/src/chs2t-process-signals.cpp | 1 + chs2t/src/chs2t-process-sounds.cpp | 1 + chs2t/src/chs2t-step-brakes-control.cpp | 2 ++ chs2t/src/chs2t-step-pneumo-supply.cpp | 1 + 9 files changed, 12 insertions(+), 2 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index ef6fe9b..09a06c5 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -45,8 +45,6 @@ #include #include #include -#include -#include #include "switchers-panel.h" #include "km-21kr2.h" @@ -65,6 +63,8 @@ class HandleEDT; class Motor; class OverloadRelay; class PhysToModbus; +class PneumoShutoffValve; +class PneumoSplitter; class PressureRegulator; class ProtectiveDevice; class PulseConverter; diff --git a/chs2t/src/chs2t-init-brakes-control.cpp b/chs2t/src/chs2t-init-brakes-control.cpp index 9e7672f..016ccb3 100644 --- a/chs2t/src/chs2t-init-brakes-control.cpp +++ b/chs2t/src/chs2t-init-brakes-control.cpp @@ -5,6 +5,8 @@ #include "electropneumovalve-release.h" #include "handle-edt.h" +#include +#include #include #include diff --git a/chs2t/src/chs2t-init-tumblers.cpp b/chs2t/src/chs2t-init-tumblers.cpp index 673171f..d2b89f4 100644 --- a/chs2t/src/chs2t-init-tumblers.cpp +++ b/chs2t/src/chs2t-init-tumblers.cpp @@ -2,6 +2,7 @@ #include "handle-edt.h" +#include #include #include diff --git a/chs2t/src/chs2t-load-config.cpp b/chs2t/src/chs2t-load-config.cpp index a9a7d89..c4ac5cd 100644 --- a/chs2t/src/chs2t-load-config.cpp +++ b/chs2t/src/chs2t-load-config.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-process-debug.cpp b/chs2t/src/chs2t-process-debug.cpp index 59c0ed9..a2f031b 100644 --- a/chs2t/src/chs2t-process-debug.cpp +++ b/chs2t/src/chs2t-process-debug.cpp @@ -5,6 +5,7 @@ #include "motor.h" #include "stepswitch.h" +#include #include #include diff --git a/chs2t/src/chs2t-process-signals.cpp b/chs2t/src/chs2t-process-signals.cpp index 09f648d..0754484 100644 --- a/chs2t/src/chs2t-process-signals.cpp +++ b/chs2t/src/chs2t-process-signals.cpp @@ -9,6 +9,7 @@ #include "sl2m.h" #include "stepswitch.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-process-sounds.cpp b/chs2t/src/chs2t-process-sounds.cpp index c4c8c35..7ddd6aa 100644 --- a/chs2t/src/chs2t-process-sounds.cpp +++ b/chs2t/src/chs2t-process-sounds.cpp @@ -5,6 +5,7 @@ #include "motor.h" #include "sl2m.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-brakes-control.cpp b/chs2t/src/chs2t-step-brakes-control.cpp index fbc1cf9..35fc7a9 100644 --- a/chs2t/src/chs2t-step-brakes-control.cpp +++ b/chs2t/src/chs2t-step-brakes-control.cpp @@ -6,6 +6,8 @@ #include "generator.h" #include "handle-edt.h" +#include +#include #include #include diff --git a/chs2t/src/chs2t-step-pneumo-supply.cpp b/chs2t/src/chs2t-step-pneumo-supply.cpp index d71daa1..4ebefc4 100644 --- a/chs2t/src/chs2t-step-pneumo-supply.cpp +++ b/chs2t/src/chs2t-step-pneumo-supply.cpp @@ -2,6 +2,7 @@ #include "dako.h" +#include #include #include #include From ae1092e10c770d304ff99354b805b3230aa1fe79 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 08:50:09 +0300 Subject: [PATCH 19/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20PneumoRelay=20=D0=B8=20PneumoHose=20=D1=87?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 7 +++---- chs2t/src/chs2t-init-brake-devices.cpp | 2 ++ chs2t/src/chs2t-init-brakes-control.cpp | 1 + chs2t/src/chs2t-init-brakes-equipment.cpp | 1 + chs2t/src/chs2t-init-pneumo-supply.cpp | 1 + chs2t/src/chs2t-init-tumblers.cpp | 2 ++ chs2t/src/chs2t-process-debug.cpp | 2 ++ chs2t/src/chs2t-step-brakes-control.cpp | 1 + chs2t/src/chs2t-step-brakes-epb.cpp | 1 + chs2t/src/chs2t-step-brakes-equipment.cpp | 1 + chs2t/src/chs2t-step-pneumo-supply.cpp | 2 ++ 11 files changed, 17 insertions(+), 4 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index 09a06c5..890dc24 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -41,10 +41,6 @@ #include #include #include -#include -#include -#include -#include #include "switchers-panel.h" #include "km-21kr2.h" @@ -63,6 +59,9 @@ class HandleEDT; class Motor; class OverloadRelay; class PhysToModbus; +class PneumoHose; +class PneumoHoseEPB; +class PneumoRelay; class PneumoShutoffValve; class PneumoSplitter; class PressureRegulator; diff --git a/chs2t/src/chs2t-init-brake-devices.cpp b/chs2t/src/chs2t-init-brake-devices.cpp index 82d40d7..2ed5cd8 100644 --- a/chs2t/src/chs2t-init-brake-devices.cpp +++ b/chs2t/src/chs2t-init-brake-devices.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include +#include #include #include "filesystem.h" diff --git a/chs2t/src/chs2t-init-brakes-control.cpp b/chs2t/src/chs2t-init-brakes-control.cpp index 016ccb3..befae32 100644 --- a/chs2t/src/chs2t-init-brakes-control.cpp +++ b/chs2t/src/chs2t-init-brakes-control.cpp @@ -5,6 +5,7 @@ #include "electropneumovalve-release.h" #include "handle-edt.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-init-brakes-equipment.cpp b/chs2t/src/chs2t-init-brakes-equipment.cpp index 1031c42..bf03ba4 100644 --- a/chs2t/src/chs2t-init-brakes-equipment.cpp +++ b/chs2t/src/chs2t-init-brakes-equipment.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include diff --git a/chs2t/src/chs2t-init-pneumo-supply.cpp b/chs2t/src/chs2t-init-pneumo-supply.cpp index cf43956..05972c4 100644 --- a/chs2t/src/chs2t-init-pneumo-supply.cpp +++ b/chs2t/src/chs2t-init-pneumo-supply.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include diff --git a/chs2t/src/chs2t-init-tumblers.cpp b/chs2t/src/chs2t-init-tumblers.cpp index d2b89f4..cacee60 100644 --- a/chs2t/src/chs2t-init-tumblers.cpp +++ b/chs2t/src/chs2t-init-tumblers.cpp @@ -2,6 +2,8 @@ #include "handle-edt.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-process-debug.cpp b/chs2t/src/chs2t-process-debug.cpp index a2f031b..2594b0e 100644 --- a/chs2t/src/chs2t-process-debug.cpp +++ b/chs2t/src/chs2t-process-debug.cpp @@ -5,6 +5,8 @@ #include "motor.h" #include "stepswitch.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-step-brakes-control.cpp b/chs2t/src/chs2t-step-brakes-control.cpp index 35fc7a9..b0a25ec 100644 --- a/chs2t/src/chs2t-step-brakes-control.cpp +++ b/chs2t/src/chs2t-step-brakes-control.cpp @@ -6,6 +6,7 @@ #include "generator.h" #include "handle-edt.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-brakes-epb.cpp b/chs2t/src/chs2t-step-brakes-epb.cpp index af74273..4c76800 100644 --- a/chs2t/src/chs2t-step-brakes-epb.cpp +++ b/chs2t/src/chs2t-step-brakes-epb.cpp @@ -2,6 +2,7 @@ #include "handle-edt.h" +#include #include //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step-brakes-equipment.cpp b/chs2t/src/chs2t-step-brakes-equipment.cpp index 8c20364..71d58bb 100644 --- a/chs2t/src/chs2t-step-brakes-equipment.cpp +++ b/chs2t/src/chs2t-step-brakes-equipment.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include diff --git a/chs2t/src/chs2t-step-pneumo-supply.cpp b/chs2t/src/chs2t-step-pneumo-supply.cpp index 4ebefc4..f64656d 100644 --- a/chs2t/src/chs2t-step-pneumo-supply.cpp +++ b/chs2t/src/chs2t-step-pneumo-supply.cpp @@ -2,6 +2,8 @@ #include "dako.h" +#include +#include #include #include #include From b6adfa24dda9b24f677d872d5c56bc28293e529c Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 08:55:28 +0300 Subject: [PATCH 20/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20PneumoCombineCrane=20=D0=B8=20PneumoAnglec?= =?UTF-8?q?ock=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 5 ++--- chs2t/src/chs2t-init-brake-devices.cpp | 2 ++ chs2t/src/chs2t-init-brakes-control.cpp | 1 + chs2t/src/chs2t-init-brakes-equipment.cpp | 1 + chs2t/src/chs2t-init-pneumo-supply.cpp | 1 + chs2t/src/chs2t-init-tumblers.cpp | 2 ++ chs2t/src/chs2t-load-config.cpp | 1 + chs2t/src/chs2t-process-debug.cpp | 2 ++ chs2t/src/chs2t-process-signals.cpp | 1 + chs2t/src/chs2t-process-sounds.cpp | 1 + chs2t/src/chs2t-step-brakes-control.cpp | 1 + chs2t/src/chs2t-step-brakes-equipment.cpp | 2 ++ chs2t/src/chs2t-step-pneumo-supply.cpp | 1 + 13 files changed, 18 insertions(+), 3 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index 890dc24..45ff64a 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -38,9 +38,6 @@ #include #include #include -#include -#include -#include #include "switchers-panel.h" #include "km-21kr2.h" @@ -59,6 +56,8 @@ class HandleEDT; class Motor; class OverloadRelay; class PhysToModbus; +class PneumoAngleCock; +class PneumoCombineCrane; class PneumoHose; class PneumoHoseEPB; class PneumoRelay; diff --git a/chs2t/src/chs2t-init-brake-devices.cpp b/chs2t/src/chs2t-init-brake-devices.cpp index 2ed5cd8..0525201 100644 --- a/chs2t/src/chs2t-init-brake-devices.cpp +++ b/chs2t/src/chs2t-init-brake-devices.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-init-brakes-control.cpp b/chs2t/src/chs2t-init-brakes-control.cpp index befae32..e663c34 100644 --- a/chs2t/src/chs2t-init-brakes-control.cpp +++ b/chs2t/src/chs2t-init-brakes-control.cpp @@ -5,6 +5,7 @@ #include "electropneumovalve-release.h" #include "handle-edt.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-init-brakes-equipment.cpp b/chs2t/src/chs2t-init-brakes-equipment.cpp index bf03ba4..5c0935f 100644 --- a/chs2t/src/chs2t-init-brakes-equipment.cpp +++ b/chs2t/src/chs2t-init-brakes-equipment.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include diff --git a/chs2t/src/chs2t-init-pneumo-supply.cpp b/chs2t/src/chs2t-init-pneumo-supply.cpp index 05972c4..aea2788 100644 --- a/chs2t/src/chs2t-init-pneumo-supply.cpp +++ b/chs2t/src/chs2t-init-pneumo-supply.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-init-tumblers.cpp b/chs2t/src/chs2t-init-tumblers.cpp index cacee60..1b39f23 100644 --- a/chs2t/src/chs2t-init-tumblers.cpp +++ b/chs2t/src/chs2t-init-tumblers.cpp @@ -2,6 +2,8 @@ #include "handle-edt.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-load-config.cpp b/chs2t/src/chs2t-load-config.cpp index c4ac5cd..ddb62e5 100644 --- a/chs2t/src/chs2t-load-config.cpp +++ b/chs2t/src/chs2t-load-config.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include diff --git a/chs2t/src/chs2t-process-debug.cpp b/chs2t/src/chs2t-process-debug.cpp index 2594b0e..251b1b8 100644 --- a/chs2t/src/chs2t-process-debug.cpp +++ b/chs2t/src/chs2t-process-debug.cpp @@ -5,6 +5,8 @@ #include "motor.h" #include "stepswitch.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-process-signals.cpp b/chs2t/src/chs2t-process-signals.cpp index 0754484..f26b985 100644 --- a/chs2t/src/chs2t-process-signals.cpp +++ b/chs2t/src/chs2t-process-signals.cpp @@ -9,6 +9,7 @@ #include "sl2m.h" #include "stepswitch.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-process-sounds.cpp b/chs2t/src/chs2t-process-sounds.cpp index 7ddd6aa..fc7e0c0 100644 --- a/chs2t/src/chs2t-process-sounds.cpp +++ b/chs2t/src/chs2t-process-sounds.cpp @@ -5,6 +5,7 @@ #include "motor.h" #include "sl2m.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-brakes-control.cpp b/chs2t/src/chs2t-step-brakes-control.cpp index b0a25ec..e1586e0 100644 --- a/chs2t/src/chs2t-step-brakes-control.cpp +++ b/chs2t/src/chs2t-step-brakes-control.cpp @@ -6,6 +6,7 @@ #include "generator.h" #include "handle-edt.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-brakes-equipment.cpp b/chs2t/src/chs2t-step-brakes-equipment.cpp index 71d58bb..40c111a 100644 --- a/chs2t/src/chs2t-step-brakes-equipment.cpp +++ b/chs2t/src/chs2t-step-brakes-equipment.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-step-pneumo-supply.cpp b/chs2t/src/chs2t-step-pneumo-supply.cpp index f64656d..f27b590 100644 --- a/chs2t/src/chs2t-step-pneumo-supply.cpp +++ b/chs2t/src/chs2t-step-pneumo-supply.cpp @@ -2,6 +2,7 @@ #include "dako.h" +#include #include #include #include From 8e05206eb63fbf660838743d9ff1fedbd0f723a6 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 09:00:35 +0300 Subject: [PATCH 21/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20Pantograph=20=D0=B8=20DCMotorFan=20=D1=87?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 6 +----- chs2t/src/chs2t-init-autostart.cpp | 1 + chs2t/src/chs2t-init.cpp | 2 ++ chs2t/src/chs2t-process-signals.cpp | 2 ++ chs2t/src/chs2t-process-sounds.cpp | 2 ++ chs2t/src/chs2t-step-autopilot.cpp | 1 + chs2t/src/chs2t-step.cpp | 2 ++ 7 files changed, 11 insertions(+), 5 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index 45ff64a..5506e79 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -32,12 +32,7 @@ #include #include #include -#include #include -#include -#include -#include -#include #include "switchers-panel.h" #include "km-21kr2.h" @@ -55,6 +50,7 @@ class Generator; class HandleEDT; class Motor; class OverloadRelay; +class Pantograph; class PhysToModbus; class PneumoAngleCock; class PneumoCombineCrane; diff --git a/chs2t/src/chs2t-init-autostart.cpp b/chs2t/src/chs2t-init-autostart.cpp index 002726f..a4b0d89 100644 --- a/chs2t/src/chs2t-init-autostart.cpp +++ b/chs2t/src/chs2t-init-autostart.cpp @@ -1,5 +1,6 @@ #include +#include #include //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-init.cpp b/chs2t/src/chs2t-init.cpp index 082d54b..af65a5b 100644 --- a/chs2t/src/chs2t-init.cpp +++ b/chs2t/src/chs2t-init.cpp @@ -11,6 +11,8 @@ #include "pusk-rez.h" #include "stepswitch.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-process-signals.cpp b/chs2t/src/chs2t-process-signals.cpp index f26b985..05c8dbb 100644 --- a/chs2t/src/chs2t-process-signals.cpp +++ b/chs2t/src/chs2t-process-signals.cpp @@ -9,6 +9,8 @@ #include "sl2m.h" #include "stepswitch.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-process-sounds.cpp b/chs2t/src/chs2t-process-sounds.cpp index fc7e0c0..fbd0384 100644 --- a/chs2t/src/chs2t-process-sounds.cpp +++ b/chs2t/src/chs2t-process-sounds.cpp @@ -5,6 +5,8 @@ #include "motor.h" #include "sl2m.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-step-autopilot.cpp b/chs2t/src/chs2t-step-autopilot.cpp index 750f448..6c21b9e 100644 --- a/chs2t/src/chs2t-step-autopilot.cpp +++ b/chs2t/src/chs2t-step-autopilot.cpp @@ -4,6 +4,7 @@ #include "motor.h" #include "stepswitch.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step.cpp b/chs2t/src/chs2t-step.cpp index 1806804..ed61399 100644 --- a/chs2t/src/chs2t-step.cpp +++ b/chs2t/src/chs2t-step.cpp @@ -9,6 +9,8 @@ #include "pusk-rez.h" #include "stepswitch.h" +#include +#include #include #include #include From 22146cf69a5a1642acd2da50acdfbf83503a078d Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 09:03:53 +0300 Subject: [PATCH 22/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20DCMotorCompressor=20=D0=B8=20LocoCrane=20?= =?UTF-8?q?=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 4 ++-- chs2t/src/chs2t-init-brake-devices.cpp | 1 + chs2t/src/chs2t-init-brakes-control.cpp | 1 + chs2t/src/chs2t-init-pneumo-supply.cpp | 1 + chs2t/src/chs2t-load-config.cpp | 1 + chs2t/src/chs2t-process-debug.cpp | 1 + chs2t/src/chs2t-process-keyprocess.cpp | 4 +++- chs2t/src/chs2t-process-signals.cpp | 2 ++ chs2t/src/chs2t-process-sounds.cpp | 2 ++ chs2t/src/chs2t-step-autopilot.cpp | 1 + chs2t/src/chs2t-step-brakes-control.cpp | 1 + chs2t/src/chs2t-step-pneumo-supply.cpp | 1 + 12 files changed, 17 insertions(+), 3 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index 5506e79..b47fd34 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -31,8 +31,6 @@ #include #include #include -#include -#include #include "switchers-panel.h" #include "km-21kr2.h" @@ -41,6 +39,7 @@ class Blinds; class BrakeRegulator; +class DCMotorCompressor; class DCMotorFan; class Dako; class ElectroPneumoValveEmergency; @@ -48,6 +47,7 @@ class ElectroPneumoValveRelease; class EnergyCounter; class Generator; class HandleEDT; +class LocoCrane; class Motor; class OverloadRelay; class Pantograph; diff --git a/chs2t/src/chs2t-init-brake-devices.cpp b/chs2t/src/chs2t-init-brake-devices.cpp index 0525201..7761ad5 100644 --- a/chs2t/src/chs2t-init-brake-devices.cpp +++ b/chs2t/src/chs2t-init-brake-devices.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-init-brakes-control.cpp b/chs2t/src/chs2t-init-brakes-control.cpp index e663c34..40cf2a8 100644 --- a/chs2t/src/chs2t-init-brakes-control.cpp +++ b/chs2t/src/chs2t-init-brakes-control.cpp @@ -5,6 +5,7 @@ #include "electropneumovalve-release.h" #include "handle-edt.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-init-pneumo-supply.cpp b/chs2t/src/chs2t-init-pneumo-supply.cpp index aea2788..e13def9 100644 --- a/chs2t/src/chs2t-init-pneumo-supply.cpp +++ b/chs2t/src/chs2t-init-pneumo-supply.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-load-config.cpp b/chs2t/src/chs2t-load-config.cpp index ddb62e5..a20c6c4 100644 --- a/chs2t/src/chs2t-load-config.cpp +++ b/chs2t/src/chs2t-load-config.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-process-debug.cpp b/chs2t/src/chs2t-process-debug.cpp index 251b1b8..f85c66d 100644 --- a/chs2t/src/chs2t-process-debug.cpp +++ b/chs2t/src/chs2t-process-debug.cpp @@ -5,6 +5,7 @@ #include "motor.h" #include "stepswitch.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-process-keyprocess.cpp b/chs2t/src/chs2t-process-keyprocess.cpp index f14618e..599c0f6 100644 --- a/chs2t/src/chs2t-process-keyprocess.cpp +++ b/chs2t/src/chs2t-process-keyprocess.cpp @@ -1,4 +1,6 @@ -#include "chs2t.h" +#include "chs2t.h" + +#include //------------------------------------------------------------------------------ // diff --git a/chs2t/src/chs2t-process-signals.cpp b/chs2t/src/chs2t-process-signals.cpp index 05c8dbb..a1a34ab 100644 --- a/chs2t/src/chs2t-process-signals.cpp +++ b/chs2t/src/chs2t-process-signals.cpp @@ -9,6 +9,8 @@ #include "sl2m.h" #include "stepswitch.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-process-sounds.cpp b/chs2t/src/chs2t-process-sounds.cpp index fbd0384..8ce0bd8 100644 --- a/chs2t/src/chs2t-process-sounds.cpp +++ b/chs2t/src/chs2t-process-sounds.cpp @@ -5,6 +5,8 @@ #include "motor.h" #include "sl2m.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-step-autopilot.cpp b/chs2t/src/chs2t-step-autopilot.cpp index 6c21b9e..a64dac5 100644 --- a/chs2t/src/chs2t-step-autopilot.cpp +++ b/chs2t/src/chs2t-step-autopilot.cpp @@ -4,6 +4,7 @@ #include "motor.h" #include "stepswitch.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-brakes-control.cpp b/chs2t/src/chs2t-step-brakes-control.cpp index e1586e0..25a1f9b 100644 --- a/chs2t/src/chs2t-step-brakes-control.cpp +++ b/chs2t/src/chs2t-step-brakes-control.cpp @@ -6,6 +6,7 @@ #include "generator.h" #include "handle-edt.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-pneumo-supply.cpp b/chs2t/src/chs2t-step-pneumo-supply.cpp index f27b590..3f361f8 100644 --- a/chs2t/src/chs2t-step-pneumo-supply.cpp +++ b/chs2t/src/chs2t-step-pneumo-supply.cpp @@ -2,6 +2,7 @@ #include "dako.h" +#include #include #include #include From 0e6866a695bc21f25acbbccf8fa246842b418d61 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 09:06:38 +0300 Subject: [PATCH 23/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20EPBControl=20=D0=B8=20EPBConverter=20?= =?UTF-8?q?=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 4 ++-- chs2t/src/chs2t-init-autopilot.cpp | 7 +++++-- chs2t/src/chs2t-init-brakes-epb.cpp | 3 +++ chs2t/src/chs2t-process-signals.cpp | 2 ++ chs2t/src/chs2t-step-autopilot.cpp | 1 + chs2t/src/chs2t-step-brakes-epb.cpp | 2 ++ 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index b47fd34..0db3ac5 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -29,8 +29,6 @@ #include #include #include -#include -#include #include "switchers-panel.h" #include "km-21kr2.h" @@ -42,6 +40,8 @@ class BrakeRegulator; class DCMotorCompressor; class DCMotorFan; class Dako; +class EPBControl; +class EPBConverter; class ElectroPneumoValveEmergency; class ElectroPneumoValveRelease; class EnergyCounter; diff --git a/chs2t/src/chs2t-init-autopilot.cpp b/chs2t/src/chs2t-init-autopilot.cpp index a272ffb..bf5c6fc 100644 --- a/chs2t/src/chs2t-init-autopilot.cpp +++ b/chs2t/src/chs2t-init-autopilot.cpp @@ -1,4 +1,7 @@ #include + +#include + #include //------------------------------------------------------------------------------ @@ -32,8 +35,8 @@ void CHS2T::initAutopilot(const QString &modules_dir, auto_feedback[cab_idx] = new chs2t_feedback_t(); connect(pantCtrlTimer, &Timer::process, this, &CHS2T::slotPantCtrl); - } - } + } + } } //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-init-brakes-epb.cpp b/chs2t/src/chs2t-init-brakes-epb.cpp index 5962372..01ea9db 100644 --- a/chs2t/src/chs2t-init-brakes-epb.cpp +++ b/chs2t/src/chs2t-init-brakes-epb.cpp @@ -1,5 +1,8 @@ #include "chs2t.h" +#include +#include + //------------------------------------------------------------------------ // //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-process-signals.cpp b/chs2t/src/chs2t-process-signals.cpp index a1a34ab..84b6aed 100644 --- a/chs2t/src/chs2t-process-signals.cpp +++ b/chs2t/src/chs2t-process-signals.cpp @@ -9,6 +9,8 @@ #include "sl2m.h" #include "stepswitch.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-step-autopilot.cpp b/chs2t/src/chs2t-step-autopilot.cpp index a64dac5..3ab4fa2 100644 --- a/chs2t/src/chs2t-step-autopilot.cpp +++ b/chs2t/src/chs2t-step-autopilot.cpp @@ -4,6 +4,7 @@ #include "motor.h" #include "stepswitch.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-brakes-epb.cpp b/chs2t/src/chs2t-step-brakes-epb.cpp index 4c76800..e5a6949 100644 --- a/chs2t/src/chs2t-step-brakes-epb.cpp +++ b/chs2t/src/chs2t-step-brakes-epb.cpp @@ -2,6 +2,8 @@ #include "handle-edt.h" +#include +#include #include #include From 9de03f16695ca70b68560af3fa2cb27f46dff9dd Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 09:09:39 +0300 Subject: [PATCH 24/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20ElectroAirDistributor=20=D0=B8=20Operating?= =?UTF-8?q?Rod=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 4 ++-- chs2t/src/chs2t-init-brake-devices.cpp | 1 + chs2t/src/chs2t-init-brakes-equipment.cpp | 1 + chs2t/src/chs2t-init-couplings.cpp | 2 ++ chs2t/src/chs2t-init-tumblers.cpp | 1 + chs2t/src/chs2t-process-debug.cpp | 1 + chs2t/src/chs2t-step-brakes-control.cpp | 1 + chs2t/src/chs2t-step-brakes-epb.cpp | 1 + chs2t/src/chs2t-step-brakes-equipment.cpp | 1 + chs2t/src/chs2t-step-couplings.cpp | 2 ++ 10 files changed, 13 insertions(+), 2 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index 0db3ac5..3c5b9f5 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -27,8 +27,6 @@ #include #include #include -#include -#include #include "switchers-panel.h" #include "km-21kr2.h" @@ -42,6 +40,7 @@ class DCMotorFan; class Dako; class EPBControl; class EPBConverter; +class ElectroAirDistributor; class ElectroPneumoValveEmergency; class ElectroPneumoValveRelease; class EnergyCounter; @@ -49,6 +48,7 @@ class Generator; class HandleEDT; class LocoCrane; class Motor; +class OperatingRod; class OverloadRelay; class Pantograph; class PhysToModbus; diff --git a/chs2t/src/chs2t-init-brake-devices.cpp b/chs2t/src/chs2t-init-brake-devices.cpp index 7761ad5..c6beb8e 100644 --- a/chs2t/src/chs2t-init-brake-devices.cpp +++ b/chs2t/src/chs2t-init-brake-devices.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-init-brakes-equipment.cpp b/chs2t/src/chs2t-init-brakes-equipment.cpp index 5c0935f..cc8b286 100644 --- a/chs2t/src/chs2t-init-brakes-equipment.cpp +++ b/chs2t/src/chs2t-init-brakes-equipment.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-init-couplings.cpp b/chs2t/src/chs2t-init-couplings.cpp index edd7a38..d553914 100644 --- a/chs2t/src/chs2t-init-couplings.cpp +++ b/chs2t/src/chs2t-init-couplings.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include + #include //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-init-tumblers.cpp b/chs2t/src/chs2t-init-tumblers.cpp index 1b39f23..2b21f5d 100644 --- a/chs2t/src/chs2t-init-tumblers.cpp +++ b/chs2t/src/chs2t-init-tumblers.cpp @@ -2,6 +2,7 @@ #include "handle-edt.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-process-debug.cpp b/chs2t/src/chs2t-process-debug.cpp index f85c66d..0880ac0 100644 --- a/chs2t/src/chs2t-process-debug.cpp +++ b/chs2t/src/chs2t-process-debug.cpp @@ -5,6 +5,7 @@ #include "motor.h" #include "stepswitch.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-brakes-control.cpp b/chs2t/src/chs2t-step-brakes-control.cpp index 25a1f9b..c84760b 100644 --- a/chs2t/src/chs2t-step-brakes-control.cpp +++ b/chs2t/src/chs2t-step-brakes-control.cpp @@ -6,6 +6,7 @@ #include "generator.h" #include "handle-edt.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-brakes-epb.cpp b/chs2t/src/chs2t-step-brakes-epb.cpp index e5a6949..a48d57f 100644 --- a/chs2t/src/chs2t-step-brakes-epb.cpp +++ b/chs2t/src/chs2t-step-brakes-epb.cpp @@ -2,6 +2,7 @@ #include "handle-edt.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-brakes-equipment.cpp b/chs2t/src/chs2t-step-brakes-equipment.cpp index 40c111a..a69b87c 100644 --- a/chs2t/src/chs2t-step-brakes-equipment.cpp +++ b/chs2t/src/chs2t-step-brakes-equipment.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-couplings.cpp b/chs2t/src/chs2t-step-couplings.cpp index cda298d..c26d7cf 100644 --- a/chs2t/src/chs2t-step-couplings.cpp +++ b/chs2t/src/chs2t-step-couplings.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include + //------------------------------------------------------------------------ // //------------------------------------------------------------------------ From d0f592a049d2dfba29e93901fc7b726d0c9337a9 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 09:13:13 +0300 Subject: [PATCH 25/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20Coupling=20=D0=B8=20BrakeMech=20=D1=87?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 5 ++--- chs2t/src/chs2t-init-brakes-equipment.cpp | 1 + chs2t/src/chs2t-init-couplings.cpp | 1 + chs2t/src/chs2t-process-debug.cpp | 2 ++ chs2t/src/chs2t-process-signals.cpp | 1 + chs2t/src/chs2t-step-autopilot.cpp | 1 + chs2t/src/chs2t-step-brakes-control.cpp | 1 + chs2t/src/chs2t-step-brakes-equipment.cpp | 1 + chs2t/src/chs2t-step-couplings.cpp | 1 + chs2t/src/chs2t.cpp | 1 + 10 files changed, 12 insertions(+), 3 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index 3c5b9f5..3022f43 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -24,9 +24,6 @@ #include #include #include -#include -#include -#include #include "switchers-panel.h" #include "km-21kr2.h" @@ -34,7 +31,9 @@ #include class Blinds; +class BrakeMech; class BrakeRegulator; +class Coupling; class DCMotorCompressor; class DCMotorFan; class Dako; diff --git a/chs2t/src/chs2t-init-brakes-equipment.cpp b/chs2t/src/chs2t-init-brakes-equipment.cpp index cc8b286..7570cf3 100644 --- a/chs2t/src/chs2t-init-brakes-equipment.cpp +++ b/chs2t/src/chs2t-init-brakes-equipment.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-init-couplings.cpp b/chs2t/src/chs2t-init-couplings.cpp index d553914..52cd757 100644 --- a/chs2t/src/chs2t-init-couplings.cpp +++ b/chs2t/src/chs2t-init-couplings.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include diff --git a/chs2t/src/chs2t-process-debug.cpp b/chs2t/src/chs2t-process-debug.cpp index 0880ac0..28bc923 100644 --- a/chs2t/src/chs2t-process-debug.cpp +++ b/chs2t/src/chs2t-process-debug.cpp @@ -5,6 +5,8 @@ #include "motor.h" #include "stepswitch.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-process-signals.cpp b/chs2t/src/chs2t-process-signals.cpp index 84b6aed..f35fca5 100644 --- a/chs2t/src/chs2t-process-signals.cpp +++ b/chs2t/src/chs2t-process-signals.cpp @@ -9,6 +9,7 @@ #include "sl2m.h" #include "stepswitch.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-autopilot.cpp b/chs2t/src/chs2t-step-autopilot.cpp index 3ab4fa2..8237559 100644 --- a/chs2t/src/chs2t-step-autopilot.cpp +++ b/chs2t/src/chs2t-step-autopilot.cpp @@ -4,6 +4,7 @@ #include "motor.h" #include "stepswitch.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-brakes-control.cpp b/chs2t/src/chs2t-step-brakes-control.cpp index c84760b..015a15d 100644 --- a/chs2t/src/chs2t-step-brakes-control.cpp +++ b/chs2t/src/chs2t-step-brakes-control.cpp @@ -6,6 +6,7 @@ #include "generator.h" #include "handle-edt.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-brakes-equipment.cpp b/chs2t/src/chs2t-step-brakes-equipment.cpp index a69b87c..a4fb5e4 100644 --- a/chs2t/src/chs2t-step-brakes-equipment.cpp +++ b/chs2t/src/chs2t-step-brakes-equipment.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-couplings.cpp b/chs2t/src/chs2t-step-couplings.cpp index c26d7cf..06806db 100644 --- a/chs2t/src/chs2t-step-couplings.cpp +++ b/chs2t/src/chs2t-step-couplings.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include //------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t.cpp b/chs2t/src/chs2t.cpp index 3cb3f5b..485d564 100644 --- a/chs2t/src/chs2t.cpp +++ b/chs2t/src/chs2t.cpp @@ -16,6 +16,7 @@ #include "chs2t-signals.h" #include "convert-physics-to-modbus.h" +#include #include #include "filesystem.h" From 2b2add79f3e8c9ae10e57217f1bd52f6200e98c2 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 09:18:23 +0300 Subject: [PATCH 26/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20BrakeCrane=20=D0=B8=20AutoTrainStop=20?= =?UTF-8?q?=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 6 ++---- chs2t/src/chs2t-init-autostart.cpp | 1 + chs2t/src/chs2t-init-brake-devices.cpp | 2 ++ chs2t/src/chs2t-init-brakes-control.cpp | 1 + chs2t/src/chs2t-init-safety-device.cpp | 1 + chs2t/src/chs2t-init-tumblers.cpp | 1 + chs2t/src/chs2t-init.cpp | 3 ++- chs2t/src/chs2t-load-config.cpp | 2 ++ chs2t/src/chs2t-process-debug.cpp | 2 ++ chs2t/src/chs2t-process-keyprocess.cpp | 2 ++ chs2t/src/chs2t-process-signals.cpp | 2 ++ chs2t/src/chs2t-process-sounds.cpp | 2 ++ chs2t/src/chs2t-step-autopilot.cpp | 1 + chs2t/src/chs2t-step-brakes-control.cpp | 1 + chs2t/src/chs2t-step-brakes-epb.cpp | 1 + chs2t/src/chs2t-step-brakes-equipment.cpp | 1 + chs2t/src/chs2t-step-pneumo-supply.cpp | 1 + chs2t/src/chs2t-step-safety-device.cpp | 1 + chs2t/src/chs2t-step.cpp | 1 + chs2t/src/chs2t.cpp | 1 + 20 files changed, 28 insertions(+), 5 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index 3022f43..9384b77 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -20,17 +20,15 @@ #include #include #include -#include -#include -#include -#include #include "switchers-panel.h" #include "km-21kr2.h" #include +class AutoTrainStop; class Blinds; +class BrakeCrane; class BrakeMech; class BrakeRegulator; class Coupling; diff --git a/chs2t/src/chs2t-init-autostart.cpp b/chs2t/src/chs2t-init-autostart.cpp index a4b0d89..ae1d0b2 100644 --- a/chs2t/src/chs2t-init-autostart.cpp +++ b/chs2t/src/chs2t-init-autostart.cpp @@ -1,5 +1,6 @@ #include +#include #include #include diff --git a/chs2t/src/chs2t-init-brake-devices.cpp b/chs2t/src/chs2t-init-brake-devices.cpp index c6beb8e..f461528 100644 --- a/chs2t/src/chs2t-init-brake-devices.cpp +++ b/chs2t/src/chs2t-init-brake-devices.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-init-brakes-control.cpp b/chs2t/src/chs2t-init-brakes-control.cpp index 40cf2a8..0d05aa1 100644 --- a/chs2t/src/chs2t-init-brakes-control.cpp +++ b/chs2t/src/chs2t-init-brakes-control.cpp @@ -5,6 +5,7 @@ #include "electropneumovalve-release.h" #include "handle-edt.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-init-safety-device.cpp b/chs2t/src/chs2t-init-safety-device.cpp index e91f242..f4783f5 100644 --- a/chs2t/src/chs2t-init-safety-device.cpp +++ b/chs2t/src/chs2t-init-safety-device.cpp @@ -3,6 +3,7 @@ #include "alsn-ukbm.h" #include "sl2m.h" +#include #include #include diff --git a/chs2t/src/chs2t-init-tumblers.cpp b/chs2t/src/chs2t-init-tumblers.cpp index 2b21f5d..397dc91 100644 --- a/chs2t/src/chs2t-init-tumblers.cpp +++ b/chs2t/src/chs2t-init-tumblers.cpp @@ -2,6 +2,7 @@ #include "handle-edt.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-init.cpp b/chs2t/src/chs2t-init.cpp index af65a5b..6db8e9c 100644 --- a/chs2t/src/chs2t-init.cpp +++ b/chs2t/src/chs2t-init.cpp @@ -99,7 +99,8 @@ void CHS2T::initEDT(const QString& modules_dir, const QString& custom_cfg_dir) //------------------------------------------------------------------------------ void CHS2T::initOtherEquipment(const QString& modules_dir, const QString& custom_cfg_dir) { - (void) modules_dir; + (void)modules_dir; + (void)custom_cfg_dir; for (auto cab_idx : {CAB1, CAB2}) { diff --git a/chs2t/src/chs2t-load-config.cpp b/chs2t/src/chs2t-load-config.cpp index a20c6c4..8215ca4 100644 --- a/chs2t/src/chs2t-load-config.cpp +++ b/chs2t/src/chs2t-load-config.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-process-debug.cpp b/chs2t/src/chs2t-process-debug.cpp index 28bc923..0c77549 100644 --- a/chs2t/src/chs2t-process-debug.cpp +++ b/chs2t/src/chs2t-process-debug.cpp @@ -5,6 +5,8 @@ #include "motor.h" #include "stepswitch.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-process-keyprocess.cpp b/chs2t/src/chs2t-process-keyprocess.cpp index 599c0f6..0618eb8 100644 --- a/chs2t/src/chs2t-process-keyprocess.cpp +++ b/chs2t/src/chs2t-process-keyprocess.cpp @@ -1,5 +1,7 @@ #include "chs2t.h" +#include +#include #include //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-process-signals.cpp b/chs2t/src/chs2t-process-signals.cpp index f35fca5..d2c482d 100644 --- a/chs2t/src/chs2t-process-signals.cpp +++ b/chs2t/src/chs2t-process-signals.cpp @@ -9,6 +9,8 @@ #include "sl2m.h" #include "stepswitch.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-process-sounds.cpp b/chs2t/src/chs2t-process-sounds.cpp index 8ce0bd8..b6a3dc0 100644 --- a/chs2t/src/chs2t-process-sounds.cpp +++ b/chs2t/src/chs2t-process-sounds.cpp @@ -5,6 +5,8 @@ #include "motor.h" #include "sl2m.h" +#include +#include #include #include #include diff --git a/chs2t/src/chs2t-step-autopilot.cpp b/chs2t/src/chs2t-step-autopilot.cpp index 8237559..ccd9fea 100644 --- a/chs2t/src/chs2t-step-autopilot.cpp +++ b/chs2t/src/chs2t-step-autopilot.cpp @@ -4,6 +4,7 @@ #include "motor.h" #include "stepswitch.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-brakes-control.cpp b/chs2t/src/chs2t-step-brakes-control.cpp index 015a15d..1390d10 100644 --- a/chs2t/src/chs2t-step-brakes-control.cpp +++ b/chs2t/src/chs2t-step-brakes-control.cpp @@ -6,6 +6,7 @@ #include "generator.h" #include "handle-edt.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-brakes-epb.cpp b/chs2t/src/chs2t-step-brakes-epb.cpp index a48d57f..2bc2af1 100644 --- a/chs2t/src/chs2t-step-brakes-epb.cpp +++ b/chs2t/src/chs2t-step-brakes-epb.cpp @@ -2,6 +2,7 @@ #include "handle-edt.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-brakes-equipment.cpp b/chs2t/src/chs2t-step-brakes-equipment.cpp index a4fb5e4..3c4e8d3 100644 --- a/chs2t/src/chs2t-step-brakes-equipment.cpp +++ b/chs2t/src/chs2t-step-brakes-equipment.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-pneumo-supply.cpp b/chs2t/src/chs2t-step-pneumo-supply.cpp index 3f361f8..022d1bb 100644 --- a/chs2t/src/chs2t-step-pneumo-supply.cpp +++ b/chs2t/src/chs2t-step-pneumo-supply.cpp @@ -2,6 +2,7 @@ #include "dako.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-safety-device.cpp b/chs2t/src/chs2t-step-safety-device.cpp index 5ab7096..7baf0a5 100644 --- a/chs2t/src/chs2t-step-safety-device.cpp +++ b/chs2t/src/chs2t-step-safety-device.cpp @@ -3,6 +3,7 @@ #include "alsn-ukbm.h" #include "sl2m.h" +#include #include //------------------------------------------------------------------------------ diff --git a/chs2t/src/chs2t-step.cpp b/chs2t/src/chs2t-step.cpp index ed61399..ea38e00 100644 --- a/chs2t/src/chs2t-step.cpp +++ b/chs2t/src/chs2t-step.cpp @@ -9,6 +9,7 @@ #include "pusk-rez.h" #include "stepswitch.h" +#include #include #include #include diff --git a/chs2t/src/chs2t.cpp b/chs2t/src/chs2t.cpp index 485d564..3239ae8 100644 --- a/chs2t/src/chs2t.cpp +++ b/chs2t/src/chs2t.cpp @@ -16,6 +16,7 @@ #include "chs2t-signals.h" #include "convert-physics-to-modbus.h" +#include #include #include From 86d10a9dfddd59f32f26296d760f00744b745e6e Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 09:21:19 +0300 Subject: [PATCH 27/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20DecoderALSN=20=D0=B8=20CoilALSN=20=D1=87?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 4 ++-- chs2t/src/chs2t-init-safety-device.cpp | 2 ++ chs2t/src/chs2t-process-debug.cpp | 1 + chs2t/src/chs2t-step-autopilot.cpp | 1 + chs2t/src/chs2t-step-safety-device.cpp | 2 ++ 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index 9384b77..ca9ab3c 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -18,8 +18,6 @@ #include #include #include -#include -#include #include "switchers-panel.h" #include "km-21kr2.h" @@ -31,10 +29,12 @@ 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; diff --git a/chs2t/src/chs2t-init-safety-device.cpp b/chs2t/src/chs2t-init-safety-device.cpp index f4783f5..db8c9b2 100644 --- a/chs2t/src/chs2t-init-safety-device.cpp +++ b/chs2t/src/chs2t-init-safety-device.cpp @@ -3,6 +3,8 @@ #include "alsn-ukbm.h" #include "sl2m.h" +#include +#include #include #include diff --git a/chs2t/src/chs2t-process-debug.cpp b/chs2t/src/chs2t-process-debug.cpp index 0c77549..be084e1 100644 --- a/chs2t/src/chs2t-process-debug.cpp +++ b/chs2t/src/chs2t-process-debug.cpp @@ -5,6 +5,7 @@ #include "motor.h" #include "stepswitch.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-autopilot.cpp b/chs2t/src/chs2t-step-autopilot.cpp index ccd9fea..a267dad 100644 --- a/chs2t/src/chs2t-step-autopilot.cpp +++ b/chs2t/src/chs2t-step-autopilot.cpp @@ -4,6 +4,7 @@ #include "motor.h" #include "stepswitch.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-safety-device.cpp b/chs2t/src/chs2t-step-safety-device.cpp index 7baf0a5..6cd8626 100644 --- a/chs2t/src/chs2t-step-safety-device.cpp +++ b/chs2t/src/chs2t-step-safety-device.cpp @@ -3,6 +3,8 @@ #include "alsn-ukbm.h" #include "sl2m.h" +#include +#include #include #include From e645786e687442c4c52271bc0e6a61f5b346de53 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 14 May 2026 09:23:58 +0300 Subject: [PATCH 28/42] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20AirDistributor=20=D1=87=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=B7=20forward-declare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 4 +--- chs2t/src/chs2t-init-brake-devices.cpp | 1 + chs2t/src/chs2t-init-brakes-equipment.cpp | 1 + chs2t/src/chs2t-step-brakes-equipment.cpp | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index ca9ab3c..27392bb 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -14,16 +14,14 @@ #define CHS2T_H #include -#include #include -#include -#include #include "switchers-panel.h" #include "km-21kr2.h" #include +class AirDistributor; class AutoTrainStop; class Blinds; class BrakeCrane; diff --git a/chs2t/src/chs2t-init-brake-devices.cpp b/chs2t/src/chs2t-init-brake-devices.cpp index f461528..5b9492b 100644 --- a/chs2t/src/chs2t-init-brake-devices.cpp +++ b/chs2t/src/chs2t-init-brake-devices.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-init-brakes-equipment.cpp b/chs2t/src/chs2t-init-brakes-equipment.cpp index 7570cf3..01597a1 100644 --- a/chs2t/src/chs2t-init-brakes-equipment.cpp +++ b/chs2t/src/chs2t-init-brakes-equipment.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include #include diff --git a/chs2t/src/chs2t-step-brakes-equipment.cpp b/chs2t/src/chs2t-step-brakes-equipment.cpp index 3c4e8d3..fded4e8 100644 --- a/chs2t/src/chs2t-step-brakes-equipment.cpp +++ b/chs2t/src/chs2t-step-brakes-equipment.cpp @@ -1,5 +1,6 @@ #include "chs2t.h" +#include #include #include #include From a15619eacca68b56e21feb3e4e6ad2e4e0f878fc Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Mon, 18 May 2026 06:28:05 +0300 Subject: [PATCH 29/42] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D1=83=20Air?= =?UTF-8?q?Distrubutor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/CMakeLists.txt | 2 ++ chs2t/src/chs2t-init-brakes-equipment.cpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/chs2t/CMakeLists.txt b/chs2t/CMakeLists.txt index 66f6032..76b26a9 100644 --- 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/src/chs2t-init-brakes-equipment.cpp b/chs2t/src/chs2t-init-brakes-equipment.cpp index 01597a1..c054fd8 100644 --- a/chs2t/src/chs2t-init-brakes-equipment.cpp +++ b/chs2t/src/chs2t-init-brakes-equipment.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include @@ -20,7 +21,7 @@ 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); // Электровоздухораспределитель From c51deaf0c52b43021271546bb86e9f51140f5069 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Mon, 18 May 2026 07:42:41 +0300 Subject: [PATCH 30/42] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D1=83=20Aut?= =?UTF-8?q?oTrainStop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/src/chs2t-init-safety-device.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chs2t/src/chs2t-init-safety-device.cpp b/chs2t/src/chs2t-init-safety-device.cpp index db8c9b2..7e570e4 100644 --- a/chs2t/src/chs2t-init-safety-device.cpp +++ b/chs2t/src/chs2t-init-safety-device.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include @@ -41,7 +42,7 @@ void CHS2T::initSafetyDevices(const QString& modules_dir, const QString& custom_ speed_meter[cab_idx]->read_config("3SL-2M", custom_cfg_dir); // ЭПК автостопа - epk[cab_idx] = loadAutoTrainStop(modules_dir + QDir::separator() + "epk150"); + epk[cab_idx] = LOAD_MODULE(AutoTrainStop, modules_dir + QDir::separator() + "epk150"); epk[cab_idx]->read_config("epk150"); // Дешифратор АЛСН From e0866312e37d1440ed05749cff54516d602dad8f Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Mon, 18 May 2026 08:19:48 +0300 Subject: [PATCH 31/42] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D1=83=20Aut?= =?UTF-8?q?opilot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t-autopilot/CMakeLists.txt | 2 ++ chs2t-autopilot/src/chs2t-autopilot.cpp | 4 +++- chs2t/src/chs2t-init-autopilot.cpp | 8 +++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/chs2t-autopilot/CMakeLists.txt b/chs2t-autopilot/CMakeLists.txt index c187374..e04c6ef 100644 --- 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 index b8c7771..9a26b70 100644 --- a/chs2t-autopilot/src/chs2t-autopilot.cpp +++ b/chs2t-autopilot/src/chs2t-autopilot.cpp @@ -1,5 +1,7 @@ #include +#include + //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ @@ -285,4 +287,4 @@ void CHS2TAutopilot::slotPosDelay() } } -GET_AUTOPILOT(CHS2TAutopilot) +GET_MODULE(CHS2TAutopilot) diff --git a/chs2t/src/chs2t-init-autopilot.cpp b/chs2t/src/chs2t-init-autopilot.cpp index bf5c6fc..97f49b9 100644 --- a/chs2t/src/chs2t-init-autopilot.cpp +++ b/chs2t/src/chs2t-init-autopilot.cpp @@ -1,6 +1,7 @@ #include #include +#include #include @@ -13,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) { From d79d884c4de0dbf0a9a81b80226061c1b14a9579 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Mon, 18 May 2026 09:22:57 +0300 Subject: [PATCH 32/42] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB?= =?UTF-8?q?=D0=B8=D1=88=D0=BD=D0=B8=D0=B9=20QObject?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t-equipment/include/alsn-ukbm.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/chs2t-equipment/include/alsn-ukbm.h b/chs2t-equipment/include/alsn-ukbm.h index 08fa229..7c0c2df 100644 --- a/chs2t-equipment/include/alsn-ukbm.h +++ b/chs2t-equipment/include/alsn-ukbm.h @@ -18,13 +18,11 @@ class Timer; //------------------------------------------------------------------------------ class SafetyDevice : public Device { - Q_OBJECT - public: explicit SafetyDevice(QObject* parent = nullptr); - ~SafetyDevice(); + virtual ~SafetyDevice() override; virtual void step(double t, double dt) override; From fdd9c9a2fdbd50e299d49469913599c8ef2276c2 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Tue, 19 May 2026 06:39:30 +0300 Subject: [PATCH 33/42] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D1=83=20Cou?= =?UTF-8?q?pling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/src/chs2t-init-couplings.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/chs2t/src/chs2t-init-couplings.cpp b/chs2t/src/chs2t-init-couplings.cpp index 52cd757..fc1549d 100644 --- a/chs2t/src/chs2t-init-couplings.cpp +++ b/chs2t/src/chs2t-init-couplings.cpp @@ -2,6 +2,7 @@ #include #include +#include #include @@ -13,10 +14,13 @@ void CHS2T::initCouplings(const QString& modules_dir, const QString& custom_cfg_ (void) custom_cfg_dir; // Сцепные устройства - coupling_fwd = loadCoupling(modules_dir + QDir::separator() + coupling_module_name); + coupling_fwd = LOAD_MODULE(Coupling, + modules_dir + QDir::separator() + coupling_module_name); coupling_fwd->read_config(coupling_config_name); forward_connectors.push_back(coupling_fwd); - coupling_bwd = loadCoupling(modules_dir + QDir::separator() + coupling_module_name); + + coupling_bwd = LOAD_MODULE(Coupling, + modules_dir + QDir::separator() + coupling_module_name); coupling_bwd->read_config(coupling_config_name); backward_connectors.push_back(coupling_bwd); From 38fbb8ed25521d29018d713e95c5e3c01fc0f570 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Tue, 19 May 2026 07:43:24 +0300 Subject: [PATCH 34/42] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D1=83=20Bra?= =?UTF-8?q?keCrane?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/src/chs2t-init-brakes-control.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chs2t/src/chs2t-init-brakes-control.cpp b/chs2t/src/chs2t-init-brakes-control.cpp index 0d05aa1..25a1db4 100644 --- a/chs2t/src/chs2t-init-brakes-control.cpp +++ b/chs2t/src/chs2t-init-brakes-control.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include @@ -32,7 +33,7 @@ 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); From 7f140f78ec195974f455e5a8d75664822e588837 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Tue, 19 May 2026 08:13:21 +0300 Subject: [PATCH 35/42] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D1=83=20Ele?= =?UTF-8?q?ctroAirDistributor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/src/chs2t-init-brakes-equipment.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chs2t/src/chs2t-init-brakes-equipment.cpp b/chs2t/src/chs2t-init-brakes-equipment.cpp index c054fd8..392c5c3 100644 --- a/chs2t/src/chs2t-init-brakes-equipment.cpp +++ b/chs2t/src/chs2t-init-brakes-equipment.cpp @@ -25,7 +25,8 @@ void CHS2T::initBrakesEquipment(const QString& modules_dir, const QString& custo 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); // Запасный резервуар From 0169d973627645739799f8dc580ab05668e19e81 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Tue, 19 May 2026 08:25:17 +0300 Subject: [PATCH 36/42] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D1=83=20Loc?= =?UTF-8?q?oCrane?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/src/chs2t-init-brakes-control.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chs2t/src/chs2t-init-brakes-control.cpp b/chs2t/src/chs2t-init-brakes-control.cpp index 25a1db4..55aa41d 100644 --- a/chs2t/src/chs2t-init-brakes-control.cpp +++ b/chs2t/src/chs2t-init-brakes-control.cpp @@ -38,7 +38,7 @@ void CHS2T::initBrakesControl(const QString& modules_dir, const QString& custom_ 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); From 2f6f059aae02d0756eee8c8b28558de260702e3c Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Tue, 19 May 2026 08:39:39 +0300 Subject: [PATCH 37/42] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D1=83=20Pne?= =?UTF-8?q?umoHoseEPB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/src/chs2t-init-brakes-equipment.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/chs2t/src/chs2t-init-brakes-equipment.cpp b/chs2t/src/chs2t-init-brakes-equipment.cpp index 392c5c3..5855460 100644 --- a/chs2t/src/chs2t-init-brakes-equipment.cpp +++ b/chs2t/src/chs2t-init-brakes-equipment.cpp @@ -54,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); } From 59d7c48bbc9e629a5dc1a18b4bca4b0687664a06 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Tue, 19 May 2026 09:29:43 +0300 Subject: [PATCH 38/42] =?UTF-8?q?=D0=97=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D1=83=20Veh?= =?UTF-8?q?icle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/src/chs2t.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/chs2t/src/chs2t.cpp b/chs2t/src/chs2t.cpp index 3239ae8..cfd0955 100644 --- a/chs2t/src/chs2t.cpp +++ b/chs2t/src/chs2t.cpp @@ -22,6 +22,8 @@ #include "filesystem.h" +#include + //------------------------------------------------------------------------------ // Конструктор //------------------------------------------------------------------------------ @@ -198,4 +200,4 @@ void CHS2T::hardwareOutput() feedback_signals.analogSignal[4].cur_value = TC_manometer->getModbus(brake_mech[0]->getBCpressure()); } -GET_VEHICLE(CHS2T) +GET_MODULE(CHS2T) From 795eedf6ecfe59fbaec78f016837baeb8d2b3901 Mon Sep 17 00:00:00 2001 From: Mikhail Arepev Date: Tue, 19 May 2026 19:20:41 +0300 Subject: [PATCH 39/42] =?UTF-8?q?=D0=A3=D0=9A=D0=91=D0=9C=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D1=80=D1=8F=D0=B5=D1=82=20=D1=81=D0=BA=D0=BE?= =?UTF-8?q?=D1=80=D0=BE=D1=81=D1=82=D1=8C=20=D1=81=20=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D0=B0=D1=81=D0=BE=D0=BC=201=20=D0=BA=D0=BC=D1=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t-equipment/src/alsn-ukbm.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/chs2t-equipment/src/alsn-ukbm.cpp b/chs2t-equipment/src/alsn-ukbm.cpp index 008d95c..eb86f67 100644 --- 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(); From 85c2c1351a82b9a63beddb5a55ad9e499bea15f7 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Wed, 20 May 2026 08:13:03 +0300 Subject: [PATCH 40/42] =?UTF-8?q?=D0=92=D0=B5=D1=80=D0=BD=D1=83=D0=BB=20al?= =?UTF-8?q?sn-ukbm=20=D0=BA=D0=B0=D0=BA=20=D0=B1=D1=8B=D0=BB=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t-equipment/include/alsn-ukbm.h | 96 ++++++----- chs2t-equipment/src/alsn-ukbm.cpp | 241 +++++++--------------------- 2 files changed, 113 insertions(+), 224 deletions(-) diff --git a/chs2t-equipment/include/alsn-ukbm.h b/chs2t-equipment/include/alsn-ukbm.h index 7c0c2df..26ae72d 100644 --- a/chs2t-equipment/include/alsn-ukbm.h +++ b/chs2t-equipment/include/alsn-ukbm.h @@ -1,17 +1,16 @@ #ifndef ALSN_UKBM_H #define ALSN_UKBM_H -#include -#include -#include +#include "device.h" -#include - -#include -#include - -class CfgReader; -class Timer; +enum +{ + RED_LAMP = 0, + RED_YELLOW_LAMP = 1, + YELLOW_LAMP = 2, + GREEN_LAMP = 3, + WHITE_LAMP = 4 +}; //------------------------------------------------------------------------------ // @@ -20,51 +19,48 @@ class SafetyDevice : public Device { public: - explicit SafetyDevice(QObject* parent = nullptr); + SafetyDevice(QObject *parent = Q_NULLPTR); - virtual ~SafetyDevice() override; + ~SafetyDevice(); - virtual void step(double t, double dt) override; + void step(double t, double dt) override; - /// Приём кода АЛСН - void setAlsnCode(int code_alsn); + /// Прием кода АЛСН + void setAlsnCode(int code_alsn) + { + old_code_alsn = this->code_alsn; + this->code_alsn = code_alsn; + }; - /// Приём состояния РБ - void setRBstate(bool state); + /// Прием состояния РБ + void setRBstate(bool state) { state_RB = state; }; - /// Приём состояния РБС - void setRBSstate(bool state); + /// Прием состояния РБС + void setRBSstate(bool state) { state_RBS = state; }; - /// Приём скорости от скоростемера - void setVelocity(double v); + /// Прием скорости от скоростемера + void setVelocity(double v) { v_kmh = v * Physics::kmh; } - void setKeyEPK(bool key_epk); + void setKeyEPK(bool key_epk) { this->key_epk = key_epk; } /// Выдача состояния цепи удерживающей катушки ЭПК - bool getEPKstate() const; - - float getRedLamp() const; - float getRedYellowLamp() const; - float getYellowLamp() const; - float getGreenLamp() const; - float getWhiteLamp() const; + bool getEPKstate() { return epk_state.getState(); }; - /// Приём сигнала от переключателя маневрового режима - void setShuntingModeState(bool is_shunting_mode); + float getGreenLamp() const { return lamps[GREEN_LAMP]; } -private: - - virtual void preStep(state_vector_t& Y, double t) override; + float getYellowLamp() const { return lamps[YELLOW_LAMP]; } - virtual void ode_system(const state_vector_t& Y, state_vector_t& dYdt, double t) override; + float getRedYellowLamp() const { return lamps[RED_YELLOW_LAMP]; } - virtual void load_config(CfgReader& cfg) override; + float getRedLamp() const { return lamps[RED_LAMP]; } - void alsn_process(int code_alsn); - - void off_all_lamps(); + float getWhiteLamp() const { return lamps[WHITE_LAMP]; } - void lamp_on(std::size_t lamp_idx); + /// Прием сигнала от переключателя маневрового режима + void setShuntingModeState(bool is_shunting_mode) + { + this->is_shunting_mode = is_shunting_mode; + } private: @@ -88,9 +84,25 @@ class SafetyDevice : public Device Trigger epk_state; - Timer* safety_timer; + Timer *safety_timer; + + virtual void preStep(state_vector_t &Y, double t) override; + + virtual void ode_system(const state_vector_t &Y, state_vector_t &dYdt, double t) override; + + virtual void load_config(CfgReader &cfg) override; + + void alsn_process(int code_alsn); + + void off_all_lamps(); + + void lamp_on(size_t lamp_idx); + + bool is_shunting_mode = false; + +private slots: - bool is_shunting_mode; + void onSafetyTimer(); }; #endif // ALSN_UKBM_H diff --git a/chs2t-equipment/src/alsn-ukbm.cpp b/chs2t-equipment/src/alsn-ukbm.cpp index b293e08..eb86f67 100644 --- a/chs2t-equipment/src/alsn-ukbm.cpp +++ b/chs2t-equipment/src/alsn-ukbm.cpp @@ -1,164 +1,47 @@ #include "alsn-ukbm.h" -#include -#include -#include -#include - -#include - -#include -#include - -enum -{ - RED_LAMP, - RED_YELLOW_LAMP, - YELLOW_LAMP, - GREEN_LAMP, - WHITE_LAMP -}; - //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ -SafetyDevice::SafetyDevice(QObject* parent) - : Device{parent} - , code_alsn{1} - , old_code_alsn{1} - , state_RB{false} - , state_RBS{false} - , state_EPK{false} - , v_kmh{0.0} - , key_epk{false} - , is_shunting_mode{false} +SafetyDevice::SafetyDevice(QObject *parent) : Device(parent) + , code_alsn(1) + , old_code_alsn(1) + , state_RB(false) + , state_RBS(false) + , state_EPK(false) + , v_kmh(0.0) + , key_epk(false) { epk_state.reset(); - safety_timer = new Timer{45.0, false, this}; - connect(safety_timer, &Timer::process, [this]() -> void { - epk_state.reset(); - }); -} - -//------------------------------------------------------------------------------ -// -//------------------------------------------------------------------------------ -SafetyDevice::~SafetyDevice() = default; - -//------------------------------------------------------------------------------ -// -//------------------------------------------------------------------------------ -void SafetyDevice::step(double t, double dt) -{ - safety_timer->step(t, dt); - Device::step(t, dt); -} - -//------------------------------------------------------------------------------ -// Приём кода АЛСН -//------------------------------------------------------------------------------ -void SafetyDevice::setAlsnCode(int code_alsn) -{ - old_code_alsn = this->code_alsn; - this->code_alsn = code_alsn; -} - -//------------------------------------------------------------------------------ -// Приём состояния РБ -//------------------------------------------------------------------------------ -void SafetyDevice::setRBstate(bool state) -{ - state_RB = state; -} - -//------------------------------------------------------------------------------ -// Приём состояния РБС -//------------------------------------------------------------------------------ -void SafetyDevice::setRBSstate(bool state) -{ - state_RBS = state; -} - -//------------------------------------------------------------------------------ -// Приём скорости от скоростемера -//------------------------------------------------------------------------------ -void SafetyDevice::setVelocity(double v) -{ - v_kmh = v * Physics::kmh; + safety_timer = new Timer(45.0, false); + connect(safety_timer, &Timer::process, this, &SafetyDevice::onSafetyTimer); } //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ -void SafetyDevice::setKeyEPK(bool key_epk) +SafetyDevice::~SafetyDevice() { - this->key_epk = key_epk; -} -//------------------------------------------------------------------------------ -// Выдача состояния цепи удерживающей катушки ЭПК -//------------------------------------------------------------------------------ -bool SafetyDevice::getEPKstate() const -{ - return epk_state.getState(); } //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ -float SafetyDevice::getRedLamp() const -{ - return lamps[RED_LAMP]; -} - -//------------------------------------------------------------------------------ -// -//------------------------------------------------------------------------------ -float SafetyDevice::getRedYellowLamp() const -{ - return lamps[RED_YELLOW_LAMP]; -} - -//------------------------------------------------------------------------------ -// -//------------------------------------------------------------------------------ -float SafetyDevice::getYellowLamp() const -{ - return lamps[YELLOW_LAMP]; -} - -//------------------------------------------------------------------------------ -// -//------------------------------------------------------------------------------ -float SafetyDevice::getGreenLamp() const -{ - return lamps[GREEN_LAMP]; -} - -//------------------------------------------------------------------------------ -// -//------------------------------------------------------------------------------ -float SafetyDevice::getWhiteLamp() const -{ - return lamps[WHITE_LAMP]; -} - -//------------------------------------------------------------------------------ -// Приём сигнала от переключателя маневрового режима -//------------------------------------------------------------------------------ -void SafetyDevice::setShuntingModeState(bool is_shunting_mode) +void SafetyDevice::step(double t, double dt) { - this->is_shunting_mode = is_shunting_mode; + safety_timer->step(t, dt); + Device::step(t, dt); } //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ -void SafetyDevice::preStep(state_vector_t& Y, double t) +void SafetyDevice::preStep(state_vector_t &Y, double t) { - (void)Y; - (void)t; + Q_UNUSED(Y) + Q_UNUSED(t) // Ничего не делаем при выключенном ЭПК if (!key_epk) @@ -168,15 +51,11 @@ 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) - { epk_state.reset(); - } // Отрезаем сигнал с дешифратора АЛСН при маневровом режиме if (is_shunting_mode) @@ -192,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; } @@ -200,9 +79,7 @@ void SafetyDevice::preStep(state_vector_t& Y, double t) else { if (!is_red.getState()) - { lamp_on(WHITE_LAMP); - } } } @@ -211,13 +88,13 @@ void SafetyDevice::preStep(state_vector_t& Y, double t) if (code_alsn == 0) { // Отключено, до выяснения реальной логики работы - // if (v_kmh > 40.0) - // { - // epk_state.reset(); - // return; - // } + /*if (v_kmh > 40.0) + { + epk_state.reset(); + return; + }*/ - if ((!safety_timer->isStarted()) && (v_kmh > 5)) + if ( (!safety_timer->isStarted()) && (v_kmh > 5) ) { safety_timer->start(); } @@ -226,15 +103,16 @@ void SafetyDevice::preStep(state_vector_t& Y, double t) safety_timer->stop(); } } - else if (code_alsn == 1) + + if (code_alsn == 1) { - if (v_kmh > 60.0) + if (v_kmh > 61.0) { epk_state.reset(); return; } - if ((!safety_timer->isStarted()) && (v_kmh > 5)) + if ( (!safety_timer->isStarted()) && (v_kmh > 5) ) { safety_timer->start(); } @@ -243,14 +121,13 @@ void SafetyDevice::preStep(state_vector_t& Y, double t) safety_timer->stop(); } } - else if (code_alsn == 2) + + if (code_alsn == 2) { - if (v_kmh > 60.0) + if (v_kmh > 61.0) { if (!safety_timer->isStarted()) - { safety_timer->start(); - } } else { @@ -279,23 +156,20 @@ void SafetyDevice::preStep(state_vector_t& Y, double t) //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ -void SafetyDevice::ode_system( - const state_vector_t& Y, - state_vector_t& dYdt, - double t -) +void SafetyDevice::ode_system(const state_vector_t &Y, + state_vector_t &dYdt, double t) { - (void)Y; - (void)dYdt; - (void)t; + Q_UNUSED(Y) + Q_UNUSED(dYdt) + Q_UNUSED(t) } //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ -void SafetyDevice::load_config(CfgReader& cfg) +void SafetyDevice::load_config(CfgReader &cfg) { - (void)cfg; + Q_UNUSED(cfg) } //------------------------------------------------------------------------------ @@ -305,32 +179,27 @@ void SafetyDevice::alsn_process(int code_alsn) { switch (code_alsn) { - case 1: + case 1: { lamp_on(RED_YELLOW_LAMP); - return; + + break; } - case 2: + + case 2: { lamp_on(YELLOW_LAMP); - return; + + break; } - case 3: + + case 3: { lamp_on(GREEN_LAMP); - return; - } - default: - { - return; + + break; } } - - // TODO: Replace on something like this? - // if (code_alsn >= RED_YELLOW_LAMP && code_alsn <= GREEN_LAMP) - // { - // lamp_on(static_cast(code_alsn)); - // } } //------------------------------------------------------------------------------ @@ -345,8 +214,16 @@ void SafetyDevice::off_all_lamps() //------------------------------------------------------------------------------ // //------------------------------------------------------------------------------ -void SafetyDevice::lamp_on(std::size_t lamp_idx) +void SafetyDevice::lamp_on(size_t lamp_idx) { off_all_lamps(); lamps[lamp_idx] = 1.0f; } + +//------------------------------------------------------------------------------ +// +//------------------------------------------------------------------------------ +void SafetyDevice::onSafetyTimer() +{ + epk_state.reset(); +} From 9b7de24fb9336320a317747e9f84014448443459 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 21 May 2026 08:21:24 +0300 Subject: [PATCH 41/42] =?UTF-8?q?registrator=20=D1=82=D0=B5=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D1=8C=20unique=5Fptr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chs2t/include/chs2t.h | 3 ++- chs2t/src/chs2t-init.cpp | 6 +++--- chs2t/src/chs2t-registrate.cpp | 4 ++-- chs2t/src/chs2t.cpp | 1 + 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index 27392bb..93df185 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -13,6 +13,7 @@ #ifndef CHS2T_H #define CHS2T_H +#include #include #include @@ -134,7 +135,7 @@ class CHS2T : public Vehicle QString custom_modules_dir = "chs2t"; /// Регистратор, для записи параметров - Registrator *reg = nullptr; + std::unique_ptr registrator; /// Сцепка спереди Coupling *coupling_fwd = nullptr; diff --git a/chs2t/src/chs2t-init.cpp b/chs2t/src/chs2t-init.cpp index 6db8e9c..fbeb8f7 100644 --- a/chs2t/src/chs2t-init.cpp +++ b/chs2t/src/chs2t-init.cpp @@ -172,7 +172,7 @@ void CHS2T::initRegistrator(const QString& modules_dir, const QString& custom_cf (void) modules_dir; (void) custom_cfg_dir; /* - reg = new Registrator(0.1); - reg->setFileName("motor"); - reg->init();*/ + registrator = new Registrator(0.1); + registrator->setFileName("motor"); + registrator->init();*/ } diff --git a/chs2t/src/chs2t-registrate.cpp b/chs2t/src/chs2t-registrate.cpp index beb341f..1496262 100644 --- a/chs2t/src/chs2t-registrate.cpp +++ b/chs2t/src/chs2t-registrate.cpp @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ void CHS2T::registrate(const double& t, const double& dt) { - if (reg == nullptr) + if (registrator == nullptr) return; QString msg = ""; @@ -18,5 +18,5 @@ void CHS2T::registrate(const double& t, const double& dt) msg += QString("omega%1|").arg(wheel_omega[0], 10, 'f', 5); msg += QString("motor%1|").arg(motor->getTorque(), 12, 'f', 5); msg += QString("gener%1|").arg(generator->getTorque(), 12, 'f', 5); - reg->print(msg, t, dt); + registrator->print(msg, t, dt); } diff --git a/chs2t/src/chs2t.cpp b/chs2t/src/chs2t.cpp index cfd0955..7d35fc6 100644 --- a/chs2t/src/chs2t.cpp +++ b/chs2t/src/chs2t.cpp @@ -23,6 +23,7 @@ #include "filesystem.h" #include +#include //------------------------------------------------------------------------------ // Конструктор From 36e2d9d63f6fdf1e8977659117b47be1df10bc82 Mon Sep 17 00:00:00 2001 From: avilkinnick Date: Thu, 21 May 2026 08:27:33 +0300 Subject: [PATCH 42/42] =?UTF-8?q?Revert=20"registrator=20=D1=82=D0=B5?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D1=8C=20unique=5Fptr"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9b7de24fb9336320a317747e9f84014448443459. --- chs2t/include/chs2t.h | 3 +-- chs2t/src/chs2t-init.cpp | 6 +++--- chs2t/src/chs2t-registrate.cpp | 4 ++-- chs2t/src/chs2t.cpp | 1 - 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/chs2t/include/chs2t.h b/chs2t/include/chs2t.h index 93df185..27392bb 100644 --- a/chs2t/include/chs2t.h +++ b/chs2t/include/chs2t.h @@ -13,7 +13,6 @@ #ifndef CHS2T_H #define CHS2T_H -#include #include #include @@ -135,7 +134,7 @@ class CHS2T : public Vehicle QString custom_modules_dir = "chs2t"; /// Регистратор, для записи параметров - std::unique_ptr registrator; + Registrator *reg = nullptr; /// Сцепка спереди Coupling *coupling_fwd = nullptr; diff --git a/chs2t/src/chs2t-init.cpp b/chs2t/src/chs2t-init.cpp index fbeb8f7..6db8e9c 100644 --- a/chs2t/src/chs2t-init.cpp +++ b/chs2t/src/chs2t-init.cpp @@ -172,7 +172,7 @@ void CHS2T::initRegistrator(const QString& modules_dir, const QString& custom_cf (void) modules_dir; (void) custom_cfg_dir; /* - registrator = new Registrator(0.1); - registrator->setFileName("motor"); - registrator->init();*/ + reg = new Registrator(0.1); + reg->setFileName("motor"); + reg->init();*/ } diff --git a/chs2t/src/chs2t-registrate.cpp b/chs2t/src/chs2t-registrate.cpp index 1496262..beb341f 100644 --- a/chs2t/src/chs2t-registrate.cpp +++ b/chs2t/src/chs2t-registrate.cpp @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ void CHS2T::registrate(const double& t, const double& dt) { - if (registrator == nullptr) + if (reg == nullptr) return; QString msg = ""; @@ -18,5 +18,5 @@ void CHS2T::registrate(const double& t, const double& dt) msg += QString("omega%1|").arg(wheel_omega[0], 10, 'f', 5); msg += QString("motor%1|").arg(motor->getTorque(), 12, 'f', 5); msg += QString("gener%1|").arg(generator->getTorque(), 12, 'f', 5); - registrator->print(msg, t, dt); + reg->print(msg, t, dt); } diff --git a/chs2t/src/chs2t.cpp b/chs2t/src/chs2t.cpp index 7d35fc6..cfd0955 100644 --- a/chs2t/src/chs2t.cpp +++ b/chs2t/src/chs2t.cpp @@ -23,7 +23,6 @@ #include "filesystem.h" #include -#include //------------------------------------------------------------------------------ // Конструктор