check return
This commit is contained in:
Luc Vandenbroucke
parent
dafba39f05
commit
d2cfb1756c
6 changed files with 41 additions and 177 deletions
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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")]
|
||||
|
|
|
|||
|
|
@ -1,145 +0,0 @@
|
|||
|
||||
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>Telerik UI for WPF Upgrade Wizard Log</title>
|
||||
<style type="text/css">
|
||||
body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
background-color: #fff;
|
||||
font: normal 12px Arial, sans-serif;
|
||||
line-height: 1.5;
|
||||
}
|
||||
#header {
|
||||
display: block;
|
||||
margin: 0;
|
||||
padding: 20px;
|
||||
height: 60px;
|
||||
min-width: 600px;
|
||||
background: url('file:///c:/users/admlvand/appdata/local/microsoft/visualstudio/16.0_14fd2cdb/extensions/2hixbe24.tps/Resources/T4Templates/UpgradeLog/Logo.png') no-repeat right 30px top 30px;
|
||||
background-color: #0e0e0e;
|
||||
color: #909090;
|
||||
font: normal 10px Arial, sans-serif;
|
||||
}
|
||||
#header span {
|
||||
display: block;
|
||||
color: #fff;
|
||||
font: normal 22px Arial, sans-serif;
|
||||
}
|
||||
#legend {
|
||||
display: block;
|
||||
height: 20px;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
background-color: #0e0e0e;
|
||||
font: normal 12px Arial, sans-serif;
|
||||
}
|
||||
#legend span {
|
||||
display: block;
|
||||
float: left;
|
||||
height: 18px;
|
||||
margin: 0;
|
||||
padding: 2px 10px 0 10px;
|
||||
background-color: #8e8e8e;
|
||||
font: normal 12px Arial, sans-serif;
|
||||
}
|
||||
table#logTable {
|
||||
border: 1px solid #999;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
table#logTable th, table#logTable td {
|
||||
border: 1px solid #999;
|
||||
padding: 5px 10px;
|
||||
text-align: left;
|
||||
}
|
||||
table#logTable th {
|
||||
border: 0;
|
||||
padding: 5px 10px;
|
||||
background-color: #8e8e8e;
|
||||
height: 20px;
|
||||
font: bold 14px Arial, sans-serif;
|
||||
color: #fff;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div>
|
||||
<table id="logTable" cellpadding="0px" cellspacing="0px">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td colspan="5" style="padding: 0;">
|
||||
<div id="header">
|
||||
Telerik UI for WPF <span>Upgrade Wizard Log</span>
|
||||
</div>
|
||||
<div id="legend">
|
||||
<span style="background-color: #0e0e0e; color: #fff;">Processed: 6</span>
|
||||
<span style="background-color: green; color: #fff;">Succeeded: 5</span>
|
||||
<span style="background-color: blue; color: #fff;">Info: 1</span>
|
||||
<span style="background-color: gold; color: #fff;">Warnings: 0</span>
|
||||
<span style="background-color: red; color: #fff;">Failed: 0</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th> </th>
|
||||
<th>Project</th>
|
||||
<th>Title</th>
|
||||
<th>Details</th>
|
||||
<th>Result</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr>
|
||||
<td><img alt="Info" src="file:///c:/users/admlvand/appdata/local/microsoft/visualstudio/16.0_14fd2cdb/extensions/2hixbe24.tps/Resources/T4Templates/UpgradeLog/Info.gif" /></td>
|
||||
<td>Solution Setup</td>
|
||||
<td>Removed unused distribution</td>
|
||||
<td>2021.3.1109.45</td>
|
||||
<td>Info</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><img alt="Success" src="file:///c:/users/admlvand/appdata/local/microsoft/visualstudio/16.0_14fd2cdb/extensions/2hixbe24.tps/Resources/T4Templates/UpgradeLog/Success.gif" /></td>
|
||||
<td>Solution Setup</td>
|
||||
<td>Copied referenced assemblies to solution</td>
|
||||
<td>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2022\Binaries\WPF45</td>
|
||||
<td>Success</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><img alt="Success" src="file:///c:/users/admlvand/appdata/local/microsoft/visualstudio/16.0_14fd2cdb/extensions/2hixbe24.tps/Resources/T4Templates/UpgradeLog/Success.gif" /></td>
|
||||
<td>eDosStation</td>
|
||||
<td>Assembly Reference</td>
|
||||
<td>D:\l\src\cs\eDosStation\lib\RCWPF\2022.1.222.45\Telerik.Windows.Controls.dll</td>
|
||||
<td>Success</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><img alt="Success" src="file:///c:/users/admlvand/appdata/local/microsoft/visualstudio/16.0_14fd2cdb/extensions/2hixbe24.tps/Resources/T4Templates/UpgradeLog/Success.gif" /></td>
|
||||
<td>eDosStation</td>
|
||||
<td>Assembly Reference</td>
|
||||
<td>D:\l\src\cs\eDosStation\lib\RCWPF\2022.1.222.45\Telerik.Windows.Controls.GridView.dll</td>
|
||||
<td>Success</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><img alt="Success" src="file:///c:/users/admlvand/appdata/local/microsoft/visualstudio/16.0_14fd2cdb/extensions/2hixbe24.tps/Resources/T4Templates/UpgradeLog/Success.gif" /></td>
|
||||
<td>eDosStation</td>
|
||||
<td>Assembly Reference</td>
|
||||
<td>D:\l\src\cs\eDosStation\lib\RCWPF\2022.1.222.45\Telerik.Windows.Controls.Input.dll</td>
|
||||
<td>Success</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><img alt="Success" src="file:///c:/users/admlvand/appdata/local/microsoft/visualstudio/16.0_14fd2cdb/extensions/2hixbe24.tps/Resources/T4Templates/UpgradeLog/Success.gif" /></td>
|
||||
<td>eDosStation</td>
|
||||
<td>Assembly Reference</td>
|
||||
<td>D:\l\src\cs\eDosStation\lib\RCWPF\2022.1.222.45\Telerik.Windows.Data.dll</td>
|
||||
<td>Success</td>
|
||||
</tr>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Add table
Reference in a new issue