diff --git a/Console.cpp b/Console.cpp index 8ca61a6b..33b31275 100644 --- a/Console.cpp +++ b/Console.cpp @@ -288,12 +288,12 @@ void Console::ValueSet(int x, double y) if (iMode == 4) if (PoKeys55[0]) { - if (x == 7) - { - PoKeys55[0]->PoExtUpdate(8, y); - } // nbmx: wal kulakowy - else - { + //if (x == 7) + //{ + // PoKeys55[0]->PoExtUpdate(8, y); + //} // nbmx: wal kulakowy + //else + //{ if (Global::iCalibrateOutDebugInfo == x) WriteLog("CalibrateOutDebugInfo: oryginal=" + AnsiString(y), false); if (Global::fCalibrateOutMax[x] > 0) @@ -312,11 +312,11 @@ void Console::ValueSet(int x, double y) if (Global::iCalibrateOutDebugInfo == x) WriteLog(" calibrated=" + AnsiString(temp)); PoKeys55[0]->PWM(x, temp); - if (x == 6) - { - PoKeys55[0]->PoExtUpdate(9, temp); //dodatkowo hasler na PoExt - } - } + //if (x == 6) + //{ + // PoKeys55[0]->PoExtUpdate(9, temp); //dodatkowo hasler na PoExt + //} + //} } }; diff --git a/Console/PoKeys55.cpp b/Console/PoKeys55.cpp index 99e61136..10aa9cef 100644 --- a/Console/PoKeys55.cpp +++ b/Console/PoKeys55.cpp @@ -389,8 +389,8 @@ bool TPoKeys55::Update(bool pause) // powinno jeszcze przyjść potwierdzenie o kodzie 0x41 break; case 4: //ustawienie - if (PoExtWrite(PoExt)) - iRepeats = 0; //informacja, że poszło dobrze + //if (PoExtWrite(PoExt)) + // iRepeats = 0; //informacja, że poszło dobrze iFaza = 0; //++iFaza; //ta faza została zakończona break; default: diff --git a/EU07.bpr b/EU07.bpr index cb7ba242..30c44f0e 100644 --- a/EU07.bpr +++ b/EU07.bpr @@ -57,9 +57,9 @@ [Version Info] IncludeVerInfo=1 AutoIncBuild=0 -MajorVer=15 -MinorVer=4 -Release=1171 +MajorVer=16 +MinorVer=0 +Release=1172 Build=475 Debug=1 PreRelease=0 @@ -72,15 +72,22 @@ CodePage=1250 [Version Info Keys] CompanyName=EU07 Team FileDescription=MaSzyna EU07-424 -FileVersion=15.4.1171.475 -InternalName=9th by firleju + Ra + SPKS + MP +FileVersion=16.0.1172.475 +InternalName=10th exe + SPKS + asynch + python LegalCopyright= LegalTrademarks= OriginalFilename=eu07.exe ProductName=MaSzyna EU07-424 -ProductVersion=15.4 +ProductVersion=16.0 Comments= +[Excluded Packages] +$(BCB)\Bin\bcbsmp50.bpl=Borland C++ Sample Components +$(BCB)\Bin\dclqrt50.bpl=QuickReport Components +C:\Windows\system32\ibsmp50.bpl=Borland C++ InterBase Alerter Component +$(BCB)\Bin\dcltee50.bpl=TeeChart 5.0 Components +$(BCB)\Bin\applet50.bpl=Borland Control Panel Applet Package + [HistoryLists\hlIncludePath] Count=2 Item0=Console;opengl;McZapkie;$(BCB)\include;$(BCB)\include\vcl;python\include diff --git a/EU07.cpp b/EU07.cpp index 1b19dac7..21c95236 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -11,7 +11,11 @@ http://mozilla.org/MPL/2.0/. Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others */ - +/* +Authors: +MarcinW, McZapkie, Shaxbee, ABu, nbmx, youBy, Ra, winger, mamut, Q424, +Stele, firleju, szociu, hunter, ZiomalCl and others +*/ #include "opengl/glew.h" #include "opengl/glut.h" #include "opengl/ARB_Multisample.h" diff --git a/Globals.cpp b/Globals.cpp index 5f8704f3..65aedecd 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -49,9 +49,9 @@ double Global::fLuminance = 1.0; // jasno int Global::iReCompile = 0; // zwiększany, gdy trzeba odświeżyć siatki HWND Global::hWnd = NULL; // uchwyt okna int Global::iCameraLast = -1; -AnsiString Global::asRelease = "15.4.1171.475"; +AnsiString Global::asRelease = "16.0.1172.475"; AnsiString Global::asVersion = - "Compilation 2016-05-03, release " + Global::asRelease + "."; // tutaj, bo wysyłany + "Compilation 2016-05-25, release " + Global::asRelease + "."; // tutaj, bo wysyłany int Global::iViewMode = 0; // co aktualnie widać: 0-kabina, 1-latanie, 2-sprzęgi, 3-dokumenty int Global::iTextMode = 0; // tryb pracy wyświetlacza tekstowego int Global::iScreenMode[12] = {0, 0, 0, 0, 0, 0,