status epd 2 & 3
This commit is contained in:
Luc
parent
87cf990ebd
commit
613691c087
20 changed files with 297498 additions and 310 deletions
331
MK3/MK3.cpp
331
MK3/MK3.cpp
|
|
@ -1,6 +1,7 @@
|
|||
#include "pch.h"
|
||||
#include "MK3.h"
|
||||
|
||||
#pragma managed
|
||||
|
||||
MK3::Epd2::Epd2(int port)
|
||||
{
|
||||
|
|
@ -33,7 +34,11 @@ int MK3::Epd2::Connect(bool reinit)
|
|||
if (DiscRV == 1)
|
||||
{
|
||||
DeviceCount = epd->DeviceCount;
|
||||
if (epd->DeviceCount >= 0) b->CurrentDeviceID = epd->DeviceIDs[0];
|
||||
if (epd->DeviceCount >= 0)
|
||||
{
|
||||
b->CurrentDeviceID = epd->DeviceIDs[0];
|
||||
EpdID = b->CurrentDeviceID;
|
||||
}
|
||||
}
|
||||
else {
|
||||
ConnectError = epd->Error;
|
||||
|
|
@ -45,7 +50,7 @@ int MK3::Epd2::Connect(bool reinit)
|
|||
int MK3::Epd2::Close()
|
||||
{
|
||||
b->CurrentDeviceID = 0;
|
||||
if (epd != nullptr) epd->Close();
|
||||
if (epd != nullptr) epd->CloseDev();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -112,168 +117,168 @@ int MK3::Epd2::GetStatus()
|
|||
return StatusRV;
|
||||
}
|
||||
|
||||
int MK3::Epd2::GetDoses()
|
||||
{
|
||||
Hp10 = Hp07 = 0.0;
|
||||
ReadDosesRV = epd->ReadDoses();
|
||||
//int MK3::Epd2::GetDoses()
|
||||
//{
|
||||
// Hp10 = Hp07 = 0.0;
|
||||
// ReadDosesRV = epd->ReadDoses();
|
||||
//
|
||||
// if (ReadDosesRV == 1) {
|
||||
// GetDosesError = 0;
|
||||
// Hp10 = (double)epd->Hp10Dose / 64.0;
|
||||
// Hp07 = (double)epd->Hp07Dose / 64.0;
|
||||
// Hp07Peak = (double)epd->Hp07Peak / 64.0;
|
||||
// Hp10Peak = (double)epd->Hp10Peak / 64.0;
|
||||
//
|
||||
// Hp07Total = epd->Hp07Total / 64.0;
|
||||
// Hp10Total = epd->Hp10Total / 64.0;
|
||||
// }
|
||||
// else {
|
||||
// GetDosesError = epd->Error;
|
||||
// }
|
||||
//
|
||||
// if (epd->Hp10Time > 0) {
|
||||
// double x = (epd->EpdClock - epd->Hp10Time) * -1.0;
|
||||
// Hp10PeakTime = System::DateTime::Now.AddSeconds(x);
|
||||
// }
|
||||
// else
|
||||
// Hp10PeakTime = System::Nullable<System::DateTime>();;
|
||||
// if (epd->Hp07Time > 0) {
|
||||
// double x = (epd->EpdClock - epd->Hp07Time) * -1.0;
|
||||
// Hp07PeakTime = System::DateTime::Now.AddSeconds(x);
|
||||
// }
|
||||
// else
|
||||
// Hp10PeakTime = System::Nullable<System::DateTime>();
|
||||
//
|
||||
// QualityData = epd->QualityData;
|
||||
// K1 = epd->K1;
|
||||
// K2 = epd->K2;
|
||||
// K3 = epd->K3;
|
||||
// K4 = epd->K4;
|
||||
// K5 = epd->K5;
|
||||
// K6 = epd->K6;
|
||||
// SG = epd->SG;
|
||||
// BC = epd->SG;
|
||||
// FB = epd->FB;
|
||||
// HG = epd->HG;
|
||||
//
|
||||
// return ReadDosesRV;
|
||||
//}
|
||||
//
|
||||
//int MK3::Epd2::SetDeIssued()
|
||||
//{
|
||||
// return epd->DeIssue();
|
||||
//}
|
||||
//
|
||||
//int MK3::Epd2::PrepareForIssue()
|
||||
//{
|
||||
// PrepareForIssueError = 0;
|
||||
// int rv = epd->PrepareForIssue();
|
||||
// if (rv != 1) PrepareForIssueError = epd->Error;
|
||||
// return rv;
|
||||
//}
|
||||
|
||||
if (ReadDosesRV == 1) {
|
||||
GetDosesError = 0;
|
||||
Hp10 = (double)epd->Hp10Dose / 64.0;
|
||||
Hp07 = (double)epd->Hp07Dose / 64.0;
|
||||
Hp07Peak = (double)epd->Hp07Peak / 64.0;
|
||||
Hp10Peak = (double)epd->Hp10Peak / 64.0;
|
||||
//int MK3::Epd2::SetIssued()
|
||||
//{
|
||||
// SetIssuedError = 0;
|
||||
// epd->Hp07THDose = (DWORD)(Hp07THDose * 64.0);
|
||||
// epd->Hp10THDose1 = (DWORD)(Hp10THDose1 * 64.0);
|
||||
// epd->Hp10THDose2 = (DWORD)(Hp10THDose2 * 64.0);
|
||||
//
|
||||
// epd->Hp10Rate1On = (DWORD)(Hp10Rate1On);
|
||||
// epd->Hp10Rate2On = (DWORD)(Hp10Rate2On);
|
||||
// epd->Hp07RateOn = (DWORD)(Hp07RateOn);
|
||||
// epd->Hp10Rate1Off = (DWORD)(Hp10Rate1Off);
|
||||
// epd->Hp10Rate2Off = (DWORD)(Hp10Rate2Off);
|
||||
// epd->Hp07RateOff = (DWORD)(Hp07RateOff);
|
||||
//
|
||||
// memset(epd->WearerID, ' ', WearerIDLength); epd->WearerID[WearerIDLength] = 0;
|
||||
// char* str1 = (char*)(void*)Runtime::InteropServices::Marshal::StringToHGlobalAnsi(WearerID);
|
||||
// int l = strlen(str1);
|
||||
// if (l > WearerIDLength) l = WearerIDLength;
|
||||
// _memccpy(epd->WearerID + WearerIDLength - l, str1, l, WearerIDLength);
|
||||
// Runtime::InteropServices::Marshal::FreeHGlobal((IntPtr)str1);
|
||||
//
|
||||
// memset(epd->WearerName, 0, WearerNameLength + 1);
|
||||
// char* str2 = (char*)(void*)Runtime::InteropServices::Marshal::StringToHGlobalAnsi(WearerName);
|
||||
// l = strlen(str2);
|
||||
// if (l > WearerNameLength) l = WearerNameLength;
|
||||
// _memccpy(epd->WearerName, str2, l, WearerNameLength);
|
||||
// Runtime::InteropServices::Marshal::FreeHGlobal((IntPtr)str2);
|
||||
//
|
||||
// int rv = epd->Issue();
|
||||
// if (rv != 1) SetIssuedError = epd->Error;
|
||||
// return rv;
|
||||
//}
|
||||
|
||||
Hp07Total = epd->Hp07Total / 64.0;
|
||||
Hp10Total = epd->Hp10Total / 64.0;
|
||||
}
|
||||
else {
|
||||
GetDosesError = epd->Error;
|
||||
}
|
||||
//int MK3::Epd2::WriteCalibration()
|
||||
//{
|
||||
// epd->K1 = K1;
|
||||
// epd->K2 = K2;
|
||||
//
|
||||
// epd->K3 = K3;
|
||||
// epd->K4 = K4;
|
||||
//
|
||||
// epd->K5 = K5;
|
||||
// epd->K6 = K6;
|
||||
//
|
||||
// //epd->K1 = 903;
|
||||
// //epd->K2 = 613;
|
||||
// //epd->K5 = 13100;
|
||||
// //epd->K6 = 1310;
|
||||
//
|
||||
// int rv = epd->WriteCal();
|
||||
// return rv;
|
||||
//
|
||||
//}
|
||||
//
|
||||
//int MK3::Epd2::ReadTresholds()
|
||||
//{
|
||||
// ReadTresholdsError = 0;
|
||||
// int rv = epd->ReadTresHolds();
|
||||
// if (rv != 0) ReadTresholdsError = epd->Error;
|
||||
//
|
||||
// Hp10THDose1 = (double)epd->Hp10THDose1 / 64.0;
|
||||
// Hp10THDose2 = (double)epd->Hp10THDose2 / 64.0;
|
||||
// Hp07THDose = (double)epd->Hp07THDose / 64.0;
|
||||
//
|
||||
// Hp10Total = (double)epd->Hp10Total / 64.0;
|
||||
// Hp07Total = (double)epd->Hp07Total / 64.0;
|
||||
//
|
||||
// Hp10Rate1On = (double)epd->Hp10Rate1On;
|
||||
// Hp10Rate2On = (double)epd->Hp10Rate2On;
|
||||
// Hp07RateOn = (double)epd->Hp07RateOn;
|
||||
// Hp10Rate1Off = (double)epd->Hp10Rate1Off;
|
||||
// Hp10Rate2Off = (double)epd->Hp10Rate2Off;
|
||||
// Hp07RateOff = (double)epd->Hp07RateOff;
|
||||
//
|
||||
// K1 = epd->K1;
|
||||
// K2 = epd->K2;
|
||||
// K3 = epd->K3;
|
||||
// K4 = epd->K4;
|
||||
// K5 = epd->K5;
|
||||
// K6 = epd->K6;
|
||||
// SG = epd->SG;
|
||||
// BC = epd->BC;
|
||||
// FB = epd->FB;
|
||||
// HG = epd->HG;
|
||||
//
|
||||
//
|
||||
// return rv;
|
||||
//}
|
||||
|
||||
if (epd->Hp10Time > 0) {
|
||||
double x = (epd->EpdClock - epd->Hp10Time) * -1.0;
|
||||
Hp10PeakTime = System::DateTime::Now.AddSeconds(x);
|
||||
}
|
||||
else
|
||||
Hp10PeakTime = System::Nullable<System::DateTime>();;
|
||||
if (epd->Hp07Time > 0) {
|
||||
double x = (epd->EpdClock - epd->Hp07Time) * -1.0;
|
||||
Hp07PeakTime = System::DateTime::Now.AddSeconds(x);
|
||||
}
|
||||
else
|
||||
Hp10PeakTime = System::Nullable<System::DateTime>();
|
||||
|
||||
QualityData = epd->QualityData;
|
||||
K1 = epd->K1;
|
||||
K2 = epd->K2;
|
||||
K3 = epd->K3;
|
||||
K4 = epd->K4;
|
||||
K5 = epd->K5;
|
||||
K6 = epd->K6;
|
||||
SG = epd->SG;
|
||||
BC = epd->SG;
|
||||
FB = epd->FB;
|
||||
HG = epd->HG;
|
||||
|
||||
return ReadDosesRV;
|
||||
}
|
||||
|
||||
int MK3::Epd2::SetDeIssued()
|
||||
{
|
||||
return epd->DeIssue();
|
||||
}
|
||||
|
||||
int MK3::Epd2::PrepareForIssue()
|
||||
{
|
||||
PrepareForIssueError = 0;
|
||||
int rv = epd->PrepareForIssue();
|
||||
if (rv != 1) PrepareForIssueError = epd->Error;
|
||||
return rv;
|
||||
}
|
||||
|
||||
int MK3::Epd2::SetIssued()
|
||||
{
|
||||
SetIssuedError = 0;
|
||||
epd->Hp07THDose = (DWORD)(Hp07THDose * 64.0);
|
||||
epd->Hp10THDose1 = (DWORD)(Hp10THDose1 * 64.0);
|
||||
epd->Hp10THDose2 = (DWORD)(Hp10THDose2 * 64.0);
|
||||
|
||||
epd->Hp10Rate1On = (DWORD)(Hp10Rate1On);
|
||||
epd->Hp10Rate2On = (DWORD)(Hp10Rate2On);
|
||||
epd->Hp07RateOn = (DWORD)(Hp07RateOn);
|
||||
epd->Hp10Rate1Off = (DWORD)(Hp10Rate1Off);
|
||||
epd->Hp10Rate2Off = (DWORD)(Hp10Rate2Off);
|
||||
epd->Hp07RateOff = (DWORD)(Hp07RateOff);
|
||||
|
||||
memset(epd->WearerID, ' ', WearerIDLength); epd->WearerID[WearerIDLength] = 0;
|
||||
char* str1 = (char*)(void*)Runtime::InteropServices::Marshal::StringToHGlobalAnsi(WearerID);
|
||||
int l = strlen(str1);
|
||||
if (l > WearerIDLength) l = WearerIDLength;
|
||||
_memccpy(epd->WearerID + WearerIDLength - l, str1, l, WearerIDLength);
|
||||
Runtime::InteropServices::Marshal::FreeHGlobal((IntPtr)str1);
|
||||
|
||||
memset(epd->WearerName, 0, WearerNameLength + 1);
|
||||
char* str2 = (char*)(void*)Runtime::InteropServices::Marshal::StringToHGlobalAnsi(WearerName);
|
||||
l = strlen(str2);
|
||||
if (l > WearerNameLength) l = WearerNameLength;
|
||||
_memccpy(epd->WearerName, str2, l, WearerNameLength);
|
||||
Runtime::InteropServices::Marshal::FreeHGlobal((IntPtr)str2);
|
||||
|
||||
int rv = epd->Issue();
|
||||
if (rv != 1) SetIssuedError = epd->Error;
|
||||
return rv;
|
||||
}
|
||||
|
||||
int MK3::Epd2::WriteCalibration()
|
||||
{
|
||||
epd->K1 = K1;
|
||||
epd->K2 = K2;
|
||||
|
||||
epd->K3 = K3;
|
||||
epd->K4 = K4;
|
||||
|
||||
epd->K5 = K5;
|
||||
epd->K6 = K6;
|
||||
|
||||
//epd->K1 = 903;
|
||||
//epd->K2 = 613;
|
||||
//epd->K5 = 13100;
|
||||
//epd->K6 = 1310;
|
||||
|
||||
int rv = epd->WriteCal();
|
||||
return rv;
|
||||
|
||||
}
|
||||
|
||||
int MK3::Epd2::ReadTresholds()
|
||||
{
|
||||
ReadTresholdsError = 0;
|
||||
int rv = epd->ReadTresHolds();
|
||||
if (rv != 0) ReadTresholdsError = epd->Error;
|
||||
|
||||
Hp10THDose1 = (double)epd->Hp10THDose1 / 64.0;
|
||||
Hp10THDose2 = (double)epd->Hp10THDose2 / 64.0;
|
||||
Hp07THDose = (double)epd->Hp07THDose / 64.0;
|
||||
|
||||
Hp10Total = (double)epd->Hp10Total / 64.0;
|
||||
Hp07Total = (double)epd->Hp07Total / 64.0;
|
||||
|
||||
Hp10Rate1On = (double)epd->Hp10Rate1On;
|
||||
Hp10Rate2On = (double)epd->Hp10Rate2On;
|
||||
Hp07RateOn = (double)epd->Hp07RateOn;
|
||||
Hp10Rate1Off = (double)epd->Hp10Rate1Off;
|
||||
Hp10Rate2Off = (double)epd->Hp10Rate2Off;
|
||||
Hp07RateOff = (double)epd->Hp07RateOff;
|
||||
|
||||
K1 = epd->K1;
|
||||
K2 = epd->K2;
|
||||
K3 = epd->K3;
|
||||
K4 = epd->K4;
|
||||
K5 = epd->K5;
|
||||
K6 = epd->K6;
|
||||
SG = epd->SG;
|
||||
BC = epd->BC;
|
||||
FB = epd->FB;
|
||||
HG = epd->HG;
|
||||
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
int MK3::Epd2::ReadExtraStatus()
|
||||
{
|
||||
int rv = epd->EPDReadExtraStatus();
|
||||
BatADC = epd->byBatADC;
|
||||
SupplyADC = epd->bySupplyADC;
|
||||
|
||||
D1 = epd->D1 - epd->BaseD1;
|
||||
D2 = epd->D2 - epd->BaseD2;
|
||||
D3 = epd->D3 - epd->BaseD3;
|
||||
D4 = epd->D4 - epd->BaseD4;
|
||||
CountsClock = epd->CountsClock;
|
||||
CountsClockBase = epd->BaseCountsClock;
|
||||
|
||||
return rv;
|
||||
}
|
||||
//int MK3::Epd2::ReadExtraStatus()
|
||||
//{
|
||||
// int rv = epd->EPDReadExtraStatus();
|
||||
// BatADC = epd->byBatADC;
|
||||
// SupplyADC = epd->bySupplyADC;
|
||||
//
|
||||
// D1 = epd->D1 - epd->BaseD1;
|
||||
// D2 = epd->D2 - epd->BaseD2;
|
||||
// D3 = epd->D3 - epd->BaseD3;
|
||||
// D4 = epd->D4 - epd->BaseD4;
|
||||
// CountsClock = epd->CountsClock;
|
||||
// CountsClockBase = epd->BaseCountsClock;
|
||||
//
|
||||
// return rv;
|
||||
//}
|
||||
|
||||
|
|
|
|||
34
MK3/MK3.h
34
MK3/MK3.h
|
|
@ -3,8 +3,8 @@
|
|||
#pragma comment(lib,"Reader3.lib")
|
||||
using namespace System;
|
||||
|
||||
#pragma managed
|
||||
namespace MK3 {
|
||||
|
||||
public ref class sEpdBase
|
||||
{
|
||||
public:
|
||||
|
|
@ -12,7 +12,6 @@ namespace MK3 {
|
|||
unsigned int CurrentDeviceID;
|
||||
};
|
||||
|
||||
|
||||
public ref class Epd2
|
||||
{
|
||||
|
||||
|
|
@ -77,20 +76,18 @@ namespace MK3 {
|
|||
unsigned int D1, D2, D3, D4, CountsClock, CountsClockBase;
|
||||
|
||||
int epdType;
|
||||
int alarmStatus;
|
||||
AlarmStatusFlags alarmStatus;
|
||||
int otherAlarms;
|
||||
int errorStatus;
|
||||
int operatingStatus;
|
||||
FaultStatusFlags errorStatus;
|
||||
OpStatusFlags operatingStatus;
|
||||
unsigned int EpdID;
|
||||
int HardVersion;
|
||||
int SoftVersion;
|
||||
int FunctionFlags;
|
||||
|
||||
|
||||
unsigned short BatADC;
|
||||
unsigned short SupplyADC;
|
||||
|
||||
|
||||
//OperatingStatus
|
||||
BYTE DetectorsOn = 0;
|
||||
BYTE EPDIssued = 0;
|
||||
|
|
@ -99,7 +96,6 @@ namespace MK3 {
|
|||
BYTE EPDProcSec = 0;
|
||||
BYTE EPDFaulty = 0;
|
||||
|
||||
|
||||
//ERrrostatus
|
||||
BYTE EPDNewFault = 0;
|
||||
BYTE EPDComFault = 0;
|
||||
|
|
@ -109,7 +105,6 @@ namespace MK3 {
|
|||
BYTE EPDTrhFault = 0;
|
||||
BYTE EPDOthFault = 0;
|
||||
|
||||
|
||||
//AlarmStatus
|
||||
BYTE AlarmDoseHP101G = 0;
|
||||
BYTE AlarmDoseHP102G = 0;
|
||||
|
|
@ -127,7 +122,6 @@ namespace MK3 {
|
|||
BYTE OtherAlarmCarrier = 0;
|
||||
BYTE OtherAlarmBatVolt = 0;
|
||||
|
||||
|
||||
Epd2(int port);
|
||||
~Epd2();
|
||||
!Epd2();
|
||||
|
|
@ -140,19 +134,13 @@ namespace MK3 {
|
|||
|
||||
int GetStatus();
|
||||
|
||||
int GetDoses();
|
||||
|
||||
int SetDeIssued();
|
||||
|
||||
int SetIssued();
|
||||
|
||||
|
||||
int PrepareForIssue();
|
||||
int WriteCalibration();
|
||||
|
||||
int ReadTresholds();
|
||||
|
||||
int ReadExtraStatus();
|
||||
//int GetDoses();
|
||||
//int SetDeIssued();
|
||||
//int SetIssued();
|
||||
//int PrepareForIssue();
|
||||
//int WriteCalibration();
|
||||
//int ReadTresholds();
|
||||
//int ReadExtraStatus();
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@
|
|||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies />
|
||||
<AdditionalDependencies>reader3.lib</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
|
|
@ -104,7 +104,7 @@
|
|||
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies />
|
||||
<AdditionalDependencies>reader3.lib</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
|
|
@ -140,6 +140,7 @@
|
|||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="TimeFunctions.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="app.rc" />
|
||||
|
|
|
|||
|
|
@ -59,6 +59,9 @@
|
|||
<ClCompile Include="MK3Base.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="TimeFunctions.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="app.rc">
|
||||
|
|
|
|||
289
MK3/MK3Base.cpp
289
MK3/MK3Base.cpp
|
|
@ -3,11 +3,12 @@
|
|||
#pragma unmanaged
|
||||
|
||||
HANDLE Ev1 = INVALID_HANDLE_VALUE;
|
||||
MK3::Epd2U* current;
|
||||
|
||||
void WINAPI completion(CommsHandle hComms, CompletionToken token)
|
||||
{
|
||||
SetEvent(Ev1);
|
||||
}
|
||||
|
||||
MK3::Epd2U::Epd2U(int _comport)
|
||||
{
|
||||
port = _comport;
|
||||
|
|
@ -27,7 +28,6 @@ WORD MK3::Epd2U::WriteConfig()
|
|||
|
||||
DWORD MK3::Epd2U::StartCom()
|
||||
{
|
||||
DWORD rv;
|
||||
ErrorReason = 0;
|
||||
int mx = 10;
|
||||
if (port == 0) {
|
||||
|
|
@ -36,7 +36,7 @@ DWORD MK3::Epd2U::StartCom()
|
|||
}
|
||||
if (CommsInitialized == 0) {
|
||||
epdComsHandle = CreateReaderInterface();
|
||||
rv = OpenReader(epdComsHandle, comPort);
|
||||
InitRv = OpenReader(epdComsHandle, comPort);
|
||||
if (InitRv == 0)
|
||||
{
|
||||
SetMultipleDiscoveryMode(epdComsHandle, false);
|
||||
|
|
@ -46,7 +46,7 @@ DWORD MK3::Epd2U::StartCom()
|
|||
CommsInitialized = 1;
|
||||
}
|
||||
}
|
||||
return rv;
|
||||
return InitRv;
|
||||
}
|
||||
|
||||
MK3::Epd2U::~Epd2U()
|
||||
|
|
@ -55,11 +55,12 @@ MK3::Epd2U::~Epd2U()
|
|||
CommsInitialized = 0;
|
||||
}
|
||||
|
||||
void WINAPI MK3::Epd2U::discovery(CommsHandle hComms, DiscoveryId const discovered[], int32_t count)
|
||||
void WINAPI discovery(CommsHandle hComms, DiscoveryId const discovered[], int32_t count)
|
||||
{
|
||||
if (count > 0)
|
||||
{
|
||||
current->CurrentDeviceID = discovered[0].Id;
|
||||
current->DeviceCount = count;
|
||||
memcpy(¤t->Epd, &discovered[0], sizeof(DiscoveryId));
|
||||
SetEvent(Ev1);
|
||||
}
|
||||
|
|
@ -67,7 +68,7 @@ void WINAPI MK3::Epd2U::discovery(CommsHandle hComms, DiscoveryId const discover
|
|||
|
||||
int MK3::Epd2U::StartDiscover()
|
||||
{
|
||||
int32_t rv;
|
||||
int32_t rv,rv2;
|
||||
|
||||
//System::Diagnostics::Trace::WriteLine("StartDiscover");
|
||||
Error = 0;
|
||||
|
|
@ -76,8 +77,8 @@ int MK3::Epd2U::StartDiscover()
|
|||
DeviceIDs[0] = 768;
|
||||
return 1;
|
||||
}
|
||||
|
||||
Cancel(epdComsHandle);
|
||||
//
|
||||
//Cancel(epdComsHandle);
|
||||
//FlushDiscoveryCache(port);
|
||||
//FlushBuffers(port);
|
||||
int tries = 25; DeviceCount = 0; DiscRV = 1;
|
||||
|
|
@ -87,8 +88,9 @@ int MK3::Epd2U::StartDiscover()
|
|||
current = this;
|
||||
Ev1 = CreateEvent(NULL, TRUE,FALSE,NULL);
|
||||
rv = StartDiscovery(epdComsHandle, discovery);
|
||||
rv = WaitForSingleObject(Ev1, 10000);
|
||||
if (rv==0) rv = WaitForSingleObject(Ev1, 10000);
|
||||
}
|
||||
if (rv == 0) DiscRV=Connect(epdComsHandle, Epd, true);
|
||||
//System::Diagnostics::Trace::WriteLine(System::String::Format("Discover DeviceCount = {0}", DeviceCount));
|
||||
|
||||
return DiscRV;
|
||||
|
|
@ -107,143 +109,238 @@ void MK3::Epd2U::Open(DiscoveryId DeviceID)
|
|||
//}
|
||||
else { OpenRV = ConRV = 1; }
|
||||
}
|
||||
void MK3::Epd2U::Close()
|
||||
void MK3::Epd2U::CloseDev()
|
||||
{
|
||||
if (port > 0) {
|
||||
Close();// CloseDevice();
|
||||
//Close();// CloseDevice();
|
||||
Disconnect(epdComsHandle);
|
||||
}
|
||||
//DeinitComms(port); CommsInitialized = 0;
|
||||
}
|
||||
|
||||
void MK3::Epd2U::DecodeFunctionFlags()
|
||||
//void MK3::Epd2U::DecodeFunctionFlags()
|
||||
//{
|
||||
// EpdType = (FunctionFlags & 0x1F00) >> 8;
|
||||
//}
|
||||
|
||||
|
||||
byte checkOpStatus(OpStatusFlags status, OpStatusFlags flag)
|
||||
{
|
||||
|
||||
EpdType = (FunctionFlags & 0x1F00) >> 8;
|
||||
if (((uint32_t)status & (uint32_t)flag) == (uint32_t)flag) return 1; else return 0;
|
||||
}
|
||||
byte checkFailStatus(FaultStatusFlags status, FaultStatusFlags flag)
|
||||
{
|
||||
if (((uint32_t)status & (uint32_t)flag) == (uint32_t)flag) return 1; else return 0;
|
||||
}
|
||||
|
||||
byte checkStatus(AlarmStatusFlags status, AlarmStatusFlags flag)
|
||||
{
|
||||
uint32_t ustatus = (uint32_t)status;
|
||||
uint32_t uflag = (uint32_t)flag;
|
||||
if ((ustatus & uflag) == uflag) return 1; else return 0;
|
||||
}
|
||||
|
||||
byte checkStatus( DoseAlarmFlags status, DoseAlarmFlags flag)
|
||||
{
|
||||
if (((uint32_t)status & (uint32_t)flag) == (uint32_t)flag) return 1; else return 0;
|
||||
}
|
||||
|
||||
void MK3::Epd2U::DecodeStatus()
|
||||
{
|
||||
DetectorsOn = checkOpStatus(epd3status.OperatingStatus, OpStatusFlags::EpdOn);
|
||||
EPDIssued = checkOpStatus(epd3status.OperatingStatus, OpStatusFlags::EpdIssued);
|
||||
EPDLocked = checkOpStatus(epd3status.OperatingStatus, OpStatusFlags::GainAdjustable);
|
||||
EPDTesting = checkOpStatus(epd3status.OperatingStatus, OpStatusFlags::DetectorTestRequested);
|
||||
EPDFaulty = checkFailStatus(epd3status.FaultStatus, FaultStatusFlags::EpdFaulty);
|
||||
|
||||
EPDNewFault = checkFailStatus(epd3status.FaultStatus, FaultStatusFlags::EpdFaulty);
|
||||
EPDComFault = checkFailStatus(epd3status.FaultStatus, FaultStatusFlags::EarlyCommsTermination);
|
||||
EPDCalFault = checkFailStatus(epd3status.FaultStatus, FaultStatusFlags::NotCalibrated);
|
||||
EPDDetFault = checkFailStatus(epd3status.FaultStatus, FaultStatusFlags::DetectorTestFail);
|
||||
EPDEprFault = checkFailStatus(epd3status.FaultStatus, FaultStatusFlags::EepromFailure);
|
||||
EPDTrhFault = checkFailStatus(epd3status.FaultStatus, FaultStatusFlags::BadThreshold);
|
||||
|
||||
DetectorsOn = ((epd3status.OperatingStatus & OpStatusFlags::EpdOn)== OpStatusFlags::EpdOn) ? 1 : 0;
|
||||
EPDIssued = ((epd3status.OperatingStatus & OpStatusFlags::EpdIssued)== OpStatusFlags::EpdIssued) ? 1 : 0;
|
||||
EPDLocked = ((epd3status.OperatingStatus & OpStatusFlags::GainAdjustable)== OpStatusFlags::GainAdjustable) ? 0 : 1;
|
||||
EPDTesting = ((epd3status.OperatingStatus & OpStatusFlags::DetectorTestRequested)== OpStatusFlags::DetectorTestRequested) ? 1 : 0;
|
||||
EPDFaulty = ((epd3status.FaultStatus & FaultStatusFlags::EpdFaulty) == FaultStatusFlags::EpdFaulty) ? 1 : 0;
|
||||
|
||||
|
||||
//DetectorsOn = (OperatingStatus & 1) != 0;
|
||||
//EPDIssued = (OperatingStatus & 4) != 0;
|
||||
//EPDLocked = (OperatingStatus & 0x10) != 0;
|
||||
//EPDTesting = (OperatingStatus & 0x20) != 0;
|
||||
//EPDProcSec = (OperatingStatus & 0x40) != 0;
|
||||
//EPDFaulty = (OperatingStatus & 0x80) != 0;
|
||||
|
||||
EPDNewFault = ((epd3status.FaultStatus & FaultStatusFlags::EpdFaulty)== FaultStatusFlags::EpdFaulty) ? 1 : 0;
|
||||
EPDComFault = ((epd3status.FaultStatus & FaultStatusFlags::EarlyCommsTermination) == FaultStatusFlags::EarlyCommsTermination) ? 1 : 0;
|
||||
EPDCalFault = ((epd3status.FaultStatus & FaultStatusFlags::NotCalibrated) == FaultStatusFlags::NotCalibrated) ? 1 : 0;
|
||||
EPDDetFault = ((epd3status.FaultStatus & FaultStatusFlags::DetectorTestFail) == FaultStatusFlags::DetectorTestFail) ? 1 : 0;
|
||||
EPDEprFault = ((epd3status.FaultStatus & FaultStatusFlags::EepromFailure) == FaultStatusFlags::EepromFailure) ? 1 : 0;
|
||||
EPDTrhFault = ((epd3status.FaultStatus & FaultStatusFlags::BadThreshold) == FaultStatusFlags::BadThreshold) ? 1 : 0;
|
||||
|
||||
|
||||
|
||||
for (int ix =0; ix < 4;ix++ )
|
||||
for (int ix = 0; ix < 4; ix++)
|
||||
{
|
||||
DoseAlarmFlags status = epd3status.DoseAlarms[ix].Status;
|
||||
switch ( (MeasurementId) epd3status.DoseAlarms[ix].Id)
|
||||
switch ((MeasurementId)epd3status.DoseAlarms[ix].Id)
|
||||
{
|
||||
case MeasurementId::Meas_Hp07:
|
||||
case MeasurementId::Meas_Hp10N:
|
||||
AlarmDoseHP07N = (status & DoseAlarmFlags::DoseAlarm) == DoseAlarmFlags::DoseAlarm ? 1 : 0;
|
||||
AlarmRateHP07N = (status & DoseAlarmFlags::RateAlarm) == DoseAlarmFlags::RateAlarm ? 1 : 0;
|
||||
AlarmDoseHP07N = checkStatus(status ,DoseAlarmFlags::DoseAlarm);
|
||||
AlarmRateHP07N = checkStatus(status, DoseAlarmFlags::RateAlarm) ;
|
||||
break;
|
||||
case MeasurementId::Meas_Hp10:
|
||||
case MeasurementId::Meas_Hp10:
|
||||
case MeasurementId::Meas_Hp10G:
|
||||
AlarmDoseHP101G = (status & DoseAlarmFlags::DoseAlarm) == DoseAlarmFlags::DoseAlarm ? 1 : 0;
|
||||
AlarmDoseHP101G = checkStatus(status, DoseAlarmFlags::DoseAlarm);
|
||||
AlarmDoseHP102G = AlarmDoseHP101G;
|
||||
AlarmRateHP101G = (status & DoseAlarmFlags::RateAlarm) == DoseAlarmFlags::RateAlarm ? 1 : 0;
|
||||
AlarmRateHP101G = checkStatus(status, DoseAlarmFlags::RateAlarm);
|
||||
AlarmRateHP102G = AlarmRateHP101G;
|
||||
break;
|
||||
}
|
||||
|
||||
//OtherAlarm
|
||||
OtherAlarmRateHp101G = (OtherAlarms & 1) != 0;
|
||||
OtherAlarmRateHp102G = (OtherAlarms & 2) != 0;
|
||||
OtherAlarmRateHp07N = (OtherAlarms & 4) != 0;
|
||||
OtherAlarmReturn = (OtherAlarms & 8) != 0;
|
||||
OtherAlarmBatLow = (OtherAlarms & 0x10) != 0;
|
||||
OtherAlarmCarrier = (OtherAlarms & 0x20) != 0;
|
||||
OtherAlarmBatVolt = (OtherAlarms & 0x40) != 0;
|
||||
|
||||
}
|
||||
OtherAlarmReturn = checkStatus(epd3status.AlarmStatus, AlarmStatusFlags::ReturnForRead);
|
||||
OtherAlarmBatLow = checkStatus(epd3status.AlarmStatus, AlarmStatusFlags::LowBattery);
|
||||
OtherAlarmCarrier = checkStatus(epd3status.AlarmStatus, AlarmStatusFlags::TelemetryAlert);
|
||||
OtherAlarmBatVolt = checkStatus(epd3status.AlarmStatus, AlarmStatusFlags::LowBattery);
|
||||
}
|
||||
|
||||
|
||||
WORD MK3::Epd2U::ReadStatus()
|
||||
{
|
||||
int32_t r;
|
||||
|
||||
OperatingStatus = (OpStatusFlags)0U;
|
||||
AlarmStatus = (AlarmStatusFlags)0U;
|
||||
ErrorStatus = (FaultStatusFlags)0;
|
||||
IssueCount = OtherAlarms = EEPROMBadSectors = 0;
|
||||
RealTime = EpdClock = OffTime = EpdID = 0;
|
||||
ErrorSource = ErrorReason = ErrorData = 0;
|
||||
HardVersion = SoftVersion = FunctionFlags = 0;
|
||||
|
||||
ResetEvent(Ev1);
|
||||
token = BeginReadStatus(epdComsHandle, completion);
|
||||
r = Commit(epdComsHandle);
|
||||
r = WaitForSingleObject(Ev1, 10000); // no time-out interval
|
||||
r = EndReadStatus(epdComsHandle, token, &epd3status);
|
||||
|
||||
IssueCount = epd3status.IssueCount;
|
||||
OperatingStatus = epd3status.OperatingStatus;
|
||||
AlarmStatus = epd3status.AlarmStatus;
|
||||
ErrorStatus = epd3status.FaultStatus;
|
||||
OtherAlarms = epd3status.OtherBits;
|
||||
|
||||
|
||||
Error = 0; ReadStatusRV = 0;
|
||||
|
||||
uint32_t EpdID32;
|
||||
uint32_t capabilities;
|
||||
MarkNumber_t MarkNumber;
|
||||
VersionNumber_t VersionNumber;
|
||||
|
||||
ResetEvent(Ev1);
|
||||
token = BeginReadEpdIdentities(epdComsHandle, completion);
|
||||
r = Commit(epdComsHandle);
|
||||
r = WaitForSingleObject(Ev1, 10000); // no time-out interval
|
||||
r = EndReadEpdIdentities(epdComsHandle, token, &EpdID32, (EpdTypes*)&EpdType, &capabilities, &MarkNumber, &VersionNumber, NULL, 0);
|
||||
|
||||
EpdID = EpdID32;
|
||||
|
||||
DecodeStatus();
|
||||
|
||||
memset(WearerID, 0, WearerIDLength + 1);
|
||||
memset(WearerName, 0, WearerNameLength + 1);
|
||||
|
||||
IssueCount = OperatingStatus = ErrorStatus = AlarmStatus = OtherAlarms = EEPROMBadSectors = 0;
|
||||
RealTime = EpdClock = OffTime = EpdID = 0;
|
||||
ErrorSource = ErrorReason = ErrorData = 0;
|
||||
HardVersion = SoftVersion = FunctionFlags = 0;
|
||||
|
||||
if (port == 0) {
|
||||
EpdID = 4567;
|
||||
EpdType = 0;
|
||||
FunctionFlags = 0x000;
|
||||
Epd.Gen = EpdGeneration::None;
|
||||
Epd.MaxBaud = 0;
|
||||
Epd.Id = EpdID;
|
||||
return 1;
|
||||
}
|
||||
|
||||
CommitRV = ReadEpdStatus(&EpdClock, &RealTime, &IssueCount, &OffTime, &OperatingStatus, &ErrorStatus, &AlarmStatus, &OtherAlarms, &EEPROMBadSectors);
|
||||
if (port == 0) {
|
||||
EpdClock = 123; ErrorStatus = 0;
|
||||
};
|
||||
if (CommitRV == 1) CommitRV = Commit();
|
||||
if (CommitRV == 1) CommitRV = ReadEpdID(
|
||||
&EpdID,
|
||||
&HardVersion,
|
||||
&SoftVersion,
|
||||
&FunctionFlags);
|
||||
if (CommitRV == 1) CommitRV = Commit();
|
||||
if (CommitRV == 0) {
|
||||
Error = GetErrorDetails(&ErrorSource, &ErrorReason, &ErrorData);
|
||||
ReadStatusRV = ErrorReason;
|
||||
return 0;
|
||||
uint8_t length = 0;
|
||||
|
||||
if (Epd.Gen == EpdGeneration::Mk2 ) {
|
||||
counterIdLen = 4;
|
||||
counterIds[0] = (uint8_t)CounterType::Counter_Hg1; // MK2 HG;
|
||||
counterIds[1] = (uint8_t)CounterType::Counter_Sg1; // MK2 SG;
|
||||
counterIds[2] = (uint8_t)CounterType::Counter_Sg2; // MK2 BC;
|
||||
counterIds[3] = (uint8_t)CounterType::Counter_Fb1; // MK2 FB;
|
||||
}
|
||||
else {
|
||||
if (CurrentDeviceID == 0) CurrentDeviceID = EpdID;
|
||||
time_t t = RealTime;
|
||||
TimeFunctions::UnixTimeToSystemTime(t, &tRealTime);
|
||||
DecodeStatus();
|
||||
DecodeFunctionFlags();
|
||||
counterIdLen = 4;
|
||||
counterIds[0] = (uint8_t)CounterType::Counter_Hg1; // MK2 HG;
|
||||
counterIds[1] = (uint8_t)CounterType::Counter_Sg1; // MK2 SG;
|
||||
counterIds[2] = (uint8_t)CounterType::Counter_Sg2; // MK2 BC;
|
||||
counterIds[3] = (uint8_t)CounterType::Counter_Fb1; // MK2 FB;
|
||||
}
|
||||
|
||||
if (CommitRV == 1 && EPDIssued == 1)
|
||||
{
|
||||
CommitRV = ReadWearer(
|
||||
WearerID,
|
||||
WearerIDLength,
|
||||
WearerName,
|
||||
WearerNameLength);
|
||||
if (CommitRV == 1) CommitRV = Commit();
|
||||
if (CommitRV == 0) {
|
||||
Error = GetErrorDetails(&ErrorSource, &ErrorReason, &ErrorData);
|
||||
ReadStatusRV = ErrorReason;
|
||||
return 0;
|
||||
}
|
||||
else {
|
||||
for (int i = 0; i < WearerIDLength; i++)
|
||||
if (WearerID[i] == 0xb) WearerID[i] = '0'; else WearerID[i] |= 0x30;
|
||||
}
|
||||
for (int ix = 0; ix < 10; ix++) {
|
||||
Counts[ix].type = 0; Counts[ix].value = 0;
|
||||
}
|
||||
countsRead = 0; utc = 0; seconds = 0;
|
||||
|
||||
|
||||
//There are only four counters in Mk2 EPD.TruDose has six counters
|
||||
//uint8_t x = sizeof(Counts);
|
||||
ResetEvent(Ev1);
|
||||
token = BeginReadCounts(epdComsHandle, counterIds, 4, completion);
|
||||
r = Commit(epdComsHandle);
|
||||
r = WaitForSingleObject(Ev1, 10000); // no time-out interval
|
||||
r = EndReadCounts(epdComsHandle,token,Counts,10, &countsRead,&utc,&seconds);
|
||||
// - 101 = InvalidParam
|
||||
// - 104 = FunctionFail,
|
||||
|
||||
|
||||
IdString_t mk3WearerID;
|
||||
//Mk2 EPDs only support Name and Primary ID
|
||||
ResetEvent(Ev1);
|
||||
token = BeginReadWearerId(epdComsHandle, static_cast<uint16_t>(WearerIdType::WearerId_Name), completion);
|
||||
r = Commit(epdComsHandle);
|
||||
r = WaitForSingleObject(Ev1, 10000); // no time-out interval
|
||||
r = EndReadWearerId(epdComsHandle, token, &mk3WearerID);
|
||||
if (mk3WearerID.Length > 23) mk3WearerID.Length = 23;
|
||||
memcpy(WearerName, mk3WearerID.Utf8String, mk3WearerID.Length); WearerName[mk3WearerID.Length - 1] = 0;
|
||||
|
||||
ResetEvent(Ev1);
|
||||
token = BeginReadWearerId(epdComsHandle, static_cast<uint16_t>(WearerIdType::WearerId_Primary), completion);
|
||||
r = Commit(epdComsHandle);
|
||||
r = WaitForSingleObject(Ev1, 10000); // no time-out interval
|
||||
r = EndReadWearerId(epdComsHandle, token, &mk3WearerID);
|
||||
if (mk3WearerID.Length > 13) mk3WearerID.Length = 13;
|
||||
memcpy(this->WearerID, mk3WearerID.Utf8String, mk3WearerID.Length); WearerName[mk3WearerID.Length - 1] = 0;
|
||||
for (int i = 0; i < mk3WearerID.Length; i++)
|
||||
if (WearerID[i] == 0xb) WearerID[i] = '0'; else WearerID[i] |= 0x30;
|
||||
|
||||
//1601-01-01T00:00:00Z.
|
||||
|
||||
FILETIME fUTC;
|
||||
TimeFunctions::EpdTimeToFileTime(utc, &fUTC);
|
||||
FileTimeToSystemTime(&fUTC, &tRealTime);
|
||||
|
||||
|
||||
//CommitRV = ReadEpdStatus(&EpdClock, &RealTime, &IssueCount, &OffTime, &OperatingStatus, &ErrorStatus, &AlarmStatus, &OtherAlarms, &EEPROMBadSectors);
|
||||
//if (port == 0) {
|
||||
// EpdClock = 123; ErrorStatus = 0;
|
||||
//};
|
||||
//if (CommitRV == 1) CommitRV = Commit();
|
||||
//if (CommitRV == 1) CommitRV = ReadEpdID(
|
||||
// &EpdID,
|
||||
// &HardVersion,
|
||||
// &SoftVersion,
|
||||
// &FunctionFlags);
|
||||
//if (CommitRV == 1) CommitRV = Commit();
|
||||
//if (CommitRV == 0) {
|
||||
// Error = GetErrorDetails(&ErrorSource, &ErrorReason, &ErrorData);
|
||||
// ReadStatusRV = ErrorReason;
|
||||
// return 0;
|
||||
//}
|
||||
//else {
|
||||
// if (CurrentDeviceID == 0) CurrentDeviceID = EpdID;
|
||||
// time_t t = RealTime;
|
||||
// TimeFunctions::UnixTimeToSystemTime(t, &tRealTime);
|
||||
// DecodeStatus();
|
||||
// DecodeFunctionFlags();
|
||||
//}
|
||||
|
||||
//if (CommitRV == 1 && EPDIssued == 1)
|
||||
//{
|
||||
// CommitRV = ReadWearer(
|
||||
// WearerID,
|
||||
// WearerIDLength,
|
||||
// WearerName,
|
||||
// WearerNameLength);
|
||||
// if (CommitRV == 1) CommitRV = Commit();
|
||||
// if (CommitRV == 0) {
|
||||
// Error = GetErrorDetails(&ErrorSource, &ErrorReason, &ErrorData);
|
||||
// ReadStatusRV = ErrorReason;
|
||||
// return 0;
|
||||
// }
|
||||
// else {
|
||||
// }
|
||||
//}
|
||||
return CommitRV;
|
||||
}
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
#pragma once
|
||||
|
||||
#pragma unmanaged
|
||||
#include <windows.h>
|
||||
#include "EpdCommon.h"
|
||||
#include "TimeFunctions.h"
|
||||
#pragma unmanaged
|
||||
|
||||
namespace MK3
|
||||
{
|
||||
|
|
@ -25,7 +24,7 @@ namespace MK3
|
|||
const WORD MaxDevices = 10;
|
||||
WORD DeviceCount = 0;
|
||||
DWORD DeviceIDs[10];
|
||||
DWORD CurrentDeviceID;
|
||||
//DWORD CurrentDeviceID;
|
||||
|
||||
//WORD AlarmCtrl = 0b01111110;
|
||||
WORD AlarmCtrl = 0b01111010; // NO sound
|
||||
|
|
@ -37,13 +36,12 @@ namespace MK3
|
|||
DWORD RealTime;
|
||||
WORD IssueCount;
|
||||
DWORD OffTime;
|
||||
WORD OperatingStatus;
|
||||
WORD ErrorStatus;
|
||||
WORD AlarmStatus;
|
||||
OpStatusFlags OperatingStatus;
|
||||
FaultStatusFlags ErrorStatus;
|
||||
AlarmStatusFlags AlarmStatus;
|
||||
WORD OtherAlarms;
|
||||
WORD EEPROMBadSectors;
|
||||
|
||||
|
||||
WORD CommsInitialized = 0;
|
||||
WORD InitRv = 0;
|
||||
WORD DiscRV = 0;
|
||||
|
|
@ -216,7 +214,7 @@ namespace MK3
|
|||
|
||||
int StartDiscover();
|
||||
void Open(DiscoveryId DeviceID);
|
||||
void Close();
|
||||
void CloseDev();
|
||||
|
||||
void DecodeFunctionFlags();
|
||||
|
||||
|
|
@ -226,30 +224,32 @@ namespace MK3
|
|||
WORD WriteConfig();
|
||||
DWORD StartCom();
|
||||
WORD ReadStatus();
|
||||
WORD EPDReadExtraStatus();
|
||||
//WORD EPDReadExtraStatus();
|
||||
WORD EPDReadConfig();
|
||||
WORD TurnOff();
|
||||
WORD TurnOn();
|
||||
WORD WriteCal();
|
||||
WORD ReadTresHolds();
|
||||
WORD ReadDoses();
|
||||
//WORD WriteCal();
|
||||
//WORD ReadTresHolds();
|
||||
//WORD ReadDoses();
|
||||
|
||||
WORD PrepareForIssue();
|
||||
|
||||
WORD DeIssue();
|
||||
|
||||
WORD Issue();
|
||||
//WORD PrepareForIssue();
|
||||
//WORD DeIssue();
|
||||
//WORD Issue();
|
||||
|
||||
~Epd2U();
|
||||
|
||||
StatusData_t epd3status;
|
||||
uint8_t counterIds[6]; //max 6 for mk3
|
||||
uint8_t counterIdLen;
|
||||
|
||||
//Voor read counters
|
||||
Counter_t Counts[10];
|
||||
uint8_t countsRead;
|
||||
uint32_t utc, seconds;
|
||||
|
||||
static HANDLE Ev1 ;
|
||||
static Epd2U* current;
|
||||
static void WINAPI discovery (CommsHandle hComms, DiscoveryId const discovered[], int32_t count);
|
||||
|
||||
|
||||
|
||||
//static HANDLE Ev1 ;
|
||||
//static Epd2U* current;
|
||||
//void WINAPI discovery (CommsHandle hComms, DiscoveryId const discovered[], int32_t count);
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "stdafx.h"
|
||||
#include "pch.h"
|
||||
#include "TimeFunctions.h"
|
||||
|
||||
#pragma unmanaged
|
||||
|
|
@ -7,13 +7,19 @@ TimeFunctions::TimeFunctions()
|
|||
{
|
||||
}
|
||||
|
||||
void TimeFunctions::EpdTimeToFileTime( INT32 t, LPFILETIME pft)
|
||||
{
|
||||
LONGLONG ll;
|
||||
ll = Int32x32To64(t, 10000000) + 125911584000000000; //1601-1-1 -> 2000
|
||||
pft->dwLowDateTime = (DWORD)ll;
|
||||
pft->dwHighDateTime = ll >> 32;
|
||||
}
|
||||
|
||||
void TimeFunctions::UnixTimeToFileTime(time_t t, LPFILETIME pft)
|
||||
{
|
||||
// Note that LONGLONG is a 64-bit value
|
||||
LONGLONG ll;
|
||||
|
||||
ll = Int32x32To64(t, 10000000) + 116444736000000000;
|
||||
ll = Int32x32To64(t, 10000000) + 116444736000000000; //1601-1-1 1970-1-1
|
||||
pft->dwLowDateTime = (DWORD)ll;
|
||||
pft->dwHighDateTime = ll >> 32;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ class TimeFunctions
|
|||
{
|
||||
public:
|
||||
TimeFunctions();
|
||||
static void EpdTimeToFileTime(INT32 t, LPFILETIME pft);
|
||||
static void UnixTimeToFileTime(time_t t, LPFILETIME pft);
|
||||
static void UnixTimeToSystemTime(time_t t, LPSYSTEMTIME pst);
|
||||
|
||||
|
|
|
|||
BIN
MK3/reader3.exp
Normal file
BIN
MK3/reader3.exp
Normal file
Binary file not shown.
BIN
MK3/reader3.lib
Normal file
BIN
MK3/reader3.lib
Normal file
Binary file not shown.
6
TestEPD3Dll/App.config
Normal file
6
TestEPD3Dll/App.config
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<configuration>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
|
||||
</startup>
|
||||
</configuration>
|
||||
25
TestEPD3Dll/Program.cs
Normal file
25
TestEPD3Dll/Program.cs
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
|
||||
namespace TestEPD3Dll
|
||||
{
|
||||
class Program
|
||||
{
|
||||
static void Main(string[] args)
|
||||
{
|
||||
DateTime start = new DateTime(1601, 1, 1);
|
||||
DateTime rpdStart = new DateTime(1970, 1, 1);
|
||||
TimeSpan ts = rpdStart - start;
|
||||
|
||||
double l = ts.TotalSeconds;
|
||||
MK3.Epd2 x = new MK3.Epd2(4);
|
||||
x.Connect(false);
|
||||
var rv = x.GetStatus();
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
36
TestEPD3Dll/Properties/AssemblyInfo.cs
Normal file
36
TestEPD3Dll/Properties/AssemblyInfo.cs
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("TestEPD3Dll")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("TestEPD3Dll")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2021")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Setting ComVisible to false makes the types in this assembly not visible
|
||||
// to COM components. If you need to access a type in this assembly from
|
||||
// COM, set the ComVisible attribute to true on that type.
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||
[assembly: Guid("37ee9d5d-1204-4b3f-879d-aaf5a9181085")]
|
||||
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
// Major Version
|
||||
// Minor Version
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
BIN
TestEPD3Dll/Reader3.dll
Normal file
BIN
TestEPD3Dll/Reader3.dll
Normal file
Binary file not shown.
64
TestEPD3Dll/TestEPD3Dll.csproj
Normal file
64
TestEPD3Dll/TestEPD3Dll.csproj
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{37EE9D5D-1204-4B3F-879D-AAF5A9181085}</ProjectGuid>
|
||||
<OutputType>Exe</OutputType>
|
||||
<RootNamespace>TestEPD3Dll</RootNamespace>
|
||||
<AssemblyName>TestEPD3Dll</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
<Deterministic>true</Deterministic>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Program.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="App.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="Reader3.dll">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\MK3\MK3.vcxproj">
|
||||
<Project>{cfd0f68d-7ef9-4541-b55a-2a557d84295b}</Project>
|
||||
<Name>MK3</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
20
TestMK3Dll/TestMK3Dll.cpp
Normal file
20
TestMK3Dll/TestMK3Dll.cpp
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
// TestMK3Dll.cpp : This file contains the 'main' function. Program execution begins and ends there.
|
||||
//
|
||||
|
||||
#include <iostream>
|
||||
|
||||
int main()
|
||||
{
|
||||
std::cout << "Hello World!\n";
|
||||
}
|
||||
|
||||
// Run program: Ctrl + F5 or Debug > Start Without Debugging menu
|
||||
// Debug program: F5 or Debug > Start Debugging menu
|
||||
|
||||
// Tips for Getting Started:
|
||||
// 1. Use the Solution Explorer window to add/manage files
|
||||
// 2. Use the Team Explorer window to connect to source control
|
||||
// 3. Use the Output window to see build output and other messages
|
||||
// 4. Use the Error List window to view errors
|
||||
// 5. Go to Project > Add New Item to create new code files, or Project > Add Existing Item to add existing code files to the project
|
||||
// 6. In the future, to open this project again, go to File > Open > Project and select the .sln file
|
||||
147
TestMK3Dll/TestMK3Dll.vcxproj
Normal file
147
TestMK3Dll/TestMK3Dll.vcxproj
Normal file
|
|
@ -0,0 +1,147 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<VCProjectVersion>16.0</VCProjectVersion>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<ProjectGuid>{02cfd177-4691-4833-b93a-fdcadf5f8f44}</ProjectGuid>
|
||||
<RootNamespace>TestMK3Dll</RootNamespace>
|
||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="Shared">
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="TestMK3Dll.cpp" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
22
TestMK3Dll/TestMK3Dll.vcxproj.filters
Normal file
22
TestMK3Dll/TestMK3Dll.vcxproj.filters
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="Source Files">
|
||||
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Header Files">
|
||||
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
||||
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Resource Files">
|
||||
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="TestMK3Dll.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -25,6 +25,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestMK3", "TestMK3\TestMK3.
|
|||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MK3", "MK3\MK3.vcxproj", "{CFD0F68D-7EF9-4541-B55A-2A557D84295B}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestEPD3Dll", "TestEPD3Dll\TestEPD3Dll.csproj", "{37EE9D5D-1204-4B3F-879D-AAF5A9181085}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
|
@ -207,6 +209,26 @@ Global
|
|||
{CFD0F68D-7EF9-4541-B55A-2A557D84295B}.Release|x64.Build.0 = Release|x64
|
||||
{CFD0F68D-7EF9-4541-B55A-2A557D84295B}.Release|x86.ActiveCfg = Release|Win32
|
||||
{CFD0F68D-7EF9-4541-B55A-2A557D84295B}.Release|x86.Build.0 = Release|Win32
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Release|x64.Build.0 = Release|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{37EE9D5D-1204-4B3F-879D-AAF5A9181085}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue