diff --git a/EpdBase3/Epd3Base.cpp b/EpdBase3/Epd3Base.cpp index 4add79a..166ae55 100644 --- a/EpdBase3/Epd3Base.cpp +++ b/EpdBase3/Epd3Base.cpp @@ -447,11 +447,14 @@ int Epd3Base::Epd3U::ConnectAndStatus(int tokenSourceTimeout) WORD dllStatus; int rv = 1; if (CommsInitialized == 0) StartCom(); - dllStatus = StartDiscover(tokenSourceTimeout); - if (dllStatus != 1) rv = 1; //Connect error - else if (DeviceCount < 1) rv = 2; //TO - else if (isMK3 && ReadStatus() != 0) rv = 1; //Read Error - else rv = 0; + if (CommsInitialized) { + dllStatus = StartDiscover(tokenSourceTimeout); + if (dllStatus != 1) rv = 1; //Connect error + else if (DeviceCount < 1) rv = 2; //TO + else if (isMK3 && ReadStatus() != 0) rv = 1; //Read Error + else rv = 0; + } + else rv = 1; return rv; } diff --git a/EpdBaseClr/EpdBaseClr.cpp b/EpdBaseClr/EpdBaseClr.cpp index cbeface..ff24767 100644 --- a/EpdBaseClr/EpdBaseClr.cpp +++ b/EpdBaseClr/EpdBaseClr.cpp @@ -782,8 +782,9 @@ void EpdBaseClr::Epd2::InitData() int EpdBaseClr::Epd2::ConnectAndStatus() { int rv = 1; - InitData(); epd->EndCom(); + InitData(); + Sleep(100); rv = epd3->ConnectAndStatus(tokenSourceTimeout); if (rv==0) { DeviceCount = epd3->DeviceCount; @@ -841,7 +842,6 @@ System::Threading::Tasks::Task^ EpdBaseClr::Epd2::Wait(int timeout, int Retries) tokenSource = gcnew System::Threading::CancellationTokenSource(tokenSourceTimeout + 500); readRetries = Retries; waitTask = System::Threading::Tasks::Task::Run(gcnew Action(this, &Epd2::WaitEpd)); // System::Threading::Tasks::Task::Factory->cre(gcnew Action(this, &CCard::WaitBadge), tokenSource->Token); - } else { tokenSource = gcnew System::Threading::CancellationTokenSource(tokenSourceTimeout - 100); diff --git a/SyncToSqlsrv7.ps1 b/SyncToSqlsrv7.ps1 index 8393239..79caeaf 100644 --- a/SyncToSqlsrv7.ps1 +++ b/SyncToSqlsrv7.ps1 @@ -2,13 +2,16 @@ $cert = get-childitem -path cert:\CurrentUser\My\857150b64ef7d3e679c8cbde425d2a0b5e58ffaa Set-AuthenticodeSignature -FilePath "\\sqlsrv7\c$\soft\eDos\Upgrader.ps1" -Certificate $cert -TimestampServer "http://timestamp.digicert.com" -compress-archive -force -Path "D:\l\src\cs\eDosStation\syncEdosLocal\bin\Release\*.*" -Destinationpath "\\sqlsrv7\c$\soft\eDos\syncEdosLocal.zip" +Export-Certificate -Force -FilePath "\\sqlsrv7\c$\soft\eDos\signertrust.cer" -Cert $cert -Confirm + + +compress-archive -force -Path "D:\l\src\cs\eDosStation\syncEdosLocal\bin\Release\*.*" -Destinationpath "\\sqlsrv7\c$\soft\eDos\eDosSync.zip" compress-archive -force -Path "D:\l\src\cs\eDosStation\eDosStation\bin\Release\*.*" -Destinationpath "\\sqlsrv7\c$\soft\eDos\eDosStation.zip" # SIG # Begin signature block # MIIcmwYJKoZIhvcNAQcCoIIcjDCCHIgCAQExDzANBglghkgBZQMEAgEFADB5Bgor # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG -# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAnVOvmb/TojVqs -# 4M+57s8NdJ6k5XNuqUu1T56ykHyuxKCCDDYwggW8MIIDpKADAgECAgEfMA0GCSqG +# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCCr3Zmzl25iHKI+ +# y42xKc2G8C/ZhC4/yu6M8noz8ql4vKCCDDYwggW8MIIDpKADAgECAgEfMA0GCSqG # SIb3DQEBCwUAMGYxCzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAK # BgNVBAcTA01vbDEPMA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNV # BAMTDVNDS0NFTiBJQ1QgQ0EwHhcNMTgwNTI0MDYxMTAwWhcNMzAwNjAxMTIwMDAw @@ -78,18 +81,18 @@ compress-archive -force -Path "D:\l\src\cs\eDosStation\eDosStation\bin\Release\* # MA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNVBAMTDVNDS0NFTiBJ # Q1QgQ0ECAR8wDQYJYIZIAWUDBAIBBQCggbAwGQYJKoZIhvcNAQkDMQwGCisGAQQB # gjcCAQQwHAYKKwYBBAGCNwIBCzEOMAwGCisGAQQBgjcCARUwLwYJKoZIhvcNAQkE -# MSIEICjyN5RRASmy4lRwUWAlq7bL0KMENUHOWlpDC3hhsjPAMEQGCisGAQQBgjcC +# MSIEINXKgZ8M0gfVjhDwdPdXa0wCnoTq1DyXk8wIq1P1x1EgMEQGCisGAQQBgjcC # AQwxNjA0oDKAMABJAG4AdABlAGcAcgBpAHQAeQAgACYAIABBAHUAdABoAGUAbgB0 -# AGkAYwBpAHQAeTANBgkqhkiG9w0BAQEFAASCAQCMef0EBOxwWzcKjgLDDqDfvhug -# H+bIjUVGe00UpEU/GlLI08blHWvnqa71v5aFwcHggIxlnmlufu8AAsXg0jZ95sUp -# 8i0H3R5/hxOD583vZ/d6hJnvg4YEre6r6lPD9ghUdWMY+FhU8yR2pgjfYZJJxDWX -# tp2xQ+LXJRT5bZrtyX1lxE9m+E7xdLeOucehX7UpNpUgnEkFM7Hr9C7ZP1L5oqZV -# 9CGzuHsMBoIpciN9TD8G49fM/cylovDnUAFovut0ZFfP+9wCrJDzQ57Do14r8If0 -# doyQPsUxnx9JbZyRuDobPRsj+pU8Nn2RDFzL4u52bFWpt25z1m6Y6GWDJ07noYIN +# AGkAYwBpAHQAeTANBgkqhkiG9w0BAQEFAASCAQANH+ibAr284LeLycYpnvqIdL41 +# fufUXW+wi7i17jUPHm0vA/W//IGS6ywTIJjYmQ7nMPxqG+l4W/OJxwXzj2Bgt7nd +# gLJ2qdnydjcjoOzjPNn8Dv8DVMc7+Z/5wRiwBUaYahZAN2pHr2+BTAoaxsnwTtls +# 20SG3AEQVl6pXZyZK7WNCzL9KNW50ZO6ISjhQqfcCPYTDdAJA2W5nyIlZFfxN9DQ +# WUVs1LcG8IozX/T3r6G8tgt4njFg0HBXwaCJr3YQOQ1d3TCkMvTMl7noESLOUilz +# 27rZ0GJTKCXxRxtrsqeHJ9Ar8JS/WzIP/q7wNEEG3TgCICxC2tyFY0mF+TIhoYIN # bjCCDWoGCisGAQQBgjcDAwExgg1aMIINVgYJKoZIhvcNAQcCoIINRzCCDUMCAQMx # DzANBglghkgBZQMEAgEFADBoBgsqhkiG9w0BCRABBKBZBFcwVQIBAQYJYIZIAYb9 -# bAcBMCEwCQYFKw4DAhoFAAQURlfOgwPPxaIARaGYP/OrpNR6U/oCEQDYz6M3V5aX -# PJZ18LwdkzMuGA8yMDIyMDMwOTEwMTY0NVqgggo3MIIE/jCCA+agAwIBAgIQDUJK +# bAcBMCEwCQYFKw4DAhoFAAQU8cSGPZq8cFW9lbGCCm9putEoNyMCEQDeKYpygemx +# 1qJTgBrl3EDcGA8yMDIyMDMwOTE0NTEyNFqgggo3MIIE/jCCA+agAwIBAgIQDUJK # 4L46iP9gQCHOFADw3TANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJVUzEVMBMG # A1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMTEw # LwYDVQQDEyhEaWdpQ2VydCBTSEEyIEFzc3VyZWQgSUQgVGltZXN0YW1waW5nIENB @@ -148,14 +151,14 @@ compress-archive -force -Path "D:\l\src\cs\eDosStation\eDosStation\bin\Release\* # aUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMTEwLwYDVQQDEyhE # aWdpQ2VydCBTSEEyIEFzc3VyZWQgSUQgVGltZXN0YW1waW5nIENBAhANQkrgvjqI # /2BAIc4UAPDdMA0GCWCGSAFlAwQCAQUAoIHRMBoGCSqGSIb3DQEJAzENBgsqhkiG -# 9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjIwMzA5MTAxNjQ1WjArBgsqhkiG9w0B +# 9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjIwMzA5MTQ1MTI0WjArBgsqhkiG9w0B # CRACDDEcMBowGDAWBBTh14Ko4ZG+72vKFpG1qrSUpiSb8zAvBgkqhkiG9w0BCQQx -# IgQgGA9DAzlErefGwfYhL4BsJpZ3nSOellcFbH9psAO7U0wwNwYLKoZIhvcNAQkQ +# IgQgg3WovGXMupx7Ndkr3yoGfqoNCBFOeT1p2Li92aOPm5IwNwYLKoZIhvcNAQkQ # Ai8xKDAmMCQwIgQgsxCQBrwK2YMHkVcp4EQDQVyD4ykrYU8mlkyNNXHs9akwDQYJ -# KoZIhvcNAQEBBQAEggEAAgs5MNR8mgGztA/nSpSloOLwh3g8rYb1CoOf9QfSswnE -# ZyvlUTaO8XgTcF1wsoOjA9tbaojaXL78+1tIvvIpQAC90IezVG1Ki4ZG5Pfo344s -# YSklQtTNumSWbGt5ZysuoLuPfT/M1mFEp3sg6eIsj/CVyl8N4KiFJysOk/gFFRlv -# 55/INyiXk/e6IQpcvGu5vTzHy6oSxSPSu2OBQvZKujfMFQ2OOIACQoq6fSjw9mJl -# 1017zRWv97g9zepHgNb3X1GMVqKJbBp8I0L90Ekc63SVZbo4d78X47ZkLcxHM0n1 -# gfHA7jFHBu/93s81VYPcpreD3CMXDSInqGhxog8ncQ== +# KoZIhvcNAQEBBQAEggEAdkZclvvq0DQp4whb2xUkjEZJeUmW9twu+WU+C/Z+smIg +# h6V7oXdfi26S+cijAKtIygtwMNbbkcp3/tXwxp/VgeNRUGr8qQ0mAXg2qZ3oTKpy +# fgpWxUWSEXND9ZmaAgfbcpwFXfU4ReZsbqxBcGBusUwc/4oA0Z7hmKiqGnR4AHIO +# iAiAb6O7tvcAhS4asWk9n8qMj9I2AgV6r79MBCTfImuMznABs1pGd10YCwYWX9zv +# 9Hdu+iyY5SPAHekhO6+D81+D3gRC9HHOOzmACMoXqlAqN1Aw2/NS3wudX+o+U3PR +# k9OIQS53jtVjoN9TlNPpHjAWL7vP70WMr/SuhKqWcQ== # SIG # End signature block diff --git a/eDosStation/MainWindow.xaml.cs b/eDosStation/MainWindow.xaml.cs index 0a52be5..c4081a7 100644 --- a/eDosStation/MainWindow.xaml.cs +++ b/eDosStation/MainWindow.xaml.cs @@ -13,6 +13,7 @@ namespace eDosStation public DataInterface dataInterface; public Station thisStation; DispatcherTimer bgTimer; + private bool Offline = true; #if SimulateEPD public SimulateData simulData = new SimulateData(); @@ -76,12 +77,14 @@ namespace eDosStation if (!dataInterface.isOnline()) { Status.Content = "*** Offline ***"; - thisStation.splunkLog?.WriteSplunkLog("Went Offline", LSWLib.CLog.iseverity.warning); + if (!Offline) thisStation.splunkLog?.WriteSplunkLog("Went Offline", LSWLib.CLog.iseverity.warning); + Offline = true; } - else + else { Status.Content = "--- Online ---"; - thisStation.splunkLog?.WriteSplunkLog("Back online", LSWLib.CLog.iseverity.info); + if (Offline) thisStation.splunkLog?.WriteSplunkLog("Back online", LSWLib.CLog.iseverity.info); + Offline = false; } } diff --git a/eDosStation/Properties/AssemblyInfo.cs b/eDosStation/Properties/AssemblyInfo.cs index 3042f17..91b9d04 100644 --- a/eDosStation/Properties/AssemblyInfo.cs +++ b/eDosStation/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // 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("2.5.8.0")] -[assembly: AssemblyFileVersion("2.5.8.0")] +[assembly: AssemblyVersion("2.5.9.0")] +[assembly: AssemblyFileVersion("2.5.9.0")] diff --git a/eDosStation_Report.htm b/eDosStation_Report.htm deleted file mode 100644 index 4475fcc..0000000 --- a/eDosStation_Report.htm +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - Telerik UI for WPF Upgrade Wizard Log - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- Processed: 6 - Succeeded: 5 - Info: 1 - Warnings: 0 - Failed: 0 -
-
 ProjectTitleDetailsResult
InfoSolution SetupRemoved unused distribution2021.3.1109.45Info
SuccessSolution SetupCopied referenced assemblies to solutionC:\Program Files (x86)\Progress\Telerik UI for WPF R1 2022\Binaries\WPF45Success
SuccesseDosStationAssembly ReferenceD:\l\src\cs\eDosStation\lib\RCWPF\2022.1.222.45\Telerik.Windows.Controls.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs\eDosStation\lib\RCWPF\2022.1.222.45\Telerik.Windows.Controls.GridView.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs\eDosStation\lib\RCWPF\2022.1.222.45\Telerik.Windows.Controls.Input.dllSuccess
SuccesseDosStationAssembly ReferenceD:\l\src\cs\eDosStation\lib\RCWPF\2022.1.222.45\Telerik.Windows.Data.dllSuccess
-
- -