small changes exit
This commit is contained in:
Luc Vandenbroucke
parent
fd98494094
commit
dafba39f05
7 changed files with 207 additions and 50 deletions
|
|
@ -841,6 +841,7 @@ 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);
|
||||
|
|
|
|||
161
SyncToSqlsrv7.ps1
Normal file
161
SyncToSqlsrv7.ps1
Normal file
|
|
@ -0,0 +1,161 @@
|
|||
|
||||
$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"
|
||||
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
|
||||
# SIb3DQEBCwUAMGYxCzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAK
|
||||
# BgNVBAcTA01vbDEPMA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNV
|
||||
# BAMTDVNDS0NFTiBJQ1QgQ0EwHhcNMTgwNTI0MDYxMTAwWhcNMzAwNjAxMTIwMDAw
|
||||
# WjBPMSEwHwYDVQQDExhWYW5kZW5icm91Y2tlIEx1YyBDUzIwMjExKjAoBgkqhkiG
|
||||
# 9w0BCQEWG2x1Yy52YW5kZW5icm91Y2tlQHNja2Nlbi5iZTCCASIwDQYJKoZIhvcN
|
||||
# AQEBBQADggEPADCCAQoCggEBAPRbMPSAdMsURs6M9TChuXZWe1LSQlVXYVHPGRln
|
||||
# QeF719tgHS1Ern70aW0PuvCECkzUTbGHw3o+bF+vj1UZWw82oOEZGannAoTyG1CI
|
||||
# xdOMc85Mdmy+Kb++9Ivxa6i4ahfpNDHE0F58TomaNyDY0dtRUDEMZw/A0AMkFmdg
|
||||
# 9BOnqrYeeLB0O/86ZkzUklRifi/Wa3ti1LV4U7fR6S4bMm7dZBh46IU2G3/oBdlN
|
||||
# YAtC3DNol+bnrcBvF+ccGwG5kVxEZg8TtpEMj00hnI+rNPjI4Ar6mE83XKak1X5/
|
||||
# xddZppx9ldJaiVujyOqy0cONhiN/vsWPdZU37LQbG1OydGUCAwEAAaOCAYowggGG
|
||||
# MAkGA1UdEwQCMAAwHQYDVR0OBBYEFN+1bIhLi6eWlLbzynleh97QuIFlMB8GA1Ud
|
||||
# IwQYMBaAFPApFPVqIRSSVlQTpD3VrfAhOsV4MAsGA1UdDwQEAwIHgDAfBgNVHSUE
|
||||
# GDAWBggrBgEFBQcDAwYKKwYBBAGCNwIBFTA6BgNVHREEMzAxgRtsdWMudmFuZGVu
|
||||
# YnJvdWNrZUBzY2tjZW4uYmWBEmx2YW5kZW5iQHNja2Nlbi5iZTA1BgNVHRIELjAs
|
||||
# hipodHRwOi8vY3JsLnNja2Nlbi5iZS9TQ0tDRU4lMjBJQ1QlMjBDQS5jcnQwOwYD
|
||||
# VR0fBDQwMjAwoC6gLIYqaHR0cDovL2NybC5zY2tjZW4uYmUvU0NLQ0VOJTIwSUNU
|
||||
# JTIwQ0EuY3JsMD4GCSsGAQQBgjcVBwQxMC8GJysGAQQBgjcVCISMvCGCyP13gqGT
|
||||
# IoSXlEaExpIugQGC1IQhgfrIaQIBZAIBCDAbBgkrBgEEAYI3FQoEDjAMMAoGCCsG
|
||||
# AQUFBwMDMA0GCSqGSIb3DQEBCwUAA4ICAQBGH87fu9sNbcCPVQCdJ9jP4jT59WTZ
|
||||
# m6s5BquO10UL9i7UAEmdd0yfCHW3myNUigR6O+Oc6Wa74HbUhAk+nEimHxzP5KcN
|
||||
# nKE6lwqsIOf49J5G+2HRmTgW9tewsr39ZiB3NE5s04fHEA0I45zs8wsgyp4Mlr5v
|
||||
# 3AfzYB7gxh0Hxdm+ion7PXvbKhAyI3F7pQTYauilmLAkHnoXD6T+Osp04wR9m1+H
|
||||
# NGqLMKYyVOSdu0UnmGuqHBxpMD7hAJ8LCi5yR6t6s4BNCczwhzUpo6ZgrtLmKCac
|
||||
# DmZ6SJMqsGFwan/GxnLSvw5QpVXUVJidDfTflMeJrfWhDOEt7jx9oQWQ249uzxlq
|
||||
# JMVfBt1YZDq4gr76yjK6VY7F6540ECog4auPte4NoiT5UPdE3QHSD/82/cdLoVuh
|
||||
# ELR4p4bfJ7PONT7x8iZzI8BoASh9SKJBh06mcmyJosOkc77Wv3ykqal7R+/LQi9g
|
||||
# eJwku6Ti0XIy9UFGBbUD4m18e5cKdqDzyIHwAne0JR0ZEILPzITWviFuSXKqGP0b
|
||||
# kSbGgpl+LuaCHcKAv+1FQBc2oWW0yPdxCUYpwo9QfTTh0qYXABQAbibOw7VKTnRL
|
||||
# sS92m9pb6wn9tYyNfMu6r7EXCuxJNDbYpKbxeadfY0arCzlOT6mpC6lzBqfgKyN+
|
||||
# VWoy9rmdzhjEjjCCBnIwggRaoAMCAQICEzgAAAACbukOrXYB5dcAAAAAAAIwDQYJ
|
||||
# KoZIhvcNAQELBQAwZzELMAkGA1UEBhMCQkUxEjAQBgNVBAgTCUFudHdlcnBlbjEM
|
||||
# MAoGA1UEBxMDTW9sMQ8wDQYDVQQKEwZTQ0tDRU4xDDAKBgNVBAsTA0lDVDEXMBUG
|
||||
# A1UEAxMOU0NLQ0VOIFJvb3QgQ0EwHhcNMTcwNjIzMTEzOTM0WhcNMzIwNjIzMTE0
|
||||
# OTM0WjBmMQswCQYDVQQGEwJCRTESMBAGA1UECBMJQW50d2VycGVuMQwwCgYDVQQH
|
||||
# EwNNb2wxDzANBgNVBAoTBlNDS0NFTjEMMAoGA1UECxMDSUNUMRYwFAYDVQQDEw1T
|
||||
# Q0tDRU4gSUNUIENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsW1u
|
||||
# J8gCKQwjdhAhr6eJJNXw+wffi5p2RB48uzTaQh2Y89P+75NFhk7qeOW0tVwacxYk
|
||||
# ubMvgNqasA9RslymREsxLfloMCidRPSQj8o0KE2cfLYojYre1TChFxc0PZobibZ7
|
||||
# BTsU2v75GQjnsEEMmxzwJLAjSU2mFVKJKjrKs4Xt/q6j3w0fdrRz0ba8zSMbTHO2
|
||||
# K8Cd1Rq3GQDLPythJyDxzo6YRE7TFOFcXGrIpFXvmy1XPc/ItiHwTocOmQ1msF+4
|
||||
# 6W0gfWtbFLt8bC/CnuE2ZQPnAmpq3lOUu8cOq/2eqhihAeAli5McYepaK+qr1JtL
|
||||
# NfgTSkkFFw27c5cPXwFCCE0ryJdN+qN4Xdk3J2iz0hayEJ4sGaimdJTXv/OTmSxx
|
||||
# KGMnPYV+BTvk/PDJnGjWQqOryf0PWgmwVQ1KAowaPjBAXJOEotzNnzW0/FKtvgJY
|
||||
# Lk3xFs3sJJ6EG6D02wB2RNszNGM66tyqqx/Z3651xwzgkYYR1ETdmddcqL6/3a+H
|
||||
# ifS5K99N+q7rX/Rp31AUlNsb53xhh43NWUAg5Tzrb9J54mBR6Z/MafmTVHcK2nK6
|
||||
# RRYaUfxs/WuE2+OzX7MdG/URi1lVuOu7hp7AKnSjcLnOcBG7lkSK1Q1pCuACYMkv
|
||||
# Cl+7keio376akUfumX3HqEVgK8ttZiRgiVHR7Q0CAwEAAaOCARYwggESMBAGCSsG
|
||||
# AQQBgjcVAQQDAgEAMB0GA1UdDgQWBBTwKRT1aiEUklZUE6Q91a3wITrFeDAZBgkr
|
||||
# BgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
|
||||
# AwEB/zAfBgNVHSMEGDAWgBRSvxsquCggUTGvI6e+I5TG0fkUMDA8BgNVHR8ENTAz
|
||||
# MDGgL6AthitodHRwOi8vY3JsLnNja2Nlbi5iZS9TQ0tDRU4lMjBSb290JTIwQ0Eu
|
||||
# Y3JsMEcGCCsGAQUFBwEBBDswOTA3BggrBgEFBQcwAoYraHR0cDovL2NybC5zY2tj
|
||||
# ZW4uYmUvU0NLQ0VOJTIwUm9vdCUyMENBLmNydDANBgkqhkiG9w0BAQsFAAOCAgEA
|
||||
# hsQ1eNAeFzKKGY9KW0VMGrLUbtccjHoeKlGdVn+yhS9xhSaIFgm00IPVO5zh9jKt
|
||||
# gCA3o81TqY0w1WoRK1U8t89On5RZYVy39pDyu+oBlHgul9KOuJbIKLgh0VgEPvY3
|
||||
# vM0h0bLdxIrnlIxchVxgs5y/h/wLKmXLjsg+AuYzsJ4+9GAD5SsdFGp2jiKPf9aw
|
||||
# 6zG67an2yTqtvPfeoRpkMWO+Mx39CWWwfU3MaQySlAx0/JzZcqWzk6QFgN1h89wS
|
||||
# BHD0mMFdnahEth5y9QhPkLydPniibF5VZ59gbUVlpFFz8VddmBtx9xfe5aIYEjkj
|
||||
# 35HmEW/FN7qwnJP3dCljzFiqSueKqiFIN3punjHbMUoAxJnibx11Xz4pFm5mdk8v
|
||||
# 95r+sncH8SFK/P5nUjjEYIBRInZiovl7C8KfI1RD9lXJDPdw5yVfkCpkCr/rYNNM
|
||||
# BHfDYZ+G1NEu9WzE2NrknC4H4qoNJLmMjVPTswcIT780iOvFZRf1ql+0e2TKUHCO
|
||||
# kZ+plXtl3H6MimrNk6B/ZQAy4mETNH6ceaoudV7X5Y7HzbTwSXCSw6GCiQMdYXgs
|
||||
# Fp+lioorEmFZhVc2PTs+oUXbMi8IUaCyKEm6tMZHJ+PGU1YBE8Szyj5nI1SUhb+a
|
||||
# HunRGlhgXPb4bnEdZVaMruxFM0UbriGwmkOEv9cPVpAxgg+7MIIPtwIBATBrMGYx
|
||||
# CzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAKBgNVBAcTA01vbDEP
|
||||
# MA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNVBAMTDVNDS0NFTiBJ
|
||||
# Q1QgQ0ECAR8wDQYJYIZIAWUDBAIBBQCggbAwGQYJKoZIhvcNAQkDMQwGCisGAQQB
|
||||
# gjcCAQQwHAYKKwYBBAGCNwIBCzEOMAwGCisGAQQBgjcCARUwLwYJKoZIhvcNAQkE
|
||||
# MSIEICjyN5RRASmy4lRwUWAlq7bL0KMENUHOWlpDC3hhsjPAMEQGCisGAQQBgjcC
|
||||
# AQwxNjA0oDKAMABJAG4AdABlAGcAcgBpAHQAeQAgACYAIABBAHUAdABoAGUAbgB0
|
||||
# AGkAYwBpAHQAeTANBgkqhkiG9w0BAQEFAASCAQCMef0EBOxwWzcKjgLDDqDfvhug
|
||||
# H+bIjUVGe00UpEU/GlLI08blHWvnqa71v5aFwcHggIxlnmlufu8AAsXg0jZ95sUp
|
||||
# 8i0H3R5/hxOD583vZ/d6hJnvg4YEre6r6lPD9ghUdWMY+FhU8yR2pgjfYZJJxDWX
|
||||
# tp2xQ+LXJRT5bZrtyX1lxE9m+E7xdLeOucehX7UpNpUgnEkFM7Hr9C7ZP1L5oqZV
|
||||
# 9CGzuHsMBoIpciN9TD8G49fM/cylovDnUAFovut0ZFfP+9wCrJDzQ57Do14r8If0
|
||||
# doyQPsUxnx9JbZyRuDobPRsj+pU8Nn2RDFzL4u52bFWpt25z1m6Y6GWDJ07noYIN
|
||||
# bjCCDWoGCisGAQQBgjcDAwExgg1aMIINVgYJKoZIhvcNAQcCoIINRzCCDUMCAQMx
|
||||
# DzANBglghkgBZQMEAgEFADBoBgsqhkiG9w0BCRABBKBZBFcwVQIBAQYJYIZIAYb9
|
||||
# bAcBMCEwCQYFKw4DAhoFAAQURlfOgwPPxaIARaGYP/OrpNR6U/oCEQDYz6M3V5aX
|
||||
# PJZ18LwdkzMuGA8yMDIyMDMwOTEwMTY0NVqgggo3MIIE/jCCA+agAwIBAgIQDUJK
|
||||
# 4L46iP9gQCHOFADw3TANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJVUzEVMBMG
|
||||
# A1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMTEw
|
||||
# LwYDVQQDEyhEaWdpQ2VydCBTSEEyIEFzc3VyZWQgSUQgVGltZXN0YW1waW5nIENB
|
||||
# MB4XDTIxMDEwMTAwMDAwMFoXDTMxMDEwNjAwMDAwMFowSDELMAkGA1UEBhMCVVMx
|
||||
# FzAVBgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMSAwHgYDVQQDExdEaWdpQ2VydCBUaW1l
|
||||
# c3RhbXAgMjAyMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLmYYRn
|
||||
# xYr1DQikRcpja1HXOhFCvQp1dU2UtAxQtSYQ/h3Ib5FrDJbnGlxI70Tlv5thzRWR
|
||||
# Ylq4/2cLnGP9NmqB+in43Stwhd4CGPN4bbx9+cdtCT2+anaH6Yq9+IRdHnbJ5MZ2
|
||||
# djpT0dHTWjaPxqPhLxs6t2HWc+xObTOKfF1FLUuxUOZBOjdWhtyTI433UCXoZObd
|
||||
# 048vV7WHIOsOjizVI9r0TXhG4wODMSlKXAwxikqMiMX3MFr5FK8VX2xDSQn9JiNT
|
||||
# 9o1j6BqrW7EdMMKbaYK02/xWVLwfoYervnpbCiAvSwnJlaeNsvrWY4tOpXIc7p96
|
||||
# AXP4Gdb+DUmEvQECAwEAAaOCAbgwggG0MA4GA1UdDwEB/wQEAwIHgDAMBgNVHRMB
|
||||
# Af8EAjAAMBYGA1UdJQEB/wQMMAoGCCsGAQUFBwMIMEEGA1UdIAQ6MDgwNgYJYIZI
|
||||
# AYb9bAcBMCkwJwYIKwYBBQUHAgEWG2h0dHA6Ly93d3cuZGlnaWNlcnQuY29tL0NQ
|
||||
# UzAfBgNVHSMEGDAWgBT0tuEgHf4prtLkYaWyoiWyyBc1bjAdBgNVHQ4EFgQUNkSG
|
||||
# jqS6sGa+vCgtHUQ23eNqerwwcQYDVR0fBGowaDAyoDCgLoYsaHR0cDovL2NybDMu
|
||||
# ZGlnaWNlcnQuY29tL3NoYTItYXNzdXJlZC10cy5jcmwwMqAwoC6GLGh0dHA6Ly9j
|
||||
# cmw0LmRpZ2ljZXJ0LmNvbS9zaGEyLWFzc3VyZWQtdHMuY3JsMIGFBggrBgEFBQcB
|
||||
# AQR5MHcwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBPBggr
|
||||
# BgEFBQcwAoZDaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hB
|
||||
# MkFzc3VyZWRJRFRpbWVzdGFtcGluZ0NBLmNydDANBgkqhkiG9w0BAQsFAAOCAQEA
|
||||
# SBzctemaI7znGucgDo5nRv1CclF0CiNHo6uS0iXEcFm+FKDlJ4GlTRQVGQd58NEE
|
||||
# w4bZO73+RAJmTe1ppA/2uHDPYuj1UUp4eTZ6J7fz51Kfk6ftQ55757TdQSKJ+4ei
|
||||
# RgNO/PT+t2R3Y18jUmmDgvoaU+2QzI2hF3MN9PNlOXBL85zWenvaDLw9MtAby/Vh
|
||||
# /HUIAHa8gQ74wOFcz8QRcucbZEnYIpp1FUL1LTI4gdr0YKK6tFL7XOBhJCVPst/J
|
||||
# KahzQ1HavWPWH1ub9y4bTxMd90oNcX6Xt/Q/hOvB46NJofrOp79Wz7pZdmGJX36n
|
||||
# tI5nePk2mOHLKNpbh6aKLzCCBTEwggQZoAMCAQICEAqhJdbWMht+QeQF2jaXwhUw
|
||||
# DQYJKoZIhvcNAQELBQAwZTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0
|
||||
# IEluYzEZMBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTEkMCIGA1UEAxMbRGlnaUNl
|
||||
# cnQgQXNzdXJlZCBJRCBSb290IENBMB4XDTE2MDEwNzEyMDAwMFoXDTMxMDEwNzEy
|
||||
# MDAwMFowcjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcG
|
||||
# A1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTExMC8GA1UEAxMoRGlnaUNlcnQgU0hBMiBB
|
||||
# c3N1cmVkIElEIFRpbWVzdGFtcGluZyBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
|
||||
# ADCCAQoCggEBAL3QMu5LzY9/3am6gpnFOVQoV7YjSsQOB0UzURB90Pl9TWh+57ag
|
||||
# 9I2ziOSXv2MhkJi/E7xX08PhfgjWahQAOPcuHjvuzKb2Mln+X2U/4Jvr40ZHBhpV
|
||||
# fgsnfsCi9aDg3iI/Dv9+lfvzo7oiPhisEeTwmQNtO4V8CdPuXciaC1TjqAlxa+DP
|
||||
# IhAPdc9xck4Krd9AOly3UeGheRTGTSQjMF287DxgaqwvB8z98OpH2YhQXv1mblZh
|
||||
# JymJhFHmgudGUP2UKiyn5HU+upgPhH+fMRTWrdXyZMt7HgXQhBlyF/EXBu89zdZN
|
||||
# 7wZC/aJTKk+FHcQdPK/P2qwQ9d2srOlW/5MCAwEAAaOCAc4wggHKMB0GA1UdDgQW
|
||||
# BBT0tuEgHf4prtLkYaWyoiWyyBc1bjAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun
|
||||
# pyGd823IDzASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBhjATBgNV
|
||||
# HSUEDDAKBggrBgEFBQcDCDB5BggrBgEFBQcBAQRtMGswJAYIKwYBBQUHMAGGGGh0
|
||||
# dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBDBggrBgEFBQcwAoY3aHR0cDovL2NhY2Vy
|
||||
# dHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0QXNzdXJlZElEUm9vdENBLmNydDCBgQYD
|
||||
# VR0fBHoweDA6oDigNoY0aHR0cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0
|
||||
# QXNzdXJlZElEUm9vdENBLmNybDA6oDigNoY0aHR0cDovL2NybDMuZGlnaWNlcnQu
|
||||
# Y29tL0RpZ2lDZXJ0QXNzdXJlZElEUm9vdENBLmNybDBQBgNVHSAESTBHMDgGCmCG
|
||||
# SAGG/WwAAgQwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29t
|
||||
# L0NQUzALBglghkgBhv1sBwEwDQYJKoZIhvcNAQELBQADggEBAHGVEulRh1Zpze/d
|
||||
# 2nyqY3qzeM8GN0CE70uEv8rPAwL9xafDDiBCLK938ysfDCFaKrcFNB1qrpn4J6Jm
|
||||
# vwmqYN92pDqTD/iy0dh8GWLoXoIlHsS6HHssIeLWWywUNUMEaLLbdQLgcseY1jxk
|
||||
# 5R9IEBhfiThhTWJGJIdjjJFSLK8pieV4H9YLFKWA1xJHcLN11ZOFk362kmf7U2GJ
|
||||
# qPVrlsD0WGkNfMgBsbkodbeZY4UijGHKeZR+WfyMD+NvtQEmtmyl7odRIeRYYJu6
|
||||
# DC0rbaLEfrvEJStHAgh8Sa4TtuF8QkIoxhhWz0E0tmZdtnR79VYzIi8iNrJLokqV
|
||||
# 2PWmjlIxggKGMIICggIBATCBhjByMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGln
|
||||
# aUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMTEwLwYDVQQDEyhE
|
||||
# aWdpQ2VydCBTSEEyIEFzc3VyZWQgSUQgVGltZXN0YW1waW5nIENBAhANQkrgvjqI
|
||||
# /2BAIc4UAPDdMA0GCWCGSAFlAwQCAQUAoIHRMBoGCSqGSIb3DQEJAzENBgsqhkiG
|
||||
# 9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjIwMzA5MTAxNjQ1WjArBgsqhkiG9w0B
|
||||
# CRACDDEcMBowGDAWBBTh14Ko4ZG+72vKFpG1qrSUpiSb8zAvBgkqhkiG9w0BCQQx
|
||||
# IgQgGA9DAzlErefGwfYhL4BsJpZ3nSOellcFbH9psAO7U0wwNwYLKoZIhvcNAQkQ
|
||||
# Ai8xKDAmMCQwIgQgsxCQBrwK2YMHkVcp4EQDQVyD4ykrYU8mlkyNNXHs9akwDQYJ
|
||||
# KoZIhvcNAQEBBQAEggEAAgs5MNR8mgGztA/nSpSloOLwh3g8rYb1CoOf9QfSswnE
|
||||
# ZyvlUTaO8XgTcF1wsoOjA9tbaojaXL78+1tIvvIpQAC90IezVG1Ki4ZG5Pfo344s
|
||||
# YSklQtTNumSWbGt5ZysuoLuPfT/M1mFEp3sg6eIsj/CVyl8N4KiFJysOk/gFFRlv
|
||||
# 55/INyiXk/e6IQpcvGu5vTzHy6oSxSPSu2OBQvZKujfMFQ2OOIACQoq6fSjw9mJl
|
||||
# 1017zRWv97g9zepHgNb3X1GMVqKJbBp8I0L90Ekc63SVZbo4d78X47ZkLcxHM0n1
|
||||
# gfHA7jFHBu/93s81VYPcpreD3CMXDSInqGhxog8ncQ==
|
||||
# SIG # End signature block
|
||||
|
|
@ -2,10 +2,9 @@
|
|||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="clr-namespace:eDosStation"
|
||||
StartupUri="MainWindow.xaml" Startup="Application_Startup" >
|
||||
StartupUri="MainWindow.xaml" Startup="Application_Startup" Exit="Application_Exit" >
|
||||
<Application.Resources>
|
||||
|
||||
<ResourceDictionary x:Key="rd1">
|
||||
<ResourceDictionary >
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<ResourceDictionary Source="eDosDict.xaml"/>
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
|
|
|
|||
|
|
@ -48,5 +48,10 @@ namespace eDosStation
|
|||
TestOrCreateFolder("c:/Logs");
|
||||
|
||||
}
|
||||
|
||||
private void Application_Exit(object sender, ExitEventArgs e)
|
||||
{
|
||||
Environment.Exit(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,6 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Documents;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
using System.Windows.Navigation;
|
||||
using System.Windows.Shapes;
|
||||
using System.Windows.Threading;
|
||||
|
||||
namespace eDosStation
|
||||
|
|
@ -35,13 +24,13 @@ namespace eDosStation
|
|||
|
||||
private void Button_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var w = new ShowEPDDose( thisStation);
|
||||
var w = new ShowEPDDose(thisStation);
|
||||
w.ShowDialog();
|
||||
}
|
||||
|
||||
private void BEntry_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
string ers=string.Empty;
|
||||
string ers = string.Empty;
|
||||
thisStation.splunkLog?.WriteSplunkLog("Entry", LSWLib.CLog.iseverity.info);
|
||||
|
||||
var w = new EntryBadge(thisStation);
|
||||
|
|
@ -98,7 +87,7 @@ namespace eDosStation
|
|||
|
||||
private void setErrorStatus(string errMsg)
|
||||
{
|
||||
thisStation.splunkLog?.WriteSplunkLog("Errorstatus", LSWLib.CLog.iseverity.err,null,errMsg);
|
||||
thisStation.splunkLog?.WriteSplunkLog("Errorstatus", LSWLib.CLog.iseverity.err, null, errMsg);
|
||||
Status.Content = $"*** Error {errMsg} ***";
|
||||
Status.Foreground = Brushes.Yellow;
|
||||
Status.Background = Brushes.Red;
|
||||
|
|
@ -108,7 +97,7 @@ namespace eDosStation
|
|||
{
|
||||
bool ok = true;
|
||||
string errMsg = string.Empty;
|
||||
tVersion.Text = "HPH eDos "+ System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
|
||||
tVersion.Text = "HPH eDos " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
|
||||
|
||||
bgTimer = new DispatcherTimer(DispatcherPriority.Background);
|
||||
bgTimer.Interval = TimeSpan.FromSeconds(60);
|
||||
|
|
@ -134,30 +123,30 @@ namespace eDosStation
|
|||
ok = false;
|
||||
}
|
||||
|
||||
// if (ok)
|
||||
// try
|
||||
// {
|
||||
// //var sp = new System.IO.Ports.SerialPort($"com{thisStation.ComPort}");
|
||||
// //sp.BaudRate = 9600;
|
||||
// //sp.Parity = System.IO.Ports.Parity.None;
|
||||
// //sp.StopBits = System.IO.Ports.StopBits.One;
|
||||
// //sp.Open();
|
||||
// //sp.DiscardInBuffer();
|
||||
// //sp.Close();
|
||||
//#if SimulateEPD
|
||||
// thisStation.ComPort = 0;
|
||||
//#endif
|
||||
// //ep = new EpdBaseClr.Epd2(thisStation.ComPort);
|
||||
// //ep.SetFeedbackSound(thisStation.useBeep);
|
||||
// }
|
||||
// catch (System.Exception ex)
|
||||
// {
|
||||
// errMsg = $"Edp software error {ex.Message}";
|
||||
// MessageBox.Show(errMsg);
|
||||
// ok = false;
|
||||
// thisStation.splunkLog.WriteException("mainWindow", "Epd", ex);
|
||||
// dataInterface.stationLog?.WriteLine($"Window_Loaded {ex.Message}");
|
||||
// }
|
||||
// if (ok)
|
||||
// try
|
||||
// {
|
||||
// //var sp = new System.IO.Ports.SerialPort($"com{thisStation.ComPort}");
|
||||
// //sp.BaudRate = 9600;
|
||||
// //sp.Parity = System.IO.Ports.Parity.None;
|
||||
// //sp.StopBits = System.IO.Ports.StopBits.One;
|
||||
// //sp.Open();
|
||||
// //sp.DiscardInBuffer();
|
||||
// //sp.Close();
|
||||
//#if SimulateEPD
|
||||
// thisStation.ComPort = 0;
|
||||
//#endif
|
||||
// //ep = new EpdBaseClr.Epd2(thisStation.ComPort);
|
||||
// //ep.SetFeedbackSound(thisStation.useBeep);
|
||||
// }
|
||||
// catch (System.Exception ex)
|
||||
// {
|
||||
// errMsg = $"Edp software error {ex.Message}";
|
||||
// MessageBox.Show(errMsg);
|
||||
// ok = false;
|
||||
// thisStation.splunkLog.WriteException("mainWindow", "Epd", ex);
|
||||
// dataInterface.stationLog?.WriteLine($"Window_Loaded {ex.Message}");
|
||||
// }
|
||||
if (ok)
|
||||
{
|
||||
if (thisStation.insComments.Length > 2)
|
||||
|
|
@ -207,10 +196,12 @@ namespace eDosStation
|
|||
|
||||
private void mExit_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
bgTimer?.Stop();
|
||||
dataInterface.stationLog?.Close();
|
||||
thisStation.splunkLog.KvClear();
|
||||
thisStation.splunkLog?.CloseSplunkLog();
|
||||
Application.Current.Shutdown();
|
||||
Environment.Exit(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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.6.0")]
|
||||
[assembly: AssemblyFileVersion("2.5.6.0")]
|
||||
[assembly: AssemblyVersion("2.5.8.0")]
|
||||
[assembly: AssemblyFileVersion("2.5.8.0")]
|
||||
|
|
|
|||
|
|
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
|||
// 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("1.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
[assembly: AssemblyVersion("1.5.7.0")]
|
||||
[assembly: AssemblyFileVersion("1.5.7.0")]
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue