mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-09 10:12:24 +01:00
39244a88a5
full_power() notched up as soon as the controlling half had closed its line contactors. In the ET42 test the locomotive brake is still at about 2.0 bar then, right at the pressure switch threshold, so whether the second half starts as well depended on thousandths of a bar in its cylinder: a half whose switch is on when the controller leaves zero doesn't close its line contactors until the controller is back at zero. Any change to the air brakes could tip it either way (with the corrected ESt3 the second half stayed off and the train reached 88.7 instead of 106 km/h). The helper now waits, as a driver does, until no pressure switch in the train cuts the start off.
101 lines
2.6 KiB
C++
101 lines
2.6 KiB
C++
#include "stdafx.h"
|
|
#include "scenario.h"
|
|
|
|
#include "McZapkie/hamulce.h"
|
|
|
|
namespace test {
|
|
|
|
namespace {
|
|
|
|
// whether the pressure switch of a vehicle in the train still cuts the start off: a half of a locomotive whose
|
|
// switch is on when the controller leaves zero doesn't close its line contactors until the controller is back at zero
|
|
bool start_cut_off(consist &Train) {
|
|
for (std::size_t i = 0; i < Train.size(); ++i) {
|
|
if (Train[i].mover().ControlPressureSwitch) {
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
scenario::scenario(std::string Name, std::vector<channel> Channels, track const &Track) : m_name(std::move(Name)), m_channels(std::move(Channels)), m_track(Track) {
|
|
reseed_random();
|
|
}
|
|
|
|
scenario &scenario::add(std::string const &Path, int Cab, int Coupling, double Velocity, double Gap) {
|
|
m_train.add(definition::fiz(Path), Cab, Coupling, Velocity, Gap);
|
|
return *this;
|
|
}
|
|
|
|
void scenario::record() {
|
|
// on the first action, once the train is complete
|
|
if (false == m_traces.empty()) {
|
|
return;
|
|
}
|
|
for (std::size_t i = 0; i < m_train.size(); ++i) {
|
|
m_traces.push_back(std::make_unique<trace>(std::format("{}/{}", m_name, i), m_channels, 100));
|
|
m_train[i].record(*m_traces.back());
|
|
}
|
|
}
|
|
|
|
void scenario::act(std::string const &Event) {
|
|
record();
|
|
for (auto const &trace : m_traces) {
|
|
trace->mark(Event);
|
|
}
|
|
}
|
|
|
|
void scenario::wait(double Seconds) {
|
|
record();
|
|
drive(driver(), m_track, Seconds);
|
|
}
|
|
|
|
bool scenario::start_up() {
|
|
record();
|
|
return test::start_up(driver(), m_track, 300.0, m_traces.front().get());
|
|
}
|
|
|
|
void scenario::get_going() {
|
|
act("get going");
|
|
release_brakes(cab());
|
|
for (int i = 0; i < 3 && cab().DirActive <= 0; ++i) {
|
|
cab().DirectionForward();
|
|
}
|
|
wait(20.0);
|
|
}
|
|
|
|
void scenario::full_power(double Seconds) {
|
|
auto &controlling{driver().controlling};
|
|
// as a driver does, wait for the brakes to let go far enough for every pressure switch of the train to allow the
|
|
// start; otherwise whether all the halves of a locomotive start hangs on thousandths of a bar of their cylinders
|
|
for (int i = 0; i < 120 && start_cut_off(m_train); ++i) {
|
|
wait(1.0);
|
|
}
|
|
controlling.IncMainCtrl(1);
|
|
for (int i = 0; i < 90 && false == controlling.StLinFlag; ++i) {
|
|
wait(1.0);
|
|
}
|
|
for (int i = 0; i < 60 && false == controlling.IsMainCtrlMaxPowerPos(); ++i) {
|
|
controlling.IncMainCtrl(1);
|
|
wait(1.0);
|
|
}
|
|
wait(Seconds);
|
|
}
|
|
|
|
void scenario::notch_back(int Position) {
|
|
auto &controlling{driver().controlling};
|
|
while (controlling.MainCtrlPos > Position && controlling.DecMainCtrl(1)) {
|
|
wait(1.0);
|
|
}
|
|
}
|
|
|
|
void scenario::check() const {
|
|
for (auto const &trace : m_traces) {
|
|
trace->check();
|
|
}
|
|
}
|
|
|
|
} // namespace test
|