luc/eDosStation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup productie LNK

Browse source
This commit is contained in:
Luc Vandenbroucke 2021-05-03 13:27:51 +02:00
parent 90f7b2ca8e
commit b66c2ed23d
6 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
EpdBase/EpdBase.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "EpdBase.h" #include "EpdBase.h"
#include "TimeFunctions.cpp" #include "TimeFunctions.h"
#define DiscoveryTimeslotPeriod 500 #define DiscoveryTimeslotPeriod 500
#define DiscoveryExpirationPeriod 6000 #define DiscoveryExpirationPeriod 6000
#define RxRetryCount 5 #define RxRetryCount 5

5
EpdBase/EpdBase.h
View file

@ -1,9 +1,6 @@
#pragma once #pragma once
#include <windows.h>
#include "dll2/reader2.h"
#include "TimeFunctions.h" #include "TimeFunctions.h"
#include "dll2/reader2.h"
namespace EpdBase namespace EpdBase
{ {

8
EpdBase/TimeFunctions.cpp
View file

@ -7,7 +7,6 @@ TimeFunctions::TimeFunctions()
{ {
} }
void TimeFunctions::UnixTimeToFileTime(time_t t, LPFILETIME pft) void TimeFunctions::UnixTimeToFileTime(time_t t, LPFILETIME pft)
{ {
// Note that LONGLONG is a 64-bit value // Note that LONGLONG is a 64-bit value
@ -25,10 +24,3 @@ void TimeFunctions::UnixTimeToFileTime(time_t t, LPFILETIME pft)
FileTimeToSystemTime(&ft, pst); FileTimeToSystemTime(&ft, pst);
} }
void TimeFunctions::msToFileTime(UINT32 ms, LARGE_INTEGER &pft)
{
// Note that LONGLONG is a 64-bit value
LONGLONG ll;
ll = Int32x32To64(ms, 10000) ;
pft.QuadPart = ll;
}

2
EpdBase/TimeFunctions.h
View file

@ -8,7 +8,5 @@ public:
TimeFunctions(); TimeFunctions();
static void UnixTimeToFileTime(time_t t, LPFILETIME pft); static void UnixTimeToFileTime(time_t t, LPFILETIME pft);
static void UnixTimeToSystemTime(time_t t, LPSYSTEMTIME pst); static void UnixTimeToSystemTime(time_t t, LPSYSTEMTIME pst);
static void msToFileTime(UINT32 ms, LARGE_INTEGER &pft);
}; };

2
SetupProject1/Product.wxs
View file

@ -3,7 +3,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<?define eDosStation_TargetDir=$(var.eDosStation.TargetDir)?> <?define eDosStation_TargetDir=$(var.eDosStation.TargetDir)?>
<?define syncEdosLocal_TargetDir=$(var.syncEdosLocal.TargetDir)?> <?define syncEdosLocal_TargetDir=$(var.syncEdosLocal.TargetDir)?>
<Product Id="*" Name="eDosStation" Language="1033" Version="1.0.3.0" Manufacturer="SCK CEN Luc Vandenbroucke" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8"> <Product Id="*" Name="eDosStation" Language="1033" Version="1.0.4.0" Manufacturer="SCK CEN Luc Vandenbroucke" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Comments="EPD lees software en synchronisatie tussen local en remote database" InstallPrivileges="elevated" Platform="x86" /> <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Comments="EPD lees software en synchronisatie tussen local en remote database" InstallPrivileges="elevated" Platform="x86" />
<Media Id="1" EmbedCab="yes" Cabinet="cab" /> <Media Id="1" EmbedCab="yes" Cabinet="cab" />
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />

2
eDosStation/EntryBadge.xaml.cs
View file

@ -18,7 +18,7 @@ namespace eDosStation
Station thisStation; Station thisStation;
EpdBaseClr.Epd2 ep; EpdBaseClr.Epd2 ep;
bool EpdFound = false; bool EpdFound = false;
DispatcherTimer dispatcherTimer, epdTimer; DispatcherTimer dispatcherTimer;
int Search, UserSeconds; int Search, UserSeconds;
Boolean Inst1 = false, Inst2 = false; Boolean Inst1 = false, Inst2 = false;
private System.Threading.Tasks.Task ReaderTask = null; private System.Threading.Tasks.Task ReaderTask = null;