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 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-09-16 22:48:53 +02:00
parent e938466c90 e881092ca0
commit d9687a4e1f
126 changed files with 40430 additions and 6134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Console.cpp
View File

@@ -89,8 +89,7 @@ Console::Console()
Console::~Console()
{
delete PoKeys55[0];
delete PoKeys55[1];
Console::Off();
};
void Console::ModeSet(int m, int h)
@@ -268,14 +267,13 @@ void Console::ValueSet(int x, double y)
WriteLog( " fraction=" + std::to_string( y ) );
}
}
double temp = (((((Global.fCalibrateOut[x][5] * y) + Global.fCalibrateOut[x][4]) * y +
Global.fCalibrateOut[x][3]) *
y +
Global.fCalibrateOut[x][2]) *
y +
Global.fCalibrateOut[x][1]) *
y +
Global.fCalibrateOut[x][0]; // zakres <0;1>
double temp = (((((
Global.fCalibrateOut[x][5] * y)
+ Global.fCalibrateOut[x][4]) * y
+ Global.fCalibrateOut[x][3]) * y
+ Global.fCalibrateOut[x][2]) * y
+ Global.fCalibrateOut[x][1]) * y
+ Global.fCalibrateOut[x][0]; // zakres <0;1>
if( Global.iCalibrateOutDebugInfo == x ) {
WriteLog( " calibrated=" + std::to_string( temp ) );
}
@@ -313,11 +311,13 @@ float Console::AnalogCalibrateGet(int x)
if (iMode == 4 && PoKeys55[0])
{
float b = PoKeys55[0]->fAnalog[x];
b = (((((Global.fCalibrateIn[x][5] * b) + Global.fCalibrateIn[x][4]) * b +
Global.fCalibrateIn[x][3]) * b +
Global.fCalibrateIn[x][2]) * b +
Global.fCalibrateIn[x][1]) * b +
Global.fCalibrateIn[x][0];
b = (((((
Global.fCalibrateIn[x][5] * b)
+ Global.fCalibrateIn[x][4]) * b
+ Global.fCalibrateIn[x][3]) * b
+ Global.fCalibrateIn[x][2]) * b
+ Global.fCalibrateIn[x][1]) * b
+ Global.fCalibrateIn[x][0];
if (x == 0) return (b + 2) / 8;
if (x == 1) return b/10;
else return b;