diff --git a/EpdBase3/Epd3Base.cpp b/EpdBase3/Epd3Base.cpp index 6fbaab5..cc92d45 100644 --- a/EpdBase3/Epd3Base.cpp +++ b/EpdBase3/Epd3Base.cpp @@ -1120,6 +1120,8 @@ WORD Epd3Base::Epd3U::DeIssue() ErrorStep = 2; r = ClearDoses(); + Sleep(2000); + ErrorStep = 3; if (EPDIssued) { token = BeginDeissueEPD(epdComsHandle, nullptr); @@ -1353,6 +1355,7 @@ int Epd3Base::Epd3U::GetAll(bool Closeconnection) return rv; } +// Main entry point deissue for MK3 int Epd3Base::Epd3U::GetAllDeissue(bool reconnect) { int rv = 0; diff --git a/EpdBaseClr/EpdBaseClr.cpp b/EpdBaseClr/EpdBaseClr.cpp index eac0aae..1d4a6a8 100644 --- a/EpdBaseClr/EpdBaseClr.cpp +++ b/EpdBaseClr/EpdBaseClr.cpp @@ -757,6 +757,8 @@ int EpdBaseClr::Epd2::GetAll(bool close) } return rv; } + +//main entry point for exit int EpdBaseClr::Epd2::GetAllDeissue(bool reconnect) { ErrorRV = ErrorStep = 0; diff --git a/eDosStation/Properties/AssemblyInfo.cs b/eDosStation/Properties/AssemblyInfo.cs index 0800b14..585d8ed 100644 --- a/eDosStation/Properties/AssemblyInfo.cs +++ b/eDosStation/Properties/AssemblyInfo.cs @@ -56,5 +56,5 @@ using System.Windows; //2.18 : more tested //2.20 Thermo : workflow bij issue ( en toevoegen time set) -[assembly: AssemblyVersion("2.20.0.0")] -[assembly: AssemblyFileVersion("2.20.0.0")] +[assembly: AssemblyVersion("2.21.0.0")] +[assembly: AssemblyFileVersion("2.21.0.0")] diff --git a/eDosStation/Resources/BuildDate.txt b/eDosStation/Resources/BuildDate.txt index e2a9752..a8e5ec2 100644 --- a/eDosStation/Resources/BuildDate.txt +++ b/eDosStation/Resources/BuildDate.txt @@ -1 +1 @@ -Wed 08/28/2024 12:26:57.52 +Thu 08/29/2024 15:25:11.68 diff --git a/eDosStation/eDosStation.zip b/eDosStation/eDosStation.zip index 84e3700..1bb0ac1 100644 Binary files a/eDosStation/eDosStation.zip and b/eDosStation/eDosStation.zip differ