mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-18 17:19:18 +02:00
fix(cab): the line contactors lamp goes out with the pressure switch (eu07/maszyna#470) The lamp of the open line contactors, which tells the start can be made, went out at 1 bar in the brake cylinders, while the pressure switch cuts the start off only at 2 bar (or below 3.6 bar in the main pipe), so with the brakes partly applied the start could be made with the lamp out. With a pressure switch fitted the lamp now follows it; without one it goes out at 1 bar as before. The same holds for the lamp of the second unit, which used to keep its last state between 1 bar and the cut-off. The condition is TMoverParameters::LineContactorsLampLit(). Tests: tests/unit/test_line_contactors.cpp. refactor: Sonar findings of PR 217 - horn_supply::pneumatic shadowed the pneumatic enumerator of the sound flags (cpp:S1117), it's horn_supply::air; the supplies read with using enum (S6177), - CouplerForce(): the automatic coupling refused or caught without another level of nested ifs (S134), the same outcome: too fast, the coupling is locked; caught, coupled and locked; otherwise left to try again, - CompressorCheck(): the power the compressor doesn't draw yet noted without a TODO (S1135), - tests: the previous crash damage setting in an in-class initializer (S3230), the loops which stop early with break rather than in their conditions (S886), the stand-ins of test::pair in a std::vector rather than an array (S5945), units in the comments of the example without /* */ (S1103). test: the cases the changes of the branch left without a test - Cntrl.: BDelay1 to BDelay4 reach the brake delays (now through std::format), the default start types of the ground and converter overload relays of a multiple unit and of other vehicles (out of the nested conditionals), - the compressor: fed from the low voltage it waits from the low voltage coming on; the pressure switch stops it above the cut-out pressure, without one the excess air is vented (the vented fraction rewritten), - the horns: a vehicle without any air sounds as before, the threshold pressure, an electric horn on 110 V, - the positions of a cab control below zero, and a control without position sounds. refactor(cab): the kind of the train heating switch as a flag Read once with the vehicle definition, rather than compared as text in each of the switch commands. feat(cab): train heating switch springing back (MaSzyna-EU07/maszyna#85) TrainHeating=[toggle]|impulse in the Switches: section of the vehicle definition makes the train heating switch an unstable one: it goes up to switch the heating on, down to switch it off, and back to the middle once let go, instead of staying where it was put. The position of such a switch isn't set from the heating state when the cab is entered. Tests: tests/unit/test_switches.cpp. feat(sound): mirror sounds (MaSzyna-EU07/maszyna#84, eu07/maszyna#322) The sound definitions of a vehicle (.mmd) take mirroropen: and mirrorclose:, played as a mirror sets off unfolding or folding, and the locations section mirrors: <offset>... end, the offsets along the vehicle of the mirror pairs, as for the doors (negative ahead of the centre), each pair at the sides of the vehicle. As the animation, only the mirrors at the occupied cab sound. The start of a move is mirror_moves::motion in vehicle/mirrors.h. Tests: tests/unit/test_mirrors.cpp. feat(cab): joint oil and fuel pump switch (MaSzyna-EU07/maszyna#81) A cab control oilfuelpump_sw: switches both the oil and the fuel pump at once, with the new command oilfuelpumptoggle (no key by default). As a two-state switch it turns both pumps off when both are on and both on otherwise; as an impulse switch it's held to start them, like the separate pump switches. Its position follows the pumps when the cab is entered. refactor(editor): text fields filled without strncpy (MaSzyna-EU07/maszyna#112) The last three strncpy calls Sonar flags (cpp:S5816), in the road and track editors, copy the text into the ImGui field buffers with std::string::copy and terminate it right after; the text gets cut to the buffer as before. fix: automatic coupler crashes, horns, compressor start delay, radio and cab lever sounds - automatic couplers don't catch above the safe collision speed (#86): with crash damage on they couple at a closing speed of 15 km/h at most, a faster hit locks the coupling until the vehicles part and the collision runs its course. On the way: CollisionVelocity() read a head-on 10 + 10 km/h as 14.1 km/h (quaternions turn by half the angle), it's now taken from the touching ends; CollisionDetect() took the other vehicle's speed the wrong way round for vehicles facing each other. Head-on hits now derail sooner, at the intended limit, - a single horn lever can't sound both tones at once (eu07/maszyna#392), - a skid ends once the vehicle stops on locked wheels (eu07/maszyna#479), - electronic destination signs are blanked at the end of the timetable (eu07/maszyna#446), - horns need the air or the voltage to sound (eu07/maszyna#290, #76): HornType=[Pneumatic]|Electric and Horn3Type in Cntrl.; a pneumatic horn needs 0.2 MPa in the main reservoir (or the main pipe without one), an electric one the low voltage; the lever stays where it was put, - compressor start delay (#67): CompressorStartDelay [s] in Brake., counted from the compressor getting its power, after the engine starts say; none by default, - the channel and volume buttons of a radio without power do nothing (eu07/maszyna#429); the power check of the radio is TMoverParameters::RadioPowered(), - a lever moved smoothly sounds the positions it passes (#83). Sonar findings in the functions changed: nesting, nested conditionals, commented-out code, std::format, references to const. Unit tests: test::pair for two vehicles running into each other, test_couplers, test_horn, test_wheelslip, test_compressor, test_radio, test_gauge_positions.
122 lines
4.6 KiB
C++
122 lines
4.6 KiB
C++
#include "stdafx.h"
|
|
#include "doctest.h"
|
|
|
|
#include "vehicle.h"
|
|
|
|
#include "vehicle/horn.h"
|
|
|
|
// the horn keys of the cab: low tone (A) and high tone (shift+A), held to sound
|
|
|
|
TEST_CASE("horn: a single lever for both tones sounds one tone at a time (eu07/maszyna#392)") {
|
|
auto signal{0};
|
|
signal = horn::pressed(signal, horn::low, true);
|
|
REQUIRE(signal == horn::low);
|
|
|
|
// the lever moved over to the high tone while the low tone key is still held
|
|
signal = horn::pressed(signal, horn::high, true);
|
|
CHECK(signal == horn::high);
|
|
|
|
// letting go of the low tone key leaves the high tone sounding
|
|
signal = horn::released(signal, horn::low);
|
|
CHECK(signal == horn::high);
|
|
|
|
signal = horn::released(signal, horn::high);
|
|
CHECK(signal == 0);
|
|
}
|
|
|
|
TEST_CASE("horn: separate buttons for the tones can sound both at once") {
|
|
auto signal{0};
|
|
signal = horn::pressed(signal, horn::low, false);
|
|
signal = horn::pressed(signal, horn::high, false);
|
|
CHECK(signal == (horn::low | horn::high));
|
|
|
|
signal = horn::released(signal, horn::low);
|
|
CHECK(signal == horn::high);
|
|
}
|
|
|
|
TEST_CASE("horn: releasing a tone leaves the other bits of the signal alone") {
|
|
auto const third{4}; // the third horn, operated separately
|
|
CHECK(horn::released(horn::low | third, horn::low) == third);
|
|
CHECK(horn::pressed(third, horn::high, true) == (horn::high | third));
|
|
}
|
|
|
|
// what the horns need to sound (eu07/maszyna#290): a pneumatic horn the air of the main reservoir, an electric one
|
|
// the low voltage. the horn lever stays where the driver put it, only the horn is silent
|
|
namespace {
|
|
|
|
test::vehicle horn_vehicle(test::definition Definition) {
|
|
// a main reservoir of its own
|
|
return test::vehicle{Definition.set("Brake", "Vv", 1.0).set("Brake", "MinCP", 0.65).set("Brake", "MaxCP", 0.8)};
|
|
}
|
|
|
|
int const allhorns{horn::low | horn::high | 4};
|
|
|
|
} // namespace
|
|
|
|
TEST_CASE("horn: a pneumatic horn sounds on the air of the main reservoir only") {
|
|
auto vehicle{horn_vehicle(test::definition::load("wagon"))};
|
|
REQUIRE(vehicle->HornSupply == horn_supply::air); // the default
|
|
|
|
vehicle->Compressor = 0.65;
|
|
CHECK(vehicle->SoundingHorns(allhorns) == allhorns);
|
|
vehicle->Compressor = 0.0; // the reservoir is empty
|
|
CHECK(vehicle->SoundingHorns(allhorns) == 0);
|
|
}
|
|
|
|
TEST_CASE("horn: a vehicle without a main reservoir takes the horn air from the main pipe") {
|
|
test::vehicle vehicle{test::definition::load("wagon")};
|
|
REQUIRE(vehicle->VeselVolume == 0.0);
|
|
|
|
vehicle->ScndPipePress = 0.5;
|
|
CHECK(vehicle->SoundingHorns(horn::low) == horn::low);
|
|
vehicle->ScndPipePress = 0.0;
|
|
CHECK(vehicle->SoundingHorns(horn::low) == 0);
|
|
}
|
|
|
|
TEST_CASE("horn: an electric horn sounds on the low voltage, whatever the air") {
|
|
auto vehicle{horn_vehicle(test::definition::load("wagon").set("Cntrl", "HornType", "Electric"))};
|
|
REQUIRE(vehicle->HornSupply == horn_supply::electric);
|
|
REQUIRE(vehicle->Horn3Supply == horn_supply::electric); // the third horn follows the others unless told otherwise
|
|
|
|
vehicle->Compressor = 0.0;
|
|
vehicle->Power24vIsAvailable = true;
|
|
CHECK(vehicle->SoundingHorns(allhorns) == allhorns);
|
|
vehicle->Power24vIsAvailable = false;
|
|
CHECK(vehicle->SoundingHorns(allhorns) == 0);
|
|
}
|
|
|
|
TEST_CASE("horn: the third horn can have a supply of its own, an electric horn of a diesel say") {
|
|
auto vehicle{horn_vehicle(test::definition::load("wagon").set("Cntrl", "Horn3Type", "Electric"))};
|
|
REQUIRE(vehicle->HornSupply == horn_supply::air);
|
|
REQUIRE(vehicle->Horn3Supply == horn_supply::electric);
|
|
|
|
vehicle->Compressor = 0.0;
|
|
vehicle->Power24vIsAvailable = true;
|
|
CHECK(vehicle->SoundingHorns(allhorns) == 4);
|
|
vehicle->Compressor = 0.65;
|
|
vehicle->Power24vIsAvailable = false;
|
|
CHECK(vehicle->SoundingHorns(allhorns) == (horn::low | horn::high));
|
|
}
|
|
|
|
TEST_CASE("horn: a vehicle without any air, a road vehicle say, sounds its pneumatic horn as before") {
|
|
// no main reservoir and no main pipe connection at either end
|
|
test::vehicle vehicle{test::definition::load("wagon").set("BuffCoupl", "AllowedFlag", 3)};
|
|
REQUIRE(vehicle->VeselVolume == 0.0);
|
|
vehicle->ScndPipePress = 0.0;
|
|
CHECK(vehicle->SoundingHorns(allhorns) == allhorns);
|
|
}
|
|
|
|
TEST_CASE("horn: a pneumatic horn sounds from the threshold pressure up") {
|
|
auto vehicle{horn_vehicle(test::definition::load("wagon"))};
|
|
vehicle->Compressor = TMoverParameters::HornMinPressure;
|
|
CHECK(vehicle->SoundingHorns(horn::low) == horn::low);
|
|
vehicle->Compressor = TMoverParameters::HornMinPressure - 0.01;
|
|
CHECK(vehicle->SoundingHorns(horn::low) == 0);
|
|
}
|
|
|
|
TEST_CASE("horn: an electric horn sounds on 110 V too") {
|
|
auto vehicle{horn_vehicle(test::definition::load("wagon").set("Cntrl", "HornType", "Electric"))};
|
|
vehicle->Power110vIsAvailable = true;
|
|
CHECK(vehicle->SoundingHorns(horn::high) == horn::high);
|
|
}
|