mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-21 00:24:57 +01:00
fix: behind a line breaker closed ahead of the pantographs the main circuit still needs the voltage
Review of #272. The closed line breaker used to mean there's traction voltage, the undervoltage trip opening it without one. With PantRequiresMain=Yes it closes on the battery and holds without voltage, so everything that took Mains for "the main circuit is live" ran with the pantographs down, lowered for a section, or under a dead catenary. - MainCircuitPowered(): the line breaker closed, and on a vehicle with PantRequiresMain and current collectors also the voltage at least MinV (what the undervoltage trip takes). For every other vehicle it is Mains. It feeds the converter (and through it the 110 V and a compressor on it), a compressor on the main circuit, the heating from the main circuit, the motor blowers, the blowers of the starting resistors, the current of the series motors and the induction motor drive. - The undervoltage relay of such a vehicle opens the line contactors, as the line breaker opening did elsewhere: the camshaft goes back to zero and the motors get no current, also not the generator current a closed circuit without voltage gave. The relay picks up again with the voltage back and the master controller at zero or the first position, so the start begins anew instead of the camshaft running back up to the position left on the controller. Vehicles without the key are unchanged: the golden traces recorded before the change compare exactly.
This commit is contained in:
@@ -2165,7 +2165,8 @@ class TMoverParameters
|
||||
bool JointEngineStart{true};
|
||||
// config, .fiz Cntrl.PantRequiresMain: the line breaker closes without traction voltage and holds without it, and the
|
||||
// pantographs rise and stay up only while it's closed (EU05, EP05, ČD 181 family); off, the pantographs come first and the line
|
||||
// breaker needs their voltage
|
||||
// breaker needs their voltage. what the main circuit feeds still needs the voltage (MainCircuitPowered()), and without
|
||||
// it the undervoltage relay opens the line contactors (NoVoltRelay)
|
||||
bool PantographsRequireMains{false};
|
||||
bool LineBreakerClosesOnlyAtNoPowerPos{false};
|
||||
bool ControlPressureSwitch{false}; // activates if the main pipe and/or brake cylinder pressure aren't within operational levels
|
||||
@@ -2232,7 +2233,9 @@ class TMoverParameters
|
||||
double PantPress = 0.0; /*Cisnienie w zbiornikach pantografow*/
|
||||
bool PantPressSwitchActive{false}; // state of the pantograph pressure switch. gets primed at defined pressure level in pantograph air system
|
||||
bool PantPressLockActive{false}; // pwr system state flag. fires when pressure switch activates by pantograph pressure dropping below defined level
|
||||
bool NoVoltRelay{true}; // switches off if the power level drops below threshold
|
||||
// switches off if the power level drops below threshold, which opens the line breaker; with PantographsRequireMains
|
||||
// it opens the line contactors instead, and switches back on only with the master controller at zero or the first position
|
||||
bool NoVoltRelay{true};
|
||||
bool OvervoltageRelay{true}; // switches off if the power level goes above threshold
|
||||
bool s_CAtestebrake = false; // hunter-091012: zmienna dla testu ca
|
||||
std::array<std::pair<double, double>, 4> PowerCircuits; // 24v, 110v, 3x400v and 3000v power circuits, voltage from local sources and current draw pairs
|
||||
@@ -2661,6 +2664,11 @@ class TMoverParameters
|
||||
bool HeatingSwitch(bool const State, range_t const Notify = range_t::consist);
|
||||
void HeatingSwitch_(bool const State);
|
||||
double EnginePowerSourceVoltage() const; // returns voltage of defined main engine power source
|
||||
// whether the main circuit feeds what runs on it (the converter, a compressor, the heating, the motor and resistor
|
||||
// blowers, the traction motors): the line breaker closed, and where it closes ahead of the pantographs and holds
|
||||
// without traction voltage (PantographsRequireMains) also the voltage there, at least the one the undervoltage
|
||||
// trip takes. everywhere else it's the same as Mains
|
||||
bool MainCircuitPowered() const;
|
||||
|
||||
/*-funkcje typowe dla lokomotywy elektrycznej*/
|
||||
void LowVoltagePowerCheck(double const Deltatime);
|
||||
|
||||
@@ -438,7 +438,7 @@ double TMoverParameters::Current(double n, double U)
|
||||
// writepaslog("Delta ", FloatToStr(Delta));
|
||||
// writepaslog("DeltaQ ", FloatToStr(DeltaQ));
|
||||
// writepaslog("U ", FloatToStr(U));
|
||||
if (Mains)
|
||||
if (MainCircuitPowered())
|
||||
{
|
||||
if (U > 0)
|
||||
MotorCurrent = (U1 - Isf * Rz - Mn * motor_param(SP).fi * n + std::sqrt(Delta)) / (2.0 * Rz);
|
||||
@@ -1952,7 +1952,7 @@ void TMoverParameters::PowerCouplersCheck(double const /*Deltatime*/, coupling c
|
||||
case TPowerSource::Main:
|
||||
{
|
||||
// HACK: main circuit can be fed through couplers, so we explicitly check pantograph supply here
|
||||
localvoltage = true == Mains ? PantographVoltage : 0.0;
|
||||
localvoltage = MainCircuitPowered() ? PantographVoltage : 0.0;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
@@ -2209,7 +2209,7 @@ void TMoverParameters::ConverterCheck(double const Timestep)
|
||||
if (ConverterAllow && ConverterAllowLocal && false == ConvOvldFlag &&
|
||||
false == PantPressLockActive
|
||||
// HACK: allow carriages to operate converter without (missing) fuse prerequisite
|
||||
&& (Power > 1.0 ? Mains : GetTrainsetHighVoltage() > 0.0))
|
||||
&& (Power > 1.0 ? MainCircuitPowered() : GetTrainsetHighVoltage() > 0.0))
|
||||
{
|
||||
// delay timer can be optionally configured, and is set anew whenever converter goes off
|
||||
if (ConverterStartDelayTimer <= 0.0)
|
||||
@@ -2295,7 +2295,7 @@ void TMoverParameters::HeatingCheck(double const /*Timestep*/)
|
||||
}
|
||||
case TPowerSource::Main:
|
||||
{
|
||||
voltage = true == Mains ? std::max(GetTrainsetHighVoltage(), PantographVoltage) : 0.0;
|
||||
voltage = MainCircuitPowered() ? std::max(GetTrainsetHighVoltage(), PantographVoltage) : 0.0;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
@@ -2406,7 +2406,7 @@ void TMoverParameters::MotorBlowersCheck(double const Timestep)
|
||||
// TODO: bind properly power source when ld is in place
|
||||
(blower.start_type == start_t::battery ? Power24vIsAvailable :
|
||||
blower.start_type == start_t::converter ? Power110vIsAvailable :
|
||||
Mains) // power source
|
||||
MainCircuitPowered()) // power source
|
||||
// breaker condition disabled until it's implemented in the class data
|
||||
// && ( true == blower.breaker )
|
||||
&& false == disable &&
|
||||
@@ -3980,6 +3980,25 @@ double TMoverParameters::EnginePowerSourceVoltage() const
|
||||
0.0;
|
||||
}
|
||||
|
||||
// whether the main circuit feeds what runs on it: the converter, a compressor, the heating, the motor and resistor
|
||||
// blowers, the traction motors
|
||||
bool TMoverParameters::MainCircuitPowered() const
|
||||
{
|
||||
if (false == Mains)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if (false == PantographsRequireMains || EnginePowerSource.SourceType != TPowerSource::CurrentCollector)
|
||||
{
|
||||
// the closed line breaker says it all: the undervoltage trip opens it without traction voltage, and an engine
|
||||
// which runs is its own supply
|
||||
return true;
|
||||
}
|
||||
// closed ahead of the pantographs the line breaker holds without the voltage, which the undervoltage trip isn't
|
||||
// there to vouch for
|
||||
return EnginePowerSourceVoltage() >= EnginePowerSource.CollectorParameters.MinV;
|
||||
}
|
||||
|
||||
// *************************************************************************************************
|
||||
// Q: 20160711
|
||||
// zwiększenie nastawy hamulca
|
||||
@@ -4573,7 +4592,7 @@ void TMoverParameters::CompressorCheck(double dt)
|
||||
}
|
||||
|
||||
// the main circuit, also for a compressor driven by the engine, otherwise the low voltage
|
||||
auto const compressorpower{CompressorPower == 0 || CompressorPower == 3 ? Mains : Power110vIsAvailable};
|
||||
auto const compressorpower{CompressorPower == 0 || CompressorPower == 3 ? MainCircuitPowered() : Power110vIsAvailable};
|
||||
CompressorPowerTime = compressorpower ? CompressorPowerTime + dt : 0.0;
|
||||
auto const compressorready{compressorpower && CompressorPowerTime >= CompressorStartDelay};
|
||||
// TBD: split CompressorAllow into separate enable/disable flags, inherit compressor from basic_device
|
||||
@@ -5910,7 +5929,7 @@ double TMoverParameters::TractionForce(double dt)
|
||||
|
||||
case TEngineType::ElectricSeriesMotor:
|
||||
{
|
||||
if (true == Mains)
|
||||
if (MainCircuitPowered())
|
||||
{
|
||||
switch (RVentType)
|
||||
{
|
||||
@@ -6042,7 +6061,13 @@ double TMoverParameters::TractionForce(double dt)
|
||||
{
|
||||
// update the state of voltage relays
|
||||
auto const voltage{std::max(GetTrainsetHighVoltage(), PantographVoltage)};
|
||||
NoVoltRelay = EnginePowerSource.SourceType != TPowerSource::CurrentCollector || voltage >= EnginePowerSource.CollectorParameters.MinV;
|
||||
// where the line breaker holds without voltage (closed ahead of the pantographs) the undervoltage relay opens the
|
||||
// line contactors instead, see MotorConnectorsCheck(). it picks up again only with the master controller back
|
||||
// where a start begins, as the line breaker it stands in for wouldn't close on a running position either: at
|
||||
// zero, or at the first position, which is the first resistance step, where the line contactors close on any
|
||||
// start, and where the AI waits for them rather than going back to zero
|
||||
auto const novoltrelaypicksup{false == PantographsRequireMains || NoVoltRelay || MainCtrlPowerPos() <= 1};
|
||||
NoVoltRelay = EnginePowerSource.SourceType != TPowerSource::CurrentCollector || (voltage >= EnginePowerSource.CollectorParameters.MinV && novoltrelaypicksup);
|
||||
OvervoltageRelay =
|
||||
EnginePowerSource.SourceType != TPowerSource::CurrentCollector || voltage <= EnginePowerSource.CollectorParameters.MaxV || false == EnginePowerSource.CollectorParameters.OVP;
|
||||
// wywalanie szybkiego z powodu niewłaściwego napięcia
|
||||
@@ -6578,7 +6603,7 @@ double TMoverParameters::TractionForce(double dt)
|
||||
|
||||
case TEngineType::ElectricInductionMotor:
|
||||
{
|
||||
if (true == Mains && !SecuritySystem.is_engine_blocked())
|
||||
if (MainCircuitPowered() && !SecuritySystem.is_engine_blocked())
|
||||
{
|
||||
double ActiveInverters = 0.0;
|
||||
for (auto const &inv : Inverters)
|
||||
@@ -7496,7 +7521,11 @@ bool TMoverParameters::MotorConnectorsCheck()
|
||||
return false;
|
||||
}
|
||||
|
||||
auto const connectorsoff{false == Mains || true == FuseFlag || true == StLinSwitchOff || DirActive == 0};
|
||||
// a line breaker closed ahead of the pantographs holds without voltage; what cuts the motors off there is its
|
||||
// undervoltage relay, which elsewhere opens the line breaker
|
||||
auto const undervoltage{PantographsRequireMains && false == NoVoltRelay};
|
||||
|
||||
auto const connectorsoff{false == Mains || undervoltage || true == FuseFlag || true == StLinSwitchOff || DirActive == 0};
|
||||
|
||||
return false == connectorsoff;
|
||||
}
|
||||
@@ -7871,7 +7900,7 @@ void TMoverParameters::CheckEIMIC(double dt)
|
||||
eimic = 0;
|
||||
}
|
||||
|
||||
auto const eimicpowerenabled{(true == Mains || Power == 0.0) && (!SpringBrake.IsActive || !SpringBrakeCutsOffDrive) && !LockPipe && DirAbsolute != 0};
|
||||
auto const eimicpowerenabled{(MainCircuitPowered() || Power == 0.0) && (!SpringBrake.IsActive || !SpringBrakeCutsOffDrive) && !LockPipe && DirAbsolute != 0};
|
||||
auto const eimicdoorenabled{(SpringBrake.IsActive && ReleaseParkingBySpringBrakeWhenDoorIsOpen)};
|
||||
double eimic_max = 0.0;
|
||||
if (Doors.instances[side::left].open_permit == false && Doors.instances[side::right].open_permit == false)
|
||||
|
||||
Reference in New Issue
Block a user