From 54ec2e1084c62f01fe153a0a5dc951d302d59787 Mon Sep 17 00:00:00 2001 From: Luc Vandenbroucke Date: Tue, 28 May 2024 08:09:23 +0200 Subject: [PATCH] tested mkv2 v3.0 v3.1 --- EpdBase3/Epd3Base.cpp | 118 +++++++++++++++---------- EpdBaseClr/EpdBaseClr.cpp | 10 +-- SyncToSqlsrv7.ps1 | 56 ++++++------ eDosStation/About.xaml | 7 +- eDosStation/About.xaml.cs | 2 +- eDosStation/Properties/AssemblyInfo.cs | 5 +- eDosStation/Resources/BuildDate.txt | 2 +- eDosStation/ShowEPDDose.xaml | 6 +- eDosStation/ShowEPDDose.xaml.cs | 2 +- scripts/Upgrader.ps1 | 26 +++--- scripts/installatie.ps1 | 26 +++--- scripts/installatie2.ps1 | 26 +++--- 12 files changed, 156 insertions(+), 130 deletions(-) diff --git a/EpdBase3/Epd3Base.cpp b/EpdBase3/Epd3Base.cpp index 967db41..d41e1d4 100644 --- a/EpdBase3/Epd3Base.cpp +++ b/EpdBase3/Epd3Base.cpp @@ -27,6 +27,7 @@ void WINAPI discovery(CommsHandle hComms, DiscoveryId const discovered[], int32_ void WINAPI disconnectcallback(CommsHandle hComms, DiscoveryId ID) { + current->EpdID = 0; current->CurrentDeviceID = 0; current->DeviceCount = 0; SetEvent(current->hCompletion); @@ -89,7 +90,7 @@ Epd3Base::Epd3U::Epd3U(int _comport) Epd3Base::Epd3U::~Epd3U() { EndCom(); - if (hCompletion != 0) { CloseHandle(hCompletion); hCompletion = 0; } + if (hCompletion != 0) { CloseHandle(hCompletion); hCompletion = 0; } //if (hWaitTimer != 0) { CloseHandle(hWaitTimer); hWaitTimer = 0; } } @@ -117,22 +118,25 @@ DWORD Epd3Base::Epd3U::StartCom() void Epd3Base::Epd3U::EndCom() { int rv; - if (CommsInitialized == 1) { - if (epdComsHandle != INVALID_HANDLE_VALUE) { - DisCon(0); - Dll3RV = CloseReader(epdComsHandle); - if (Dll3RV) { - rv = 1; - } - Dll3RV = DestroyReaderInterface(epdComsHandle); - if (Dll3RV) { - rv = 1; + if (CommsInitialized == 1 || CurrentDeviceID != 0) { + if (CommsInitialized == 1) { + if (epdComsHandle != INVALID_HANDLE_VALUE) { + DisCon(0); + Dll3RV = CloseReader(epdComsHandle); + if (Dll3RV) { + rv = 1; + } + Dll3RV = DestroyReaderInterface(epdComsHandle); + if (Dll3RV) { + rv = 1; + } } } + Epd.Id = 0; + CurrentDeviceID = 0; + CommsInitialized = 0; + epdComsHandle = INVALID_HANDLE_VALUE; } - CurrentDeviceID = 0; - CommsInitialized = 0; - epdComsHandle = INVALID_HANDLE_VALUE; } /// @@ -152,6 +156,7 @@ int Epd3Base::Epd3U::StartDiscover(int tokentimeout) return 0; } + Dll3RV = SetDiscoveryCacheTimeout(epdComsHandle, tokentimeout); //Dll3RV = Commit3(epdComsHandle); DeviceCount = 0; ConnectTries = 1; @@ -172,6 +177,7 @@ int Epd3Base::Epd3U::StartDiscover(int tokentimeout) if ( DeviceCount > 0) { Dll3RV = Connect3(epdComsHandle, Epd, true); if (Dll3RV != 0) rv = 2; + else Dll3RV = SetDisconnectCallback(epdComsHandle, disconnectcallback); } return rv; } @@ -193,31 +199,42 @@ int Epd3Base::Epd3U::ReOpenDev() { Dll3RV = Connect3(epdComsHandle, Epd, true); } - else { Dll3RV = r_InvalidCommsHandle; } //no handle .. + else { + Dll3RV = r_InvalidCommsHandle; } //no handle .. return Dll3RV; } int Epd3Base::Epd3U::DisCon(UINT16 alarm) { int rv = 0; + int step = 0; if (CurrentDeviceID != 0) { ResetEvent(hCompletion); current = this; + step = 1; Dll3RV = SetDisconnectCallback(epdComsHandle, disconnectcallback); - SetResponseTimeout(epdComsHandle, 3000); - Sleep(500); if (alarm) Dll3RV = DisconnectAndNotify(epdComsHandle, EndSessionControl, 12); else Dll3RV = Disconnect(epdComsHandle); + + if (Dll3RV) { rv = Dll3RV; goto error; } + + step = 2; Dll3RV = WaitForSingleObject(hCompletion, 3000); switch (Dll3RV) { case WAIT_OBJECT_0: rv = 0; break; - case WAIT_TIMEOUT: rv = 2; break; + case WAIT_TIMEOUT: + rv = 0; + current->CurrentDeviceID = 0; + current->DeviceCount = 0; + break; default: rv = 3; break; } } return rv; +error: + return rv; } void Epd3Base::Epd3U::CloseDev(bool CloseAll) @@ -307,6 +324,9 @@ void Epd3Base::Epd3U::DecodeStatus() eDosDoseAlarm = eDosDose10Alarm || eDosDose07Alarm || checkStatus(epd3status.AlarmStatus, AlarmStatusFlags::DoseAlarm); eDosRateAlarm = eDosRate07Alarm || eDosRate10Alarm || checkStatus(epd3status.AlarmStatus, AlarmStatusFlags::RateAlarm); hasAlarm = eDosDoseAlarm || eDosRateAlarm ; + if (hasAlarm) { + + } hasFault = (int)epd3status.FaultStatus != 0; eDosBatteryWarning = OtherAlarmBatLow | OtherAlarmBatVolt; } @@ -355,7 +375,8 @@ int Epd3Base::Epd3U::ReadStatus() ErrorSource = ErrorReason = ErrorData = 0; HardVersion = HardVersionMinor = SoftVersion = FunctionFlags = 0; - ReOpenDev(); + r = ReOpenDev(); + step = 1; token = BeginReadStatus(epdComsHandle, nullptr); r = Commit3(epdComsHandle); @@ -1031,7 +1052,7 @@ WORD Epd3Base::Epd3U::DeIssue() if (port == 0) return 0; if (CurrentDeviceID==0) return 0; - ReOpenDev(); + //ReOpenDev(); ErrorStep = 1; r = ClearAlarms(); @@ -1122,8 +1143,7 @@ WORD Epd3Base::Epd3U::Issue(bool PrepareDone) r = 0; if (!PrepareDone) { r = PrepareForIssue(); - if (r != 0) - goto error; + if (r) goto error; } @@ -1135,7 +1155,8 @@ WORD Epd3Base::Epd3U::Issue(bool PrepareDone) goto error; }*/ step = 1; - ReOpenDev(); + r=ReOpenDev(); + if (r) goto error; step = 2; r = WriteAlarmTresholds(); @@ -1155,13 +1176,12 @@ WORD Epd3Base::Epd3U::Issue(bool PrepareDone) r = Commit3(epdComsHandle); if (!r) r = EndEpdOnOff(epdComsHandle, token); // OKRV = EpdOn(); OKRV = Commit3(); - if (r != 0) r=0; //} - step = 5; - ReOpenDev(); + //step = 5; + //ReOpenDev(); tries = 1; token = BeginIssueEPD(epdComsHandle, nullptr); @@ -1277,22 +1297,22 @@ int Epd3Base::Epd3U::GetAllDeissue(bool reconnect) int rv = 0; int step = 0; - if (reconnect) + /*if (reconnect) rv = ReOpenDev(); - if (!rv) goto error; + if (!rv) goto error;*/ step = 1; rv = ReadDoses(); //0 = success - if (!rv) goto error; + if (rv) goto error; //rv = ReadAlarmTresholds(); //0 = success step = 2; rv = EPDReadExtraStatus(); - if (!rv) goto error; + if (rv) goto error; step = 3; rv = DeIssue(); //does close - if (!rv) goto error; + if (rv) goto error; return rv; error: @@ -1306,7 +1326,8 @@ int Epd3Base::Epd3U::IssueAndCheck(float gain,float ChirpRate) int rv = 0; int step = 0; - ReOpenDev(); + rv = ReOpenDev(); + if (rv) goto error; if (isNG) { step = 1; @@ -1322,13 +1343,16 @@ int Epd3Base::Epd3U::IssueAndCheck(float gain,float ChirpRate) } } step = 3; - SetChirp( ChirpRate); + rv = SetChirp( ChirpRate); + if (rv) goto error; + step = 4; rv = PrepareForIssue(); - if (rv != 0) goto error; + if (rv) goto error; + step = 5; - if (!rv) rv = Issue(true); // data already loaded - if (rv != 0) goto error; + rv = Issue(true); // data already loaded + if (rv) goto error; return rv; error: @@ -1383,7 +1407,6 @@ int Epd3Base::Epd3U::WriteConfig(void) r = Commit3(epdComsHandle); r = EndWriteDisplayEnables_R3(epdComsHandle, token); } - if (!r) { uint8_t numMenus = 9; uint16_t permissions[9] = { @@ -1402,7 +1425,6 @@ int Epd3Base::Epd3U::WriteConfig(void) r = Commit3(epdComsHandle); r = EndWriteDisplayEnablePermissions_R3(epdComsHandle, token); } - if (!r) { //AlarmConfiguration uint8_t alarmConfigLen = 14; @@ -1427,7 +1449,6 @@ int Epd3Base::Epd3U::WriteConfig(void) r = Commit3(epdComsHandle); r = EndWriteAlarmConfiguration_R3(epdComsHandle, token); } - //OffModeDisplay if (!r) { dutyCycle = (OffModeDutyCycle)0; @@ -1436,7 +1457,6 @@ int Epd3Base::Epd3U::WriteConfig(void) r = Commit3(epdComsHandle); r = EndWriteOffModeDisplay_R3(epdComsHandle, token); } - //SwitchOnFromButton if (!r) { uint8_t OnOfenabled = 0; @@ -1444,11 +1464,7 @@ int Epd3Base::Epd3U::WriteConfig(void) r = Commit3(epdComsHandle); r = EndWriteSwitchOnFromButton_R3(epdComsHandle, token); } - - return r; - - } int Epd3Base::Epd3U::SetChirp(float Sensitivity) @@ -1460,12 +1476,18 @@ int Epd3Base::Epd3U::SetChirp(float Sensitivity) enable = 1; token = BeginWriteChirpSensitivity(epdComsHandle, Sensitivity, nullptr); r = Commit3(epdComsHandle); - r = EndWriteChirpSensitivity(epdComsHandle, token); + if (!r) r = EndWriteChirpSensitivity(epdComsHandle, token); } + if (r) goto error; - token = BeginWriteChirpEnable_R3(epdComsHandle, enable, nullptr); - r = Commit3(epdComsHandle); - r = EndWriteChirpEnable_R3(epdComsHandle, token); + if (!r) { + token = BeginWriteChirpEnable_R3(epdComsHandle, enable, nullptr); + r = Commit3(epdComsHandle); + if (!r) r = EndWriteChirpEnable_R3(epdComsHandle, token); + } + if (r) goto error; + return r; +error: return r; } \ No newline at end of file diff --git a/EpdBaseClr/EpdBaseClr.cpp b/EpdBaseClr/EpdBaseClr.cpp index 70f6321..4d5dce0 100644 --- a/EpdBaseClr/EpdBaseClr.cpp +++ b/EpdBaseClr/EpdBaseClr.cpp @@ -182,7 +182,8 @@ int EpdBaseClr::Epd2::AfterGetStatus(EpdBase::Epd2U *epd) operatingStatus = epd->OperatingStatus; hasAlarm = epd->hasAlarm; EpdID = epd->EpdID; - HardVersion = epd->HardVersion; + HardVersion = epd->HardVersion / 100; + HardVersionMinor = epd->HardVersion % 100; SoftVersion = epd->SoftVersion; FunctionFlags = epd->FunctionFlags; CountsClock = epd->EpdClock; @@ -774,11 +775,9 @@ int EpdBaseClr::Epd2::IssueAndCheck(float gain,float ChirpRate) if (!isMK3) { BeforeSetIssued(epd); rv = epd->IssueAndCheck(gain); - } - else - { + } else { BeforeSetIssued(epd3); //geen interactie met epd - rv = epd3->IssueAndCheck(gain, ChirpRate); + rv = epd3->IssueAndCheck(gain, ChirpRate); // set step,error } return rv; } @@ -822,7 +821,6 @@ void EpdBaseClr::Epd2::InitData() SoftVersion = 0; FunctionFlags = 0; CountsClock = 0; - } /// /// connect to Epd and read status diff --git a/SyncToSqlsrv7.ps1 b/SyncToSqlsrv7.ps1 index 40fad1a..1655cd1 100644 --- a/SyncToSqlsrv7.ps1 +++ b/SyncToSqlsrv7.ps1 @@ -25,13 +25,19 @@ Copy-Item -Path "$SourcePath\eDosLocal\Updates.sql" -Destination "$DestPath\Upda Copy-Item -Path "$SourcePathTools\LogFolderClean\bin\Release\logFolderClean.exe" -Destination "$DestPath\LogFolderClean.exe" Copy-Item -Path "$SourcePathTools\LogFolderClean\bin\Release\logFolderClean.exe.config" -Destination "$DestPath\LogFolderClean.exe.config" Copy-Item -Path "$DistributePath\OpenSSH\OpenSSH92bSigned.zip" -Destination $DestPath + +write-host "Files are copied to $DestPath" +write-host "Source files from $SourcePath\syncEdosLocal\bin\Release are zipped to $DestPath\eDosSync.zip" +write-host "Source files from $SourcePath\eDosStation\bin\Release are zipped to $DestPath\eDosSync.zip" + +Sleep 5 exit # SIG # Begin signature block # MIImXAYJKoZIhvcNAQcCoIImTTCCJkkCAQExDzANBglghkgBZQMEAgEFADB5Bgor # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG -# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCC7935PME+qoKtj -# ZI3+G4Deh2jbv10w1q6IxFnXsvXmzKCCDDYwggW8MIIDpKADAgECAgEfMA0GCSqG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCC+RoUzUcGy05Yp +# UkfU41sE8HhgEAeFcT2OiEblfJoIfqCCDDYwggW8MIIDpKADAgECAgEfMA0GCSqG # SIb3DQEBCwUAMGYxCzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAK # BgNVBAcTA01vbDEPMA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNV # BAMTDVNDS0NFTiBJQ1QgQ0EwHhcNMTgwNTI0MDYxMTAwWhcNMzAwNjAxMTIwMDAw @@ -101,18 +107,18 @@ exit # MA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNVBAMTDVNDS0NFTiBJ # Q1QgQ0ECAR8wDQYJYIZIAWUDBAIBBQCggbAwGQYJKoZIhvcNAQkDMQwGCisGAQQB # gjcCAQQwHAYKKwYBBAGCNwIBCzEOMAwGCisGAQQBgjcCARUwLwYJKoZIhvcNAQkE -# MSIEIDkZIU86eoJn/A8WlSekztEneonsMtQyH5c4pkcwiOrbMEQGCisGAQQBgjcC +# MSIEIMnHQycnEBm401//klWARxS+2UehOX3I0WNzAEXYv7IyMEQGCisGAQQBgjcC # AQwxNjA0oDKAMABJAG4AdABlAGcAcgBpAHQAeQAgACYAIABBAHUAdABoAGUAbgB0 -# AGkAYwBpAHQAeTANBgkqhkiG9w0BAQEFAASCAQBtHkqUPHADcapG9qnvKU2PgdN/ -# Os/p/pBaQE5Bgi7rFYNOCmKmygwDjE1wnRLFfL7RwVpZJOVIJojQNIm3yssOUkIu -# 4nPS9L/Csj1yrZirbgr6TeYBCSWMS021QV9dVWR8x8JHqvLImU3Y7UV02weMYWMw -# dYkQkeMidl53EjoAwW4qHPvyGi58exPVlGAx2LDELyHrPcBhTjtAh2vKPfogOZT0 -# 0vobTFeDwA6MJk+oxCyElc/2Yivbb3ZOATbMnw0FP+kX6vYaASYFTSyFRrkfozak -# Eo46XNug3D5sj9+1yDYatLJwGCC7EZbDbxaXT1cOkWkc7QOLIRdZlz0d7vi7oYIX +# AGkAYwBpAHQAeTANBgkqhkiG9w0BAQEFAASCAQCJ+aPN8+GNoIRxF6nekOfF57gD +# f80/9C2rV5wCuR+NvHm1sJmlHJdxMokuskB6SKUmhX2HNT/X0dB6RscQzN1echXf +# IG3GKHOjRXUJxUUkqjAAi53NpDnX/YKpPwC/SF7H80dJYqI42hewuHRZJe/GfmLL +# N3SYzCpV3tFVRz/mzTB0DVTdlPT0e6OwsMEof3Ukr7125hx5azrWCOm9SrHfcEkM +# XwXO7IQSx/Mb8cUA2o5G/VpNQS+tZ98hrj+Il//uqlKKtoXeZLiuM4cwouWhBBhm +# Gj6zV0rsb3psxY8adKxj50P5p1Wq8I0bVag/DChnfjWu+d06uAx863E8MQixoYIX # LzCCFysGCisGAQQBgjcDAwExghcbMIIXFwYJKoZIhvcNAQcCoIIXCDCCFwQCAQMx # DzANBglghkgBZQMEAgEFADBnBgsqhkiG9w0BCRABBKBYBFYwVAIBAQYJYIZIAYb9 -# bAcBMCEwCQYFKw4DAhoFAAQUwgyzsHznkQf8is1McJNuB8z/0aMCECVnpb+1hS8H -# oDFYr2ViAKkYDzIwMjQwNTI3MDU1MzA3WqCCEwkwggbCMIIEqqADAgECAhAFRK/z +# bAcBMCEwCQYFKw4DAhoFAAQUhwvX8KKrgc20+xBjtEotdqGE/MgCECvQ+/hiZf8G +# Y2IcDNtKrTQYDzIwMjQwNTI4MDUzNDA4WqCCEwkwggbCMIIEqqADAgECAhAFRK/z # lJ0IOaa/2z9f5WEWMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNVBAYTAlVTMRcwFQYD # VQQKEw5EaWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBH # NCBSU0E0MDk2IFNIQTI1NiBUaW1lU3RhbXBpbmcgQ0EwHhcNMjMwNzE0MDAwMDAw @@ -218,19 +224,19 @@ exit # aUNlcnQsIEluYy4xOzA5BgNVBAMTMkRpZ2lDZXJ0IFRydXN0ZWQgRzQgUlNBNDA5 # NiBTSEEyNTYgVGltZVN0YW1waW5nIENBAhAFRK/zlJ0IOaa/2z9f5WEWMA0GCWCG # SAFlAwQCAQUAoIHRMBoGCSqGSIb3DQEJAzENBgsqhkiG9w0BCRABBDAcBgkqhkiG -# 9w0BCQUxDxcNMjQwNTI3MDU1MzA3WjArBgsqhkiG9w0BCRACDDEcMBowGDAWBBRm -# 8CsywsLJD4JdzqqKycZPGZzPQDAvBgkqhkiG9w0BCQQxIgQgxbx1dV3BMlPwghrW -# 0lnoOoU82Efi4gIFLSOl6RxlzKswNwYLKoZIhvcNAQkQAi8xKDAmMCQwIgQg0vbk +# 9w0BCQUxDxcNMjQwNTI4MDUzNDA4WjArBgsqhkiG9w0BCRACDDEcMBowGDAWBBRm +# 8CsywsLJD4JdzqqKycZPGZzPQDAvBgkqhkiG9w0BCQQxIgQgcUo7AtMsaPFIh+xs +# sGJe8Gdz9bAgIJ/9qVYFz+kZiOEwNwYLKoZIhvcNAQkQAi8xKDAmMCQwIgQg0vbk # be10IszR1EBXaEE2b4KK2lWarjMWr00amtQMeCgwDQYJKoZIhvcNAQEBBQAEggIA -# LBgJkQnsbFaIsJ7E9w9BYwY54k4ErAISMeemna+fxURT64hMRd2byUFH/WsLoFKp -# uq82G12uzcF2EyZka8u975jTBj9uZ8CWT6YOy1l6fhQAKSjjvMSPPjRpZYt47+07 -# 1ftgLSJa6/DsFCYcovHoLllV6nY+R4nUwcNJC0jNSTC9G+9RsRZzeDoSwfLiwLDq -# 8DuukcCsBsB2Cx0KQXRluhibNs9xnpqNikxrS90oDSknRs+6GjY+qZWvhxuHclN/ -# WcCjIx5xZJaoDEi9oQZh7qrLaT/WdRWs3VII1KC8i8T1y9qtVZd8Z1mn2v0/VxFr -# iRC5fCVS7+yCUiwToM1CbOpHwrJ/d63Z621xLQm4MqPBtZL5Q/0CPzIMsU98WbBo -# kOur5Fx3/k+kfhjnLkomUGJfmaUQOfD6RoMUJJhsK5P8FBsGlCPv6oiqTLKNP31S -# uoLxLemYcIzqVbV1cCkytY+cpMP4AKTYxj0sNgXZbqUFvWv50/IDgXGpNFX2r3oa -# Y5+H7kXe/ZBxoWrz5SrL5jzlWkyC0KrziwLh1f8Is4IrspSac6C+4Nep5hrk77Au -# AzFLtrPakR9wfH0blJG6M9x+UuVLGiPrPPX0AhOM/DDGVgIKm+/mbLfODpYH1Ff5 -# /n0ZO48CvIO1MqW23+k+HqMtNV90QbYq+QiRwrFBcrM= +# PwhNxyzffdIx9wClF1lklxqouSCRA7adup0oTRYwfotxquFBxDrtpd2+HkHs0ah5 +# U8LMNeeiBTMxtK3aj5Z7jAtu/1cAPG5yXemWlt1Yxoyj4mxHrt62HRw8Zy/0wTlO +# b4ZotHzQ2K/ZZhxV0oXeZ0zsT6Y5f/l2LiuIBe0vF+Htrt8unQUoVlxL0iiF/Uvn +# 1yOQ8TguyeaEiwgv4oZbRUV0x75KKhiyVjhydeYZU/l7Ey+/Fum4ydTj5IR3O9m2 +# Bo3mI7i1hXMZ5ARKSNVuR3mgV81uMLs3O3+gbbSAM7dPG0vbbkerSOW0kjT1CdhH +# lxR+B+A88dqdTO/V+yeM3049ZwgIbhUPW0RAdjRj5fdXL7OC45GrVRF1rTJDrGa/ +# CiFySllUFCD+JLPxeBtXZg/xP4xqPSCXSj6I/NwiX5rIKf7fv1dvOQEPHUGDDk5l +# mj2N/WPDHSdeA6b7v4w0hmKy2CLUsfKTlrXLEp4fa9Eo00nxFmYeNjDPTBif8fA7 +# UlxUvLRTVegF9PlK3xQeWZikFV4mqueUdm9rWSFC716p5u3gA/LXrAuiORXB08hT +# 1MwIY0UBxYafnEtL8gyE0D1dBGF7na7IiaBDWJSRCzapDxJXL2bIhVon495ZTV55 +# MMluDDK6McZEJw/D8W6XhYgnuNDD2bV57y2Hg7sv8HU= # SIG # End signature block diff --git a/eDosStation/About.xaml b/eDosStation/About.xaml index beab610..931a53c 100644 --- a/eDosStation/About.xaml +++ b/eDosStation/About.xaml @@ -16,12 +16,11 @@ - eDos EPD station - 2021-2024 Version + @@ -76,11 +75,11 @@ Feedback by Cools Job, Thijs Bart, Mutert Peter, Smets Gunter - Developed by Luc Vandenbroucke + Developed by Luc Vandenbroucke, Karel Janssen Technical info by Thermo - and lots of research ... + and lots of research … diff --git a/eDosStation/About.xaml.cs b/eDosStation/About.xaml.cs index 47ee0c7..0f03cdf 100644 --- a/eDosStation/About.xaml.cs +++ b/eDosStation/About.xaml.cs @@ -23,7 +23,7 @@ namespace eDosStation public About(Station station) { InitializeComponent(); - aVersion.Text = "2021 - 2024 Version " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString()+ " (Build "+Properties.Resources.BuildDate+")"; + aVersion.Text = "2021 - 2024 Version " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString()+ " (Build "+Properties.Resources.BuildDate.Trim() +")"; stationID.Text = station.ID_Station.ToString(); ReadAlias(); if (station.checkUser) checkUser.Text = "Yes"; else checkUser.Text = "No"; diff --git a/eDosStation/Properties/AssemblyInfo.cs b/eDosStation/Properties/AssemblyInfo.cs index f921b66..e2befff 100644 --- a/eDosStation/Properties/AssemblyInfo.cs +++ b/eDosStation/Properties/AssemblyInfo.cs @@ -53,6 +53,7 @@ using System.Windows; // [assembly: AssemblyVersion("1.0.*")] //2.16 : version with reconnect MK3v2) +//2.18 : more tested -[assembly: AssemblyVersion("2.16.0.0")] -[assembly: AssemblyFileVersion("2.16.0.0")] +[assembly: AssemblyVersion("2.18.0.0")] +[assembly: AssemblyFileVersion("2.18.0.0")] diff --git a/eDosStation/Resources/BuildDate.txt b/eDosStation/Resources/BuildDate.txt index 5569910..579c16d 100644 --- a/eDosStation/Resources/BuildDate.txt +++ b/eDosStation/Resources/BuildDate.txt @@ -1 +1 @@ -Mon 05/27/2024 7:20:14.42 +Tue 05/28/2024 7:59:42.11 diff --git a/eDosStation/ShowEPDDose.xaml b/eDosStation/ShowEPDDose.xaml index d6f3dba..cd6f99a 100644 --- a/eDosStation/ShowEPDDose.xaml +++ b/eDosStation/ShowEPDDose.xaml @@ -26,7 +26,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eDosStation/ShowEPDDose.xaml.cs b/eDosStation/ShowEPDDose.xaml.cs index 8353fca..01610e8 100644 --- a/eDosStation/ShowEPDDose.xaml.cs +++ b/eDosStation/ShowEPDDose.xaml.cs @@ -82,7 +82,7 @@ namespace eDosStation Wearer.Text = sPersID; EpdVisit.Text = ep.WearerID.ToString(); - HardVersion.Text = ep.HardVersion.ToString() + '.' + ep.SoftVersion.ToString(); + HardVersion.Text = ep.HardVersion.ToString() + '.' + ep.HardVersionMinor.ToString(); // ep.SoftVersion.ToString(); if (ep.hasAlarm) { diff --git a/scripts/Upgrader.ps1 b/scripts/Upgrader.ps1 index 9977160..a44b8fa 100644 --- a/scripts/Upgrader.ps1 +++ b/scripts/Upgrader.ps1 @@ -213,17 +213,17 @@ exit # aWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0 # MDk2IFNIQTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAVEr/OUnQg5pr/bP1/lYRYwDQYJ # YIZIAWUDBAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3 -# DQEJBTEPFw0yNDA1MjcwNTUzMTVaMC8GCSqGSIb3DQEJBDEiBCDbjZuxJgcSDufz -# +ekiprJJKPMdOid8HFavnX4C8hgeWzANBgkqhkiG9w0BAQEFAASCAgCZ5FPbeqxj -# aVQrKu1e3XNHoWYrsDxcjlRuCGLieVkn7Fyf0XMXxknQMWEd3XavONAh0z26UGn6 -# NZQ7ywtrYJ+coPtcUBqZkW+TBIqovHoW27+eT6juguwfVixVR10CUhUG+9YMYTLf -# C+z+VF7daXdh2ZXKNaPbVyl30qHmSV464IECV6zpyBC5MjA6no4Hreg9QggWFbEi -# oW1jSLQ2a9Uz2dyUkedjj8AYH9OpzAW/OZ2rE8GCsnbzL7oGEXooCnrAq6qx0BcX -# 4giRqr6lhe+Fhz2BSEpIqG+Qqob2pyppkcy+SnsTkSPGhHiOhcG/TI4REXOa1Pa5 -# VjiOflCVi53l4DhRk/HorYzBiBtTro5uG2/Auau7JFk9xlMYhFF8N/r8j0gnurdU -# 1UmOfri/Azxzt8IOAGBpwxX+jzDKMt82rEzacHayODm5QAM9FH1tho3zZbkU9drT -# rmycBSfE51cYlTDIyof2xZygTh0moeaq85PjOHw+QjZ+42yhYqhUJ7m4i15Q4zYu -# fFEJ6zPU7ye/sUsmcy5WtfLBmIdahRaIIm1l9Y/z6+XIlXny1IUGHpBDUVTfQai9 -# Dlnbg3Cvge/sH/eW04x/f9QIltiL8VPAqFXp/uU5tpzS6zPtrdB4ayzw5c7kIRng -# a3yoSDI8Hbyl33LXNXCaYLxuoWKDo1l87g== +# DQEJBTEPFw0yNDA1MjgwNTM0MTJaMC8GCSqGSIb3DQEJBDEiBCDbjZuxJgcSDufz +# +ekiprJJKPMdOid8HFavnX4C8hgeWzANBgkqhkiG9w0BAQEFAASCAgCH9lWfpp5t +# b00PHQlLYC1Jy5yb4gosf7fEOR4TS0cduRMhLuUEqij7nUSwPiqAZjNV1eaH3eb9 +# QFzcr9kxcFAtoY8R8pf4G+YSJaiQ7QB2DfbEdkusuxrOtxCIRNwhbaynT0Hhuysj +# t0VxhU828B1iYpoWTPYnapExqgVokEmuK4kbNNSGJI1BYfE0iqSyMxHvj3brmAnW +# OzacfYfX//MMvbxno+JP/ynbg8EnAfVxZVL9W8CRTCTEotQFtEVdz/XPfFRQy1IU +# fN2e4FDuzXS9tf1a6Dn6F8F6FTkCDFP/qZtHIgGI6pk1Kad+vfZh/hpGnvFo+A6B +# SGh3qNdayL1XGcpnKTm/Yz2faZ05xas+VgmnZ+qO6i6L5Ia1zcsPzQUzylFpqE+v +# 0rt2OO8yC+UcDhihny09vtnaZvGSg2QCagKqx/lVQEmfBxx4e2zbCKL/NvMm0CB+ +# VyFxku4NvMu28vCVQ029incGJMCsYaOdW8HUFdT6ei9HPU0B5p9dzprqU7xJibkb +# t3eplK/KgSyHRDnzg2h1DnkY7VzA+cn2WWs9hXX+5PeoDJ3rT4zhkYPQi7gxj0r0 +# Ong4FIclb9y/xVx9y+j//hQKN4SOulJv9xkdGPrIrwpZCdndQjgOcJ8uZBwaOA2g +# CmZ92tG+4gn8CNOp9zi042M5EwkTtq4u2g== # SIG # End signature block diff --git a/scripts/installatie.ps1 b/scripts/installatie.ps1 index 245ac7f..e62ce3f 100644 --- a/scripts/installatie.ps1 +++ b/scripts/installatie.ps1 @@ -328,17 +328,17 @@ exit # aWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0 # MDk2IFNIQTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAVEr/OUnQg5pr/bP1/lYRYwDQYJ # YIZIAWUDBAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3 -# DQEJBTEPFw0yNDA1MjcwNTUzMTZaMC8GCSqGSIb3DQEJBDEiBCAcllG2mSPxCJ8u -# oQsIqOunNyELPZuVN2PuUwDZLmIbpTANBgkqhkiG9w0BAQEFAASCAgBZmOqHTizZ -# r66aInFB80NEomQ7z78WXzHlOXDP6hiCBx+s8ERDhYMRateuT0yb4uOV/15iHFo/ -# PrVm8WkqeX0vrlDSsrZBeBMJTm/3pFm4cgX3CV9YEGHm7T07iiuJ8NIWPi+8hJ3W -# qW8OWN3eacsXjHbTR5xZakatj5uu9RalERuR0WR3c6EGKnbzKtr0OqzNnLgy++iR -# M1e9GaXj5W1dro2Me14IGKppIYV5BCSK4NV56xvnq2lNHw4Ng2onEXKjI1EGzVWP -# jvdeehqhf551sGlxXN/vBA2ZM4tUDxq9nKyCtzzm2pspJgWEUwuZELduEr4TDsdB -# JkS84XuKhKWanCOP8rEVID4Lo3YiOZ/Ilo2Zb6hu5VxolWBmKu6+82j4aikIelEm -# qKp+/crsz9DDA9g2Ma6+/6tnYFFBQelLvWuN9TduqbXd+2HheZU1Zp+VnlyX53V9 -# IdeEzf5sKlTKoIfd/euuftszwnQeOguSWm619FVHIYyn0dfTnCw/FUp4pq3pvfAt -# /jH19rQZ9jv8CRPcnWtW6Co+txFQPevSUzIYfIxmvi2HpMopy0nWs0bH12GTKrNt -# uxvhUbNd2RXHHg8hUCzpdO0H/l0enEaUmO5UH8FsIwjMsjNdevNwaDkBT+ADQfpj -# iPg+E/R5t16BBJDfYLKWCNkOgocdRZibiA== +# DQEJBTEPFw0yNDA1MjgwNTM0MTJaMC8GCSqGSIb3DQEJBDEiBCAcllG2mSPxCJ8u +# oQsIqOunNyELPZuVN2PuUwDZLmIbpTANBgkqhkiG9w0BAQEFAASCAgArsQWfdjSe +# QOVAwFE2Axz5OLj8HMNdSIp0fBDZRJyiL0Pu7JkAcSPvK44kQ/yK9+pLJyLKN3hC +# 1s9GtSMGdYdqpmrVPvVS8WA0sOH+YtxN+VgudyJ0f1QWHJGJT4BQDRxMYQInBePB +# 79VJIveRqlSkxjRHLtrZQ56rr5HHukBWkxP0mxEkl8g6U/VbfxgwkgMcm63kv5xT +# 8tY5jqBj3tRkYg3zoirNEUNH8VzVvtQ6hBfoMM1gZmj7A/QbB4jd3ssawEDY/P3+ +# TQ1Pr4T5wP+0XPis24qwpxjJ6IDFoGodM18MJkAczC6lLraf4DfwdszVJy3yRZov +# ShR3ueUDeQHZzUEmVh7ZmWv/YYyWexuVHhyR4HBR1Brb3W1XF+/ouSyPba3z06WU +# UmIMZzy/7VxNtSIBbwFx9le0cn5c5mi4+cNx6nOoT/JAQ4TVckcTOPcTbp3xNbcx +# Ez1nekS/6hksT5bzogwN9Q7h/yB+kkEKeNc8+5UKtIE6s+5y4+i7RNz5a54549iL +# Sbg35F+ZyqOpB3bAPafj0p9RpXoqugMISQ5STklSKDmU69/bFsnEPGmMQKfW590G +# XuhscXk1bSPvx/0decysPJU/tMbj0U1mDMTfXL2pmt+MKcwYirw35t4zGsB31Zpx +# kf8GhZRTzB0PRN1R0WuQStX3XlF3IsH41A== # SIG # End signature block diff --git a/scripts/installatie2.ps1 b/scripts/installatie2.ps1 index 34c2cc5..f173b99 100644 --- a/scripts/installatie2.ps1 +++ b/scripts/installatie2.ps1 @@ -192,17 +192,17 @@ exit # aWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBHNCBSU0E0 # MDk2IFNIQTI1NiBUaW1lU3RhbXBpbmcgQ0ECEAVEr/OUnQg5pr/bP1/lYRYwDQYJ # YIZIAWUDBAIBBQCgaTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3 -# DQEJBTEPFw0yNDA1MjcwNTUzMTZaMC8GCSqGSIb3DQEJBDEiBCDpOCR32+BElOsp -# pr9o2qvS6Cq0zGXXv8N/urfnLBwlITANBgkqhkiG9w0BAQEFAASCAgBD91keMoWq -# KQVUpAvI8G9aWBhv2KQo+0XYVUK12NDvRBiGfZglW2D3oZb/tkWt4uqFQSX5+vSv -# dpdzlNRPhW8oExVv/uBNZ1/kZKH0RgdN75WJb9juBiCUsNNs8VoOZrBcxq8kRijt -# bSCR1aGLo+6a3WA81v59h0mby8B7EoWUeB1IbccP0qAfsNrM8oaH0SpJqqSF4//t -# +Sr7jGebJ1EbxyKod7OinFVG/Xxh4hlc9yQxXCU/FB3f2iiZpNvmbi/c1GqjeZhr -# R28/OhBog5pubGJ9Oy5GwkVO5udisKN19ot0G6/pz1vQ9uY5i+LC0/83INTHFHTw -# H5rV85nmwuswhrptPuZ/pecm6LmRwq0lU555Zns2K2YrH5IEMq8UUOski6jGGnq5 -# X0AkI8VJ1H8TcdJJtJ/RQaIRW2VbCz7sQ1+23H3cfRU6d2CnegO2002Vww3KcBfT -# bffJMH8KFYAVrpBxtXQzGbG193x+Hyl85MT2Q2LAzP/altRh10tvXK7qwTt3JeWH -# /FB6pir8PKCx/sM8ikJuInkneYWvlcOchRy5IVOSobOmw8qu8RGBEf5ocTEmA8Gn -# 9E4RumwafahmI4eQ3rV6uEgbEnix5PR/dvWxNK1IGDSBrvqbLJ/2fgsSZFhHbP/b -# umPd0SLjJnbe9dRU3oeCew4RrPJwYaopHA== +# DQEJBTEPFw0yNDA1MjgwNTM0MTJaMC8GCSqGSIb3DQEJBDEiBCDpOCR32+BElOsp +# pr9o2qvS6Cq0zGXXv8N/urfnLBwlITANBgkqhkiG9w0BAQEFAASCAgCfTHsVbpZf +# W4dpipchv87UBpejQZy21Uu7uYXTZtVQuyRItstCVQ0xeZU96pBIlhC+o38O+K4O +# w/VF79BzDe0mA+xbKM7XX3g4JSWgNTARzYSoA5f3UIYWiECk2zkR3s9XHzzBg11D +# 3DnaVOhpxnz3X9r7dTNHI5iV8pqFQN6L6Hyuc6J4nH+6vLp80BVG4rp29wz6expK +# 78+nozPHE4lgFEedom0cgDCe6p3UEx77xI2JzlKdl0B3E5B+zY9tAfhMmmtGoZ1y +# DqhHWiNYCGxVnalkmru9Hte4AiHFpvxUPnPFqRUFuzbyzAZZvePftrRadE4SLIn+ +# 2h7ckT7BAB42y78o7b/DLCAKK5MF6HCuNbmbBMzb0FlnYujGR3wTOFiTTw3gDtPy +# pH3gSlZVx4pRD5o9lyEv/Vi7yJy7PGt1bikFKA4C57NWtbZn76ZFrfaz2u4KUZEz +# 0SjK1gPy1ZgF3XksGCRMuL5UtEQH5qP3hVhyL31KeNsadrVpsOQSkCPcQVi7SVe6 +# UVLSjVFxZDTheYy6/zGmzuCJp6i/3+xubSPTIiQSgYcR4C0S8OIGY+2LItXIaNNb +# j4A20QZPx41CnpMz+8jkHpkXl3j5GNDLxFgI+m83T7efbzOyzPu5RpQQx3eITnZD +# KJPM7nx/c1O6IgKPN3YIMJjmZ0SE1rwyYA== # SIG # End signature block