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

New Handle type MHZ_6P for Traxx

Browse Source
This commit is contained in:
Królik Uszasty
2019-03-16 20:43:12 +01:00
committed by tmj-fstate
parent fb36c1348b
commit 4855b3a5a5
4 changed files with 165 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
McZapkie/Mover.cpp
View File

@@ -8413,6 +8413,7 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) {
{ "MHZ_EN57", TBrakeHandle::MHZ_EN57 },
{ "MHZ_K5P", TBrakeHandle::MHZ_K5P },
{ "MHZ_K8P", TBrakeHandle::MHZ_K8P },
{ "MHZ_6P", TBrakeHandle::MHZ_6P },
{ "M394", TBrakeHandle::M394 },
{ "Knorr", TBrakeHandle::Knorr },
{ "Westinghouse", TBrakeHandle::West },
@@ -8428,6 +8429,8 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) {
}
Handle_AutomaticOverload = (extract_value("HAO", line) == "Yes");
Handle_ManualOverload = (extract_value("HMO", line) == "Yes");
extract_value(Handle_GenericDoubleParameter1, "HGDP1", line, "");
extract_value(Handle_GenericDoubleParameter2, "HGDP2", line, "");
// brakelochandle
{
std::map<std::string, TBrakeHandle> locbrakehandles{
@@ -9257,10 +9260,13 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir)
case TBrakeHandle::MHZ_K5P:
Handle = std::make_shared<TMHZ_K5P>();
break;
case TBrakeHandle::MHZ_6P:
Handle = std::make_shared<TMHZ_6P>();
break;
default:
Handle = std::make_shared<TDriverHandle>();
}
Handle->SetParams(Handle_AutomaticOverload, Handle_ManualOverload, 0.0, 0.0);
Handle->SetParams(Handle_AutomaticOverload, Handle_ManualOverload, Handle_GenericDoubleParameter1, Handle_GenericDoubleParameter2);
switch( BrakeLocHandle ) {
case TBrakeHandle::FD1: