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

Wyłączenie PoExt, gdyż powodował błędy. Dodani wszyscy znani autorzy w eu07.cpp

Browse Source
This commit is contained in:
firleju
2016-05-24 21:49:47 +02:00
parent efa2d07f48
commit 4bd94daa1b
5 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Console.cpp
View File

@@ -288,12 +288,12 @@ void Console::ValueSet(int x, double y)
if (iMode == 4) if (iMode == 4)
if (PoKeys55[0]) if (PoKeys55[0])
{ {
if (x == 7) //if (x == 7)
{ //{
PoKeys55[0]->PoExtUpdate(8, y); // PoKeys55[0]->PoExtUpdate(8, y);
} // nbmx: wal kulakowy //} // nbmx: wal kulakowy
else //else
{ //{
if (Global::iCalibrateOutDebugInfo == x) if (Global::iCalibrateOutDebugInfo == x)
WriteLog("CalibrateOutDebugInfo: oryginal=" + AnsiString(y), false); WriteLog("CalibrateOutDebugInfo: oryginal=" + AnsiString(y), false);
if (Global::fCalibrateOutMax[x] > 0) if (Global::fCalibrateOutMax[x] > 0)
@@ -312,11 +312,11 @@ void Console::ValueSet(int x, double y)
if (Global::iCalibrateOutDebugInfo == x) if (Global::iCalibrateOutDebugInfo == x)
WriteLog(" calibrated=" + AnsiString(temp)); WriteLog(" calibrated=" + AnsiString(temp));
PoKeys55[0]->PWM(x, temp); PoKeys55[0]->PWM(x, temp);
if (x == 6) //if (x == 6)
{ //{
PoKeys55[0]->PoExtUpdate(9, temp); //dodatkowo hasler na PoExt // PoKeys55[0]->PoExtUpdate(9, temp); //dodatkowo hasler na PoExt
} //}
} //}
} }
}; };

4
Console/PoKeys55.cpp
View File

@@ -389,8 +389,8 @@ bool TPoKeys55::Update(bool pause)
// powinno jeszcze przyjϾ potwierdzenie o kodzie 0x41 // powinno jeszcze przyjϾ potwierdzenie o kodzie 0x41
break; break;
case 4: //ustawienie case 4: //ustawienie
if (PoExtWrite(PoExt)) //if (PoExtWrite(PoExt))
iRepeats = 0; //informacja, ¿e posz³o dobrze // iRepeats = 0; //informacja, ¿e posz³o dobrze
iFaza = 0; //++iFaza; //ta faza zosta³a zakoñczona iFaza = 0; //++iFaza; //ta faza zosta³a zakoñczona
break; break;
default: default:

19
EU07.bpr
View File

@@ -57,9 +57,9 @@
[Version Info] [Version Info]
IncludeVerInfo=1 IncludeVerInfo=1
AutoIncBuild=0 AutoIncBuild=0
MajorVer=15 MajorVer=16
MinorVer=4 MinorVer=0
Release=1171 Release=1172
Build=475 Build=475
Debug=1 Debug=1
PreRelease=0 PreRelease=0
@@ -72,15 +72,22 @@ CodePage=1250
[Version Info Keys] [Version Info Keys]
CompanyName=EU07 Team CompanyName=EU07 Team
FileDescription=MaSzyna EU07-424 FileDescription=MaSzyna EU07-424
FileVersion=15.4.1171.475 FileVersion=16.0.1172.475
InternalName=9th by firleju + Ra + SPKS + MP InternalName=10th exe + SPKS + asynch + python
LegalCopyright= LegalCopyright=
LegalTrademarks= LegalTrademarks=
OriginalFilename=eu07.exe OriginalFilename=eu07.exe
ProductName=MaSzyna EU07-424 ProductName=MaSzyna EU07-424
ProductVersion=15.4 ProductVersion=16.0
Comments= 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] [HistoryLists\hlIncludePath]
Count=2 Count=2
Item0=Console;opengl;McZapkie;$(BCB)\include;$(BCB)\include\vcl;python\include Item0=Console;opengl;McZapkie;$(BCB)\include;$(BCB)\include\vcl;python\include

6
EU07.cpp
View File

@@ -11,7 +11,11 @@ http://mozilla.org/MPL/2.0/.
Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others 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/glew.h"
#include "opengl/glut.h" #include "opengl/glut.h"
#include "opengl/ARB_Multisample.h" #include "opengl/ARB_Multisample.h"

4
Globals.cpp
View File

@@ -49,9 +49,9 @@ double Global::fLuminance = 1.0; // jasno
int Global::iReCompile = 0; // zwiêkszany, gdy trzeba odœwie¿yæ siatki int Global::iReCompile = 0; // zwiêkszany, gdy trzeba odœwie¿yæ siatki
HWND Global::hWnd = NULL; // uchwyt okna HWND Global::hWnd = NULL; // uchwyt okna
int Global::iCameraLast = -1; int Global::iCameraLast = -1;
AnsiString Global::asRelease = "15.4.1171.475"; AnsiString Global::asRelease = "16.0.1172.475";
AnsiString Global::asVersion = 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::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::iTextMode = 0; // tryb pracy wyœwietlacza tekstowego
int Global::iScreenMode[12] = {0, 0, 0, 0, 0, 0, int Global::iScreenMode[12] = {0, 0, 0, 0, 0, 0,