eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/firleju/maszyna

Browse Source
This commit is contained in:
antonisauren
2016-07-28 19:50:07 +02:00
parent 3731d3a0dc a324e9fd02
commit e3e7b764d0
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Console.cpp
View File

@@ -288,6 +288,7 @@ void Console::ValueSet(int x, double y)
if (iMode == 4)
if (PoKeys55[0])
{
x = Global::iPoKeysPWM[x];
if (Global::iCalibrateOutDebugInfo == x)
WriteLog("CalibrateOutDebugInfo: oryginal=" + AnsiString(y), false);
if (Global::fCalibrateOutMax[x] > 0)

8
Globals.cpp
View File

@@ -177,6 +177,7 @@ double Global::fCalibrateOut[7][6] = {{0, 1, 0, 0, 0, 0},
{0, 1, 0, 0, 0, 0}};
double Global::fCalibrateOutMax[7] = {0, 0, 0, 0, 0, 0, 0};
int Global::iCalibrateOutDebugInfo = -1;
int Global::iPoKeysPWM[7] = {0, 1, 2, 3, 4, 5, 6};
// parametry przejœciowe (do usuniêcia)
// bool Global::bTimeChange=false; //Ra: ZiomalCl wy³¹czy³ star¹ wersjê nocy
// bool Global::bRenderAlpha=true; //Ra: wywali³am tê flagê
@@ -501,6 +502,12 @@ void Global::ConfigParse(TQueryParserComp *qp, cParser *cp)
}
else if (str == AnsiString("calibrateoutdebuginfo")) // wyjœcie z info o przebiegu kalibracji
iCalibrateOutDebugInfo = GetNextSymbol().ToInt();
else if (str == AnsiString("pwm")) // zmiana numerów wyjœæ PWM
{
int pwm_out = GetNextSymbol().ToInt();
int pwm_no = GetNextSymbol().ToInt();
iPoKeysPWM[pwm_out] = pwm_no;
}
else if (str == AnsiString("brakestep")) // krok zmiany hamulca dla klawiszy [Num3] i [Num9]
fBrakeStep = GetNextSymbol().ToDouble();
else if (str ==
@@ -912,5 +919,4 @@ double Global::CutValueToRange(double min, double value, double max)
return value;
};
#pragma package(smart_init)

5
Globals.h
View File

@@ -311,7 +311,9 @@ class Global
static AnsiString asLang; // domyœlny jêzyk - http://tools.ietf.org/html/bcp47
static int iHiddenEvents; // czy ³¹czyæ eventy z torami poprzez nazwê toru
static TTextSound *tsRadioBusy[10]; // zajêtoœæ kana³ów radiowych (wskaŸnik na odgrywany dŸwiêk)
// metody
static int iPoKeysPWM[7]; // numery wejϾ dla PWM
// metody
static void TrainDelete(TDynamicObject *d);
static void ConfigParse(Queryparsercomp::TQueryParserComp *qp, cParser *cp = NULL);
static AnsiString GetNextSymbol();
@@ -322,6 +324,7 @@ class Global
static AnsiString Bezogonkow(AnsiString str, bool _ = false);
static double Min0RSpeed(double vel1, double vel2);
static double CutValueToRange(double min, double value, double max);
};
//---------------------------------------------------------------------------