eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 17:29:18 +02:00
Code Issues 123 Wiki Activity

Dodana informacja o wersji

Browse Source
This commit is contained in:
firleju
2017-01-19 18:01:44 +01:00
parent 3dec967d30
commit dcf91d9044
2 changed files with 220 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

275
Console.cpp
View File

@@ -10,11 +10,12 @@ http://mozilla.org/MPL/2.0/.
#include "stdafx.h" #include "stdafx.h"
#include "Console.h" #include "Console.h"
#include "Globals.h" #include "Globals.h"
#include "Logs.h"
#include "PoKeys55.h"
#include "LPT.h" #include "LPT.h"
#include "mczapkie/mctools.h" #include "Logs.h"
#include "MWD.h" // maciek001: obsluga portu COM #include "MWD.h" // maciek001: obsluga portu COM
#include "PoKeys55.h"
#include "mczapkie/mctools.h"
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Ra: klasa statyczna gromadz<64>ca sygna<6E>y steruj<75>ce oraz informacje zwrotne // Ra: klasa statyczna gromadz<64>ca sygna<6E>y steruj<75>ce oraz informacje zwrotne
@@ -80,20 +81,21 @@ public static Int32 GetScreenSaverTimeout()
*/ */
// static class member storage allocation // static class member storage allocation
TKeyTrans Console::ktTable[ 4 * 256 ]; TKeyTrans Console::ktTable[4 * 256];
// Ra: do poprawienia // Ra: do poprawienia
void SetLedState(char Code, bool bOn) void SetLedState(char Code, bool bOn){
{ // Ra: bajer do migania LED-ami w klawiaturze // Ra: bajer do migania LED-ami w klawiaturze
// NOTE: disabled for the time being // NOTE: disabled for the time being
// TODO: find non Borland specific equivalent, or get rid of it // TODO: find non Borland specific equivalent, or get rid of it
/* if (Win32Platform == VER_PLATFORM_WIN32_NT) /* if (Win32Platform == VER_PLATFORM_WIN32_NT)
{ {
// WriteLog(AnsiString(int(GetAsyncKeyState(Code)))); // WriteLog(AnsiString(int(GetAsyncKeyState(Code))));
if (bool(GetAsyncKeyState(Code)) != bOn) if (bool(GetAsyncKeyState(Code)) != bOn)
{ {
keybd_event(Code, MapVirtualKey(Code, 0), KEYEVENTF_EXTENDEDKEY, 0); keybd_event(Code, MapVirtualKey(Code, 0), KEYEVENTF_EXTENDEDKEY, 0);
keybd_event(Code, MapVirtualKey(Code, 0), KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0); keybd_event(Code, MapVirtualKey(Code, 0), KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP,
0);
} }
} }
else else
@@ -103,7 +105,7 @@ void SetLedState(char Code, bool bOn)
KBState[Code] = bOn ? 1 : 0; KBState[Code] = bOn ? 1 : 0;
SetKeyboardState(KBState); SetKeyboardState(KBState);
}; };
*/ */
}; };
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
@@ -113,7 +115,7 @@ int Console::iMode = 0;
int Console::iConfig = 0; int Console::iConfig = 0;
TPoKeys55 *Console::PoKeys55[2] = {NULL, NULL}; TPoKeys55 *Console::PoKeys55[2] = {NULL, NULL};
TLPT *Console::LPT = NULL; TLPT *Console::LPT = NULL;
MWDComm * Console::MWD = NULL; // maciek001: obiekt dla MWD MWDComm *Console::MWD = NULL; // maciek001: obiekt dla MWD
int Console::iSwitch[8]; // bistabilne w kabinie, za<7A><61>czane z [Shift], wy<77><79>czane bez int Console::iSwitch[8]; // bistabilne w kabinie, za<7A><61>czane z [Shift], wy<77><79>czane bez
int Console::iButton[8]; // monostabilne w kabinie, za<7A><61>czane podczas trzymania klawisza int Console::iButton[8]; // monostabilne w kabinie, za<7A><61>czane podczas trzymania klawisza
@@ -178,7 +180,8 @@ int Console::On()
break; break;
case 5: // maciek001: MWD OK case 5: // maciek001: MWD OK
MWD = new MWDComm(); MWD = new MWDComm();
if(!(MWD->Open())){ if (!(MWD->Open()))
{
delete MWD; delete MWD;
iMode = 0; iMode = 0;
Global::iFeedbackMode = 0; Global::iFeedbackMode = 0;
@@ -204,10 +207,8 @@ void Console::Off()
PoKeys55[1] = NULL; PoKeys55[1] = NULL;
delete LPT; delete LPT;
LPT = NULL; LPT = NULL;
if(iMode == 5 || MWD->GetMWDState()){
delete MWD; // maciek001: zamykanie portu COM i takie tam inne ;) delete MWD; // maciek001: zamykanie portu COM i takie tam inne ;)
MWD = NULL; MWD = NULL;
}
}; };
void Console::BitsSet(int mask, int entry) void Console::BitsSet(int mask, int entry)
@@ -218,7 +219,8 @@ void Console::BitsSet(int mask, int entry)
iBits |= mask; iBits |= mask;
BitsUpdate(old ^ iBits); // 1 dla bit<69>w zmienionych BitsUpdate(old ^ iBits); // 1 dla bit<69>w zmienionych
if (iMode == 4) if (iMode == 4)
WriteLog("PoKeys::BitsSet: mask: " + std::to_string(mask) + " iBits: " + std::to_string(iBits)); WriteLog("PoKeys::BitsSet: mask: " + std::to_string(mask) +
" iBits: " + std::to_string(iBits));
} }
}; };
@@ -297,50 +299,100 @@ void Console::BitsUpdate(int mask)
break; break;
case 5: // maciek001: MWD lampki i kontrolki case 5: // maciek001: MWD lampki i kontrolki
/* out3: ogrzewanie sk?adu, opory rozruchowe, poslizg, zaluzjewent, -, -, czuwak, shp /* out3: ogrzewanie sk?adu, opory rozruchowe, poslizg, zaluzjewent, -, -, czuwak, shp
out4: stycz.liniowe, pezekaznikr??nicobwpomoc, nadmiarprzetw, roznicowy obw. g?, nadmiarsilniki, wylszybki, zanikpr?duprzyje?dzienaoporach, nadmiarsprezarki out4: stycz.liniowe, pezekaznikr??nicobwpomoc, nadmiarprzetw, roznicowy obw. g?,
nadmiarsilniki, wylszybki, zanikpr?duprzyje?dzienaoporach, nadmiarsprezarki
out5: HASLER */ out5: HASLER */
if(mask & 0x0001) if(iBits & 1){ if (mask & 0x0001)
MWD->WriteDataBuff[4] |= 1<<7; // SHP HASLER te<74> if (iBits & 1)
if(!MWD->bSHPstate){ {
MWD->WriteDataBuff[4] |= 1 << 7; // SHP HASLER te<74>
if (!MWD->bSHPstate)
{
MWD->bSHPstate = true; MWD->bSHPstate = true;
MWD->bPrzejazdSHP = true; MWD->bPrzejazdSHP = true;
}else MWD->bPrzejazdSHP = false;
} }
else{ else
MWD->WriteDataBuff[4] &= ~(1<<7); MWD->bPrzejazdSHP = false;
}
else
{
MWD->WriteDataBuff[4] &= ~(1 << 7);
MWD->bPrzejazdSHP = false; MWD->bPrzejazdSHP = false;
MWD->bSHPstate = false; MWD->bSHPstate = false;
} }
if(mask & 0x0002) if(iBits & 2) MWD->WriteDataBuff[4] |= 1<<6; // CA if (mask & 0x0002)
else MWD->WriteDataBuff[4] &= ~(1<<6); if (iBits & 2)
if(mask & 0x0004) if(iBits & 4) MWD->WriteDataBuff[4] |= 1<<1; // jazda na oporach rozruchowych MWD->WriteDataBuff[4] |= 1 << 6; // CA
else MWD->WriteDataBuff[4] &= ~(1<<1); else
if(mask & 0x0008) if(iBits & 8) MWD->WriteDataBuff[5] |= 1<<5; // wy??cznik szybki MWD->WriteDataBuff[4] &= ~(1 << 6);
else MWD->WriteDataBuff[5] &= ~(1<<5); if (mask & 0x0004)
if(mask & 0x0010) if(iBits & 0x10) MWD->WriteDataBuff[5] |= 1<<4; // nadmiarowy silnik?w trakcyjnych if (iBits & 4)
else MWD->WriteDataBuff[5] &= ~(1<<4); MWD->WriteDataBuff[4] |= 1 << 1; // jazda na oporach rozruchowych
if(mask & 0x0020) if(iBits & 0x20) MWD->WriteDataBuff[4] |= 1<<0; // styczniki liniowe else
else MWD->WriteDataBuff[5] &= ~(1<<0); MWD->WriteDataBuff[4] &= ~(1 << 1);
if(mask & 0x0040) if(iBits & 0x40) MWD->WriteDataBuff[4] |= 1<<2; // po?lizg if (mask & 0x0008)
else MWD->WriteDataBuff[4] &= ~(1<<2); if (iBits & 8)
if(mask & 0x0080) if(iBits & 0x80) MWD->WriteDataBuff[5] |= 1<<2; // (nadmiarowy) przetwornicy? ++ MWD->WriteDataBuff[5] |= 1 << 5; // wy??cznik szybki
else MWD->WriteDataBuff[5] &= ~(1<<2); else
if(mask & 0x0100) if(iBits & 0x100) MWD->WriteDataBuff[5] |= 1<<7; // nadmiarowy spr??arki MWD->WriteDataBuff[5] &= ~(1 << 5);
else MWD->WriteDataBuff[5] &= ~(1<<7); if (mask & 0x0010)
if(mask & 0x0200) if(iBits & 0x200) MWD->WriteDataBuff[2] |= 1<<1; // wentylatory i opory if (iBits & 0x10)
else MWD->WriteDataBuff[2] &= ~(1<<1); MWD->WriteDataBuff[5] |= 1 << 4; // nadmiarowy silnik?w trakcyjnych
if(mask & 0x0400) if(iBits & 0x400) MWD->WriteDataBuff[2] |= 1<<2; // wysoki rozruch else
else MWD->WriteDataBuff[2] &= ~(1<<2); MWD->WriteDataBuff[5] &= ~(1 << 4);
if(mask & 0x0800) if(iBits & 0x800) MWD->WriteDataBuff[4] |= 1<<0; // ogrzewanie poci?gu if (mask & 0x0020)
else MWD->WriteDataBuff[4] &= ~(1<<0); if (iBits & 0x20)
if(mask & 0x1000) if(iBits & 0x1000) MWD->bHamowanie = true; // hasler: ci?nienie w hamulcach HASLER rysik 2 MWD->WriteDataBuff[4] |= 1 << 0; // styczniki liniowe
else MWD->bHamowanie = false; else
if(mask & 0x2000) if(iBits & 0x2000) MWD->WriteDataBuff[6] |= 1<<4; // hasler: pr?d "na" silnikach HASLER rysik 3 MWD->WriteDataBuff[5] &= ~(1 << 0);
else MWD->WriteDataBuff[6] &= ~(1<<4); if (mask & 0x0040)
if(mask & 0x4000) if(iBits & 0x4000) MWD->WriteDataBuff[6] |= 1<<7; // brz?czyk SHP/CA if (iBits & 0x40)
else MWD->WriteDataBuff[6] &= ~(1<<7); MWD->WriteDataBuff[4] |= 1 << 2; // po?lizg
//if(mask & 0x8000) if(iBits & 0x8000) MWD->WriteDataBuff[1] |= 1<<7; (puste) else
//else MWD->WriteDataBuff[0] &= ~(1<<7); MWD->WriteDataBuff[4] &= ~(1 << 2);
if (mask & 0x0080)
if (iBits & 0x80)
MWD->WriteDataBuff[5] |= 1 << 2; // (nadmiarowy) przetwornicy? ++
else
MWD->WriteDataBuff[5] &= ~(1 << 2);
if (mask & 0x0100)
if (iBits & 0x100)
MWD->WriteDataBuff[5] |= 1 << 7; // nadmiarowy spr??arki
else
MWD->WriteDataBuff[5] &= ~(1 << 7);
if (mask & 0x0200)
if (iBits & 0x200)
MWD->WriteDataBuff[2] |= 1 << 1; // wentylatory i opory
else
MWD->WriteDataBuff[2] &= ~(1 << 1);
if (mask & 0x0400)
if (iBits & 0x400)
MWD->WriteDataBuff[2] |= 1 << 2; // wysoki rozruch
else
MWD->WriteDataBuff[2] &= ~(1 << 2);
if (mask & 0x0800)
if (iBits & 0x800)
MWD->WriteDataBuff[4] |= 1 << 0; // ogrzewanie poci?gu
else
MWD->WriteDataBuff[4] &= ~(1 << 0);
if (mask & 0x1000)
if (iBits & 0x1000)
MWD->bHamowanie = true; // hasler: ci?nienie w hamulcach HASLER rysik 2
else
MWD->bHamowanie = false;
if (mask & 0x2000)
if (iBits & 0x2000)
MWD->WriteDataBuff[6] |=
1 << 4; // hasler: pr?d "na" silnikach HASLER rysik 3
else
MWD->WriteDataBuff[6] &= ~(1 << 4);
if (mask & 0x4000)
if (iBits & 0x4000)
MWD->WriteDataBuff[6] |= 1 << 7; // brz?czyk SHP/CA
else
MWD->WriteDataBuff[6] &= ~(1 << 7);
// if(mask & 0x8000) if(iBits & 0x8000) MWD->WriteDataBuff[1] |= 1<<7; (puste)
// else MWD->WriteDataBuff[0] &= ~(1<<7);
break; break;
} }
}; };
@@ -362,51 +414,78 @@ void Console::ValueSet(int x, double y)
{ {
y = Global::CutValueToRange(0, y, Global::fCalibrateOutMax[x]); y = Global::CutValueToRange(0, y, Global::fCalibrateOutMax[x]);
if (Global::iCalibrateOutDebugInfo == x) if (Global::iCalibrateOutDebugInfo == x)
WriteLog(" cutted=" + std::to_string(y),false); WriteLog(" cutted=" + std::to_string(y), false);
y = y / Global::fCalibrateOutMax[x]; // sprowadzenie do <0,1> je<6A>li podana maksymalna warto<74><6F> y = y / Global::fCalibrateOutMax[x]; // sprowadzenie do <0,1> je<6A>li podana
// maksymalna warto<74><6F>
if (Global::iCalibrateOutDebugInfo == x) if (Global::iCalibrateOutDebugInfo == x)
WriteLog(" fraction=" + std::to_string(y),false); WriteLog(" fraction=" + std::to_string(y), false);
} }
double temp = (((((Global::fCalibrateOut[x][5] * y) + Global::fCalibrateOut[x][4]) * 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][3]) *
Global::fCalibrateOut[x][1]) * y + y +
Global::fCalibrateOut[x][2]) *
y +
Global::fCalibrateOut[x][1]) *
y +
Global::fCalibrateOut[x][0]; // zakres <0;1> Global::fCalibrateOut[x][0]; // zakres <0;1>
if (Global::iCalibrateOutDebugInfo == x) if (Global::iCalibrateOutDebugInfo == x)
WriteLog(" calibrated=" + std::to_string(temp)); WriteLog(" calibrated=" + std::to_string(temp));
PoKeys55[0]->PWM(x, temp); PoKeys55[0]->PWM(x, temp);
} }
if(iMode == 5 && MWD) //pwm-y i pr<70>dko<6B><6F> if (iMode == 5 && MWD) // pwm-y i pr<70>dko<6B><6F>
{ {
unsigned int iliczba ; unsigned int iliczba;
if(x==0){ if (x == 0)
iliczba = (unsigned int) floor((y / (Global::fMWDzg[0] * 10) * Global::fMWDzg[1]) + 0.5); // zbiornik g??wny {
MWD->WriteDataBuff[12] = (unsigned char)(iliczba>>8); iliczba = (unsigned int)floor((y / (Global::fMWDzg[0] * 10) * Global::fMWDzg[1]) +
0.5); // zbiornik g??wny
MWD->WriteDataBuff[12] = (unsigned char)(iliczba >> 8);
MWD->WriteDataBuff[11] = (unsigned char)iliczba; MWD->WriteDataBuff[11] = (unsigned char)iliczba;
}else if(x==1){ }
iliczba = (unsigned int) floor((y / (Global::fMWDpg[0] * 10) * Global::fMWDpg[1]) + 0.5); // przew?d g??wny else if (x == 1)
MWD->WriteDataBuff[10] = (unsigned char)(iliczba>>8); {
iliczba = (unsigned int)floor((y / (Global::fMWDpg[0] * 10) * Global::fMWDpg[1]) +
0.5); // przew?d g??wny
MWD->WriteDataBuff[10] = (unsigned char)(iliczba >> 8);
MWD->WriteDataBuff[9] = (unsigned char)iliczba; MWD->WriteDataBuff[9] = (unsigned char)iliczba;
}else if(x==2){ }
iliczba = (unsigned int) floor((y / (Global::fMWDph[0] * 10) * Global::fMWDph[1]) + 0.5); // cylinder hamulcowy else if (x == 2)
MWD->WriteDataBuff[8] = (unsigned char)(iliczba>>8); {
iliczba = (unsigned int)floor((y / (Global::fMWDph[0] * 10) * Global::fMWDph[1]) +
0.5); // cylinder hamulcowy
MWD->WriteDataBuff[8] = (unsigned char)(iliczba >> 8);
MWD->WriteDataBuff[7] = (unsigned char)iliczba; MWD->WriteDataBuff[7] = (unsigned char)iliczba;
}else if(x==3){ }
iliczba = (unsigned int) floor((y / Global::fMWDvolt[0] * Global::fMWDvolt[1]) + 0.5); // woltomierz WN else if (x == 3)
MWD->WriteDataBuff[14] = (unsigned char)(iliczba>>8); {
iliczba = (unsigned int)floor((y / Global::fMWDvolt[0] * Global::fMWDvolt[1]) +
0.5); // woltomierz WN
MWD->WriteDataBuff[14] = (unsigned char)(iliczba >> 8);
MWD->WriteDataBuff[13] = (unsigned char)iliczba; MWD->WriteDataBuff[13] = (unsigned char)iliczba;
}else if(x==4){ }
iliczba = (unsigned int)floor((y / Global::fMWDamp[0] * Global::fMWDamp[1]) + 0.5); // amp WN 1 else if (x == 4)
MWD->WriteDataBuff[16] = (unsigned char)(iliczba>>8); {
iliczba = (unsigned int)floor((y / Global::fMWDamp[0] * Global::fMWDamp[1]) +
0.5); // amp WN 1
MWD->WriteDataBuff[16] = (unsigned char)(iliczba >> 8);
MWD->WriteDataBuff[15] = (unsigned char)iliczba; MWD->WriteDataBuff[15] = (unsigned char)iliczba;
}else if(x==5){ }
iliczba = (unsigned int)floor((y / Global::fMWDamp[0] * Global::fMWDamp[1]) + 0.5); // amp WN 2 else if (x == 5)
MWD->WriteDataBuff[18] = (unsigned char)(iliczba>>8); {
iliczba = (unsigned int)floor((y / Global::fMWDamp[0] * Global::fMWDamp[1]) +
0.5); // amp WN 2
MWD->WriteDataBuff[18] = (unsigned char)(iliczba >> 8);
MWD->WriteDataBuff[17] = (unsigned char)iliczba; MWD->WriteDataBuff[17] = (unsigned char)iliczba;
}else if(x==6){ }
iliczba = (unsigned int)floor((y / Global::fMWDamp[0] * Global::fMWDamp[1]) + 0.5); // amp WN 3 else if (x == 6)
MWD->WriteDataBuff[20] = (unsigned int)(iliczba>>8); {
iliczba = (unsigned int)floor((y / Global::fMWDamp[0] * Global::fMWDamp[1]) +
0.5); // amp WN 3
MWD->WriteDataBuff[20] = (unsigned int)(iliczba >> 8);
MWD->WriteDataBuff[19] = (unsigned char)iliczba; MWD->WriteDataBuff[19] = (unsigned char)iliczba;
}else if(x==7) MWD->WriteDataBuff[0] = (unsigned char)floor(y); // pr<70>dko<6B><6F> }
else if (x == 7)
MWD->WriteDataBuff[0] = (unsigned char)floor(y); // pr<70>dko<6B><6F>
} }
}; };
@@ -425,7 +504,7 @@ void Console::Update()
Global::iPause |= 8; // tak??? Global::iPause |= 8; // tak???
PoKeys55[0]->Connect(); // pr<70>ba ponownego pod<6F><64>czenia PoKeys55[0]->Connect(); // pr<70>ba ponownego pod<6F><64>czenia
} }
if (iMode == 5)// Obs?uga MWD OK if (iMode == 5) // Obs?uga MWD OK
{ {
MWD->Run(); MWD->Run();
} }
@@ -445,24 +524,34 @@ float Console::AnalogCalibrateGet(int x)
{ {
float b = PoKeys55[0]->fAnalog[x]; float b = PoKeys55[0]->fAnalog[x];
return (((((Global::fCalibrateIn[x][5] * b) + Global::fCalibrateIn[x][4]) * b + return (((((Global::fCalibrateIn[x][5] * b) + Global::fCalibrateIn[x][4]) * b +
Global::fCalibrateIn[x][3]) * b + Global::fCalibrateIn[x][2]) * b + Global::fCalibrateIn[x][3]) *
Global::fCalibrateIn[x][1]) *b + Global::fCalibrateIn[x][0]; b +
Global::fCalibrateIn[x][2]) *
b +
Global::fCalibrateIn[x][1]) *
b +
Global::fCalibrateIn[x][0];
} }
if(iMode == 5 && MWD) // maciek001: obs?uga hamulc?w (wej?? analogowych) OK if (iMode == 5 && MWD) // maciek001: obs?uga hamulc?w (wej?? analogowych) OK
{ {
float b = MWD->fAnalog[x]; float b = MWD->fAnalog[x];
//b = b*(Global::fMWDAnalogCalib[x][0]-Global::fMWDAnalogCalib[x][1])/Global::fMWDAnalogCalib[x][3]+Global::fMWDAnalogCalib[x][1]/Global::fMWDAnalogCalib[x][3]; // b =
b = (b-Global::fMWDAnalogCalib[x][1])/(Global::fMWDAnalogCalib[x][1]-Global::fMWDAnalogCalib[x][0]); // b*(Global::fMWDAnalogCalib[x][0]-Global::fMWDAnalogCalib[x][1])/Global::fMWDAnalogCalib[x][3]+Global::fMWDAnalogCalib[x][1]/Global::fMWDAnalogCalib[x][3];
switch(x) b = (b - Global::fMWDAnalogCalib[x][1]) /
(Global::fMWDAnalogCalib[x][1] - Global::fMWDAnalogCalib[x][0]);
switch (x)
{ {
case 0: return (b*8-2); case 0:
return (b * 8 - 2);
break; break;
case 1: return (b*10); case 1:
return (b * 10);
break; break;
default: return 0; default:
return 0;
} }
} }
return -1.0; //odci<63>cie return -1.0; // odci<EFBFBD>cie
}; };
unsigned char Console::DigitalGet(int x) unsigned char Console::DigitalGet(int x)

BIN
maszyna.rc
View File

Binary file not shown.