diff --git a/EpdBase/EpdBase.cpp b/EpdBase/EpdBase.cpp
index 4ccb087..f717453 100644
--- a/EpdBase/EpdBase.cpp
+++ b/EpdBase/EpdBase.cpp
@@ -10,7 +10,7 @@
EpdBase::Epd2U::Epd2U(int comport)
{
port = comport;
- CommsInitialized = 0;
+ CommsInitialized = 0;
isBG = isNG = VersionOK = hasAlarm = false;
maxDiscoverTime = 10000;
hWaitTimer = CreateWaitableTimer(NULL, TRUE, NULL);
diff --git a/EpdBase3/Epd3Base.cpp b/EpdBase3/Epd3Base.cpp
index 48bfea1..cf66f3e 100644
--- a/EpdBase3/Epd3Base.cpp
+++ b/EpdBase3/Epd3Base.cpp
@@ -276,7 +276,6 @@ error:
void Epd3Base::Epd3U::EndCom(bool doDiscon)
{
int rv;
-
if (CommsInitialized == 1 || CurrentDeviceID != 0) {
if (CommsInitialized == 1) {
DebugWrite( "**** EndCom(%d) is Connected=%d ****\n", doDiscon, isConnected);
@@ -328,7 +327,8 @@ int Epd3Base::Epd3U::StartDiscover(int tokentimeout)
Dll3RV = StartDiscovery(epdComsHandle, discovery);
if (Dll3RV == 0) {
Dll3RV = WaitForSingleObject(hCompletion, tokentimeout);
- if (Dll3RV == WAIT_OBJECT_0) rv = 1;
+ if (Dll3RV == WAIT_OBJECT_0)
+ rv = 1;
else if (Dll3RV == WAIT_TIMEOUT) {
rv = 1;
ConnectTimerFired = 1;
@@ -337,6 +337,7 @@ int Epd3Base::Epd3U::StartDiscover(int tokentimeout)
}
else rv = 2;
}
+
if (DeviceCount > 0) {
Dll3RV = SetConnectCallback(epdComsHandle, connectcallback);
Dll3RV = Connect3(epdComsHandle, Epd, true);
diff --git a/eDosStation/EntryBadge.xaml.cs b/eDosStation/EntryBadge.xaml.cs
index 409bb69..82e5f7a 100644
--- a/eDosStation/EntryBadge.xaml.cs
+++ b/eDosStation/EntryBadge.xaml.cs
@@ -34,7 +34,6 @@ namespace eDosStation
static User _User;
DataSet1.GetTaskInfoRow CurTaskRow;
eDosStation.DataSet1 dataSet1;
-
private DateTime ResultTime;
private bool EpdReading=false;
private bool FinalTimeOut=false;
@@ -68,7 +67,6 @@ namespace eDosStation
Dispatcher.InvokeAsync(() => { SetTimedOutAndEnd(); });
});
}
-
private void StopProgress(string newmessage)
{
dispatcherTimer?.Stop();
@@ -387,14 +385,11 @@ namespace eDosStation
SetTimedOutAndEnd();
}
}
-
public static void DoEvents()
{
Application.Current.Dispatcher.Invoke(DispatcherPriority.Background,
new Action(delegate { }));
}
-
-
private void ShowFinal(int ReturnValue)
{
@@ -714,9 +709,9 @@ namespace eDosStation
private void startEPDRead()
{
EpdReading = true; bEpdCancel.IsEnabled = false;
+
Dispatcher.InvokeAsync(new Action(() => { ep.Wait(thisStation.EPDTimeOut, thisStation.EPDRetries); }), DispatcherPriority.Background);
}
-
private void SetTimedOutAndEnd()
{
bool ShowExtraTime= true;
diff --git a/eDosStation/Resources/BuildDate.txt b/eDosStation/Resources/BuildDate.txt
index c5900e7..30c62d0 100644
--- a/eDosStation/Resources/BuildDate.txt
+++ b/eDosStation/Resources/BuildDate.txt
@@ -1 +1 @@
-Mon 10/14/2024 7:50:24.36
+Mon 10/14/2024 9:54:23.70
diff --git a/scripts/Upgrader.ps1 b/scripts/Upgrader.ps1
index 6bb7755..3e40403 100644
--- a/scripts/Upgrader.ps1
+++ b/scripts/Upgrader.ps1
@@ -28,10 +28,10 @@ Start-ScheduledTask -TaskName $taskname
exit
# SIG # Begin signature block
-# MIIlBQYJKoZIhvcNAQcCoIIk9jCCJPICAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
+# MIIk/wYJKoZIhvcNAQcCoIIk8DCCJOwCAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
# gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR
# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUtRVTh7pvQAmc9/k17SmKvWNa
-# 9qCggh8/MIIFjTCCBHWgAwIBAgIQDpsYjvnQLefv21DiCEAYWjANBgkqhkiG9w0B
+# 9qCggh85MIIFjTCCBHWgAwIBAgIQDpsYjvnQLefv21DiCEAYWjANBgkqhkiG9w0B
# AQwFADBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYD
# VQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVk
# IElEIFJvb3QgQ0EwHhcNMjIwODAxMDAwMDAwWhcNMzExMTA5MjM1OTU5WjBiMQsw
@@ -161,69 +161,69 @@ exit
# nOHdI/0dKNPH+ejxmF/7K9h+8kaddSweJywm228Vex4Ziza4k9Tm8heZWcpw8De/
# mADfIBZPJ/tgZxahZrrdVcA6KYawmKAr7ZVBtzrVFZgxtGIJDwq9gdkT/r+k0fNX
# 2bwE+oLeMt8EifAAzV3C+dAjfwAL5HYCJtnwZXZCpimHCUcr5n8apIUP/JiW9lVU
-# Kx+A+sDyDivl1vupL0QVSucTDh3bNzgaoSv27dZ8/DCCBsIwggSqoAMCAQICEAVE
-# r/OUnQg5pr/bP1/lYRYwDQYJKoZIhvcNAQELBQAwYzELMAkGA1UEBhMCVVMxFzAV
+# Kx+A+sDyDivl1vupL0QVSucTDh3bNzgaoSv27dZ8/DCCBrwwggSkoAMCAQICEAuu
+# Zrxaun+Vh8b56QTjMwQwDQYJKoZIhvcNAQELBQAwYzELMAkGA1UEBhMCVVMxFzAV
# BgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMTswOQYDVQQDEzJEaWdpQ2VydCBUcnVzdGVk
-# IEc0IFJTQTQwOTYgU0hBMjU2IFRpbWVTdGFtcGluZyBDQTAeFw0yMzA3MTQwMDAw
-# MDBaFw0zNDEwMTMyMzU5NTlaMEgxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdp
-# Q2VydCwgSW5jLjEgMB4GA1UEAxMXRGlnaUNlcnQgVGltZXN0YW1wIDIwMjMwggIi
-# MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCjU0WHHYOOW6w+VLMj4M+f1+XS
-# 512hDgncL0ijl3o7Kpxn3GIVWMGpkxGnzaqyat0QKYoeYmNp01icNXG/OpfrlFCP
-# HCDqx5o7L5Zm42nnaf5bw9YrIBzBl5S0pVCB8s/LB6YwaMqDQtr8fwkklKSCGtpq
-# utg7yl3eGRiF+0XqDWFsnf5xXsQGmjzwxS55DxtmUuPI1j5f2kPThPXQx/ZILV5F
-# dZZ1/t0QoRuDwbjmUpW1R9d4KTlr4HhZl+NEK0rVlc7vCBfqgmRN/yPjyobutKQh
-# ZHDr1eWg2mOzLukF7qr2JPUdvJscsrdf3/Dudn0xmWVHVZ1KJC+sK5e+n+T9e3M+
-# Mu5SNPvUu+vUoCw0m+PebmQZBzcBkQ8ctVHNqkxmg4hoYru8QRt4GW3k2Q/gWEH7
-# 2LEs4VGvtK0VBhTqYggT02kefGRNnQ/fztFejKqrUBXJs8q818Q7aESjpTtC/XN9
-# 7t0K/3k0EH6mXApYTAA+hWl1x4Nk1nXNjxJ2VqUk+tfEayG66B80mC866msBsPf7
-# Kobse1I4qZgJoXGybHGvPrhvltXhEBP+YUcKjP7wtsfVx95sJPC/QoLKoHE9nJKT
-# BLRpcCcNT7e1NtHJXwikcKPsCvERLmTgyyIryvEoEyFJUX4GZtM7vvrrkTjYUQfK
-# lLfiUKHzOtOKg8tAewIDAQABo4IBizCCAYcwDgYDVR0PAQH/BAQDAgeAMAwGA1Ud
-# EwEB/wQCMAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwIAYDVR0gBBkwFzAIBgZn
-# gQwBBAIwCwYJYIZIAYb9bAcBMB8GA1UdIwQYMBaAFLoW2W1NhS9zKXaaL3WMaiCP
-# nshvMB0GA1UdDgQWBBSltu8T5+/N0GSh1VapZTGj3tXjSTBaBgNVHR8EUzBRME+g
-# TaBLhklodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkRzRS
-# U0E0MDk2U0hBMjU2VGltZVN0YW1waW5nQ0EuY3JsMIGQBggrBgEFBQcBAQSBgzCB
-# gDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMFgGCCsGAQUF
-# BzAChkxodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVk
-# RzRSU0E0MDk2U0hBMjU2VGltZVN0YW1waW5nQ0EuY3J0MA0GCSqGSIb3DQEBCwUA
-# A4ICAQCBGtbeoKm1mBe8cI1PijxonNgl/8ss5M3qXSKS7IwiAqm4z4Co2efjxe0m
-# gopxLxjdTrbebNfhYJwr7e09SI64a7p8Xb3CYTdoSXej65CqEtcnhfOOHpLawkA4
-# n13IoC4leCWdKgV6hCmYtld5j9smViuw86e9NwzYmHZPVrlSwradOKmB521BXIxp
-# 0bkrxMZ7z5z6eOKTGnaiaXXTUOREEr4gDZ6pRND45Ul3CFohxbTPmJUaVLq5vMFp
-# GbrPFvKDNzRusEEm3d5al08zjdSNd311RaGlWCZqA0Xe2VC1UIyvVr1MxeFGxSjT
-# redDAHDezJieGYkD6tSRN+9NUvPJYCHEVkft2hFLjDLDiOZY4rbbPvlfsELWj+MX
-# kdGqwFXjhr+sJyxB0JozSqg21Llyln6XeThIX8rC3D0y33XWNmdaifj2p8flTzU8
-# AL2+nCpseQHc2kTmOt44OwdeOVj0fHMxVaCAEcsUDH6uvP6k63llqmjWIso765qC
-# NVcoFstp8jKastLYOrixRoZruhf9xHdsFWyuq69zOuhJRrfVf8y2OMDY7Bz1tqG4
-# QyzfTkx9HmhwwHcK1ALgXGC7KP845VJa1qwXIiNO9OzTF/tQa/8Hdx9xl0RBybhG
-# 02wyfFgvZ0dl5Rtztpn5aywGRu9BHvDwX+Db2a2QgESvgBBBijGCBTAwggUsAgEB
-# MGswZjELMAkGA1UEBhMCQkUxEjAQBgNVBAgTCUFudHdlcnBlbjEMMAoGA1UEBxMD
-# TW9sMQ8wDQYDVQQKEwZTQ0tDRU4xDDAKBgNVBAsTA0lDVDEWMBQGA1UEAxMNU0NL
-# Q0VOIElDVCBDQQIBHzAJBgUrDgMCGgUAoHgwGAYKKwYBBAGCNwIBDDEKMAigAoAA
-# oQKAADAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4w
-# DAYKKwYBBAGCNwIBFTAjBgkqhkiG9w0BCQQxFgQUBB3OZ2RsFlKJYSR2wlGAUfq9
-# zpEwDQYJKoZIhvcNAQEBBQAEggEA8RoUEw651B8/CrClnpv4XY8h7AZUv+TCwJZV
-# 5bhbj5wAtGqFY9gnGaGj8hpBk+BPRPeHyyMMO7/ZlNQZhYbZJrXGCfqyCcHV6aHQ
-# aSVYnuRw6vqqPOoleL2XoVZ4gZOeOLCSnac0X/sITO72pzieCDiAjhS5nYA5vXql
-# efVU05gSKZ8HHjJYjueix2aOQu+ebByRJNfrTcNDuNw8x6ogMAJp0fypTb3K/Jlc
-# yyO0iuvXztWsOmoU3YhZxcEzZBOu2Is94HOvF/sKTewO/4X3xkd+IdTlfeOD0wGU
-# Suecb/RCgjXO4Z1oBOn85F4TUHHaiZjUb6qc7RJ3iC0LmdscpaGCAyAwggMcBgkq
-# hkiG9w0BCQYxggMNMIIDCQIBATB3MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5E
-# aWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0
-# MDk2IFNIQTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAVEr/OUnQg5pr/bP1/lYRYwDQYJ
-# YIZIAWUDBAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3
-# DQEJBTEPFw0yNDA5MTMxMzI2MjdaMC8GCSqGSIb3DQEJBDEiBCDbjZuxJgcSDufz
-# +ekiprJJKPMdOid8HFavnX4C8hgeWzANBgkqhkiG9w0BAQEFAASCAgA8N59XJuBB
-# N0V5DWUpBQYyIAbxNGPjwZeNYP88nWwMwzGt8RJ56xbiOYLp65MN0oya5FqjLHaC
-# u2shRZ2tLRMteOfNROwDKGFXZ8AvCRAlmR2e9/wg2z1Lh9RJX6hV7Yx0qmKNj2D9
-# zNwRICnDk9QwSZ+cW5CZG+npDmuurOrNwxR+J0oK6UD/aMdTJ9rYCJzGpygP0orW
-# xaAsCOXvZjq9dZBfLkk7QG40G+G5rcwNrsOFJaYr3n0LtngkrDebzWZj7GoYzUjF
-# rWgEV7wJ98wRtRwltDpfAyl9K1EQe7TubDzQW4rmFw+00tsoEpjgc8IOPxrOhGOt
-# DSDGAHkbYOj0KTSd6aHr5Ogr5raENQsykpbdy7kQ/bgfSHP/o4GOB4k2C3J9+smO
-# 5dhHVoyecMWmDbmDl28nN8yVW6NJLeu8NCd7zCfaVwuJzixU34vP7HcMyOMRnBBA
-# WTJTHdwU5DW3RjBbh3k1Yp5Xev09ysE/H5ZwSon1j5hoaKzoPIKETnjY4hnZEnpb
-# 2942gEICxePiXlg69ZhfPcYvzHs+yUjjCRyf7DWhWXjs3lY0ci0BUXLQME7pS6DT
-# y7vjKIxmn+2pCSLtO1FTDGIlEop86adVJvoBtU0OZaU3q6s3qBCBzEwlL3iMHlaY
-# n6YFc5sG5pLm3evxp6HjJ0AsxHQbcql87g==
+# IEc0IFJTQTQwOTYgU0hBMjU2IFRpbWVTdGFtcGluZyBDQTAeFw0yNDA5MjYwMDAw
+# MDBaFw0zNTExMjUyMzU5NTlaMEIxCzAJBgNVBAYTAlVTMREwDwYDVQQKEwhEaWdp
+# Q2VydDEgMB4GA1UEAxMXRGlnaUNlcnQgVGltZXN0YW1wIDIwMjQwggIiMA0GCSqG
+# SIb3DQEBAQUAA4ICDwAwggIKAoICAQC+anOf9pUhq5Ywultt5lmjtej9kR8YxIg7
+# apnjpcH9CjAgQxK+CMR0Rne/i+utMeV5bUlYYSuuM4vQngvQepVHVzNLO9RDnEXv
+# PghCaft0djvKKO+hDu6ObS7rJcXa/UKvNminKQPTv/1+kBPgHGlP28mgmoCw/xi6
+# FG9+Un1h4eN6zh926SxMe6We2r1Z6VFZj75MU/HNmtsgtFjKfITLutLWUdAoWle+
+# jYZ49+wxGE1/UXjWfISDmHuI5e/6+NfQrxGFSKx+rDdNMsePW6FLrphfYtk/FLih
+# p/feun0eV+pIF496OVh4R1TvjQYpAztJpVIfdNsEvxHofBf1BWkadc+Up0Th8Eif
+# kEEWdX4rA/FE1Q0rqViTbLVZIqi6viEk3RIySho1XyHLIAOJfXG5PEppc3XYeBH7
+# xa6VTZ3rOHNeiYnY+V4j1XbJ+Z9dI8ZhqcaDHOoj5KGg4YuiYx3eYm33aebsyF6e
+# D9MF5IDbPgjvwmnAalNEeJPvIeoGJXaeBQjIK13SlnzODdLtuThALhGtyconcVuP
+# I8AaiCaiJnfdzUcb3dWnqUnjXkRFwLtsVAxFvGqsxUA2Jq/WTjbnNjIUzIs3ITVC
+# 6VBKAOlb2u29Vwgfta8b2ypi6n2PzP0nVepsFk8nlcuWfyZLzBaZ0MucEdeBiXL+
+# nUOGhCjl+QIDAQABo4IBizCCAYcwDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQC
+# MAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwIAYDVR0gBBkwFzAIBgZngQwBBAIw
+# CwYJYIZIAYb9bAcBMB8GA1UdIwQYMBaAFLoW2W1NhS9zKXaaL3WMaiCPnshvMB0G
+# A1UdDgQWBBSfVywDdw4oFZBmpWNe7k+SH3agWzBaBgNVHR8EUzBRME+gTaBLhklo
+# dHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkRzRSU0E0MDk2
+# U0hBMjU2VGltZVN0YW1waW5nQ0EuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDAkBggr
+# BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMFgGCCsGAQUFBzAChkxo
+# dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkRzRSU0E0
+# MDk2U0hBMjU2VGltZVN0YW1waW5nQ0EuY3J0MA0GCSqGSIb3DQEBCwUAA4ICAQA9
+# rR4fdplb4ziEEkfZQ5H2EdubTggd0ShPz9Pce4FLJl6reNKLkZd5Y/vEIqFWKt4o
+# KcKz7wZmXa5VgW9B76k9NJxUl4JlKwyjUkKhk3aYx7D8vi2mpU1tKlY71AYXB8wT
+# LrQeh83pXnWwwsxc1Mt+FWqz57yFq6laICtKjPICYYf/qgxACHTvypGHrC8k1TqC
+# eHk6u4I/VBQC9VK7iSpU5wlWjNlHlFFv/M93748YTeoXU/fFa9hWJQkuzG2+B7+b
+# MDvmgF8VlJt1qQcl7YFUMYgZU1WM6nyw23vT6QSgwX5Pq2m0xQ2V6FJHu8z4LXe/
+# 371k5QrN9FQBhLLISZi2yemW0P8ZZfx4zvSWzVXpAb9k4Hpvpi6bUe8iK6WonUSV
+# 6yPlMwerwJZP/Gtbu3CKldMnn+LmmRTkTXpFIEB06nXZrDwhCGED+8RsWQSIXZpu
+# G4WLFQOhtloDRWGoCwwc6ZpPddOFkM2LlTbMcqFSzm4cd0boGhBq7vkqI1uHRz6F
+# q1IX7TaRQuR+0BGOzISkcqwXu7nMpFu3mgrlgbAW+BzikRVQ3K2YHcGkiKjA4gi4
+# OA/kz1YCsdhIBHXqBzR0/Zd2QwQ/l4Gxftt/8wY3grcc/nS//TVkej9nmUYu83BD
+# tccHHXKibMs/yXHhDXNkoPIdynhVAku7aRZOwqw6pDGCBTAwggUsAgEBMGswZjEL
+# MAkGA1UEBhMCQkUxEjAQBgNVBAgTCUFudHdlcnBlbjEMMAoGA1UEBxMDTW9sMQ8w
+# DQYDVQQKEwZTQ0tDRU4xDDAKBgNVBAsTA0lDVDEWMBQGA1UEAxMNU0NLQ0VOIElD
+# VCBDQQIBHzAJBgUrDgMCGgUAoHgwGAYKKwYBBAGCNwIBDDEKMAigAoAAoQKAADAZ
+# BgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYB
+# BAGCNwIBFTAjBgkqhkiG9w0BCQQxFgQUBB3OZ2RsFlKJYSR2wlGAUfq9zpEwDQYJ
+# KoZIhvcNAQEBBQAEggEA8RoUEw651B8/CrClnpv4XY8h7AZUv+TCwJZV5bhbj5wA
+# tGqFY9gnGaGj8hpBk+BPRPeHyyMMO7/ZlNQZhYbZJrXGCfqyCcHV6aHQaSVYnuRw
+# 6vqqPOoleL2XoVZ4gZOeOLCSnac0X/sITO72pzieCDiAjhS5nYA5vXqlefVU05gS
+# KZ8HHjJYjueix2aOQu+ebByRJNfrTcNDuNw8x6ogMAJp0fypTb3K/JlcyyO0iuvX
+# ztWsOmoU3YhZxcEzZBOu2Is94HOvF/sKTewO/4X3xkd+IdTlfeOD0wGUSuecb/RC
+# gjXO4Z1oBOn85F4TUHHaiZjUb6qc7RJ3iC0LmdscpaGCAyAwggMcBgkqhkiG9w0B
+# CQYxggMNMIIDCQIBATB3MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2Vy
+# dCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0MDk2IFNI
+# QTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAuuZrxaun+Vh8b56QTjMwQwDQYJYIZIAWUD
+# BAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEP
+# Fw0yNDEwMTQwNTUzMDBaMC8GCSqGSIb3DQEJBDEiBCDbjZuxJgcSDufz+ekiprJJ
+# KPMdOid8HFavnX4C8hgeWzANBgkqhkiG9w0BAQEFAASCAgBYxZBpW400fw4dOT4F
+# UA6ieyONjG7mA4KwDsnEOdNESABVTFT8oQBg7ltiQBKqYpctGRkFzq7/tztGC49t
+# gEby547rSJRTTXHlIUfSAm3TiXx1TGV+Y0ltEueuNu4NiZcwRCxMriPBlwa17Pzd
+# dGohTJekVf30RlKPzRv4CfC/DJ2v+N1i0zNx78GqN6eEDJScTZe2NUD5/vp2vc4i
+# KQRFLDA1tr9nk0kTZddR7J4Tn0+ZfbyGYRM1Gx5xG9ttI3OGKCLHGXosgBNbJqRM
+# WjCPljE9AUz4WO+EJerNVUYxr7Sxbxnv/BdSKbiDmNeKud0graC4EjtMeSyBymJm
+# Jma+kqNKjocphF8ChMYfu4OCwhloOIsAdin9qL3xiC2KJ3q/scXod2Lr0CHRtpIQ
+# NMprm4CFMSm5jQCjD7TxOXqR5qC2te3EMq2GW9H7vOGz5fmUA2D84fL1x5t9/7g2
+# V67MX9c4aWDKG8axrcwdC+S2IWEVg96ydX6fFs205njrGHAHv/hzvb4CbrwqG+1J
+# HGdpGP2uKGQu4PzKehH0T7BDZJ7PsZA9tbPoyY5QNO9IOTC2McS4dy4+wLmoi53o
+# Pd8BnYTtAMpZ6VLcfv8UIFuxGSVb9gyQKVIXT1yJVp4KniQ/FK/PaBBUPPSHOnEP
+# n1fFE/BcFBnqF+ziVCZap0mMrg==
# SIG # End signature block
diff --git a/scripts/installatie.ps1 b/scripts/installatie.ps1
index 9d5d7b8..d05ac6c 100644
--- a/scripts/installatie.ps1
+++ b/scripts/installatie.ps1
@@ -143,10 +143,10 @@ c:\software\installatie2.ps1
exit
# SIG # Begin signature block
-# MIIlBQYJKoZIhvcNAQcCoIIk9jCCJPICAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
+# MIIk/wYJKoZIhvcNAQcCoIIk8DCCJOwCAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
# gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR
# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQU8DoDZCivnrAKl9UuWag3fbRx
-# LXqggh8/MIIFjTCCBHWgAwIBAgIQDpsYjvnQLefv21DiCEAYWjANBgkqhkiG9w0B
+# LXqggh85MIIFjTCCBHWgAwIBAgIQDpsYjvnQLefv21DiCEAYWjANBgkqhkiG9w0B
# AQwFADBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYD
# VQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVk
# IElEIFJvb3QgQ0EwHhcNMjIwODAxMDAwMDAwWhcNMzExMTA5MjM1OTU5WjBiMQsw
@@ -276,69 +276,69 @@ exit
# nOHdI/0dKNPH+ejxmF/7K9h+8kaddSweJywm228Vex4Ziza4k9Tm8heZWcpw8De/
# mADfIBZPJ/tgZxahZrrdVcA6KYawmKAr7ZVBtzrVFZgxtGIJDwq9gdkT/r+k0fNX
# 2bwE+oLeMt8EifAAzV3C+dAjfwAL5HYCJtnwZXZCpimHCUcr5n8apIUP/JiW9lVU
-# Kx+A+sDyDivl1vupL0QVSucTDh3bNzgaoSv27dZ8/DCCBsIwggSqoAMCAQICEAVE
-# r/OUnQg5pr/bP1/lYRYwDQYJKoZIhvcNAQELBQAwYzELMAkGA1UEBhMCVVMxFzAV
+# Kx+A+sDyDivl1vupL0QVSucTDh3bNzgaoSv27dZ8/DCCBrwwggSkoAMCAQICEAuu
+# Zrxaun+Vh8b56QTjMwQwDQYJKoZIhvcNAQELBQAwYzELMAkGA1UEBhMCVVMxFzAV
# BgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMTswOQYDVQQDEzJEaWdpQ2VydCBUcnVzdGVk
-# IEc0IFJTQTQwOTYgU0hBMjU2IFRpbWVTdGFtcGluZyBDQTAeFw0yMzA3MTQwMDAw
-# MDBaFw0zNDEwMTMyMzU5NTlaMEgxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdp
-# Q2VydCwgSW5jLjEgMB4GA1UEAxMXRGlnaUNlcnQgVGltZXN0YW1wIDIwMjMwggIi
-# MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCjU0WHHYOOW6w+VLMj4M+f1+XS
-# 512hDgncL0ijl3o7Kpxn3GIVWMGpkxGnzaqyat0QKYoeYmNp01icNXG/OpfrlFCP
-# HCDqx5o7L5Zm42nnaf5bw9YrIBzBl5S0pVCB8s/LB6YwaMqDQtr8fwkklKSCGtpq
-# utg7yl3eGRiF+0XqDWFsnf5xXsQGmjzwxS55DxtmUuPI1j5f2kPThPXQx/ZILV5F
-# dZZ1/t0QoRuDwbjmUpW1R9d4KTlr4HhZl+NEK0rVlc7vCBfqgmRN/yPjyobutKQh
-# ZHDr1eWg2mOzLukF7qr2JPUdvJscsrdf3/Dudn0xmWVHVZ1KJC+sK5e+n+T9e3M+
-# Mu5SNPvUu+vUoCw0m+PebmQZBzcBkQ8ctVHNqkxmg4hoYru8QRt4GW3k2Q/gWEH7
-# 2LEs4VGvtK0VBhTqYggT02kefGRNnQ/fztFejKqrUBXJs8q818Q7aESjpTtC/XN9
-# 7t0K/3k0EH6mXApYTAA+hWl1x4Nk1nXNjxJ2VqUk+tfEayG66B80mC866msBsPf7
-# Kobse1I4qZgJoXGybHGvPrhvltXhEBP+YUcKjP7wtsfVx95sJPC/QoLKoHE9nJKT
-# BLRpcCcNT7e1NtHJXwikcKPsCvERLmTgyyIryvEoEyFJUX4GZtM7vvrrkTjYUQfK
-# lLfiUKHzOtOKg8tAewIDAQABo4IBizCCAYcwDgYDVR0PAQH/BAQDAgeAMAwGA1Ud
-# EwEB/wQCMAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwIAYDVR0gBBkwFzAIBgZn
-# gQwBBAIwCwYJYIZIAYb9bAcBMB8GA1UdIwQYMBaAFLoW2W1NhS9zKXaaL3WMaiCP
-# nshvMB0GA1UdDgQWBBSltu8T5+/N0GSh1VapZTGj3tXjSTBaBgNVHR8EUzBRME+g
-# TaBLhklodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkRzRS
-# U0E0MDk2U0hBMjU2VGltZVN0YW1waW5nQ0EuY3JsMIGQBggrBgEFBQcBAQSBgzCB
-# gDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMFgGCCsGAQUF
-# BzAChkxodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVk
-# RzRSU0E0MDk2U0hBMjU2VGltZVN0YW1waW5nQ0EuY3J0MA0GCSqGSIb3DQEBCwUA
-# A4ICAQCBGtbeoKm1mBe8cI1PijxonNgl/8ss5M3qXSKS7IwiAqm4z4Co2efjxe0m
-# gopxLxjdTrbebNfhYJwr7e09SI64a7p8Xb3CYTdoSXej65CqEtcnhfOOHpLawkA4
-# n13IoC4leCWdKgV6hCmYtld5j9smViuw86e9NwzYmHZPVrlSwradOKmB521BXIxp
-# 0bkrxMZ7z5z6eOKTGnaiaXXTUOREEr4gDZ6pRND45Ul3CFohxbTPmJUaVLq5vMFp
-# GbrPFvKDNzRusEEm3d5al08zjdSNd311RaGlWCZqA0Xe2VC1UIyvVr1MxeFGxSjT
-# redDAHDezJieGYkD6tSRN+9NUvPJYCHEVkft2hFLjDLDiOZY4rbbPvlfsELWj+MX
-# kdGqwFXjhr+sJyxB0JozSqg21Llyln6XeThIX8rC3D0y33XWNmdaifj2p8flTzU8
-# AL2+nCpseQHc2kTmOt44OwdeOVj0fHMxVaCAEcsUDH6uvP6k63llqmjWIso765qC
-# NVcoFstp8jKastLYOrixRoZruhf9xHdsFWyuq69zOuhJRrfVf8y2OMDY7Bz1tqG4
-# QyzfTkx9HmhwwHcK1ALgXGC7KP845VJa1qwXIiNO9OzTF/tQa/8Hdx9xl0RBybhG
-# 02wyfFgvZ0dl5Rtztpn5aywGRu9BHvDwX+Db2a2QgESvgBBBijGCBTAwggUsAgEB
-# MGswZjELMAkGA1UEBhMCQkUxEjAQBgNVBAgTCUFudHdlcnBlbjEMMAoGA1UEBxMD
-# TW9sMQ8wDQYDVQQKEwZTQ0tDRU4xDDAKBgNVBAsTA0lDVDEWMBQGA1UEAxMNU0NL
-# Q0VOIElDVCBDQQIBHzAJBgUrDgMCGgUAoHgwGAYKKwYBBAGCNwIBDDEKMAigAoAA
-# oQKAADAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4w
-# DAYKKwYBBAGCNwIBFTAjBgkqhkiG9w0BCQQxFgQU4rl9zioj2bPgYNNZFtIvyJ9h
-# TdwwDQYJKoZIhvcNAQEBBQAEggEAZDGL9B9+4zUvx4G3sjDKC2bJ3yYPiyn4cPd2
-# LdNYWQwBd4S033USIF5qRiiXlKrISkCGEFDWI/g6VQPtacut0GlVWmlw5DYA0Jl5
-# Pcze2NQgvNNqxiBD3+9HqhyrMf5K4KVqVuy+2XM22Wx2Yk7lLCj8hbcwUhfB14Fb
-# 3l1luQVMceR9bsveoAA+yPpP7mTCLrw+f21QywAo0GlCCwLcjqkIqPWUyokL4jrU
-# dhvRtRK9STksAMrSe9V49pVvULvP35MaLCa5mLzaePYW/Us1M5nQ+/NwHzzmf9Lj
-# htPivU6iJ/fK/IJhQNFyudK+YfsPRBPGVkGgjkABE7zkPhlbg6GCAyAwggMcBgkq
-# hkiG9w0BCQYxggMNMIIDCQIBATB3MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5E
-# aWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0
-# MDk2IFNIQTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAVEr/OUnQg5pr/bP1/lYRYwDQYJ
-# YIZIAWUDBAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3
-# DQEJBTEPFw0yNDA5MTMxMzI2MjdaMC8GCSqGSIb3DQEJBDEiBCAcllG2mSPxCJ8u
-# oQsIqOunNyELPZuVN2PuUwDZLmIbpTANBgkqhkiG9w0BAQEFAASCAgBXvsy4zDK6
-# 9GPXRXQXjAgURJy4RWHgLuw7AmlVm6MLkC0BPI3l6tk4pD8OLUCp4sQ1OL7umIgJ
-# YlirmTJipWM7Dbzd7WO6i8dVzgykxXxL8m7bZCJ/OI7OuyY4+GCgNQb4+Ml5Vnf3
-# 3i5A/xzHzpBruldStrXQYswrTrED7wpuZYxIkJVtjuNSQcWMp/AvUTVftUyp89TJ
-# LGeciOjxU1RDPrahuWUxR1d+Y/q0Y4B0SCPgp8g9LoOt189oZJJajBfT24zrzZkp
-# J0rVdYEK1iRK15HWtbth0IxexxdALgokjqX10xcFUrUfqzmoESUc0F+4g9cgrlnK
-# PWtMI+k/V1KvcJpOgtPLR6t7AEicK+lp+KK9oDGqJjoL6ul+c8IHV8fzpT8y4ytq
-# kcQnojUpt+rlgi1tKhm8OTpv6xC36KcN9r6ZGFmERl/ptqElAEWdVOf1oKiu3/Oj
-# UjqzNeHj4u03uvvLlYKvq8jddHrzjEPBPTwD+FjCgjO49u1rgaKuLsH4qocY/9rq
-# 7nefnAZBqR36k05nUgBfIRUEmlHIzqBH+bEFdc6zdgtOyrdudeka7QMM8oZaqdb7
-# +mZrbhtFdzg8F4KO/5A23QTAYVw+1ZdsEH7QBD8xc6sjIPNALqjoEZJlugvaF+x7
-# XRSdcQlKpk2dr9oy+POlYSXcDRNtLjT4+Q==
+# IEc0IFJTQTQwOTYgU0hBMjU2IFRpbWVTdGFtcGluZyBDQTAeFw0yNDA5MjYwMDAw
+# MDBaFw0zNTExMjUyMzU5NTlaMEIxCzAJBgNVBAYTAlVTMREwDwYDVQQKEwhEaWdp
+# Q2VydDEgMB4GA1UEAxMXRGlnaUNlcnQgVGltZXN0YW1wIDIwMjQwggIiMA0GCSqG
+# SIb3DQEBAQUAA4ICDwAwggIKAoICAQC+anOf9pUhq5Ywultt5lmjtej9kR8YxIg7
+# apnjpcH9CjAgQxK+CMR0Rne/i+utMeV5bUlYYSuuM4vQngvQepVHVzNLO9RDnEXv
+# PghCaft0djvKKO+hDu6ObS7rJcXa/UKvNminKQPTv/1+kBPgHGlP28mgmoCw/xi6
+# FG9+Un1h4eN6zh926SxMe6We2r1Z6VFZj75MU/HNmtsgtFjKfITLutLWUdAoWle+
+# jYZ49+wxGE1/UXjWfISDmHuI5e/6+NfQrxGFSKx+rDdNMsePW6FLrphfYtk/FLih
+# p/feun0eV+pIF496OVh4R1TvjQYpAztJpVIfdNsEvxHofBf1BWkadc+Up0Th8Eif
+# kEEWdX4rA/FE1Q0rqViTbLVZIqi6viEk3RIySho1XyHLIAOJfXG5PEppc3XYeBH7
+# xa6VTZ3rOHNeiYnY+V4j1XbJ+Z9dI8ZhqcaDHOoj5KGg4YuiYx3eYm33aebsyF6e
+# D9MF5IDbPgjvwmnAalNEeJPvIeoGJXaeBQjIK13SlnzODdLtuThALhGtyconcVuP
+# I8AaiCaiJnfdzUcb3dWnqUnjXkRFwLtsVAxFvGqsxUA2Jq/WTjbnNjIUzIs3ITVC
+# 6VBKAOlb2u29Vwgfta8b2ypi6n2PzP0nVepsFk8nlcuWfyZLzBaZ0MucEdeBiXL+
+# nUOGhCjl+QIDAQABo4IBizCCAYcwDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQC
+# MAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwIAYDVR0gBBkwFzAIBgZngQwBBAIw
+# CwYJYIZIAYb9bAcBMB8GA1UdIwQYMBaAFLoW2W1NhS9zKXaaL3WMaiCPnshvMB0G
+# A1UdDgQWBBSfVywDdw4oFZBmpWNe7k+SH3agWzBaBgNVHR8EUzBRME+gTaBLhklo
+# dHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkRzRSU0E0MDk2
+# U0hBMjU2VGltZVN0YW1waW5nQ0EuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDAkBggr
+# BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMFgGCCsGAQUFBzAChkxo
+# dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkRzRSU0E0
+# MDk2U0hBMjU2VGltZVN0YW1waW5nQ0EuY3J0MA0GCSqGSIb3DQEBCwUAA4ICAQA9
+# rR4fdplb4ziEEkfZQ5H2EdubTggd0ShPz9Pce4FLJl6reNKLkZd5Y/vEIqFWKt4o
+# KcKz7wZmXa5VgW9B76k9NJxUl4JlKwyjUkKhk3aYx7D8vi2mpU1tKlY71AYXB8wT
+# LrQeh83pXnWwwsxc1Mt+FWqz57yFq6laICtKjPICYYf/qgxACHTvypGHrC8k1TqC
+# eHk6u4I/VBQC9VK7iSpU5wlWjNlHlFFv/M93748YTeoXU/fFa9hWJQkuzG2+B7+b
+# MDvmgF8VlJt1qQcl7YFUMYgZU1WM6nyw23vT6QSgwX5Pq2m0xQ2V6FJHu8z4LXe/
+# 371k5QrN9FQBhLLISZi2yemW0P8ZZfx4zvSWzVXpAb9k4Hpvpi6bUe8iK6WonUSV
+# 6yPlMwerwJZP/Gtbu3CKldMnn+LmmRTkTXpFIEB06nXZrDwhCGED+8RsWQSIXZpu
+# G4WLFQOhtloDRWGoCwwc6ZpPddOFkM2LlTbMcqFSzm4cd0boGhBq7vkqI1uHRz6F
+# q1IX7TaRQuR+0BGOzISkcqwXu7nMpFu3mgrlgbAW+BzikRVQ3K2YHcGkiKjA4gi4
+# OA/kz1YCsdhIBHXqBzR0/Zd2QwQ/l4Gxftt/8wY3grcc/nS//TVkej9nmUYu83BD
+# tccHHXKibMs/yXHhDXNkoPIdynhVAku7aRZOwqw6pDGCBTAwggUsAgEBMGswZjEL
+# MAkGA1UEBhMCQkUxEjAQBgNVBAgTCUFudHdlcnBlbjEMMAoGA1UEBxMDTW9sMQ8w
+# DQYDVQQKEwZTQ0tDRU4xDDAKBgNVBAsTA0lDVDEWMBQGA1UEAxMNU0NLQ0VOIElD
+# VCBDQQIBHzAJBgUrDgMCGgUAoHgwGAYKKwYBBAGCNwIBDDEKMAigAoAAoQKAADAZ
+# BgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYB
+# BAGCNwIBFTAjBgkqhkiG9w0BCQQxFgQU4rl9zioj2bPgYNNZFtIvyJ9hTdwwDQYJ
+# KoZIhvcNAQEBBQAEggEAZDGL9B9+4zUvx4G3sjDKC2bJ3yYPiyn4cPd2LdNYWQwB
+# d4S033USIF5qRiiXlKrISkCGEFDWI/g6VQPtacut0GlVWmlw5DYA0Jl5Pcze2NQg
+# vNNqxiBD3+9HqhyrMf5K4KVqVuy+2XM22Wx2Yk7lLCj8hbcwUhfB14Fb3l1luQVM
+# ceR9bsveoAA+yPpP7mTCLrw+f21QywAo0GlCCwLcjqkIqPWUyokL4jrUdhvRtRK9
+# STksAMrSe9V49pVvULvP35MaLCa5mLzaePYW/Us1M5nQ+/NwHzzmf9LjhtPivU6i
+# J/fK/IJhQNFyudK+YfsPRBPGVkGgjkABE7zkPhlbg6GCAyAwggMcBgkqhkiG9w0B
+# CQYxggMNMIIDCQIBATB3MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2Vy
+# dCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0MDk2IFNI
+# QTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAuuZrxaun+Vh8b56QTjMwQwDQYJYIZIAWUD
+# BAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEP
+# Fw0yNDEwMTQwNTUzMDBaMC8GCSqGSIb3DQEJBDEiBCAcllG2mSPxCJ8uoQsIqOun
+# NyELPZuVN2PuUwDZLmIbpTANBgkqhkiG9w0BAQEFAASCAgAMVsWvLNSByXounxRs
+# xWsy0e8HXEqCJUB/zyMY29kQuLuf9xYUAvctxeHFBOu26RkaN0Ts9xC8u/2TMFFW
+# 8BnmetLk2UPSH6jx+U2/P8glR2BZpQFc5GYKZ3Ik4OnWFXRBhoL7x7B5J7rpJNLs
+# /wFgnF8mBpjFRdvB/Ao646GuIUC8UWf5y3+ksZTFIYeEBEYF30oaOGgnnNnVNC4X
+# W3jP3K4ZqQ0kDdUKD69wrTNtze6v2BWeOfW/p6S2ylNrPUqHttVnxDezH4Ibu3HH
+# cAAVGEsVRzCCVZhdp+K3/I6n7UVl3IKISna/wrMODYluGEjpmOddJFe5r2Rcsxfw
+# kzdlLETwsiOqLTxhxbI7LjVx37gzFjISn/kjPwxbnFNWMX8RKeF2JtNrEDdnv91u
+# erzPN8guYuKSK8ks2JezL6JN9p/Jbyx13Ke6jJPJPTm8Fc/gP6CmYztPDdMn4vy8
+# X52+CBCYLHczcWpemCeoKo2NYUvQQaANHZeAhR0rMR40X6KYUuAw+uLrtm1yyMV5
+# l329wr1PaV2eTqyW3VG1muhhP5Zgdtb/KAGo3XAA8bMiYoPAXo0jci2KfR1hdh+A
+# aFnct31aDUbYmQppdIm9bSJozYEwfughPudo55eekZMwDqc+isd5NJLzfPlti30k
+# rd6IYVAWMRLa1dZiuIFH5YAzHA==
# SIG # End signature block
diff --git a/scripts/installatie2.ps1 b/scripts/installatie2.ps1
index d8dfcb8..c272b5c 100644
--- a/scripts/installatie2.ps1
+++ b/scripts/installatie2.ps1
@@ -7,10 +7,10 @@ start-process -wait -workingdirectory "c:\software" -filepath "C:\Windows\System
exit
# SIG # Begin signature block
-# MIIlBQYJKoZIhvcNAQcCoIIk9jCCJPICAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
+# MIIk/wYJKoZIhvcNAQcCoIIk8DCCJOwCAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
# gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR
# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUJ3kTd4gKlW9tPg9vE59sNaVb
-# fHiggh8/MIIFjTCCBHWgAwIBAgIQDpsYjvnQLefv21DiCEAYWjANBgkqhkiG9w0B
+# fHiggh85MIIFjTCCBHWgAwIBAgIQDpsYjvnQLefv21DiCEAYWjANBgkqhkiG9w0B
# AQwFADBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYD
# VQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVk
# IElEIFJvb3QgQ0EwHhcNMjIwODAxMDAwMDAwWhcNMzExMTA5MjM1OTU5WjBiMQsw
@@ -140,69 +140,69 @@ exit
# nOHdI/0dKNPH+ejxmF/7K9h+8kaddSweJywm228Vex4Ziza4k9Tm8heZWcpw8De/
# mADfIBZPJ/tgZxahZrrdVcA6KYawmKAr7ZVBtzrVFZgxtGIJDwq9gdkT/r+k0fNX
# 2bwE+oLeMt8EifAAzV3C+dAjfwAL5HYCJtnwZXZCpimHCUcr5n8apIUP/JiW9lVU
-# Kx+A+sDyDivl1vupL0QVSucTDh3bNzgaoSv27dZ8/DCCBsIwggSqoAMCAQICEAVE
-# r/OUnQg5pr/bP1/lYRYwDQYJKoZIhvcNAQELBQAwYzELMAkGA1UEBhMCVVMxFzAV
+# Kx+A+sDyDivl1vupL0QVSucTDh3bNzgaoSv27dZ8/DCCBrwwggSkoAMCAQICEAuu
+# Zrxaun+Vh8b56QTjMwQwDQYJKoZIhvcNAQELBQAwYzELMAkGA1UEBhMCVVMxFzAV
# BgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMTswOQYDVQQDEzJEaWdpQ2VydCBUcnVzdGVk
-# IEc0IFJTQTQwOTYgU0hBMjU2IFRpbWVTdGFtcGluZyBDQTAeFw0yMzA3MTQwMDAw
-# MDBaFw0zNDEwMTMyMzU5NTlaMEgxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdp
-# Q2VydCwgSW5jLjEgMB4GA1UEAxMXRGlnaUNlcnQgVGltZXN0YW1wIDIwMjMwggIi
-# MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCjU0WHHYOOW6w+VLMj4M+f1+XS
-# 512hDgncL0ijl3o7Kpxn3GIVWMGpkxGnzaqyat0QKYoeYmNp01icNXG/OpfrlFCP
-# HCDqx5o7L5Zm42nnaf5bw9YrIBzBl5S0pVCB8s/LB6YwaMqDQtr8fwkklKSCGtpq
-# utg7yl3eGRiF+0XqDWFsnf5xXsQGmjzwxS55DxtmUuPI1j5f2kPThPXQx/ZILV5F
-# dZZ1/t0QoRuDwbjmUpW1R9d4KTlr4HhZl+NEK0rVlc7vCBfqgmRN/yPjyobutKQh
-# ZHDr1eWg2mOzLukF7qr2JPUdvJscsrdf3/Dudn0xmWVHVZ1KJC+sK5e+n+T9e3M+
-# Mu5SNPvUu+vUoCw0m+PebmQZBzcBkQ8ctVHNqkxmg4hoYru8QRt4GW3k2Q/gWEH7
-# 2LEs4VGvtK0VBhTqYggT02kefGRNnQ/fztFejKqrUBXJs8q818Q7aESjpTtC/XN9
-# 7t0K/3k0EH6mXApYTAA+hWl1x4Nk1nXNjxJ2VqUk+tfEayG66B80mC866msBsPf7
-# Kobse1I4qZgJoXGybHGvPrhvltXhEBP+YUcKjP7wtsfVx95sJPC/QoLKoHE9nJKT
-# BLRpcCcNT7e1NtHJXwikcKPsCvERLmTgyyIryvEoEyFJUX4GZtM7vvrrkTjYUQfK
-# lLfiUKHzOtOKg8tAewIDAQABo4IBizCCAYcwDgYDVR0PAQH/BAQDAgeAMAwGA1Ud
-# EwEB/wQCMAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwIAYDVR0gBBkwFzAIBgZn
-# gQwBBAIwCwYJYIZIAYb9bAcBMB8GA1UdIwQYMBaAFLoW2W1NhS9zKXaaL3WMaiCP
-# nshvMB0GA1UdDgQWBBSltu8T5+/N0GSh1VapZTGj3tXjSTBaBgNVHR8EUzBRME+g
-# TaBLhklodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkRzRS
-# U0E0MDk2U0hBMjU2VGltZVN0YW1waW5nQ0EuY3JsMIGQBggrBgEFBQcBAQSBgzCB
-# gDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMFgGCCsGAQUF
-# BzAChkxodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVk
-# RzRSU0E0MDk2U0hBMjU2VGltZVN0YW1waW5nQ0EuY3J0MA0GCSqGSIb3DQEBCwUA
-# A4ICAQCBGtbeoKm1mBe8cI1PijxonNgl/8ss5M3qXSKS7IwiAqm4z4Co2efjxe0m
-# gopxLxjdTrbebNfhYJwr7e09SI64a7p8Xb3CYTdoSXej65CqEtcnhfOOHpLawkA4
-# n13IoC4leCWdKgV6hCmYtld5j9smViuw86e9NwzYmHZPVrlSwradOKmB521BXIxp
-# 0bkrxMZ7z5z6eOKTGnaiaXXTUOREEr4gDZ6pRND45Ul3CFohxbTPmJUaVLq5vMFp
-# GbrPFvKDNzRusEEm3d5al08zjdSNd311RaGlWCZqA0Xe2VC1UIyvVr1MxeFGxSjT
-# redDAHDezJieGYkD6tSRN+9NUvPJYCHEVkft2hFLjDLDiOZY4rbbPvlfsELWj+MX
-# kdGqwFXjhr+sJyxB0JozSqg21Llyln6XeThIX8rC3D0y33XWNmdaifj2p8flTzU8
-# AL2+nCpseQHc2kTmOt44OwdeOVj0fHMxVaCAEcsUDH6uvP6k63llqmjWIso765qC
-# NVcoFstp8jKastLYOrixRoZruhf9xHdsFWyuq69zOuhJRrfVf8y2OMDY7Bz1tqG4
-# QyzfTkx9HmhwwHcK1ALgXGC7KP845VJa1qwXIiNO9OzTF/tQa/8Hdx9xl0RBybhG
-# 02wyfFgvZ0dl5Rtztpn5aywGRu9BHvDwX+Db2a2QgESvgBBBijGCBTAwggUsAgEB
-# MGswZjELMAkGA1UEBhMCQkUxEjAQBgNVBAgTCUFudHdlcnBlbjEMMAoGA1UEBxMD
-# TW9sMQ8wDQYDVQQKEwZTQ0tDRU4xDDAKBgNVBAsTA0lDVDEWMBQGA1UEAxMNU0NL
-# Q0VOIElDVCBDQQIBHzAJBgUrDgMCGgUAoHgwGAYKKwYBBAGCNwIBDDEKMAigAoAA
-# oQKAADAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4w
-# DAYKKwYBBAGCNwIBFTAjBgkqhkiG9w0BCQQxFgQUgkRlmD16zmoBrg1du+W/Dzlu
-# hY4wDQYJKoZIhvcNAQEBBQAEggEA0VOgjbW1itVczBY9n7RJD3LYlIrCL/ukEPuf
-# WiAR545rhB7LW06OM2FcV2und67zyRusab96TJA7Frbu5Mmc8Jxoms2F+M2HfZLU
-# 8ZBRoyJP9YbVdVm1IIUvt5O9q0gk3PtiGlUXk+CGC7Uft9SgSpQNXu5NaDZsgV+c
-# ZXC0VJl67xXKViAsQzH0RqYl8rgRYh4TbdhKc8W3RwYp/rxYgP1h9RZZ0/59WlJB
-# T8c5WPh5Rw5ZDN1fnppU5CAyd7yi9tuM9r2yCBhTr7JscepsR6B1HlvHsnCzYFZc
-# PaBKztnoRvoFIihkK39wEoI6cVRouBCr9IA6RK2rx+nLRCqIZKGCAyAwggMcBgkq
-# hkiG9w0BCQYxggMNMIIDCQIBATB3MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5E
-# aWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0
-# MDk2IFNIQTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAVEr/OUnQg5pr/bP1/lYRYwDQYJ
-# YIZIAWUDBAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3
-# DQEJBTEPFw0yNDA5MTMxMzI2MjdaMC8GCSqGSIb3DQEJBDEiBCDpOCR32+BElOsp
-# pr9o2qvS6Cq0zGXXv8N/urfnLBwlITANBgkqhkiG9w0BAQEFAASCAgBwwnkWf+jq
-# x43RcfGKXoLepTvXFKsQauGxtGj7Z43fUFy2Amv+GpQ7jmS7Zlv0G84hsR7yI3Ls
-# U0kXvYqHu6DEFUixZLUBZkWSBTSYXB6KqcBybyZx4wtnCcPi7/thMefnIkvIYjuR
-# q+TwLMRkEciCQQlMAZghSHtQeoqaw7DlDSMmGQf3kRPxGRU1sHMVmNuCQTCDRN3u
-# Fm0fEgnTOF0xTvNCo95Pym+AW1G/XZJAmwXNUm2PQEofMG+Sq9dkvIXwiNdlxb1b
-# lxEtmgcO0M4C3FlhOxuyRCKC33InJimGd+lhipO0EgSC9hcr1c2/2ccWglN7PfD7
-# In8FPPaR0dTPnASdXEodXceMTzrb8Wmi2tHrrpiAXOO2Op015CDLkKNgcEwVN0Jd
-# jJmpsTWd0JZv+0puka9H+A2BNL41H4f9CvSkR2sbh+fZLu0gzP1i14uItbLkJ2YF
-# rmyTDnC3IVVNtNUimoblov8dsMVyVQVEzq4LMCGcxFe3Tu9NmrMItViM/XIWAyWL
-# 77L1qBEjlXugwEAaecldzVFHFj7siAoCSGreswPkzIl1Z1pr/LAujBVuJpYaDNmP
-# baJnal33+6HJ18OiU3rwH+6xA/vcvd/cIkMPZLK26MwrB+jL+p55IehI9WOcjXAj
-# vydoUlI1T84TXM3oa/GeLl7nRyOPM3Mk2w==
+# IEc0IFJTQTQwOTYgU0hBMjU2IFRpbWVTdGFtcGluZyBDQTAeFw0yNDA5MjYwMDAw
+# MDBaFw0zNTExMjUyMzU5NTlaMEIxCzAJBgNVBAYTAlVTMREwDwYDVQQKEwhEaWdp
+# Q2VydDEgMB4GA1UEAxMXRGlnaUNlcnQgVGltZXN0YW1wIDIwMjQwggIiMA0GCSqG
+# SIb3DQEBAQUAA4ICDwAwggIKAoICAQC+anOf9pUhq5Ywultt5lmjtej9kR8YxIg7
+# apnjpcH9CjAgQxK+CMR0Rne/i+utMeV5bUlYYSuuM4vQngvQepVHVzNLO9RDnEXv
+# PghCaft0djvKKO+hDu6ObS7rJcXa/UKvNminKQPTv/1+kBPgHGlP28mgmoCw/xi6
+# FG9+Un1h4eN6zh926SxMe6We2r1Z6VFZj75MU/HNmtsgtFjKfITLutLWUdAoWle+
+# jYZ49+wxGE1/UXjWfISDmHuI5e/6+NfQrxGFSKx+rDdNMsePW6FLrphfYtk/FLih
+# p/feun0eV+pIF496OVh4R1TvjQYpAztJpVIfdNsEvxHofBf1BWkadc+Up0Th8Eif
+# kEEWdX4rA/FE1Q0rqViTbLVZIqi6viEk3RIySho1XyHLIAOJfXG5PEppc3XYeBH7
+# xa6VTZ3rOHNeiYnY+V4j1XbJ+Z9dI8ZhqcaDHOoj5KGg4YuiYx3eYm33aebsyF6e
+# D9MF5IDbPgjvwmnAalNEeJPvIeoGJXaeBQjIK13SlnzODdLtuThALhGtyconcVuP
+# I8AaiCaiJnfdzUcb3dWnqUnjXkRFwLtsVAxFvGqsxUA2Jq/WTjbnNjIUzIs3ITVC
+# 6VBKAOlb2u29Vwgfta8b2ypi6n2PzP0nVepsFk8nlcuWfyZLzBaZ0MucEdeBiXL+
+# nUOGhCjl+QIDAQABo4IBizCCAYcwDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQC
+# MAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwIAYDVR0gBBkwFzAIBgZngQwBBAIw
+# CwYJYIZIAYb9bAcBMB8GA1UdIwQYMBaAFLoW2W1NhS9zKXaaL3WMaiCPnshvMB0G
+# A1UdDgQWBBSfVywDdw4oFZBmpWNe7k+SH3agWzBaBgNVHR8EUzBRME+gTaBLhklo
+# dHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkRzRSU0E0MDk2
+# U0hBMjU2VGltZVN0YW1waW5nQ0EuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDAkBggr
+# BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMFgGCCsGAQUFBzAChkxo
+# dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRUcnVzdGVkRzRSU0E0
+# MDk2U0hBMjU2VGltZVN0YW1waW5nQ0EuY3J0MA0GCSqGSIb3DQEBCwUAA4ICAQA9
+# rR4fdplb4ziEEkfZQ5H2EdubTggd0ShPz9Pce4FLJl6reNKLkZd5Y/vEIqFWKt4o
+# KcKz7wZmXa5VgW9B76k9NJxUl4JlKwyjUkKhk3aYx7D8vi2mpU1tKlY71AYXB8wT
+# LrQeh83pXnWwwsxc1Mt+FWqz57yFq6laICtKjPICYYf/qgxACHTvypGHrC8k1TqC
+# eHk6u4I/VBQC9VK7iSpU5wlWjNlHlFFv/M93748YTeoXU/fFa9hWJQkuzG2+B7+b
+# MDvmgF8VlJt1qQcl7YFUMYgZU1WM6nyw23vT6QSgwX5Pq2m0xQ2V6FJHu8z4LXe/
+# 371k5QrN9FQBhLLISZi2yemW0P8ZZfx4zvSWzVXpAb9k4Hpvpi6bUe8iK6WonUSV
+# 6yPlMwerwJZP/Gtbu3CKldMnn+LmmRTkTXpFIEB06nXZrDwhCGED+8RsWQSIXZpu
+# G4WLFQOhtloDRWGoCwwc6ZpPddOFkM2LlTbMcqFSzm4cd0boGhBq7vkqI1uHRz6F
+# q1IX7TaRQuR+0BGOzISkcqwXu7nMpFu3mgrlgbAW+BzikRVQ3K2YHcGkiKjA4gi4
+# OA/kz1YCsdhIBHXqBzR0/Zd2QwQ/l4Gxftt/8wY3grcc/nS//TVkej9nmUYu83BD
+# tccHHXKibMs/yXHhDXNkoPIdynhVAku7aRZOwqw6pDGCBTAwggUsAgEBMGswZjEL
+# MAkGA1UEBhMCQkUxEjAQBgNVBAgTCUFudHdlcnBlbjEMMAoGA1UEBxMDTW9sMQ8w
+# DQYDVQQKEwZTQ0tDRU4xDDAKBgNVBAsTA0lDVDEWMBQGA1UEAxMNU0NLQ0VOIElD
+# VCBDQQIBHzAJBgUrDgMCGgUAoHgwGAYKKwYBBAGCNwIBDDEKMAigAoAAoQKAADAZ
+# BgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYB
+# BAGCNwIBFTAjBgkqhkiG9w0BCQQxFgQUgkRlmD16zmoBrg1du+W/DzluhY4wDQYJ
+# KoZIhvcNAQEBBQAEggEA0VOgjbW1itVczBY9n7RJD3LYlIrCL/ukEPufWiAR545r
+# hB7LW06OM2FcV2und67zyRusab96TJA7Frbu5Mmc8Jxoms2F+M2HfZLU8ZBRoyJP
+# 9YbVdVm1IIUvt5O9q0gk3PtiGlUXk+CGC7Uft9SgSpQNXu5NaDZsgV+cZXC0VJl6
+# 7xXKViAsQzH0RqYl8rgRYh4TbdhKc8W3RwYp/rxYgP1h9RZZ0/59WlJBT8c5WPh5
+# Rw5ZDN1fnppU5CAyd7yi9tuM9r2yCBhTr7JscepsR6B1HlvHsnCzYFZcPaBKztno
+# RvoFIihkK39wEoI6cVRouBCr9IA6RK2rx+nLRCqIZKGCAyAwggMcBgkqhkiG9w0B
+# CQYxggMNMIIDCQIBATB3MGMxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2Vy
+# dCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0MDk2IFNI
+# QTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAuuZrxaun+Vh8b56QTjMwQwDQYJYIZIAWUD
+# BAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEP
+# Fw0yNDEwMTQwNTUzMDFaMC8GCSqGSIb3DQEJBDEiBCDpOCR32+BElOsppr9o2qvS
+# 6Cq0zGXXv8N/urfnLBwlITANBgkqhkiG9w0BAQEFAASCAgA7qQa2HdEsRA3zSNn2
+# V2v+fJxflriEM9irAwccgVjC6fsqSCGJUZ2cf0e7APpDplIAl0Nmu7rxsT+wXDj1
+# N0kautrRm4Q7sPqPSY0pIw4ysCzaMjl9f9eubRgdvMv3KOj2Ojr8uAZo/6OZRVUP
+# yHeJtusFU/Fixh+TqhIau+5y2qJ7tCL72Damp7tEYcbAjgqO/TBztZeQOP0fjdJa
+# sMQu7hXepoXu5T7o8my/rJsW0wS9lqfmJcDUSL6hOe8A7cubGBmyLJjZIplf5fFB
+# DDRwMI6Z16jGdngJsUnQSk6zA+MhCon1R+uyHl11/cZCgZkCSWShyB4NqNmmpGEq
+# J7Lt1rs7vS2ZvNVnP4r+omVkAvyxDEfQ5uUqQXyOJCaXGRmpdir5Ko4C7/tr/1Gs
+# LjmU1MnEEoORpXizcPobXAdFvTh0GNoWj1zMHTyh389FO68LUpu2vlyYjdWInb/F
+# XHYsdrehKEpUUnJXa9jWD5P83yz7vd0sza0gPitBsegSAnYGFfik4ouBs7JL9hj1
+# ivO961rCCkN/BKSuqmjtjKmO4hUotpHNQseIjQtInnFo9Fz2hPCAIB9Aw5u8MIqf
+# CA30Hq8QErl0wPuFNbWRdg24gqfEsaTOwephTZUsGgHxRfmLjs6J1FIc3TP/KEJm
+# I6WIg5afWzfwkn/MT9RWolkNsQ==
# SIG # End signature block
diff --git a/syncEdosLocal/packages.config b/syncEdosLocal/packages.config
index 415a685..d45e346 100644
--- a/syncEdosLocal/packages.config
+++ b/syncEdosLocal/packages.config
@@ -1,11 +1,11 @@
-
+
-
+
@@ -19,7 +19,8 @@
-
+
+
@@ -42,7 +43,7 @@
-
+
@@ -55,5 +56,6 @@
+
\ No newline at end of file
diff --git a/syncEdosLocal/syncEdosLocal.csproj b/syncEdosLocal/syncEdosLocal.csproj
index 771a728..a10ae0c 100644
--- a/syncEdosLocal/syncEdosLocal.csproj
+++ b/syncEdosLocal/syncEdosLocal.csproj
@@ -37,8 +37,8 @@
false
-
- ..\packages\LSWLib2.4.0.25\lib\net48\LSWLib.dll
+
+ ..\packages\LSWLib2.4.0.26\lib\net48\LSWLib.dll
..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll
@@ -82,7 +82,10 @@
- ..\packages\System.Drawing.Common.8.0.4\lib\net462\System.Drawing.Common.dll
+ ..\packages\System.Drawing.Common.8.0.8\lib\net462\System.Drawing.Common.dll
+
+
+ ..\packages\System.Formats.Asn1.8.0.1\lib\net462\System.Formats.Asn1.dll
@@ -150,8 +153,8 @@
..\packages\System.Security.Cryptography.ProtectedData.8.0.0\lib\net462\System.Security.Cryptography.ProtectedData.dll
-
- ..\packages\System.Security.Cryptography.Xml.8.0.0\lib\net462\System.Security.Cryptography.Xml.dll
+
+ ..\packages\System.Security.Cryptography.Xml.8.0.1\lib\net462\System.Security.Cryptography.Xml.dll
..\packages\System.Security.Permissions.8.0.0\lib\net462\System.Security.Permissions.dll
@@ -190,6 +193,9 @@
..\packages\System.Threading.AccessControl.8.0.0\lib\net462\System.Threading.AccessControl.dll
+
+ ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll
+
..\packages\System.Web.Services.Description.4.10.0\lib\net461\System.Web.Services.Description.dll