eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-20 11:29:18 +02:00
Code Issues 123 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

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)