apply fix on XEU5 ...

This commit is contained in:
2024-02-24 08:45:32 +03:30
parent f482e4097a
commit 558928d1a2
8 changed files with 7708 additions and 6754 deletions
@@ -58,10 +58,10 @@ input bool xEU5XTSFIAllowShortSignals = true; // Enable Short Signals
//
// XOBDLH ...
input group "XEU5 XOBDLH Signaller";
input bool xEU5XOBDLHEnableSignaller = true; // Enable Signaller
input bool xEU5XOBDLHAllowLongSignals = true; // Enable Long Signals
input bool xEU5XOBDLHAllowShortSignals = true; // Enable Short Signals
// input group "XEU5 XOBDLH Signaller";
// input bool xEU5XOBDLHEnableSignaller = true; // Enable Signaller
// input bool xEU5XOBDLHAllowLongSignals = true; // Enable Long Signals
// input bool xEU5XOBDLHAllowShortSignals = true; // Enable Short Signals
//
// XCHMACC ...
@@ -72,17 +72,17 @@ input bool xEU5XCHMACCAllowShortSignals = true; // Enable Short Signals
//
// XCHMAMX ...
input group "XEU5 XCHMAMX Signaller";
input bool xEU5XCHMAMXEnableSignaller = true; // Enable Signaller
input bool xEU5XCHMAMXAllowLongSignals = true; // Enable Long Signals
input bool xEU5XCHMAMXAllowShortSignals = true; // Enable Short Signals
// input group "XEU5 XCHMAMX Signaller";
// input bool xEU5XCHMAMXEnableSignaller = true; // Enable Signaller
// input bool xEU5XCHMAMXAllowLongSignals = true; // Enable Long Signals
// input bool xEU5XCHMAMXAllowShortSignals = true; // Enable Short Signals
//
// XCHMAMN ...
input group "XEU5 XCHMAMN Signaller";
input bool xEU5XCHMAMNEnableSignaller = true; // Enable Signaller
input bool xEU5XCHMAMNAllowLongSignals = true; // Enable Long Signals
input bool xEU5XCHMAMNAllowShortSignals = true; // Enable Short Signals
// input group "XEU5 XCHMAMN Signaller";
// input bool xEU5XCHMAMNEnableSignaller = true; // Enable Signaller
// input bool xEU5XCHMAMNAllowLongSignals = true; // Enable Long Signals
// input bool xEU5XCHMAMNAllowShortSignals = true; // Enable Short Signals
//
// Check in Test Mode or not ...
@@ -128,9 +128,9 @@ bool xEU5MXTSFIAllowShortSignals = xEU5XTSFIAllowShortSignals;
//
// XOBDLH ...
bool xEU5MXOBDLHEnableSignaller = xEU5XOBDLHEnableSignaller;
bool xEU5MXOBDLHAllowLongSignals = xEU5XOBDLHAllowLongSignals;
bool xEU5MXOBDLHAllowShortSignals = xEU5XOBDLHAllowShortSignals;
bool xEU5MXOBDLHEnableSignaller = false; // xEU5XOBDLHEnableSignaller;
bool xEU5MXOBDLHAllowLongSignals = false; // xEU5XOBDLHAllowLongSignals;
bool xEU5MXOBDLHAllowShortSignals = false; // xEU5XOBDLHAllowShortSignals;
//
// XCHMACC ...
@@ -140,15 +140,15 @@ bool xEU5MXCHMACCAllowShortSignals = xEU5XCHMACCAllowShortSignals;
//
// XCHMAMX ...
bool xEU5MXCHMAMXEnableSignaller = xEU5XCHMAMXEnableSignaller;
bool xEU5MXCHMAMXAllowLongSignals = xEU5XCHMAMXAllowLongSignals;
bool xEU5MXCHMAMXAllowShortSignals = xEU5XCHMAMXAllowShortSignals;
bool xEU5MXCHMAMXEnableSignaller = false; // xEU5XCHMAMXEnableSignaller;
bool xEU5MXCHMAMXAllowLongSignals = false; // xEU5XCHMAMXAllowLongSignals;
bool xEU5MXCHMAMXAllowShortSignals = false; // xEU5XCHMAMXAllowShortSignals;
//
// XCHMAMN ...
bool xEU5MXCHMAMNEnableSignaller = xEU5XCHMAMNEnableSignaller;
bool xEU5MXCHMAMNAllowLongSignals = xEU5XCHMAMNAllowLongSignals;
bool xEU5MXCHMAMNAllowShortSignals = xEU5XCHMAMNAllowShortSignals;
bool xEU5MXCHMAMNEnableSignaller = false; // xEU5XCHMAMNEnableSignaller;
bool xEU5MXCHMAMNAllowLongSignals = false; // xEU5XCHMAMNAllowLongSignals;
bool xEU5MXCHMAMNAllowShortSignals = false; // xEU5XCHMAMNAllowShortSignals;
//
XCProvider *xEU5Provider;
@@ -436,10 +436,10 @@ bool XEU5InitIndicators()
//
// XOBDLH ...
bool isXOBDLHEnable =
xEU5XOBDLHEnableSignaller &&
(xEU5XOBDLHAllowLongSignals ||
xEU5XOBDLHAllowShortSignals);
bool isXOBDLHEnable = false;
// xEU5XOBDLHEnableSignaller &&
// (xEU5XOBDLHAllowLongSignals ||
// xEU5XOBDLHAllowShortSignals);
//
// XCHMACC ...
@@ -450,17 +450,17 @@ bool XEU5InitIndicators()
//
// XCHMAMX ...
bool isXCHMAMXEnable =
xEU5XCHMAMXEnableSignaller &&
(xEU5XCHMAMXAllowLongSignals ||
xEU5XCHMAMXAllowShortSignals);
bool isXCHMAMXEnable = false;
// xEU5XCHMAMXEnableSignaller &&
// (xEU5XCHMAMXAllowLongSignals ||
// xEU5XCHMAMXAllowShortSignals);
//
// XCHMAMN ...
bool isXCHMAMNEnable =
xEU5XCHMAMNEnableSignaller &&
(xEU5XCHMAMNAllowLongSignals ||
xEU5XCHMAMNAllowShortSignals);
bool isXCHMAMNEnable = false;
// xEU5XCHMAMNEnableSignaller &&
// (xEU5XCHMAMNAllowLongSignals ||
// xEU5XCHMAMNAllowShortSignals);
//
bool hasSignaller =
@@ -1103,12 +1103,12 @@ void XEU5DisableLongSignallers()
//
// XOBDLH ...
if (xEU5MXOBDLHEnableSignaller)
{
//
xEU5Provider.DisbaleXOBDLHLongs();
xEU5MXOBDLHAllowLongSignals = false;
}
// if (xEU5MXOBDLHEnableSignaller)
// {
// //
// xEU5Provider.DisbaleXOBDLHLongs();
// xEU5MXOBDLHAllowLongSignals = false;
// }
//
// XCHMACC ...
@@ -1121,21 +1121,21 @@ void XEU5DisableLongSignallers()
//
// XCHMAMX ...
if (xEU5MXCHMAMXEnableSignaller)
{
//
xEU5Provider.DisbaleXCHMAMXLongs();
xEU5MXCHMAMXAllowLongSignals = false;
}
// if (xEU5MXCHMAMXEnableSignaller)
// {
// //
// xEU5Provider.DisbaleXCHMAMXLongs();
// xEU5MXCHMAMXAllowLongSignals = false;
// }
//
// XCHMAMN ...
if (xEU5MXCHMAMNEnableSignaller)
{
//
xEU5Provider.DisbaleXCHMAMNLongs();
xEU5MXCHMAMNAllowLongSignals = false;
}
// if (xEU5MXCHMAMNEnableSignaller)
// {
// //
// xEU5Provider.DisbaleXCHMAMNLongs();
// xEU5MXCHMAMNAllowLongSignals = false;
// }
}
//
@@ -1213,20 +1213,20 @@ void XEU5EnableLongSignallers()
//
// XOBDLH ...
if (xEU5MXOBDLHEnableSignaller)
{
//
xEU5MXOBDLHAllowLongSignals =
xEU5XOBDLHAllowLongSignals
? true
: xEU5MXOBDLHAllowLongSignals;
// if (xEU5MXOBDLHEnableSignaller)
// {
// //
// xEU5MXOBDLHAllowLongSignals =
// xEU5XOBDLHAllowLongSignals
// ? true
// : xEU5MXOBDLHAllowLongSignals;
//
if (xEU5MXOBDLHAllowLongSignals)
{
xEU5Provider.EnableXOBDLHLongs();
}
}
// //
// if (xEU5MXOBDLHAllowLongSignals)
// {
// xEU5Provider.EnableXOBDLHLongs();
// }
// }
//
// XCHMACC ...
@@ -1247,37 +1247,37 @@ void XEU5EnableLongSignallers()
//
// XCHMAMX ...
if (xEU5MXCHMAMXEnableSignaller)
{
//
xEU5MXCHMAMXAllowLongSignals =
xEU5XCHMAMXAllowLongSignals
? true
: xEU5MXCHMAMXAllowLongSignals;
// if (xEU5MXCHMAMXEnableSignaller)
// {
// //
// xEU5MXCHMAMXAllowLongSignals =
// xEU5XCHMAMXAllowLongSignals
// ? true
// : xEU5MXCHMAMXAllowLongSignals;
//
if (xEU5MXCHMAMXAllowLongSignals)
{
xEU5Provider.EnableXCHMAMXLongs();
}
}
// //
// if (xEU5MXCHMAMXAllowLongSignals)
// {
// xEU5Provider.EnableXCHMAMXLongs();
// }
// }
//
// XCHMAMN ...
if (xEU5MXCHMAMNEnableSignaller)
{
//
xEU5MXCHMAMNAllowLongSignals =
xEU5XCHMAMNAllowLongSignals
? true
: xEU5MXCHMAMNAllowLongSignals;
// if (xEU5MXCHMAMNEnableSignaller)
// {
// //
// xEU5MXCHMAMNAllowLongSignals =
// xEU5XCHMAMNAllowLongSignals
// ? true
// : xEU5MXCHMAMNAllowLongSignals;
//
if (xEU5MXCHMAMNAllowLongSignals)
{
xEU5Provider.EnableXCHMAMNLongs();
}
}
// //
// if (xEU5MXCHMAMNAllowLongSignals)
// {
// xEU5Provider.EnableXCHMAMNLongs();
// }
// }
}
//
@@ -1322,12 +1322,12 @@ void XEU5DisableShortSignallers()
//
// XOBDLH ...
if (xEU5MXOBDLHEnableSignaller)
{
//
xEU5Provider.DisableXOBDLHShorts();
xEU5MXOBDLHAllowShortSignals = false;
}
// if (xEU5MXOBDLHEnableSignaller)
// {
// //
// xEU5Provider.DisableXOBDLHShorts();
// xEU5MXOBDLHAllowShortSignals = false;
// }
//
// XCHMACC ...
@@ -1340,21 +1340,21 @@ void XEU5DisableShortSignallers()
//
// XCHMAMX ...
if (xEU5MXCHMAMXEnableSignaller)
{
//
xEU5Provider.DisableXCHMAMXShorts();
xEU5MXCHMAMXAllowShortSignals = false;
}
// if (xEU5MXCHMAMXEnableSignaller)
// {
// //
// xEU5Provider.DisableXCHMAMXShorts();
// xEU5MXCHMAMXAllowShortSignals = false;
// }
//
// XCHMAMN ...
if (xEU5MXCHMAMNEnableSignaller)
{
//
xEU5Provider.DisableXCHMAMNShorts();
xEU5MXCHMAMNAllowShortSignals = false;
}
// if (xEU5MXCHMAMNEnableSignaller)
// {
// //
// xEU5Provider.DisableXCHMAMNShorts();
// xEU5MXCHMAMNAllowShortSignals = false;
// }
}
//
@@ -1432,20 +1432,20 @@ void XEU5EnableShortSignallers()
//
// XOBDLH ...
if (xEU5MXOBDLHEnableSignaller)
{
//
xEU5MXOBDLHAllowShortSignals =
xEU5XOBDLHAllowShortSignals
? true
: xEU5MXOBDLHAllowShortSignals;
// if (xEU5MXOBDLHEnableSignaller)
// {
// //
// xEU5MXOBDLHAllowShortSignals =
// xEU5XOBDLHAllowShortSignals
// ? true
// : xEU5MXOBDLHAllowShortSignals;
//
if (xEU5MXOBDLHAllowShortSignals)
{
xEU5Provider.EnableXOBDLHShorts();
}
}
// //
// if (xEU5MXOBDLHAllowShortSignals)
// {
// xEU5Provider.EnableXOBDLHShorts();
// }
// }
//
// XCHMACC ...
@@ -1466,37 +1466,37 @@ void XEU5EnableShortSignallers()
//
// XCHMAMX ...
if (xEU5MXCHMAMXEnableSignaller)
{
//
xEU5MXCHMAMXAllowShortSignals =
xEU5XCHMAMXAllowShortSignals
? true
: xEU5MXCHMAMXAllowShortSignals;
// if (xEU5MXCHMAMXEnableSignaller)
// {
// //
// xEU5MXCHMAMXAllowShortSignals =
// xEU5XCHMAMXAllowShortSignals
// ? true
// : xEU5MXCHMAMXAllowShortSignals;
//
if (xEU5MXCHMAMXAllowShortSignals)
{
xEU5Provider.EnableXCHMAMXShorts();
}
}
// //
// if (xEU5MXCHMAMXAllowShortSignals)
// {
// xEU5Provider.EnableXCHMAMXShorts();
// }
// }
//
// XCHMAMN ...
if (xEU5MXCHMAMNEnableSignaller)
{
//
xEU5MXCHMAMNAllowShortSignals =
xEU5XCHMAMNAllowShortSignals
? true
: xEU5MXCHMAMNAllowShortSignals;
// if (xEU5MXCHMAMNEnableSignaller)
// {
// //
// xEU5MXCHMAMNAllowShortSignals =
// xEU5XCHMAMNAllowShortSignals
// ? true
// : xEU5MXCHMAMNAllowShortSignals;
//
if (xEU5MXCHMAMNAllowShortSignals)
{
xEU5Provider.EnableXCHMAMNShorts();
}
}
// //
// if (xEU5MXCHMAMNAllowShortSignals)
// {
// xEU5Provider.EnableXCHMAMNShorts();
// }
// }
}
//