eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 17:29:18 +02:00
Code Issues 123 Wiki Activity

fixes after merge

Browse Source
This commit is contained in:
milek7
2022-01-06 15:49:46 +01:00
parent 3c7ad80252
commit 97af1e7d74
5 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
McZapkie/MOVER.h
View File

@@ -648,6 +648,7 @@ class TSecuritySystem
bool enabled = false;
bool is_sifa = false; // Sifa-like pedal device, with inverted input for convenient keyboard usage
bool separate_acknowledge = false; // cabsignal reset button is separate from vigilance
bool cabsignal_lock = false;
double vigilance_timer = 0.0;
double alert_timer = 0.0;
@@ -669,6 +670,7 @@ public:
void cabsignal_reset();
void update(double dt, double Vel, bool pwr);
void set_cabsignal();
void set_cabsignal_lock(bool);
bool is_blinking() const;
bool is_vigilance_blinking() const;
bool is_cabsignal_blinking() const;
@@ -677,11 +679,9 @@ public:
bool is_braking() const;
bool is_engine_blocked() const;
bool radiostop_available() const;
bool system_available() const;
void load(std::string const &line, double Vmax);
bool SHPLock = false;
double MagnetLocation;
double MagnetLocation = 0.0;
};
struct TTransmision

20
McZapkie/Mover.cpp
View File

@@ -95,7 +95,7 @@ void TSecuritySystem::acknowledge_press() {
}
vigilance_timer = 0.0;
if (!separate_acknowledge && cabsignal_active) {
if (!separate_acknowledge && cabsignal_active && !cabsignal_lock) {
cabsignal_active = false;
alert_timer = 0.0;
}
@@ -110,7 +110,7 @@ void TSecuritySystem::acknowledge_release() {
}
void TSecuritySystem::cabsignal_reset() {
if (cabsignal_active) {
if (cabsignal_active && !cabsignal_lock) {
cabsignal_active = false;
alert_timer = 0.0;
}
@@ -192,12 +192,12 @@ bool TSecuritySystem::is_cabsignal_beeping() const {
}
bool TSecuritySystem::is_braking() const {
if (!power && (vigilance_enabled || cabsignal_enabled || radiostop_enabled))
return true;
if (!enabled)
return false;
if (!power && (vigilance_enabled || cabsignal_enabled))
return true;
return alert_timer > SoundSignalDelay + EmergencyBrakeDelay;
}
@@ -205,8 +205,8 @@ bool TSecuritySystem::radiostop_available() const {
return radiostop_enabled;
}
bool TSecuritySystem::system_available() const {
return vigilance_enabled || cabsignal_enabled;
void TSecuritySystem::set_cabsignal_lock(bool v) {
cabsignal_lock = v;
}
bool TSecuritySystem::is_engine_blocked() const {
@@ -234,6 +234,7 @@ void TSecuritySystem::load(std::string const &line, double Vmax) {
extract_value( EmergencyBrakeDelay, "EmergencyBrakeDelay", line, "" );
extract_value( MaxHoldTime, "MaxHoldTime", line, "" );
extract_value( radiostop_enabled, "RadioStop", line, "" );
extract_value( MagnetLocation, "MagnetLocation", line, "" );
}
double TableInterpolation(std::map<double, double> &Map, double Parameter)
@@ -4450,7 +4451,6 @@ void TMoverParameters::UpdatePipePressure(double dt)
// ulepszony hamulec bezp.
EmergencyValveFlow = 0.0;
auto const securitysystempresent { SecuritySystem.radiostop_available() || SecuritySystem.system_available() };
auto const lowvoltagepower { Power24vIsAvailable || Power110vIsAvailable };
if( (( true == RadioStopFlag )
@@ -4468,9 +4468,7 @@ void TMoverParameters::UpdatePipePressure(double dt)
*/
|| ( ( SpringBrakeDriveEmergencyVel >= 0 )
&& ( Vel > SpringBrakeDriveEmergencyVel )
&& ( SpringBrake.IsActive ) )
|| ( ( true == securitysystempresent )
&& ( false == lowvoltagepower ) ) ) {
&& ( SpringBrake.IsActive ) ) ) {
EmergencyValveFlow = PF( 0, PipePress, 0.15 ) * dt;
}
dpMainValve += EmergencyValveFlow;