clear alarm bij issue ?
This commit is contained in:
Luc Vandenbroucke
parent
d2cfb1756c
commit
019f9189b2
7 changed files with 47 additions and 25 deletions
|
|
@ -56,6 +56,7 @@ DWORD EpdBase::Epd2U::StartCom()
|
|||
|
||||
void EpdBase::Epd2U::EndCom()
|
||||
{
|
||||
|
||||
if (port > 0 && CommsInitialized==1) DeinitComms(port);
|
||||
CommsInitialized = 0;
|
||||
}
|
||||
|
|
@ -385,6 +386,16 @@ WORD EpdBase::Epd2U::ReadTresHolds()
|
|||
return rv;
|
||||
}
|
||||
|
||||
WORD EpdBase::Epd2U::ClearAlarms()
|
||||
{
|
||||
int rv = 0;
|
||||
if (port == 0) return 0;
|
||||
if (CommitRV) CommitRV = ClearFaultFlags();
|
||||
if (CommitRV) CommitRV = ClearLatchedAlarms();
|
||||
if (CommitRV) rv = 0; else rv = 1;
|
||||
return rv;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
|
|
@ -450,6 +461,7 @@ WORD EpdBase::Epd2U::PrepareForIssue()
|
|||
int rv = 0;
|
||||
if (port == 0) return 0;
|
||||
CommitRV = WriteConfig();
|
||||
ClearAlarms();
|
||||
if (CommitRV) CommitRV = Commit();
|
||||
if (CommitRV) CommitRV = ClearDose();
|
||||
if (CommitRV) CommitRV = ClearTotalDose();
|
||||
|
|
@ -546,7 +558,6 @@ WORD EpdBase::Epd2U::Issue()
|
|||
return rv;
|
||||
}
|
||||
|
||||
|
||||
int EpdBase::Epd2U::GetAllDeissue()
|
||||
{
|
||||
int rv = 0;
|
||||
|
|
@ -557,7 +568,6 @@ int EpdBase::Epd2U::GetAllDeissue()
|
|||
return rv;
|
||||
}
|
||||
|
||||
|
||||
int EpdBase::Epd2U::GetAll(bool Closeconnection)
|
||||
{
|
||||
int rv = 0;
|
||||
|
|
|
|||
|
|
@ -236,6 +236,7 @@ namespace EpdBase
|
|||
|
||||
WORD ReadDoses();
|
||||
|
||||
WORD ClearAlarms();
|
||||
WORD PrepareForIssue();
|
||||
|
||||
WORD DeIssue();
|
||||
|
|
|
|||
|
|
@ -860,7 +860,6 @@ WORD Epd3Base::Epd3U::PrepareForIssue()
|
|||
if (port == 0) return 0;
|
||||
//CommitRV = WriteConfig();
|
||||
|
||||
|
||||
if (DetectorsOn) {
|
||||
token = BeginEpdOnOff(epdComsHandle, 0, nullptr);
|
||||
rv = Commit3(epdComsHandle);
|
||||
|
|
|
|||
|
|
@ -312,6 +312,15 @@ int EpdBaseClr::Epd2::GetDoses(Epd3Base::Epd3U* epd)
|
|||
return rv;
|
||||
}
|
||||
|
||||
|
||||
int EpdBaseClr::Epd2::ClearAlarms()
|
||||
{
|
||||
int rv = 0;
|
||||
if (isMK3) rv = epd3->ClearAlarms();
|
||||
else rv = epd->ClearAlarms();
|
||||
return rv;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -263,6 +263,7 @@ namespace EpdBaseClr {
|
|||
int GetDoses(EpdBase::Epd2U* epd);
|
||||
int AfterGetDoses(Epd3Base::Epd3U* epd);
|
||||
int GetDoses(Epd3Base::Epd3U* epd);
|
||||
int ClearAlarms();
|
||||
int SetIssued();
|
||||
int BeforeSetIssued(Epd3Base::Epd3U* epd);
|
||||
int SetIssued(Epd3Base::Epd3U* epd);
|
||||
|
|
|
|||
|
|
@ -1,17 +1,19 @@
|
|||
|
||||
$cert = get-childitem -path cert:\CurrentUser\My\857150b64ef7d3e679c8cbde425d2a0b5e58ffaa
|
||||
Set-AuthenticodeSignature -FilePath "\\sqlsrv7\c$\soft\eDos\Upgrader.ps1" -Certificate $cert -TimestampServer "http://timestamp.digicert.com"
|
||||
|
||||
Export-Certificate -Force -FilePath "\\sqlsrv7\c$\soft\eDos\signertrust.cer" -Cert $cert -Confirm
|
||||
|
||||
Set-AuthenticodeSignature -FilePath "\\sqlsrv7\c$\soft\eDos\Upgrader.ps1" -Certificate $cert -TimestampServer "http://timestamp.digicert.com"
|
||||
Set-AuthenticodeSignature -FilePath "\\sqlsrv7\c$\soft\eDos\installatie.ps1" -Certificate $cert -TimestampServer "http://timestamp.digicert.com"
|
||||
Set-AuthenticodeSignature -FilePath "\\sqlsrv7\c$\soft\eDos\installatie2.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\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
|
||||
# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCCr3Zmzl25iHKI+
|
||||
# y42xKc2G8C/ZhC4/yu6M8noz8ql4vKCCDDYwggW8MIIDpKADAgECAgEfMA0GCSqG
|
||||
# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCDYvMaPXHgEyBZB
|
||||
# yeXPR/tE3sxD1ZMfuEvj1AR20ou52aCCDDYwggW8MIIDpKADAgECAgEfMA0GCSqG
|
||||
# SIb3DQEBCwUAMGYxCzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAK
|
||||
# BgNVBAcTA01vbDEPMA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNV
|
||||
# BAMTDVNDS0NFTiBJQ1QgQ0EwHhcNMTgwNTI0MDYxMTAwWhcNMzAwNjAxMTIwMDAw
|
||||
|
|
@ -81,18 +83,18 @@ compress-archive -force -Path "D:\l\src\cs\eDosStation\eDosStation\bin\Release\*
|
|||
# MA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNVBAMTDVNDS0NFTiBJ
|
||||
# Q1QgQ0ECAR8wDQYJYIZIAWUDBAIBBQCggbAwGQYJKoZIhvcNAQkDMQwGCisGAQQB
|
||||
# gjcCAQQwHAYKKwYBBAGCNwIBCzEOMAwGCisGAQQBgjcCARUwLwYJKoZIhvcNAQkE
|
||||
# MSIEINXKgZ8M0gfVjhDwdPdXa0wCnoTq1DyXk8wIq1P1x1EgMEQGCisGAQQBgjcC
|
||||
# MSIEIOY6I/b54ixYbVqk3u2lIUmaMoLZDkrUi8uso7taAz+PMEQGCisGAQQBgjcC
|
||||
# AQwxNjA0oDKAMABJAG4AdABlAGcAcgBpAHQAeQAgACYAIABBAHUAdABoAGUAbgB0
|
||||
# AGkAYwBpAHQAeTANBgkqhkiG9w0BAQEFAASCAQANH+ibAr284LeLycYpnvqIdL41
|
||||
# fufUXW+wi7i17jUPHm0vA/W//IGS6ywTIJjYmQ7nMPxqG+l4W/OJxwXzj2Bgt7nd
|
||||
# gLJ2qdnydjcjoOzjPNn8Dv8DVMc7+Z/5wRiwBUaYahZAN2pHr2+BTAoaxsnwTtls
|
||||
# 20SG3AEQVl6pXZyZK7WNCzL9KNW50ZO6ISjhQqfcCPYTDdAJA2W5nyIlZFfxN9DQ
|
||||
# WUVs1LcG8IozX/T3r6G8tgt4njFg0HBXwaCJr3YQOQ1d3TCkMvTMl7noESLOUilz
|
||||
# 27rZ0GJTKCXxRxtrsqeHJ9Ar8JS/WzIP/q7wNEEG3TgCICxC2tyFY0mF+TIhoYIN
|
||||
# AGkAYwBpAHQAeTANBgkqhkiG9w0BAQEFAASCAQBUpQ0uWj5S2Tj4elA/oWqeodd9
|
||||
# O83xQko1yb86L0eXLbR8KxlNE6d6vLjt1JF4ukKokofSdn1y75wUtqY9zYLBVcgk
|
||||
# YUoQdPasmgRr1NAb6XTExQ86RaqmITkj40/Pi9by0MKjTRDgH7MqlnPJhxflfZ64
|
||||
# r4hdaHFWlfE/bt0o+m+Z8bEYfLWwjrnXNxaY4H7OyH319MnHGtQ0boZh8GeZh1Lv
|
||||
# +8Ggt5Yk/e63HYeyGTtRhzKIhCl92EFFalWw2eweX/uUDayuAdvl1athllGsh+1C
|
||||
# vwVhcKSc854H+z8OQmbqKMUFqwoWBziU6CLK2JJOTEC0G77HAoEH3kFgQRhZoYIN
|
||||
# bjCCDWoGCisGAQQBgjcDAwExgg1aMIINVgYJKoZIhvcNAQcCoIINRzCCDUMCAQMx
|
||||
# DzANBglghkgBZQMEAgEFADBoBgsqhkiG9w0BCRABBKBZBFcwVQIBAQYJYIZIAYb9
|
||||
# bAcBMCEwCQYFKw4DAhoFAAQU8cSGPZq8cFW9lbGCCm9putEoNyMCEQDeKYpygemx
|
||||
# 1qJTgBrl3EDcGA8yMDIyMDMwOTE0NTEyNFqgggo3MIIE/jCCA+agAwIBAgIQDUJK
|
||||
# bAcBMCEwCQYFKw4DAhoFAAQUgzrBRvS6UfdP8iE0mwlra3+bGTICEQCrx6yu7038
|
||||
# 1YRJZHUJOKWQGA8yMDIyMDMxNTA5NTQ0NVqgggo3MIIE/jCCA+agAwIBAgIQDUJK
|
||||
# 4L46iP9gQCHOFADw3TANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJVUzEVMBMG
|
||||
# A1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMTEw
|
||||
# LwYDVQQDEyhEaWdpQ2VydCBTSEEyIEFzc3VyZWQgSUQgVGltZXN0YW1waW5nIENB
|
||||
|
|
@ -151,14 +153,14 @@ compress-archive -force -Path "D:\l\src\cs\eDosStation\eDosStation\bin\Release\*
|
|||
# aUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMTEwLwYDVQQDEyhE
|
||||
# aWdpQ2VydCBTSEEyIEFzc3VyZWQgSUQgVGltZXN0YW1waW5nIENBAhANQkrgvjqI
|
||||
# /2BAIc4UAPDdMA0GCWCGSAFlAwQCAQUAoIHRMBoGCSqGSIb3DQEJAzENBgsqhkiG
|
||||
# 9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjIwMzA5MTQ1MTI0WjArBgsqhkiG9w0B
|
||||
# 9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMjIwMzE1MDk1NDQ1WjArBgsqhkiG9w0B
|
||||
# CRACDDEcMBowGDAWBBTh14Ko4ZG+72vKFpG1qrSUpiSb8zAvBgkqhkiG9w0BCQQx
|
||||
# IgQgg3WovGXMupx7Ndkr3yoGfqoNCBFOeT1p2Li92aOPm5IwNwYLKoZIhvcNAQkQ
|
||||
# IgQg72z52r5BZUM1V4xd5J0vkwC3PwU6OH8agsEfMeM0/6QwNwYLKoZIhvcNAQkQ
|
||||
# Ai8xKDAmMCQwIgQgsxCQBrwK2YMHkVcp4EQDQVyD4ykrYU8mlkyNNXHs9akwDQYJ
|
||||
# KoZIhvcNAQEBBQAEggEAdkZclvvq0DQp4whb2xUkjEZJeUmW9twu+WU+C/Z+smIg
|
||||
# h6V7oXdfi26S+cijAKtIygtwMNbbkcp3/tXwxp/VgeNRUGr8qQ0mAXg2qZ3oTKpy
|
||||
# fgpWxUWSEXND9ZmaAgfbcpwFXfU4ReZsbqxBcGBusUwc/4oA0Z7hmKiqGnR4AHIO
|
||||
# iAiAb6O7tvcAhS4asWk9n8qMj9I2AgV6r79MBCTfImuMznABs1pGd10YCwYWX9zv
|
||||
# 9Hdu+iyY5SPAHekhO6+D81+D3gRC9HHOOzmACMoXqlAqN1Aw2/NS3wudX+o+U3PR
|
||||
# k9OIQS53jtVjoN9TlNPpHjAWL7vP70WMr/SuhKqWcQ==
|
||||
# KoZIhvcNAQEBBQAEggEAaGPHzFfN4spH7GUiTI2HRdkXF6bH0UOVXcwM6MjEcotx
|
||||
# NDYjH9AMr29zsboQnNsT3mkPi7CxUDHKwnavIPYmRFjNz6tBcVzrd3YwDxTPVQYs
|
||||
# 0yBv5+CgX+NtE8QTqD6KMVEul2ZIWw14F+iC2pv81vQQUueCQlCmdUhawIk7dZ+r
|
||||
# 6EA7FCejBzhe01EeUlDgogU43E7yp8S5mhiB+w+WC/m+2t5eC/a5WhUNthm37Jc/
|
||||
# KAa7ZmB4P1e8BFiUEOYtZ2ooUo+uNPJKqnKqTER9ITVqyzJIuefsc2qXC6Z2S0Xd
|
||||
# By34FoqHHhpkDOvepZrWD+Yfeph2YmpK9x+SRleeVg==
|
||||
# SIG # End signature block
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ namespace eDosStation
|
|||
endPage();
|
||||
return false;
|
||||
}
|
||||
if (ep.hasAlarm)
|
||||
if (ep.hasAlarm && ep.OtherAlarmBatLow > 0)
|
||||
{
|
||||
TextBlock il = new TextBlock();
|
||||
il.Inlines.Add(new Run("EPD is in alarm status\n\n")
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue