corrected Peak Dose

2022-04-12 14:28:14 +02:00 · 2022-04-12 14:28:14 +02:00 · fb28ccefad
commit fb28ccefad
parent dc62df2cea
37 changed files with 2171 additions and 238 deletions
--- a/EpdBase/EpdBase.cpp
+++ b/EpdBase/EpdBase.cpp
@ -53,18 +53,15 @@ DWORD EpdBase::Epd2U::StartCom()
 		isBG = isNG = VersionOK = hasAlarm = false;
 		return ErrorReason;
 }
-
 void EpdBase::Epd2U::EndCom()
 {
 	if (port > 0 && CommsInitialized==1) DeinitComms(port);
 	CommsInitialized = 0;
 }
-
 EpdBase::Epd2U::~Epd2U()
 {
 	EndCom();
 }
-
 int EpdBase::Epd2U::StartDiscover( int EpdTimeout)
 {
 	maxDiscoverTime = EpdTimeout;
@ -176,8 +173,22 @@ void EpdBase::Epd2U::DecodeStatus()
 	OtherAlarmCarrier = (OtherAlarms & 0x20) != 0;
 	OtherAlarmBatVolt = (OtherAlarms & 0x40) != 0;

+	//New fields
+	eDosDose07Alarm = AlarmDoseHP07N;
+	eDosDose07Warning = eDosDose07Alarm;
+	eDosDose10Warning = AlarmDoseHP101G;
+	eDosDose10Alarm = AlarmRateHP102G;
+	eDosRate07Alarm = OtherAlarmRateHp07N | AlarmRateHP07N;
+	eDosRate07Warning = eDosRate07Alarm;
+	eDosRate10Warning = OtherAlarmRateHp101G | AlarmRateHP101G;
+	eDosRate10Alarm = OtherAlarmRateHp102G | AlarmRateHP102G;
+	eDosBatteryWarning = OtherAlarmBatLow | OtherAlarmBatVolt;
+
 	if (!VersionOK) OtherAlarms &= 0x7f;
 	hasAlarm = (OtherAlarms != 0) || (AlarmStatus != 0);
+	eDosDoseAlarm = eDosDose07Alarm || eDosDose10Alarm;
+	eDosRateAlarm = eDosRate07Alarm || eDosRate10Alarm;
+
 }

 /// <summary>
@ -208,6 +219,9 @@ WORD EpdBase::Epd2U::ReadStatus()
 	if (port == 0) {
 		EpdClock = 123; ErrorStatus = 0;
 	};
+	ErrorStatus &= 0xff;
+	OperatingStatus &= 0xff;
+	//RealTime The number of seconds since January 1st, 1970 according to	your system time
 	if (CommitRV == 1) CommitRV = Commit();

 	if (CommitRV == 1) CommitRV = ReadEpdID(
@ -307,7 +321,6 @@ WORD EpdBase::Epd2U::EPDReadConfig()
 	return CommitRV;
 }

-
 /// <summary>
 /// 
 /// </summary>
@ -331,7 +344,6 @@ WORD EpdBase::Epd2U::WriteCal()
 	return rv;
 }

-
 WORD EpdBase::Epd2U::ReadCal()
 {
 	ReadCalibrationDataRV = ReadCalibrationData(
@ -397,9 +409,11 @@ WORD EpdBase::Epd2U::ClearAlarms()
 /// <returns>0 OK</returns>
 WORD EpdBase::Epd2U::ReadDoses()
 {
+	Hp10FTime = Hp07FTime = 0UL;
 	if (port == 0) {
 		Hp10Dose = Hp07Dose = Hp10Total = Hp07Total = Knocks = Resets = QualityData = 21;
 		Hp10Peak = Hp07Peak = Hp10Time = Hp07Time = 1000;
+		eDosDose07Warning = eDosDose07Alarm = eDosDose10Warning = eDosDose10Alarm = eDosRate07Warning = eDosRate07Alarm = eDosRate10Warning = eDosRate10Alarm = eDosBatteryWarning = eDosDoseAlarm = eDosRateAlarm   = 0;
 		ErrorSource = ErrorReason = ErrorData = 0;
 		K1 = 1; K2 = 2; K3 = 3; K4 = 4; K5 = 5;  K6 = 6;
 		SG = 7; BC = 8; FB = 9; HG = 10;
@ -420,22 +434,23 @@ WORD EpdBase::Epd2U::ReadDoses()
 		return 0;
 	}

+	QualityData &= 0x7f;
+
 	ReadPeaksRV = ReadPeaks(
 		&Hp10Peak,
 		&Hp07Peak,
-		&Hp10Time,
+		&Hp10Time, //EpdClock of Occurence
 		&Hp07Time);
 	if (ReadPeaksRV == 0) {
 		Error = GetErrorDetails(&ErrorSource, &ErrorReason, &ErrorData);
 		return 0;
 	}
-
-	TimeFunctions::EPD2PeakTimeToFiletime(EpdClock, Hp10Time, (LPFILETIME) &Hp10FTime);
-	TimeFunctions::EPD2PeakTimeToFiletime(EpdClock, Hp07Time, (LPFILETIME) &Hp07FTime);
-
 	CommitRV = Commit();
 	if (CommitRV == 0) Error = GetErrorDetails(&ErrorSource, &ErrorReason, &ErrorData);

+	TimeFunctions::EPD2PeakTimeToFiletime(EpdClock, Hp10Time, (LPFILETIME)&Hp10FTime);
+	TimeFunctions::EPD2PeakTimeToFiletime(EpdClock, Hp07Time, (LPFILETIME)&Hp07FTime);
+
 	ReadCalibrationData(
 		&K1,
 		&K2,
--- a/EpdBase/EpdBase.h
+++ b/EpdBase/EpdBase.h
@ -37,7 +37,6 @@ namespace EpdBase
 		WORD OtherAlarms;
 		WORD EEPROMBadSectors;

-
 		WORD CommsInitialized = 0;
 		WORD InitRv = 0;
 		WORD DiscRV = 0;
@ -86,15 +85,12 @@ namespace EpdBase
 		SYSTEMTIME tRealTime;

 		//Wearer
-		
 		#define WearerIDLength  12
 		BYTE WearerID[(WearerIDLength)+1];
 		#define WearerNameLength  22
 		BYTE WearerName[WearerNameLength+1];
-		

 		// Dose
-		
 		DWORD Hp10Dose;
 		DWORD Hp07Dose;
 		DWORD Hp10Total;
@ -110,7 +106,6 @@ namespace EpdBase
 		DWORD Hp07Time;
 		long long Hp10FTime , Hp07FTime;

-
 		//AlarmDoseTreshold
 		DWORD Hp10THDose1;
 		DWORD Hp10THDose2;
@ -122,7 +117,6 @@ namespace EpdBase
 		DWORD Hp10Rate1Off; 
 		DWORD Hp10Rate2Off;
 		DWORD Hp07RateOff;
-
 		
 		WORD K1;
 		WORD K2;
@ -146,7 +140,6 @@ namespace EpdBase
 		DWORD	BaseD3;
 		DWORD	BaseD4;
 		DWORD  BaseCountsClock;
-
 		
 		//Config
 		WORD CountDownTime;
@ -171,7 +164,6 @@ namespace EpdBase
 		BYTE EPDProcSec= 0;
 		BYTE EPDFaulty = 0;

-
 		//ERrrostatus
 		BYTE EPDNewFault = 0;
 		BYTE EPDComFault = 0;
@ -181,7 +173,6 @@ namespace EpdBase
 		BYTE EPDTrhFault = 0;
 		BYTE EPDOthFault = 0;

-
 		//AlarmStatus
 		BYTE AlarmDoseHP101G = 0;
 		BYTE AlarmDoseHP102G = 0;
@ -199,11 +190,22 @@ namespace EpdBase
 		BYTE OtherAlarmCarrier= 0;
 		BYTE OtherAlarmBatVolt = 0;

+		//New fields
+		BYTE eDosDose07Warning = 0;
+		BYTE eDosDose07Alarm = 0;
+		BYTE eDosDose10Warning = 0;
+		BYTE eDosDose10Alarm = 0;
+		BYTE eDosRate07Warning = 0;
+		BYTE eDosRate07Alarm = 0;
+		BYTE eDosRate10Warning = 0;
+		BYTE eDosRate10Alarm = 0;
+		BYTE eDosBatteryWarning = 0;
+		BYTE eDosDoseAlarm = 0;
+		BYTE eDosRateAlarm = 0;


 		DWORD Password = 9;

-
 		BYTE byBatADC;
 		BYTE bySupplyADC;
 		BYTE byStatus3;
--- a/EpdBase/TimeFunctions.cpp
+++ b/EpdBase/TimeFunctions.cpp
@ -8,6 +8,25 @@ TimeFunctions::TimeFunctions()
 	lu.LL = 0;
 }

+time_t FileTime_to_POSIX_DST(FILETIME ft)
+{
+	FILETIME localFileTime;
+	FileTimeToLocalFileTime(&ft, &localFileTime);
+	SYSTEMTIME sysTime;
+	FileTimeToSystemTime(&localFileTime, &sysTime);
+	struct tm tmtime = { 0 };
+	tmtime.tm_year = sysTime.wYear - 1900;
+	tmtime.tm_mon = sysTime.wMonth - 1;
+	tmtime.tm_mday = sysTime.wDay;
+	tmtime.tm_hour = sysTime.wHour;
+	tmtime.tm_min = sysTime.wMinute;
+	tmtime.tm_sec = sysTime.wSecond;
+	tmtime.tm_wday = 0;
+	tmtime.tm_yday = 0;
+	tmtime.tm_isdst = -1;
+	time_t ret = mktime(&tmtime);
+	return ret;
+}

 UINT32  FileTime_to_POSIX(FILETIME ft)
 {
@ -49,7 +68,6 @@ void TimeFunctions::UnixTimeToFileTime(time_t t, LPFILETIME pft)
 	FileTimeToSystemTime(&ft, pst);
 }

-
 void TimeFunctions::EpdTimeToFileTime(INT32 t, LPFILETIME pft, bool isMK2)  //MK3
 {
 	 LONGLONG offset;
@ -82,9 +100,9 @@ void TimeFunctions::UnixTimeToFileTime(time_t t, LPFILETIME pft)

 void TimeFunctions::EPD2PeakTimeToFiletime(DWORD EpdClock, DWORD EpdPeakTime, FILETIME *PeakFileTime ) {
 	 if (EpdPeakTime != 0xCDCDCDCD) {
-		 UINT32 tm = EpdClock - EpdPeakTime;
+		 UINT32 tm = EpdClock - EpdPeakTime;  //seconden geleden
 		 GetSystemTimeAsFileTime(&lu.FT);
-		 lu.LL -= UInt32x32To64(tm, 10000000);
+		 lu.LL -= UInt32x32To64(tm, 10000000UL);
 		 *PeakFileTime = lu.FT;
 	 }
 	 else {
--- a/EpdBase/x64/Debug/EpdBase.log
+++ b/EpdBase/x64/Debug/EpdBase.log
@ -1,7 +1,4 @@
-  stdafx.cpp
-  AssemblyInfo.cpp
-  EpdBase.cpp
+  EpdBase.cpp
  TimeFunctions.cpp
  Generating Code...
-  .NETFramework,Version=v4.8.AssemblyAttributes.cpp
  EpdBase.vcxproj -> D:\l\src\cs\eDosStation\x64\Debug\EpdBase.lib
--- a/EpdBase/x64/Debug/EpdBase.obj
+++ b/EpdBase/x64/Debug/EpdBase.obj
--- a/EpdBase/x64/Debug/EpdBase.tlog/CL.command.1.tlog
+++ b/EpdBase/x64/Debug/EpdBase.tlog/CL.command.1.tlog
--- a/EpdBase/x64/Debug/EpdBase.tlog/CL.read.1.tlog
+++ b/EpdBase/x64/Debug/EpdBase.tlog/CL.read.1.tlog
--- a/EpdBase/x64/Debug/EpdBase.tlog/CL.write.1.tlog
+++ b/EpdBase/x64/Debug/EpdBase.tlog/CL.write.1.tlog
--- a/EpdBase/x64/Debug/EpdBase.tlog/Lib-link-cvtres.read.1.tlog
+++ b/EpdBase/x64/Debug/EpdBase.tlog/Lib-link-cvtres.read.1.tlog
--- a/EpdBase/x64/Debug/EpdBase.tlog/Lib-link-cvtres.write.1.tlog
+++ b/EpdBase/x64/Debug/EpdBase.tlog/Lib-link-cvtres.write.1.tlog
--- a/EpdBase/x64/Debug/EpdBase.tlog/rc.read.1.tlog
+++ b/EpdBase/x64/Debug/EpdBase.tlog/rc.read.1.tlog
--- a/EpdBase/x64/Debug/EpdBase.tlog/rc.write.1.tlog
+++ b/EpdBase/x64/Debug/EpdBase.tlog/rc.write.1.tlog
--- a/EpdBase/x64/Debug/TimeFunctions.obj
+++ b/EpdBase/x64/Debug/TimeFunctions.obj
--- a/EpdBase3/Epd3Base.cpp
+++ b/EpdBase3/Epd3Base.cpp
@ -242,6 +242,9 @@ BYTE checkStatus(DoseAlarmFlags status, DoseAlarmFlags flag)

 void Epd3Base::Epd3U::DecodeStatus()
 {
+	
+	eDosDose07Warning = eDosDose07Alarm = eDosDose10Warning = eDosDose10Alarm = eDosRate07Warning = eDosRate07Alarm = eDosRate10Warning = eDosRate10Alarm = eDosBatteryWarning = eDosDoseAlarm = eDosRateAlarm = 0;
+
 	DetectorsOn = checkStatus(epd3status.OperatingStatus, OpStatusFlags::EpdOn);
 	EPDIssued = checkStatus(epd3status.OperatingStatus, OpStatusFlags::EpdIssued);
 	EPDLocked = checkStatus(epd3status.OperatingStatus, OpStatusFlags::GainAdjustable);
@ -262,14 +265,22 @@ void Epd3Base::Epd3U::DecodeStatus()
 		{
 		case MeasurementId::Meas_Hp07:
 		case MeasurementId::Meas_Hp10N:
-			AlarmDoseHP07N = checkStatus(status, DoseAlarmFlags::DoseAlarm);
-			AlarmRateHP07N = checkStatus(status, DoseAlarmFlags::RateAlarm);
+			eDosDose07Warning = checkStatus(status, DoseAlarmFlags::DoseWarning);
+			eDosDose07Alarm = checkStatus(status, DoseAlarmFlags::DoseAlarm);
+			eDosRate07Warning = checkStatus(status, DoseAlarmFlags::LatchedRateWarning) | checkStatus(status, DoseAlarmFlags::RateWarning);
+			eDosRate07Alarm = checkStatus(status, DoseAlarmFlags::LatchedRateAlarm) | checkStatus(status, DoseAlarmFlags::RateAlarm);
+			AlarmDoseHP07N = checkStatus(status, DoseAlarmFlags::DoseAlarm) ;
+			AlarmRateHP07N = checkStatus(status, DoseAlarmFlags::RateAlarm) | checkStatus(status, DoseAlarmFlags::LatchedRateAlarm);
 			break;
 		case MeasurementId::Meas_Hp10:
 		case MeasurementId::Meas_Hp10G:
+			eDosDose10Warning = checkStatus(status, DoseAlarmFlags::DoseWarning);
+			eDosDose10Alarm = checkStatus(status, DoseAlarmFlags::DoseAlarm);
+			eDosRate10Warning = checkStatus(status, DoseAlarmFlags::LatchedRateWarning) | checkStatus(status, DoseAlarmFlags::RateWarning);
+			eDosRate10Alarm = checkStatus(status, DoseAlarmFlags::LatchedRateAlarm) | checkStatus(status, DoseAlarmFlags::RateAlarm);
 			AlarmDoseHP101G = checkStatus(status, DoseAlarmFlags::DoseAlarm);
 			AlarmDoseHP102G = AlarmDoseHP101G;
-			AlarmRateHP101G = checkStatus(status, DoseAlarmFlags::RateAlarm);
+			AlarmRateHP101G = checkStatus(status, DoseAlarmFlags::RateAlarm) | checkStatus(status, DoseAlarmFlags::LatchedRateAlarm);
 			AlarmRateHP102G = AlarmRateHP101G;
 			break;
 		}
@ -278,7 +289,11 @@ void Epd3Base::Epd3U::DecodeStatus()
 	OtherAlarmBatLow = checkStatus(epd3status.AlarmStatus, AlarmStatusFlags::LowBattery);
 	OtherAlarmCarrier = checkStatus(epd3status.AlarmStatus, AlarmStatusFlags::TelemetryAlert);
 	OtherAlarmBatVolt = checkStatus(epd3status.AlarmStatus, AlarmStatusFlags::LowBattery);
-	hasAlarm = ((int)epd3status.FaultStatus != 0) || AlarmDoseHP07N || AlarmRateHP07N || AlarmDoseHP101G || AlarmDoseHP102G || AlarmRateHP101G || AlarmRateHP102G;
+	
+	eDosDoseAlarm = eDosDose10Alarm || eDosDose07Alarm || checkStatus(epd3status.AlarmStatus, AlarmStatusFlags::DoseAlarm);
+	eDosRateAlarm = eDosRate07Alarm || eDosRate10Alarm || checkStatus(epd3status.AlarmStatus, AlarmStatusFlags::RateAlarm);
+	hasAlarm = ((int)epd3status.FaultStatus != 0) || eDosDoseAlarm || eDosRateAlarm ;
+	eDosBatteryWarning = OtherAlarmBatLow | OtherAlarmBatVolt;
 }

 void Epd3Base::Epd3U::SetTime() //Only R3
@ -290,7 +305,6 @@ void Epd3Base::Epd3U::SetTime() //Only R3
 		Dll3RV = EndWriteRTC_R3(epdComsHandle, token);
 	}
 }
-
 /// <summary>
 /// 
 /// </summary>
@ -360,10 +374,8 @@ int Epd3Base::Epd3U::ReadStatus()
 	HardVersion = MarkNumber.Major;
 	SoftVersion = VersionNumber.Major;
 	VersionOK = true;
-	DecodeStatus();
+	DecodeStatus();	//Alarm status...

-		
-	
 	token = BeginReadCounts(epdComsHandle, nullptr, 0, nullptr);
 	r = Commit3(epdComsHandle);
 	r = EndReadCounts(epdComsHandle, token, Counts, MaxCounts, &countsRead, &utc, &seconds);
@ -427,8 +439,6 @@ error:
 	return r;
 	
 }
-
-
 /// <summary>
 /// discover, connect and read status
 /// </summary>
@ -449,7 +459,6 @@ int Epd3Base::Epd3U::ConnectAndStatus(int tokenSourceTimeout)
 	else rv = 1;
 	return rv;
 }
-
 /// <summary>
 /// K1 = K2 = K3 = K4 = K4 = K6 (*100000 )
 /// </summary>
@ -498,13 +507,12 @@ void Epd3Base::Epd3U::decodeDoses(int count)
 		}
 	}
 }
-
 void Epd3Base::Epd3U::decodePeakRates(int count)
 {
 	//Rates
 	Hp10Peak = Hp07Peak = 0;
 	Hp10Time = Hp07Time = 0;
-	
+
 	/*SYSTEMTIME st07,st10;*/
 	for (int ix = 0; ix < count; ix++)
 	{
@ -732,6 +740,8 @@ error:
 WORD Epd3Base::Epd3U::ReadDoses()
 {
 	int32_t r = 1;
+	eDosDose07Warning = eDosDose07Alarm = eDosDose10Warning = eDosDose10Alarm = eDosRate07Warning = eDosRate07Alarm = eDosRate10Warning = eDosRate10Alarm = eDosBatteryWarning = 0;
+
 	if (port == 0) {
 		Hp10Dose = Hp07Dose = Hp10Total = Hp07Total = 0.0;
 		Knocks = Resets = QualityData = 21;
--- a/EpdBase3/Epd3Base.h
+++ b/EpdBase3/Epd3Base.h
@ -86,6 +86,20 @@ namespace Epd3Base {
 		BYTE OtherAlarmBatLow = 0;
 		BYTE OtherAlarmCarrier = 0;
 		BYTE OtherAlarmBatVolt = 0;
+		
+		
+		//New fields
+		BYTE eDosDose07Warning = 0;
+		BYTE eDosDose07Alarm = 0;
+		BYTE eDosDose10Warning = 0;
+		BYTE eDosDose10Alarm = 0;
+		BYTE eDosRate07Warning = 0;
+		BYTE eDosRate07Alarm = 0;
+		BYTE eDosRate10Warning = 0;
+		BYTE eDosRate10Alarm = 0;
+		BYTE eDosBatteryWarning = 0;
+		BYTE eDosDoseAlarm = 0;
+		BYTE eDosRateAlarm = 0;

 		DWORD Password = 9;

@ -229,8 +243,6 @@ namespace Epd3Base {
 		void decodetotDoses(int count);
 		void decodeDoses(int count);
 		void decodePeakRates(int count);
-
-
 		public:
 			int GetAll(bool Closeconnection);
 			int GetAllDeissue();
@ -247,7 +259,6 @@ namespace Epd3Base {
 		WORD WriteAlarmTresholds();
 		WORD DeIssue();
 		WORD WriteWearer();
-
 		WORD Issue();
 		WORD EPDReadExtraStatus();
 		WORD WriteCal();
--- a/EpdBase3/TimeFunctions.cpp
+++ b/EpdBase3/TimeFunctions.cpp
@ -14,13 +14,10 @@ UINT32  FileTime_to_POSIX(FILETIME ft)
 	LARGE_INTEGER date, adjust;
 	date.HighPart = ft.dwHighDateTime;
 	date.LowPart = ft.dwLowDateTime;
-
 	// 100-nanoseconds = milliseconds * 10000
 	adjust.QuadPart = 11644473600000 * 10000;
-
 	// removes the diff between 1970 and 1601
 	date.QuadPart -= adjust.QuadPart;
-
 	// converts back from 100-nanoseconds to seconds
 	return (UINT32)(date.QuadPart / 10000000);
 }
@ -33,10 +30,7 @@ UINT32 UnixTimeNow() {

 void TimeFunctions::UnixTimeToFileTime(time_t t, LPFILETIME pft)
 {
-	// Note that LONGLONG is a 64-bit value
-	LONGLONG ll;
-	
-	ll = Int32x32To64(t, 10000000) + 116444736000000000;
+	ULONG64 ll = ((ULONG64)t * (ULONG64)10000000) + (ULONG64)116444736000000000;
 	pft->dwLowDateTime = (DWORD)ll;
 	pft->dwHighDateTime = ll >> 32;
 }
@ -51,11 +45,9 @@ void TimeFunctions::UnixTimeToFileTime(time_t t, LPFILETIME pft)

 void TimeFunctions::EpdTimeToFileTime(INT32 t, LPFILETIME pft, bool isMK2)  //MK3
 {
-	 LONGLONG offset;
-	 if (isMK2) offset = 116444736000000000; else offset = 125911584000000000;;
-	 LONGLONG ll;
-	 ll = Int32x32To64(t, 10000000) + offset;  //1601-1-1 -> 2000
-	 pft->dwLowDateTime = (DWORD)ll;
+	 ULONG64 ll = (ULONG64)t * (ULONG64)10000000;
+	 if (isMK2) ll += (ULONG64) 116444736000000000; else ll += (ULONG64)125911584000000000; // 2000 base - 1601-1-1 (FT) Base
+	 pft->dwLowDateTime = (DWORD)(ll & 0xffffffff);
 	 pft->dwHighDateTime = ll >> 32;
 }

--- a/EpdBaseClr/EpdBaseClr.cpp
+++ b/EpdBaseClr/EpdBaseClr.cpp
@ -283,6 +283,17 @@ int EpdBaseClr::Epd2::AfterGetDoses(Epd3Base::Epd3U* epd)
 	FB = epd->FB;
 	HG = epd->HG;
 	NGgain = K3;
+
+	eDosDose07Warning = epd->eDosDose07Warning;
+	eDosDose07Alarm= epd->eDosDose07Alarm;
+	eDosDose10Warning = epd->eDosDose10Warning;
+	eDosDose10Alarm = epd->eDosDose10Alarm;
+	eDosRate07Warning = epd->eDosRate07Warning;
+	eDosRate07Alarm = epd->eDosRate07Alarm;
+	eDosRate10Warning = epd->eDosRate10Warning;
+	eDosRate10Alarm = epd->eDosRate10Alarm;
+	eDosBatteryWarning = epd->eDosBatteryWarning;
+
 	return rv;
 }
 /// <summary>
@ -398,6 +409,7 @@ int EpdBaseClr::Epd2::BeforeSetIssued(EpdBase::Epd2U* epd)
 	epd->Hp10Rate1On = (DWORD)(Hp10Rate1On);
 	epd->Hp10Rate2On = (DWORD)(Hp10Rate2On);
 	epd->Hp07RateOn = (DWORD)(Hp07RateOn);
+
 	epd->Hp10Rate1Off = (DWORD)(Hp10Rate1Off);
 	epd->Hp10Rate2Off = (DWORD)(Hp10Rate2Off);
 	epd->Hp07RateOff = (DWORD)(Hp07RateOff);
@ -497,6 +509,7 @@ int EpdBaseClr::Epd2::AfterReadTresholds(EpdBase::Epd2U* epd)
 	Hp10Rate1On = (double)epd->Hp10Rate1On;
 	Hp10Rate2On = (double)epd->Hp10Rate2On;
 	Hp07RateOn = (double)epd->Hp07RateOn;
+
 	Hp10Rate1Off = (double)epd->Hp10Rate1Off;
 	Hp10Rate2Off = (double)epd->Hp10Rate2Off;
 	Hp07RateOff = (double)epd->Hp07RateOff;
@ -536,7 +549,6 @@ int EpdBaseClr::Epd2::AfterReadTresholds(Epd3Base::Epd3U* epd)
 	Hp10THDose1 = (double)epd->Hp10THDose1;
 	Hp10THDose2 = (double)epd->Hp10THDose2;
 	Hp07THDose = (double)epd->Hp07THDose;
-
 	
 	Hp10Rate1On = (double)epd->Hp10Rate1On;
 	Hp10Rate2On = (double)epd->Hp10Rate2On;
@ -545,11 +557,9 @@ int EpdBaseClr::Epd2::AfterReadTresholds(Epd3Base::Epd3U* epd)
 	Hp10Rate2Off = (double)epd->Hp10Rate2Off;
 	Hp07RateOff = (double)epd->Hp07RateOff;

-
 	Hp10Total = (double)epd->Hp10Total;
 	Hp07Total = (double)epd->Hp07Total;

-
 	K1 = (int)epd->K1;
 	K2 = epd->K2;
 	K3 = epd->K3;
@ -620,24 +630,27 @@ int EpdBaseClr::Epd2::ReadExtraStatus(Epd3Base::Epd3U* epd)

 	return rv;
 }
+
+
 int  EpdBaseClr::Epd2::AfterGetDoses(EpdBase::Epd2U* epd)
 {
-		int rv = 0;
-		GetDosesError = 0;
-		Hp10 = (double)epd->Hp10Dose / 64.0;
-		Hp07 = (double)epd->Hp07Dose / 64.0;
-		Hp07Peak = (double)epd->Hp07Peak / 64.0;
-		Hp10Peak = (double)epd->Hp10Peak / 64.0;
+	int rv = 0;
+	GetDosesError = 0;
+	Hp10 = (double)epd->Hp10Dose / 64.0;
+	Hp07 = (double)epd->Hp07Dose / 64.0;
+
+	Hp07Peak = (double)epd->Hp07Peak; // / niet delen door 64 !!!
+	Hp10Peak = (double)epd->Hp10Peak; // / niet delen door 64 !!!
+
+	Hp07Total = epd->Hp07Total / 64.0;
+	Hp10Total = epd->Hp10Total / 64.0;

-		Hp07Total = epd->Hp07Total / 64.0;
-		Hp10Total = epd->Hp10Total / 64.0;
-	
 	if (epd->Hp10FTime != 0) {
 		try {
 			Hp10PeakTime = System::DateTime::FromFileTime(epd->Hp10FTime);
 		}
 		catch (System::Exception^ ex) {
-			Hp10PeakTime = System::Nullable<System::DateTime>(); 
+			Hp10PeakTime = System::Nullable<System::DateTime>();
 		}
 		//double x = (epd->EpdClock - epd->Hp10Time) * -1.0;
 		//Hp10PeakTime = System::DateTime::Now.AddSeconds(x);
@ -646,7 +659,7 @@ int  EpdBaseClr::Epd2::AfterGetDoses(EpdBase::Epd2U* epd)
 		Hp10PeakTime = System::Nullable<System::DateTime>();
 	if (epd->Hp07FTime != 0) {
 		try {
-		Hp07PeakTime = System::DateTime::FromFileTime(epd->Hp07FTime);
+			Hp07PeakTime = System::DateTime::FromFileTime(epd->Hp07FTime);
 		}
 		catch (System::Exception^ ex) {
 			Hp10PeakTime = System::Nullable<System::DateTime>();
@ -670,8 +683,20 @@ int  EpdBaseClr::Epd2::AfterGetDoses(EpdBase::Epd2U* epd)
 	HG = epd->HG;

 	NGgain = K3;
+
+	eDosDose07Warning = epd->eDosDose07Warning;
+	eDosDose07Alarm = epd->eDosDose07Alarm;
+	eDosDose10Warning = epd->eDosDose10Warning;
+	eDosDose10Alarm = epd->eDosDose10Alarm;
+	eDosRate07Warning = epd->eDosRate07Warning;
+	eDosRate07Alarm = epd->eDosRate07Alarm;
+	eDosRate10Warning = epd->eDosRate10Warning;
+	eDosRate10Alarm = epd->eDosRate10Alarm;
+	eDosBatteryWarning = epd->eDosBatteryWarning;
 	return rv;
 }
+
+
 /// <summary>
 /// Get Doses and tresholds, and close if requested
 /// </summary>
@ -787,7 +812,7 @@ int EpdBaseClr::Epd2::ConnectAndStatus()
 		if (onlyMK2) {
 			DeviceCount = epd->DeviceCount;
 			EpdID = epd->EpdID;
-			epd->EpdID = epd->EpdID;
+			epd3->EpdID = epd->EpdID;
 			isMK3 = 0;
 			isBG = epd->isBG;
 			isNG = epd->isNG;
@ -821,7 +846,6 @@ int EpdBaseClr::Epd2::ConnectAndStatus()
 		ConnectError = epd->Error;
 	return rv;
 }
-
 void EpdBaseClr::Epd2::WaitEpd()
 {
 	int rv = 0; //start
--- a/EpdBaseClr/EpdBaseClr.h
+++ b/EpdBaseClr/EpdBaseClr.h
@ -206,11 +206,9 @@ namespace EpdBaseClr {
 		int SoftVersion ;
 		int FunctionFlags ;

-
 		unsigned short BatADC;
 		unsigned short SupplyADC;

-
 		//OperatingStatus
 		BYTE DetectorsOn = 0;
 		bool EPDIssued = 0;
@ -219,7 +217,6 @@ namespace EpdBaseClr {
 		BYTE EPDProcSec = 0;
 		BYTE EPDFaulty = 0;

-
 		//ERrrostatus
 		BYTE EPDNewFault = 0;
 		BYTE EPDComFault = 0;
@ -246,13 +243,22 @@ namespace EpdBaseClr {
 		BYTE OtherAlarmCarrier = 0;
 		BYTE OtherAlarmBatVolt = 0;

+		//New fields
+		bool eDosDose07Warning =false;
+		bool eDosDose07Alarm = false;
+		bool eDosDose10Warning = false;
+		bool eDosDose10Alarm = false;
+		bool eDosRate07Warning = false;
+		bool eDosRate07Alarm = false;
+		bool eDosRate10Warning= false;
+		bool eDosRate10Alarm = false;
+		bool eDosBatteryWarning= false;
 		
 		Epd2(int port);
 		~Epd2();
 		!Epd2();

 		int SetFeedbackSound(byte sound, UINT16 sound3);
-
 		
 		private:
 		int Connect(bool reinit, int EPDTimeout);
@ -305,8 +311,5 @@ namespace EpdBaseClr {
 			void InitData();
 			
 			void WaitEpd();
-
-			
-
 	};
 }
--- a/SyncToSqlsrv7.ps1
+++ b/SyncToSqlsrv7.ps1
@ -9,14 +9,19 @@ Set-AuthenticodeSignature -FilePath "\\sqlsrv7\c$\soft\eDos\installatie2.ps1" -C

 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"
+Copy-Item -Path "D:\l\src\cs\eDosStation\eDosLocal\UpdateLocal.sql" -Destination "\\sqlsrv7\c$\soft\eDos\UpdateLocal.sql"
+Copy-Item -Path "D:\l\src\cs\eDosStation\eDosLocal\Updates.sql" -Destination "\\sqlsrv7\c$\soft\eDos\Updates.sql"
+Copy-Item -Path "D:\l\src\cs\LSWTools\LogFolderClean\bin\Release\logFolderClean.exe" -Destination "\\sqlsrv7\c$\soft\eDos\LogFolderClean.exe"
+Copy-Item -Path "D:\l\src\cs\LSWTools\LogFolderClean\bin\Release\logFolderClean.exe.config" -Destination "\\sqlsrv7\c$\soft\eDos\LogFolderClean.exe.config"
+

 exit

 # SIG # Begin signature block
-# MIIcmgYJKoZIhvcNAQcCoIIcizCCHIcCAQExDzANBglghkgBZQMEAgEFADB5Bgor
+# MIIgzwYJKoZIhvcNAQcCoIIgwDCCILwCAQExDzANBglghkgBZQMEAgEFADB5Bgor
 # BgEEAYI3AgEEoGswaTA0BgorBgEEAYI3AgEeMCYCAwEAAAQQH8w7YFlLCE63JNLG
-# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCAn3abgIIZHJdyK
-# I14p1QUPKVoszm43eugUb43WSeFiGqCCDDYwggW8MIIDpKADAgECAgEfMA0GCSqG
+# KX7zUQIBAAIBAAIBAAIBAAIBADAxMA0GCWCGSAFlAwQCAQUABCA+fDmHhnog4UGM
+# e3vgoZTowQzXcGEXO0O2Dfo82QdpQKCCDDYwggW8MIIDpKADAgECAgEfMA0GCSqG
 # SIb3DQEBCwUAMGYxCzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAK
 # BgNVBAcTA01vbDEPMA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNV
 # BAMTDVNDS0NFTiBJQ1QgQ0EwHhcNMTgwNTI0MDYxMTAwWhcNMzAwNjAxMTIwMDAw
@ -81,89 +86,112 @@ exit
 # BHfDYZ+G1NEu9WzE2NrknC4H4qoNJLmMjVPTswcIT780iOvFZRf1ql+0e2TKUHCO
 # kZ+plXtl3H6MimrNk6B/ZQAy4mETNH6ceaoudV7X5Y7HzbTwSXCSw6GCiQMdYXgs
 # Fp+lioorEmFZhVc2PTs+oUXbMi8IUaCyKEm6tMZHJ+PGU1YBE8Szyj5nI1SUhb+a
-# HunRGlhgXPb4bnEdZVaMruxFM0UbriGwmkOEv9cPVpAxgg+6MIIPtgIBATBrMGYx
+# HunRGlhgXPb4bnEdZVaMruxFM0UbriGwmkOEv9cPVpAxghPvMIIT6wIBATBrMGYx
 # CzAJBgNVBAYTAkJFMRIwEAYDVQQIEwlBbnR3ZXJwZW4xDDAKBgNVBAcTA01vbDEP
 # MA0GA1UEChMGU0NLQ0VOMQwwCgYDVQQLEwNJQ1QxFjAUBgNVBAMTDVNDS0NFTiBJ
 # Q1QgQ0ECAR8wDQYJYIZIAWUDBAIBBQCggbAwGQYJKoZIhvcNAQkDMQwGCisGAQQB
 # gjcCAQQwHAYKKwYBBAGCNwIBCzEOMAwGCisGAQQBgjcCARUwLwYJKoZIhvcNAQkE
-# MSIEIEtdmoei8NvK6zZPhH4YINBxvlmQZdy1qQefoo9xzDg9MEQGCisGAQQBgjcC
+# MSIEIOModi0HjAdP5qGJaeVHmXSQ1s4i6mPKQ6tMGNl+2MmzMEQGCisGAQQBgjcC
 # AQwxNjA0oDKAMABJAG4AdABlAGcAcgBpAHQAeQAgACYAIABBAHUAdABoAGUAbgB0
-# AGkAYwBpAHQAeTANBgkqhkiG9w0BAQEFAASCAQCJJiEAT9oUmD5uCWqT2Zfwq1ou
-# VLr7TnYgNdstiP0RnEIE9AL5sxemIJktOqvLos3DqIZHPfqkV9yY0YDQB3MeU4Uf
-# ryvwfruaxGtOn2eXHPTGLnyJG1bda4V29Ql3HCRwGo3yLmZY4GO+3dPu777zUMhV
-# UB3oexK14X5zThSBrCiLXAfrY6EmdTZ/hWpFhUAVO6rAkyuYyFZbMveAVoEMiV4S
-# AVXHYu0sZSSsLMThJdgpHtvUwdQyZIO3EiQKcRMHMfZJJOP8xd6tADorQZI+duUU
-# ixvA3FMnKZjB8PlA50voGzzbbhhxZa6hykg+JSZhjoiRAxpOJtTKO/71OXJBoYIN
-# bTCCDWkGCisGAQQBgjcDAwExgg1ZMIINVQYJKoZIhvcNAQcCoIINRjCCDUICAQMx
+# AGkAYwBpAHQAeTANBgkqhkiG9w0BAQEFAASCAQDbA2yTpPzA7GiMtyxLN88SUvdG
+# 3IU1XzQRGYhrEm3T08z4L730AwCkMOAv9cH9D/qg0CeiImaVfgPiMc4WfPWonR9/
+# E0EVULGG6wiYO76wGiGRU9txyJajuU9SONmo9TQn00RSqBul1SHS0HBeypNkqidD
+# jdWjD1VWG/JkZqb4kONUw4gY4KkyrLnXhg5LCVGNdZNG0ooR8qxPrgJKOoJQGUtj
+# 2hUAOqWajI+onea4O8uq5+bmvW7reYv8fWjF1oC54HnC7lJe5mk8XzLVPCeGeIpk
+# XX6puuRzgq2n7aCSDUSWymg0eO+YxmSVi0OLQQus2o3zj7QzZASDpUMiuHHAoYIR
+# ojCCEZ4GCisGAQQBgjcDAwExghGOMIIRigYJKoZIhvcNAQcCoIIRezCCEXcCAQMx
 # DzANBglghkgBZQMEAgEFADBnBgsqhkiG9w0BCRABBKBYBFYwVAIBAQYJYIZIAYb9
-# bAcBMCEwCQYFKw4DAhoFAAQUMPDrRtFLLZT7BB+/NV1kagaKVx8CEGHgCagRoXqt
-# ssvJEK/I5ZIYDzIwMjIwMzE3MDgyMDA0WqCCCjcwggT+MIID5qADAgECAhANQkrg
-# vjqI/2BAIc4UAPDdMA0GCSqGSIb3DQEBCwUAMHIxCzAJBgNVBAYTAlVTMRUwEwYD
-# VQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMTAv
-# BgNVBAMTKERpZ2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBUaW1lc3RhbXBpbmcgQ0Ew
-# HhcNMjEwMTAxMDAwMDAwWhcNMzEwMTA2MDAwMDAwWjBIMQswCQYDVQQGEwJVUzEX
-# MBUGA1UEChMORGlnaUNlcnQsIEluYy4xIDAeBgNVBAMTF0RpZ2lDZXJ0IFRpbWVz
-# dGFtcCAyMDIxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwuZhhGfF
-# ivUNCKRFymNrUdc6EUK9CnV1TZS0DFC1JhD+HchvkWsMlucaXEjvROW/m2HNFZFi
-# Wrj/ZwucY/02aoH6KfjdK3CF3gIY83htvH35x20JPb5qdofpir34hF0edsnkxnZ2
-# OlPR0dNaNo/Go+EvGzq3YdZz7E5tM4p8XUUtS7FQ5kE6N1aG3JMjjfdQJehk5t3T
-# jy9XtYcg6w6OLNUj2vRNeEbjA4MxKUpcDDGKSoyIxfcwWvkUrxVfbENJCf0mI1P2
-# jWPoGqtbsR0wwptpgrTb/FZUvB+hh6u+elsKIC9LCcmVp42y+tZji06lchzun3oB
-# c/gZ1v4NSYS9AQIDAQABo4IBuDCCAbQwDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB
-# /wQCMAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwQQYDVR0gBDowODA2BglghkgB
-# hv1sBwEwKTAnBggrBgEFBQcCARYbaHR0cDovL3d3dy5kaWdpY2VydC5jb20vQ1BT
-# MB8GA1UdIwQYMBaAFPS24SAd/imu0uRhpbKiJbLIFzVuMB0GA1UdDgQWBBQ2RIaO
-# pLqwZr68KC0dRDbd42p6vDBxBgNVHR8EajBoMDKgMKAuhixodHRwOi8vY3JsMy5k
-# aWdpY2VydC5jb20vc2hhMi1hc3N1cmVkLXRzLmNybDAyoDCgLoYsaHR0cDovL2Ny
-# bDQuZGlnaWNlcnQuY29tL3NoYTItYXNzdXJlZC10cy5jcmwwgYUGCCsGAQUFBwEB
-# BHkwdzAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tME8GCCsG
-# AQUFBzAChkNodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRTSEEy
-# QXNzdXJlZElEVGltZXN0YW1waW5nQ0EuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBI
-# HNy16ZojvOca5yAOjmdG/UJyUXQKI0ejq5LSJcRwWb4UoOUngaVNFBUZB3nw0QTD
-# htk7vf5EAmZN7WmkD/a4cM9i6PVRSnh5Nnont/PnUp+Tp+1DnnvntN1BIon7h6JG
-# A0789P63ZHdjXyNSaYOC+hpT7ZDMjaEXcw3082U5cEvznNZ6e9oMvD0y0BvL9WH8
-# dQgAdryBDvjA4VzPxBFy5xtkSdgimnUVQvUtMjiB2vRgorq0Uvtc4GEkJU+y38kp
-# qHNDUdq9Y9YfW5v3LhtPEx33Sg1xfpe39D+E68Hjo0mh+s6nv1bPull2YYlffqe0
-# jmd4+TaY4cso2luHpoovMIIFMTCCBBmgAwIBAgIQCqEl1tYyG35B5AXaNpfCFTAN
-# BgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQg
-# SW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2Vy
-# dCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMTYwMTA3MTIwMDAwWhcNMzEwMTA3MTIw
-# MDAwWjByMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYD
-# VQQLExB3d3cuZGlnaWNlcnQuY29tMTEwLwYDVQQDEyhEaWdpQ2VydCBTSEEyIEFz
-# c3VyZWQgSUQgVGltZXN0YW1waW5nIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-# MIIBCgKCAQEAvdAy7kvNj3/dqbqCmcU5VChXtiNKxA4HRTNREH3Q+X1NaH7ntqD0
-# jbOI5Je/YyGQmL8TvFfTw+F+CNZqFAA49y4eO+7MpvYyWf5fZT/gm+vjRkcGGlV+
-# Cyd+wKL1oODeIj8O/36V+/OjuiI+GKwR5PCZA207hXwJ0+5dyJoLVOOoCXFr4M8i
-# EA91z3FyTgqt30A6XLdR4aF5FMZNJCMwXbzsPGBqrC8HzP3w6kfZiFBe/WZuVmEn
-# KYmEUeaC50ZQ/ZQqLKfkdT66mA+Ef58xFNat1fJky3seBdCEGXIX8RcG7z3N1k3v
-# BkL9olMqT4UdxB08r8/arBD13ays6Vb/kwIDAQABo4IBzjCCAcowHQYDVR0OBBYE
-# FPS24SAd/imu0uRhpbKiJbLIFzVuMB8GA1UdIwQYMBaAFEXroq/0ksuCMS1Ri6en
-# IZ3zbcgPMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgGGMBMGA1Ud
-# JQQMMAoGCCsGAQUFBwMIMHkGCCsGAQUFBwEBBG0wazAkBggrBgEFBQcwAYYYaHR0
-# cDovL29jc3AuZGlnaWNlcnQuY29tMEMGCCsGAQUFBzAChjdodHRwOi8vY2FjZXJ0
-# cy5kaWdpY2VydC5jb20vRGlnaUNlcnRBc3N1cmVkSURSb290Q0EuY3J0MIGBBgNV
-# HR8EejB4MDqgOKA2hjRodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vRGlnaUNlcnRB
-# c3N1cmVkSURSb290Q0EuY3JsMDqgOKA2hjRodHRwOi8vY3JsMy5kaWdpY2VydC5j
-# b20vRGlnaUNlcnRBc3N1cmVkSURSb290Q0EuY3JsMFAGA1UdIARJMEcwOAYKYIZI
-# AYb9bAACBDAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20v
-# Q1BTMAsGCWCGSAGG/WwHATANBgkqhkiG9w0BAQsFAAOCAQEAcZUS6VGHVmnN793a
-# fKpjerN4zwY3QITvS4S/ys8DAv3Fp8MOIEIsr3fzKx8MIVoqtwU0HWqumfgnoma/
-# Capg33akOpMP+LLR2HwZYuhegiUexLoceywh4tZbLBQ1QwRostt1AuByx5jWPGTl
-# H0gQGF+JOGFNYkYkh2OMkVIsrymJ5Xgf1gsUpYDXEkdws3XVk4WTfraSZ/tTYYmo
-# 9WuWwPRYaQ18yAGxuSh1t5ljhSKMYcp5lH5Z/IwP42+1ASa2bKXuh1Eh5Fhgm7oM
-# LSttosR+u8QlK0cCCHxJrhO24XxCQijGGFbPQTS2Zl22dHv1VjMiLyI2skuiSpXY
-# 9aaOUjGCAoYwggKCAgEBMIGGMHIxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdp
-# Q2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xMTAvBgNVBAMTKERp
-# Z2lDZXJ0IFNIQTIgQXNzdXJlZCBJRCBUaW1lc3RhbXBpbmcgQ0ECEA1CSuC+Ooj/
-# YEAhzhQA8N0wDQYJYIZIAWUDBAIBBQCggdEwGgYJKoZIhvcNAQkDMQ0GCyqGSIb3
-# DQEJEAEEMBwGCSqGSIb3DQEJBTEPFw0yMjAzMTcwODIwMDRaMCsGCyqGSIb3DQEJ
-# EAIMMRwwGjAYMBYEFOHXgqjhkb7va8oWkbWqtJSmJJvzMC8GCSqGSIb3DQEJBDEi
-# BCCM9/7vk66yhOMBTuV9eDmXdJJOyDjTMDOt4oMihVR/UzA3BgsqhkiG9w0BCRAC
-# LzEoMCYwJDAiBCCzEJAGvArZgweRVyngRANBXIPjKSthTyaWTI01cez1qTANBgkq
-# hkiG9w0BAQEFAASCAQBSSBSTtvKHmM8n4akhoGigHh9vKv7V41EaTuDZ8kXil2b7
-# Y3MfVUyu50NPNMV7gQSuWLsyDeLJR0MP089UQmiCLigWA5OXfmUcojn+JiEaJz80
-# cHPEy8xRcLRMKZ3OTuNLT0TDMaKFpb6DeC9XuBAdXDydaVXFNZYjYTctwkoKp934
-# rF7Miguya89HOu41WgW5IhPbVdOm/PRJ48tCCcCQHRlR0EmmbQZTju7xD1Y22Mip
-# fQEbi8xHCoOZtU245u3D5In8Ol0jBiilXcm2ljEyDGb81HCgTOMPP/3g4MLUVaLl
-# MGBou4p858ZwEERArFEdr+LJEtO2krminpoKRTUo
+# bAcBMCEwCQYFKw4DAhoFAAQUxKkLyeoejdIzULU1OHnooTi9XoUCEGzvu/VcoYtl
+# rPEkzBh8wRAYDzIwMjIwNDEyMDgzODIwWqCCDXwwggbGMIIErqADAgECAhAKekqI
+# nsmZQpAGYzhNhpedMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNVBAYTAlVTMRcwFQYD
+# VQQKEw5EaWdpQ2VydCwgSW5jLjE7MDkGA1UEAxMyRGlnaUNlcnQgVHJ1c3RlZCBH
+# NCBSU0E0MDk2IFNIQTI1NiBUaW1lU3RhbXBpbmcgQ0EwHhcNMjIwMzI5MDAwMDAw
+# WhcNMzMwMzE0MjM1OTU5WjBMMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNl
+# cnQsIEluYy4xJDAiBgNVBAMTG0RpZ2lDZXJ0IFRpbWVzdGFtcCAyMDIyIC0gMjCC
+# AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALkqliOmXLxf1knwFYIY9DPu
+# zFxs4+AlLtIx5DxArvurxON4XX5cNur1JY1Do4HrOGP5PIhp3jzSMFENMQe6Rm7p
+# o0tI6IlBfw2y1vmE8Zg+C78KhBJxbKFiJgHTzsNs/aw7ftwqHKm9MMYW2Nq867Lx
+# g9GfzQnFuUFqRUIjQVr4YNNlLD5+Xr2Wp/D8sfT0KM9CeR87x5MHaGjlRDRSXw9Q
+# 3tRZLER0wDJHGVvimC6P0Mo//8ZnzzyTlU6E6XYYmJkRFMUrDKAz200kheiClOEv
+# A+5/hQLJhuHVGBS3BEXz4Di9or16cZjsFef9LuzSmwCKrB2NO4Bo/tBZmCbO4O2u
+# fyguwp7gC0vICNEyu4P6IzzZ/9KMu/dDI9/nw1oFYn5wLOUrsj1j6siugSBrQ4nI
+# fl+wGt0ZvZ90QQqvuY4J03ShL7BUdsGQT5TshmH/2xEvkgMwzjC3iw9dRLNDHSNQ
+# zZHXL537/M2xwafEDsTvQD4ZOgLUMalpoEn5deGb6GjkagyP6+SxIXuGZ1h+fx/o
+# K+QUshbWgaHK2jCQa+5vdcCwNiayCDv/vb5/bBMY38ZtpHlJrYt/YYcFaPfUcONC
+# leieu5tLsuK2QT3nr6caKMmtYbCgQRgZTu1Hm2GV7T4LYVrqPnqYklHNP8lE54CL
+# KUJy93my3YTqJ+7+fXprAgMBAAGjggGLMIIBhzAOBgNVHQ8BAf8EBAMCB4AwDAYD
+# VR0TAQH/BAIwADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAgBgNVHSAEGTAXMAgG
+# BmeBDAEEAjALBglghkgBhv1sBwEwHwYDVR0jBBgwFoAUuhbZbU2FL3MpdpovdYxq
+# II+eyG8wHQYDVR0OBBYEFI1kt4kh/lZYRIRhp+pvHDaP3a8NMFoGA1UdHwRTMFEw
+# T6BNoEuGSWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRydXN0ZWRH
+# NFJTQTQwOTZTSEEyNTZUaW1lU3RhbXBpbmdDQS5jcmwwgZAGCCsGAQUFBwEBBIGD
+# MIGAMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wWAYIKwYB
+# BQUHMAKGTGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRydXN0
+# ZWRHNFJTQTQwOTZTSEEyNTZUaW1lU3RhbXBpbmdDQS5jcnQwDQYJKoZIhvcNAQEL
+# BQADggIBAA0tI3Sm0fX46kuZPwHk9gzkrxad2bOMl4IpnENvAS2rOLVwEb+EGYs/
+# XeWGT76TOt4qOVo5TtiEWaW8G5iq6Gzv0UhpGThbz4k5HXBw2U7fIyJs1d/2Wcuh
+# wupMdsqh3KErlribVakaa33R9QIJT4LWpXOIxJiA3+5JlbezzMWn7g7h7x44ip/v
+# EckxSli23zh8y/pc9+RTv24KfH7X3pjVKWWJD6KcwGX0ASJlx+pedKZbNZJQfPQX
+# podkTz5GiRZjIGvL8nvQNeNKcEiptucdYL0EIhUlcAZyqUQ7aUcR0+7px6A+TxC5
+# MDbk86ppCaiLfmSiZZQR+24y8fW7OK3NwJMR1TJ4Sks3KkzzXNy2hcC7cDBVeNaY
+# /lRtf3GpSBp43UZ3Lht6wDOK+EoojBKoc88t+dMj8p4Z4A2UKKDr2xpRoJWCjihr
+# pM6ddt6pc6pIallDrl/q+A8GQp3fBmiW/iqgdFtjZt5rLLh4qk1wbfAs8QcVfjW0
+# 5rUMopml1xVrNQ6F1uAszOAMJLh8UgsemXzvyMjFjFhpr6s94c/MfRWuFL+Kcd/K
+# l7HYR+ocheBFThIcFClYzG/Tf8u+wQ5KbyCcrtlzMlkI5y2SoRoR/jKYpl0rl+CL
+# 05zMbbUNrkdjOEcXW28T2moQbh9Jt0RbtAgKh1pZBHYRoad3AhMcMIIGrjCCBJag
+# AwIBAgIQBzY3tyRUfNhHrP0oZipeWzANBgkqhkiG9w0BAQsFADBiMQswCQYDVQQG
+# EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
+# cnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMjIw
+# MzIzMDAwMDAwWhcNMzcwMzIyMjM1OTU5WjBjMQswCQYDVQQGEwJVUzEXMBUGA1UE
+# ChMORGlnaUNlcnQsIEluYy4xOzA5BgNVBAMTMkRpZ2lDZXJ0IFRydXN0ZWQgRzQg
+# UlNBNDA5NiBTSEEyNTYgVGltZVN0YW1waW5nIENBMIICIjANBgkqhkiG9w0BAQEF
+# AAOCAg8AMIICCgKCAgEAxoY1BkmzwT1ySVFVxyUDxPKRN6mXUaHW0oPRnkyibaCw
+# zIP5WvYRoUQVQl+kiPNo+n3znIkLf50fng8zH1ATCyZzlm34V6gCff1DtITaEfFz
+# sbPuK4CEiiIY3+vaPcQXf6sZKz5C3GeO6lE98NZW1OcoLevTsbV15x8GZY2UKdPZ
+# 7Gnf2ZCHRgB720RBidx8ald68Dd5n12sy+iEZLRS8nZH92GDGd1ftFQLIWhuNyG7
+# QKxfst5Kfc71ORJn7w6lY2zkpsUdzTYNXNXmG6jBZHRAp8ByxbpOH7G1WE15/teP
+# c5OsLDnipUjW8LAxE6lXKZYnLvWHpo9OdhVVJnCYJn+gGkcgQ+NDY4B7dW4nJZCY
+# OjgRs/b2nuY7W+yB3iIU2YIqx5K/oN7jPqJz+ucfWmyU8lKVEStYdEAoq3NDzt9K
+# oRxrOMUp88qqlnNCaJ+2RrOdOqPVA+C/8KI8ykLcGEh/FDTP0kyr75s9/g64ZCr6
+# dSgkQe1CvwWcZklSUPRR8zZJTYsg0ixXNXkrqPNFYLwjjVj33GHek/45wPmyMKVM
+# 1+mYSlg+0wOI/rOP015LdhJRk8mMDDtbiiKowSYI+RQQEgN9XyO7ZONj4KbhPvbC
+# dLI/Hgl27KtdRnXiYKNYCQEoAA6EVO7O6V3IXjASvUaetdN2udIOa5kM0jO0zbEC
+# AwEAAaOCAV0wggFZMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFLoW2W1N
+# hS9zKXaaL3WMaiCPnshvMB8GA1UdIwQYMBaAFOzX44LScV1kTN8uZz/nupiuHA9P
+# MA4GA1UdDwEB/wQEAwIBhjATBgNVHSUEDDAKBggrBgEFBQcDCDB3BggrBgEFBQcB
+# AQRrMGkwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBBBggr
+# BgEFBQcwAoY1aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VHJ1
+# c3RlZFJvb3RHNC5jcnQwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybDMuZGln
+# aWNlcnQuY29tL0RpZ2lDZXJ0VHJ1c3RlZFJvb3RHNC5jcmwwIAYDVR0gBBkwFzAI
+# BgZngQwBBAIwCwYJYIZIAYb9bAcBMA0GCSqGSIb3DQEBCwUAA4ICAQB9WY7Ak7Zv
+# mKlEIgF+ZtbYIULhsBguEE0TzzBTzr8Y+8dQXeJLKftwig2qKWn8acHPHQfpPmDI
+# 2AvlXFvXbYf6hCAlNDFnzbYSlm/EUExiHQwIgqgWvalWzxVzjQEiJc6VaT9Hd/ty
+# dBTX/6tPiix6q4XNQ1/tYLaqT5Fmniye4Iqs5f2MvGQmh2ySvZ180HAKfO+ovHVP
+# ulr3qRCyXen/KFSJ8NWKcXZl2szwcqMj+sAngkSumScbqyQeJsG33irr9p6xeZmB
+# o1aGqwpFyd/EjaDnmPv7pp1yr8THwcFqcdnGE4AJxLafzYeHJLtPo0m5d2aR8XKc
+# 6UsCUqc3fpNTrDsdCEkPlM05et3/JWOZJyw9P2un8WbDQc1PtkCbISFA0LcTJM3c
+# HXg65J6t5TRxktcma+Q4c6umAU+9Pzt4rUyt+8SVe+0KXzM5h0F4ejjpnOHdI/0d
+# KNPH+ejxmF/7K9h+8kaddSweJywm228Vex4Ziza4k9Tm8heZWcpw8De/mADfIBZP
+# J/tgZxahZrrdVcA6KYawmKAr7ZVBtzrVFZgxtGIJDwq9gdkT/r+k0fNX2bwE+oLe
+# Mt8EifAAzV3C+dAjfwAL5HYCJtnwZXZCpimHCUcr5n8apIUP/JiW9lVUKx+A+sDy
+# Divl1vupL0QVSucTDh3bNzgaoSv27dZ8/DGCA3YwggNyAgEBMHcwYzELMAkGA1UE
+# BhMCVVMxFzAVBgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMTswOQYDVQQDEzJEaWdpQ2Vy
+# dCBUcnVzdGVkIEc0IFJTQTQwOTYgU0hBMjU2IFRpbWVTdGFtcGluZyBDQQIQCnpK
+# iJ7JmUKQBmM4TYaXnTANBglghkgBZQMEAgEFAKCB0TAaBgkqhkiG9w0BCQMxDQYL
+# KoZIhvcNAQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTIyMDQxMjA4MzgyMFowKwYLKoZI
+# hvcNAQkQAgwxHDAaMBgwFgQUhQjzhlFcs9MHfba0t8B/G0peQd4wLwYJKoZIhvcN
+# AQkEMSIEIFC6eLQ1GrWoCY9H7Ix/i43Z0BbYY09ijHymqmF89rjgMDcGCyqGSIb3
+# DQEJEAIvMSgwJjAkMCIEIJ2mkBXDScbBiXhFujWCrXDIj6QpO9tqvpwr0lOSeeY7
+# MA0GCSqGSIb3DQEBAQUABIICAKecGErSiuFMa3UwWHj55qcdmPCcRyIhUV8gRdpk
+# TMmkSb72WbQ2if5qmqMXZ4purIPa73gFwMoNS+QW7OL8r+ROP/qDKX5EqVPQcNfj
+# A/k1KffMrUGtMbq464zufkWTHBBbGNhvZpb9o/q1mWAbo51iNkhOAdVhPrFMlnWL
+# HWKqoY4xp4+b3I+H7mPAAcTnIRuEVUHSdeZjecKNQZGvY6PHJuui4XSpYAnrmNI5
+# Ep5cd63noDvS0QDw+5JrbHRN+pl4OQrwGFo2NUnKuilJDpekxB/qzAE6UFjElqfk
+# c15xdjuFjPEgp45EvEVeGsnJBHhi2jsTHnwCTHH4NEk8Qr1UgYx4MR9HQcx6jfml
+# /H4eOetwrdFjK5cPnJ45LWYMVblX8Xnsjo6fIh3ABLdnjo8FDjqyHXOb5LvzcIJN
+# 5B7zaw7KLwFAGX/gRj1excOYrX6seHhov9OdOqPhM4KX0MiSco7DJmbLgwtouoat
+# wRA++Bu3uMPrKK6N+lzimIfvmkOUyUTUvqYZEjzzfIwz9+tid5NvUxybN686YqWt
+# 9kPhAd+UjTNiBypcV+WkrjlV1HM2B5V/XQmrfKXtE/ftmzre0nlazynXeYDka898
+# QlqGxh9/81WhIc9AweB9zIR5DGXQUF+tt7ePQ08BVs2U1mbSPoi/9gzP3h7NvnWh
+# scq4
 # SIG # End signature block
--- a/Testing/App.config
+++ b/Testing/App.config
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+    </startup>
+</configuration>
--- a/Testing/Program.cs
+++ b/Testing/Program.cs
@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Testing
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            //2846034226
+            TimeSpan ts0 = TimeSpan.FromSeconds(2846034226);
+
+            DateTime d1 = new DateTime(1601, 1, 1,0,0,0);
+            DateTime d2 = new DateTime(1970, 1, 1);
+            DateTime d3 = new DateTime(2000, 1, 1,0,0,0);
+            TimeSpan ts1 = d2.Subtract(d1);
+            TimeSpan ts2 = d3.Subtract(d1);
+
+            System.Diagnostics.Debug.WriteLine($" 1970 {ts1.TotalSeconds}");
+            System.Diagnostics.Debug.WriteLine($" 2000 {ts2.TotalSeconds}");
+            //125911584000000000
+
+            //DateTime d4 = new DateTime(2022, 02, 19,2,49,38);
+            DateTime d4 = new DateTime(2000, 1, 1);
+            DateTime d5 = d4.AddSeconds(703076180);
+            DateTime d6 = d4.AddSeconds(-284603422);
+            DateTime d7 = d4.AddSeconds(-28460342);
+            DateTime d8 = d4.AddSeconds(-2846034);
+        }
+    }
+}
--- a/Testing/Properties/AssemblyInfo.cs
+++ b/Testing/Properties/AssemblyInfo.cs
@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Testing")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Testing")]
+[assembly: AssemblyCopyright("Copyright ©  2022")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("814e327a-4148-44d8-9eb0-a4190a454540")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// 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")]
--- a/Testing/Testing.csproj
+++ b/Testing/Testing.csproj
@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{814E327A-4148-44D8-9EB0-A4190A454540}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Testing</RootNamespace>
+    <AssemblyName>Testing</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
--- a/eDosLocal/UpdateLocal.sql
+++ b/eDosLocal/UpdateLocal.sql
@ -0,0 +1,339 @@
+USE [eDosLocal];
+GO
+
+/****** Object:  StoredProcedure [dbo].[VisitExit]    Script Date: 11/04/2022 14:31:28 ******/
+SET ANSI_NULLS ON;
+GO
+
+SET QUOTED_IDENTIFIER ON;
+GO
+
+
+ALTER TABLE [dbo].[Visit] ADD eDosBatteryWarning BIT;
+ALTER TABLE [dbo].[Visit] ADD eDosDose07Warning BIT;
+ALTER TABLE [dbo].[Visit] ADD eDosDose07Alarm BIT;
+ALTER TABLE [dbo].[Visit] ADD eDosRate07Warning BIT;
+ALTER TABLE [dbo].[Visit] ADD eDosRate07Alarm BIT;
+ALTER TABLE [dbo].[Visit] ADD eDosDose10Warning BIT;
+ALTER TABLE [dbo].[Visit] ADD eDosDose10Alarm BIT;
+ALTER TABLE [dbo].[Visit] ADD eDosRate10Warning BIT;
+ALTER TABLE [dbo].[Visit] ADD eDosRate10Alarm BIT;
+
+GO
+
+ALTER PROCEDURE [dbo].[VisitExit]
+    @EPDVisitID INT,
+    @HP07 FLOAT,
+    @HP10 FLOAT,
+    @HP07Peak FLOAT,
+    @HP10Peak FLOAT,
+    @HP07PeakTime DATETIME = NULL,
+    @HP10PeakTime DATETIME = NULL,
+    @HP07Total FLOAT,
+    @HP10Total FLOAT,
+    @K1 INT,
+    @K2 INT,
+    @K3 INT,
+    @K4 INT,
+    @K5 INT = NULL,
+    @K6 INT = NULL,
+    @SG INT,
+    @BC INT,
+    @FB INT,
+    @HG INT,
+    @QualityData INT,
+    @alarmStatus INT,
+    @otherAlarms INT,
+    @errorStatus INT,
+    @operatingStatus INT,
+    @ENTRY_EPD_CLOCK DECIMAL(10, 0) NULL,
+    @EXIT_EPD_CLOCK DECIMAL(10, 0) NULL,
+    @PersID INT = NULL,
+    @eDosBatteryWarning BIT = NULL,
+    @eDosDose07Warning BIT = NULL,
+    @eDosDose07Alarm BIT = NULL,
+    @eDosRate07Warning BIT = NULL,
+    @eDosRate07Alarm BIT = NULL,
+    @eDosDose10Warning BIT = NULL,
+    @eDosDose10Alarm BIT = NULL,
+    @eDosRate10Warning BIT = NULL,
+    @eDosRate10Alarm BIT = NULL
+AS
+DECLARE @ID_Visit INT,
+        @ID_Station INT,
+        @ID_Station_Return INT;
+
+SET @ID_Station = @EPDVisitID % 100;
+SET @ID_Visit = @EPDVisitID / 100;
+
+IF @ID_Station_Return IS NULL
+    SELECT @ID_Station_Return = [ID_Station]
+    FROM [dbo].[StationSettings]
+    WHERE [PCNr] = HOST_NAME ();
+
+DECLARE @isComplete BIT = 1;
+
+IF NOT EXISTS
+(
+    SELECT *
+    FROM [dbo].[Visit]
+    WHERE [ID_Visit] = @ID_Visit
+          AND [ID_Station] = @ID_Station
+)
+BEGIN
+    SET @isComplete = 0;
+
+    INSERT [dbo].[Visit]
+    (
+        [ID_Station],
+        [ID_Visit],
+        [Inst_CODE],
+        [isManualExit],
+        [isDeleted],
+        [ID_Station_Return],
+        [isComplete],
+        [ENTRY_EPD_CLOCK],
+        [PersID]
+    )
+    VALUES
+    (@ID_Station, @ID_Visit, 0, 0, 0, @ID_Station_Return, 0, @ENTRY_EPD_CLOCK, @PersID);
+END;
+
+UPDATE [dbo].[Visit]
+SET [Hp07Dose] = @HP07,
+    [Hp10Dose] = @HP10,
+    [isComplete] = @isComplete,
+    [ReturnTime] = GETDATE (),
+    [Hp07Peak] = @HP07Peak,
+    [Hp10Peak] = @HP10Peak,
+    [Hp07Time] = @HP07PeakTime,
+    [Hp10Time] = @HP10PeakTime,
+    [Hp07Total] = @HP07Total,
+    [Hp10Total] = @HP10Total,
+    [K1] = @K1,
+    [K2] = @K2,
+    [K3] = @K3,
+    [K4] = @K4,
+    [K5] = @K5,
+    [K6] = @K6,
+    [SG] = @SG,
+    [BC] = @BC,
+    [FB] = @FB,
+    [HG] = @HG,
+    [QualityData] = @QualityData,
+    [alarmStatus] = @alarmStatus,
+    [otherAlarms] = @otherAlarms,
+    [errorStatus] = @errorStatus,
+    [operatingStatus] = @operatingStatus,
+    --[D1] = @D1,    [D2] = @D2,    [D3] = @D3,    [D4] = @D4,
+    [isAlarm] = CASE
+                    WHEN ISNULL (@alarmStatus, 0) <> 0 THEN
+                        1
+                    ELSE
+                        0
+                END,
+    [isManualExit] = 0,
+    [ID_Station_Return] = @ID_Station_Return,
+    [ENTRY_EPD_CLOCK] = @ENTRY_EPD_CLOCK,
+    [EXIT_EPD_CLOCK] = @EXIT_EPD_CLOCK,
+    [PersID] = CASE
+                   WHEN [PersID] IS NULL THEN
+                       @PersID
+                   ELSE
+                       [PersID]
+               END,
+	eDosBatteryWarning=	@eDosBatteryWarning,
+    eDosDose07Warning = @eDosDose07Warning ,
+    eDosDose07Alarm=@eDosDose07Alarm,
+    eDosRate07Warning=@eDosRate07Warning,
+    eDosRate07Alarm=@eDosRate07Alarm,
+    eDosDose10Warning=@eDosDose10Warning,
+    eDosDose10Alarm=@eDosDose10Alarm,
+    eDosRate10Warning=@eDosRate10Warning,
+    eDosRate10Alarm=@eDosRate10Alarm
+WHERE [ID_Visit] = @ID_Visit
+      AND [ID_Station] = @ID_Station;
+
+-- local- >PersonInfoSnapshot
+IF ISNULL (@alarmStatus, 0) <> 0 
+	OR ISNULL(@eDosDose07Alarm,0)<>0
+	OR ISNULL(@eDosRate07Alarm,0)<>0
+	OR ISNULL(@eDosDose10Alarm,0)<>0
+	OR ISNULL(@eDosRate10Alarm,0)<>0
+BEGIN
+    UPDATE [dbo].[PersonInfoSnapshot]
+    SET [VisitIDLocked] = @ID_Visit * 100 + @ID_Station
+    WHERE [PersID] =
+    (
+        SELECT [PersID]
+        FROM [dbo].[Visit]
+        WHERE [ID_Visit] = @ID_Visit
+              AND @ID_Station = @ID_Station
+    );
+END;
+
+GO
+ALTER PROCEDURE [export].[VisitsSelect]
+AS
+SELECT [ID_Station],
+       [ID_Visit],
+       [Inst_CODE],
+       [PersID],
+       [ID_Task],
+       [EntryTime],
+       [ReturnTime],
+       [Hp10Dose],
+       [Hp07Dose],
+       [Hp10Total],
+       [Hp07Total],
+       [Hp10Peak],
+       [Hp07Peak],
+       [Hp10Time],
+       [Hp07Time],
+       [ID_EPD],
+       [QualityData],
+       [K1],
+       [K2],
+       [K3],
+       [K4],
+       [K5],
+       [K6],
+       [SG],
+       [BC],
+       [FB],
+       [HG],
+       [alarmStatus],
+       [otherAlarms],
+       [errorStatus],
+       [operatingStatus],
+       [isBG],
+       [isComplete],
+       [isDeleted],
+       [isAlarm],
+       [isAlarmCleared],
+       [isManualExit],
+       [ID_Station_Return],
+       [ENTRY_EPD_CLOCK],
+       [EXIT_EPD_CLOCK],
+       [TIME_LOST],
+       [VisitStatus] = CONVERT (   TINYINT,
+                                   CASE
+                                       WHEN [EntryTime] IS NOT NULL
+                                            AND [ReturnTime] IS NOT NULL THEN
+                                           3
+                                       WHEN [EntryTime] IS NOT NULL THEN
+                                           1
+                                       WHEN [ReturnTime] IS NOT NULL THEN
+                                           2
+                                       ELSE
+                                           0
+                                   END
+                               ),
+       [syncedEntry],
+       [syncedExit],
+       [epdType],
+       [eDosBatteryWarning],
+       [eDosDose07Warning],
+       [eDosDose07Alarm],
+       [eDosRate07Warning],
+       [eDosRate07Alarm],
+       [eDosDose10Warning],
+       [eDosDose10Alarm],
+       [eDosRate10Warning],
+       [eDosRate10Alarm]
+FROM [dbo].[Visit]
+WHERE (
+          [syncedEntry] = 0
+          OR [syncedExit] = 0
+      );
+GO
+
+ALTER TABLE [dbo].[StationSettings] ADD [RestartComFirst] BIT;
+ALTER TABLE [dbo].[StationSettings] ADD [OnlyMK2] BIT;
+GO
+
+ALTER PROCEDURE [dbo].[StationSettingsSelect]
+AS
+SELECT [ID_Station],
+       [PCNr],
+       [ComPort],
+       [Inst_CODE1],
+       [Inst_CODE2],
+       [Inst_Name1],
+       [Inst_Name2],
+       [TestCSN],
+       [Reader],
+       [useTestButtons] = ISNULL ([useTestButtons], 0),
+       [useBeep] = ISNULL ([useBeep], 22),
+       [checkUser] = ISNULL ([checkUser], 0),
+       [EPDTimeout] = ISNULL ([EPDTimeout], 10000),
+       [EPDRetries] = ISNULL ([EPDREtries], 1),
+       [RestartCom] = ISNULL ([RestartCom], 0),
+       [RestartComFirst] = ISNULL ([RestartComFirst], 0),
+       [OnlyMK2] = ISNULL ([OnlyMK2], 0)
+FROM [dbo].[StationSettings]
+WHERE [PCNr] = HOST_NAME ();
+GO
+
+ALTER PROCEDURE [dbo].[StationSettingsUpdate]
+    @ComPort INT = NULL,
+    @Inst_CODE1 INT = NULL,
+    @Inst_CODE2 INT = NULL,
+    @Inst_Name1 VARCHAR(50) = NULL,
+    @Inst_Name2 VARCHAR(50) = NULL,
+    @TestCSN VARCHAR(50) = NULL,
+    @Reader VARCHAR(70) = NULL,
+    @useTestButtons BIT = 0,
+    @useBeep TINYINT = 22,
+    @checkUser BIT = 0,
+    @EPDTimeout INT = 10000,
+    @EPDRetries INT = 1,
+    @RestartCom BIT = 0,
+    @RestartComFirst BIT = 0,
+    @OnlyMK2 BIT = 0
+AS
+IF NOT EXISTS
+(
+    SELECT *
+    FROM [dbo].[StationSettings]
+    WHERE [PCNr] = HOST_NAME ()
+)
+    INSERT [dbo].[StationSettings]
+    (
+        [PCNr],
+        [ComPort],
+        [Inst_CODE1],
+        [Inst_CODE2],
+        [Inst_Name1],
+        [Inst_Name2],
+        [TestCSN],
+        [Reader],
+        [useTestButtons],
+        [useBeep],
+        [checkUser],
+        [EPDREtries],
+        [RestartCom],
+        [RestartComFirst],
+        [OnlyMK2]
+    )
+    VALUES
+    (HOST_NAME (), @ComPort, @Inst_CODE1, @Inst_CODE2, @Inst_Name1, @Inst_Name2, @TestCSN, @Reader, @useTestButtons,
+     @useBeep, @checkUser, @EPDRetries, @RestartCom, @RestartComFirst, @OnlyMK2);
+ELSE
+    UPDATE [dbo].[StationSettings]
+    SET [ComPort] = @ComPort,
+        [Inst_CODE1] = @Inst_CODE1,
+        [Inst_CODE2] = @Inst_CODE2,
+        [Inst_Name1] = @Inst_Name1,
+        [Inst_Name2] = @Inst_Name2,
+        [TestCSN] = @TestCSN,
+        [Reader] = @Reader,
+        [useTestButtons] = @useTestButtons,
+        [useBeep] = @useBeep,
+        [checkUser] = @checkUser,
+        [EPDTimeout] = @EPDTimeout,
+        [EPDREtries] = @EPDRetries,
+        [RestartCom] = @RestartCom,
+        [RestartComFirst] = @RestartComFirst,
+        [OnlyMK2] = @OnlyMK2
+    WHERE [PCNr] = HOST_NAME ();
--- a/eDosLocal/Updates.sql
+++ b/eDosLocal/Updates.sql
@ -0,0 +1,362 @@
+USE [eDosLocal];
+GO
+
+/****** Object:  StoredProcedure [dbo].[GetPersonInfo]    Script Date: 8/03/2022 15:53:18 ******/
+SET ANSI_NULLS ON;
+GO
+
+SET QUOTED_IDENTIFIER ON;
+GO
+
+IF NOT EXISTS
+(
+    SELECT *
+    FROM [INFORMATION_SCHEMA].[COLUMNS]
+    WHERE [TABLE_NAME] = 'StationSettings'
+          AND [COLUMN_NAME] = 'EPDRetries'
+)
+    ALTER TABLE [dbo].[StationSettings] ADD [EPDRetries] INT;
+
+IF NOT EXISTS
+(
+    SELECT *
+    FROM [INFORMATION_SCHEMA].[COLUMNS]
+    WHERE [TABLE_NAME] = 'StationSettings'
+          AND [COLUMN_NAME] = 'RestartCom'
+)
+    ALTER TABLE [dbo].[StationSettings] ADD [RestartCom] BIT;
+GO
+
+ALTER PROCEDURE [dbo].[StationSettingsSelect]
+AS
+SELECT [ID_Station],
+       [PCNr],
+       [ComPort],
+       [Inst_CODE1],
+       [Inst_CODE2],
+       [Inst_Name1],
+       [Inst_Name2],
+       [TestCSN],
+       [Reader],
+       [useTestButtons] = ISNULL ([useTestButtons], 0),
+       [useBeep] = ISNULL ([useBeep], 22),
+       [checkUser] = ISNULL ([checkUser], 0),
+       [EPDTimeout],
+       [EPDRetries],
+       [RestartCom]
+FROM [dbo].[StationSettings]
+WHERE [PCNr] = HOST_NAME ();
+GO
+
+ALTER PROCEDURE [dbo].[StationSettingsUpdate]
+    @ComPort INT = NULL,
+    @Inst_CODE1 INT = NULL,
+    @Inst_CODE2 INT = NULL,
+    @Inst_Name1 VARCHAR(50) = NULL,
+    @Inst_Name2 VARCHAR(50) = NULL,
+    @TestCSN VARCHAR(50) = NULL,
+    @Reader VARCHAR(70) = NULL,
+    @useTestButtons BIT = 0,
+    @useBeep TINYINT = 22,
+    @checkUser BIT = 0,
+    @EPDTimeout INT = 10000,
+    @EPDRetries INT = 1,
+    @RestartCom BIT = 0
+AS
+IF NOT EXISTS
+(
+    SELECT *
+    FROM [dbo].[StationSettings]
+    WHERE [PCNr] = HOST_NAME ()
+)
+    INSERT [dbo].[StationSettings]
+    (
+        [PCNr],
+        [ComPort],
+        [Inst_CODE1],
+        [Inst_CODE2],
+        [Inst_Name1],
+        [Inst_Name2],
+        [TestCSN],
+        [Reader],
+        [useTestButtons],
+        [useBeep],
+        [checkUser],
+        [EPDRetries],
+        [RestartCom]
+    )
+    VALUES
+    (HOST_NAME (), @ComPort, @Inst_CODE1, @Inst_CODE2, @Inst_Name1, @Inst_Name2, @TestCSN, @Reader, @useTestButtons,
+     @useBeep, @checkUser, @EPDRetries, @RestartCom);
+ELSE
+    UPDATE [dbo].[StationSettings]
+    SET [ComPort] = @ComPort,
+        [Inst_CODE1] = @Inst_CODE1,
+        [Inst_CODE2] = @Inst_CODE2,
+        [Inst_Name1] = @Inst_Name1,
+        [Inst_Name2] = @Inst_Name2,
+        [TestCSN] = @TestCSN,
+        [Reader] = @Reader,
+        [useTestButtons] = @useTestButtons,
+        [useBeep] = @useBeep,
+        [checkUser] = @checkUser,
+        [EPDTimeout] = @EPDTimeout,
+        [EPDRetries] = @EPDRetries,
+        [RestartCom] = @RestartCom
+    WHERE [PCNr] = HOST_NAME ();
+GO
+
+ALTER PROCEDURE [dbo].[StationSettingsSelect]
+AS
+SELECT [ID_Station],
+       [PCNr],
+       [ComPort],
+       [Inst_CODE1],
+       [Inst_CODE2],
+       [Inst_Name1],
+       [Inst_Name2],
+       [TestCSN],
+       [Reader],
+       [useTestButtons] = ISNULL ([useTestButtons], 0),
+       [useBeep] = ISNULL ([useBeep], 22),
+       [checkUser] = ISNULL ([checkUser], 0),
+       [EPDTimeout] = ISNULL ([EPDTimeout], 10000),
+       [EPDRetries] = ISNULL ([EPDRetries], 1),
+       [RestartCom] = ISNULL ([RestartCom], 0)
+FROM [dbo].[StationSettings]
+WHERE [PCNr] = HOST_NAME ();
+
+go
+
+ALTER PROCEDURE [dbo].[GetPersonInfo]    @CSN CHAR(14) =NULL,    @PersID INT = NULL AS
+--DECLARE    @PersID INT = null,    @CSN CHAR(14) = 'TP10';
+DECLARE
+    @lid_station INT,
+    @lid_visit INT;
+
+	if @PersID IS NULL SELECT @PersID=persid FROM [dbo].[PersonInfoSnapshot]  where [CSN] = @CSN COLLATE SQL_Latin1_General_CP850_BIN;
+
+SELECT TOP(1)
+    @lid_station = id_station,
+    @lid_visit = id_visit
+FROM dbo.Visit
+WHERE PersID = @PersID
+      AND ReturnTime IS NULL
+      AND [EntryTime] > DATEADD(year, -1, GETDATE());
+
+SELECT
+    [a].[PersID],
+    [a].[Type],
+    [a].[CSN],
+    [a].[FirstName],
+    [a].[LastName],
+    [a].[NickName],
+    [AccessAllow] = CASE WHEN a.[hasEPD] = 1 THEN 0 ELSE a.[AccessAllow] END,
+    [a].[Language],
+    [a].[MarginHP10_M],
+    [a].[MarginHP10_Y],
+    [a].[Margin],
+    [a].[VisitIDLocked],
+    [a].[ID_CommentToPerson],
+    [a].[Comment],
+    [a].[Deleted],
+    [ReasonNoAccess] = CASE WHEN a.[hasEPD] = 1 THEN 'EPD not returned' ELSE a.[ReasonNoAccess] END,
+    [a].[Dose_52W_microSv],
+    [a].[hasEPD],
+    activeStation = @lid_station,
+    activeVisit = @lid_visit
+FROM(SELECT
+         [p].[PersID],
+         [p].[Type],
+         [p].[CSN],
+         [p].[FirstName],
+         [p].[LastName],
+         [p].[NickName],
+         [p].[AccessAllow],
+         [p].[Language],
+         [p].[MarginHP10_M],
+         [p].[MarginHP10_Y],
+         [p].[Margin],
+         [p].[VisitIDLocked],
+         [p].[ID_CommentToPerson],
+         [p].[Comment],
+         [p].[Deleted],
+         [p].[ReasonNoAccess],
+         [p].[Dose_52W_microSv],
+         hasEPD = CONVERT(BIT, CASE WHEN @lid_visit IS NOT NULL THEN 1 ELSE 0 END)
+     FROM [dbo].[PersonInfoSnapshot] [p]
+     WHERE [p].[PersID] = @PersID) a
+	 go
+
+---- Luc 2022-03-25	 
+IF OBJECT_ID('[syncLoc].[compareVisit]') IS  NULL
+begin
+CREATE TABLE [syncLoc].[compareVisit](
+	[ID_Station] [INT] NOT NULL,
+	[ID_Visit] [INT] NOT NULL,
+	[Inst_CODE] [INT] NOT NULL,
+	[PersID] [INT] NULL,
+	[ID_Task] [INT] NULL,
+	[EntryTime] [DATETIME] NULL,
+	[ReturnTime] [DATETIME] NULL,
+	[Hp10Dose] [FLOAT] NULL,
+	[Hp07Dose] [FLOAT] NULL,
+	[Hp10Total] [FLOAT] NULL,
+	[Hp07Total] [FLOAT] NULL,
+	[Hp10Peak] [FLOAT] NULL,
+	[Hp07Peak] [FLOAT] NULL,
+	[Hp10Time] [DATETIME] NULL,
+	[Hp07Time] [DATETIME] NULL,
+	[ID_EPD] [INT] NULL,
+	[QualityData] [INT] NULL,
+	[K1] [INT] NULL,
+	[K2] [INT] NULL,
+	[K3] [INT] NULL,
+	[K4] [INT] NULL,
+	[K5] [INT] NULL,
+	[K6] [INT] NULL,
+	[SG] [INT] NULL,
+	[BC] [INT] NULL,
+	[FB] [INT] NULL,
+	[HG] [INT] NULL,
+	[alarmStatus] [INT] NULL,
+	[otherAlarms] [INT] NULL,
+	[errorStatus] [INT] NULL,
+	[operatingStatus] [INT] NULL,
+	[isBG] [BIT] NULL,
+	[isComplete] [BIT] NOT NULL,
+	[isDeleted] [BIT] NOT NULL,
+	[isAlarm] [BIT] NOT NULL,
+	[isAlarmCleared] [BIT] NOT NULL,
+	[isManualExit] [BIT] NOT NULL,
+	[ID_Station_Return] [INT] NULL,
+	[ENTRY_EPD_CLOCK] [NUMERIC](10, 0) NULL,
+	[EXIT_EPD_CLOCK] [NUMERIC](10, 0) NULL,
+	[TIME_LOST] [INT] NULL,
+	[epdID] [INT] NULL,
+ CONSTRAINT [PK_compareVisit] PRIMARY KEY CLUSTERED 
+(
+	[ID_Station] ASC,
+	[ID_Visit] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON ) ON [PRIMARY]
+) ON [PRIMARY];
+
+GRANT ALTER,INSERT,UPDATE,DELETE,select ON [syncLoc].[compareVisit] TO edosStation
+
+END 
+GO
+
+	 
+	 
+CREATE OR ALTER PROCEDURE [syncLoc].[UpdateRemoteReturns] @ID_LocalStation INT=null AS
+	 -- Luc 2022-03-25
+	 --DECLARE @ID_LocalStation INT = 9;
+	 DECLARE @pcnr VARCHAR(20)
+	 
+	 select @pcnr=@@servername;
+	 IF @pcnr='EDOS-SCH' SET  @pcnr='EDOS-WSCH'
+	 ELSE IF @pcnr='DESKTOP-CCDL4A3' SET  @pcnr='EDOS-LNK'
+	 ELSE IF @pcnr='EDOS-ZZZ'SET  @pcnr='EDOS-LSCH'
+
+	 IF @ID_LocalStation IS NULL SELECT @ID_LocalStation =id_station From stationsettings WHERE pcnr= @pcnr 
+	 select @ID_LocalStation,pcnr FROM stationsettings WHERE id_station=@ID_LocalStation;
+
+TRUNCATE TABLE [syncLoc].[compareVisit];
+
+INSERT [syncLoc].[compareVisit]([ID_Station], [ID_Visit], [Inst_CODE], [PersID], [ID_Task], [EntryTime], [ReturnTime], [Hp10Dose], [Hp07Dose], [Hp10Total], [Hp07Total], [Hp10Peak], [Hp07Peak], [Hp10Time], [Hp07Time], [ID_EPD], [QualityData], [K1], [K2], [K3], [K4], [K5], [K6], [SG], [BC], [FB], [HG], [alarmStatus], [otherAlarms], [errorStatus], [operatingStatus], [isBG], [isComplete], [isDeleted], [isAlarm], [isAlarmCleared], [isManualExit], [ID_Station_Return], [ENTRY_EPD_CLOCK], [EXIT_EPD_CLOCK], [TIME_LOST], [epdID])
+SELECT
+    [v].[ID_Station],
+    [v].[ID_Visit],
+    [v].[Inst_CODE],
+    [v].[PersID],
+    [v].[ID_Task],
+    [v].[EntryTime],
+    [v].[ReturnTime],
+    [v].[Hp10Dose],
+    [v].[Hp07Dose],
+    [v].[Hp10Total],
+    [v].[Hp07Total],
+    [v].[Hp10Peak],
+    [v].[Hp07Peak],
+    [v].[Hp10Time],
+    [v].[Hp07Time],
+    [v].[ID_EPD],
+    [v].[QualityData],
+    [v].[K1],
+    [v].[K2],
+    [v].[K3],
+    [v].[K4],
+    [v].[K5],
+    [v].[K6],
+    [v].[SG],
+    [v].[BC],
+    [v].[FB],
+    [v].[HG],
+    [v].[alarmStatus],
+    [v].[otherAlarms],
+    [v].[errorStatus],
+    [v].[operatingStatus],
+    [v].[isBG],
+    [v].[isComplete],
+    [v].[isDeleted],
+    [v].[isAlarm],
+    [v].[isAlarmCleared],
+    [v].[isManualExit],
+    [v].[ID_Station_Return],
+    [v].[ENTRY_EPD_CLOCK],
+    [v].[EXIT_EPD_CLOCK],
+    [v].[TIME_LOST],
+    [v].[epdID]
+FROM [EDOS].[edos].[dbo].[visit] [v]
+     INNER JOIN(SELECT
+                    [ID_Visit]
+                FROM [dbo].[Visit]
+                WHERE [ID_Station] = @ID_LocalStation
+                      AND [ReturnTime] IS NULL) [i] ON [i].[ID_Visit] = [v].[ID_Visit]
+WHERE [id_station] = @ID_LocalStation
+      AND [v].[returntime] IS NOT NULL;
+
+UPDATE
+    [dbo].[Visit]
+SET
+    [ReturnTime] = [c].[ReturnTime],
+    [Hp10Dose] = [c].[Hp10Dose],
+    [Hp07Dose] = [c].[Hp07Dose],
+    [Hp10Total] = [c].[Hp10Total],
+    [Hp07Total] = [c].[Hp07Total],
+    [Hp10Peak] = [c].[Hp10Peak],
+    [Hp07Peak] = [c].[Hp07Peak],
+    [Hp10Time] = [c].[Hp10Time],
+    [Hp07Time] = [c].[Hp07Time],
+    [QualityData] = [c].[QualityData],
+    [K1] = [c].[K1],
+    [K2] = [c].[K2],
+    [K3] = [c].[K3],
+    [K4] = [c].[K4],
+    [K5] = [c].[K5],
+    [K6] = [c].[K6],
+    [SG] = [c].[SG],
+    [BC] = [c].[BC],
+    [FB] = [c].[FB],
+    [HG] = [c].[HG],
+    [alarmStatus] = [c].[alarmStatus],
+    [otherAlarms] = [c].[otherAlarms],
+    [errorStatus] = [c].[errorStatus],
+    [operatingStatus] = [c].[operatingStatus],
+    [isComplete] = [c].[isComplete],
+    [isDeleted] = [c].[isDeleted],
+    [isAlarm] = [c].[isAlarm],
+    [isAlarmCleared] = [c].[isAlarmCleared],
+    [isManualExit] = ISNULL([c].[isManualExit], [v].[isManualExit]),
+    [ID_Station_Return] = ISNULL([c].[ID_Station_Return], [v].[ID_Station_Return]),
+    [EXIT_EPD_CLOCK] = [c].[EXIT_EPD_CLOCK]
+FROM [dbo].[Visit] [v]
+     INNER JOIN [syncLoc].[compareVisit] [c] ON [c].[ID_Station] = [v].[ID_Station]
+                                                AND [c].[ID_Visit] = [v].[ID_Visit]
+WHERE [v].[ReturnTime] IS NULL
+      AND [v].[isComplete] = 0;
+
+GO
+
+GRANT EXECUTE ON [syncLoc].[UpdateRemoteReturns] TO [eDosStation]
+go
--- a/eDosLocal/eDosLocal.sqlproj
+++ b/eDosLocal/eDosLocal.sqlproj
@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <Name>eDosLocal</Name>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectVersion>4.1</ProjectVersion>
+    <ProjectGuid>{3a150025-d770-4521-ba21-16843b2d5359}</ProjectGuid>
+    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider</DSP>
+    <OutputType>Database</OutputType>
+    <RootPath>
+    </RootPath>
+    <RootNamespace>eDosLocal</RootNamespace>
+    <AssemblyName>eDosLocal</AssemblyName>
+    <ModelCollation>1033, CI</ModelCollation>
+    <DefaultFileStructure>BySchemaAndSchemaType</DefaultFileStructure>
+    <DeployToDatabase>True</DeployToDatabase>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetLanguage>CS</TargetLanguage>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <SqlServerVerification>False</SqlServerVerification>
+    <IncludeCompositeObjects>True</IncludeCompositeObjects>
+    <TargetDatabaseSet>True</TargetDatabaseSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
+    <!-- Default to the v11.0 targets path if the targets file for the current VS version is not found -->
+    <SSDTExists Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets')">True</SSDTExists>
+    <VisualStudioVersion Condition="'$(SSDTExists)' == ''">11.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
+  <Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
+  <ItemGroup>
+    <Folder Include="Properties" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="UpdateLocal.sql" />
+    <None Include="Updates.sql" />
+  </ItemGroup>
+</Project>
--- a/eDosStation.sln
+++ b/eDosStation.sln
@ -33,6 +33,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eDosPrep", "eDosPrep\eDosPr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CheckRemoteeDosLocal", "CheckRemoteeDosLocal\CheckRemoteeDosLocal.csproj", "{41FCBAFF-5FC7-49A1-9A97-23B8F0742F59}"
 EndProject
+Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "eDosLocal", "eDosLocal\eDosLocal.sqlproj", "{3A150025-D770-4521-BA21-16843B2D5359}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testing", "Testing\Testing.csproj", "{814E327A-4148-44D8-9EB0-A4190A454540}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -283,6 +287,56 @@ Global
 		{41FCBAFF-5FC7-49A1-9A97-23B8F0742F59}.Release|x64.Build.0 = Release|Any CPU
 		{41FCBAFF-5FC7-49A1-9A97-23B8F0742F59}.Release|x86.ActiveCfg = Release|Any CPU
 		{41FCBAFF-5FC7-49A1-9A97-23B8F0742F59}.Release|x86.Build.0 = Release|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Debug|ARM.Build.0 = Debug|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Debug|ARM.Deploy.0 = Debug|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Debug|ARM64.Deploy.0 = Debug|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Debug|x64.Build.0 = Debug|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Debug|x64.Deploy.0 = Debug|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Debug|x86.Build.0 = Debug|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Debug|x86.Deploy.0 = Debug|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Release|ARM.ActiveCfg = Release|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Release|ARM.Build.0 = Release|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Release|ARM.Deploy.0 = Release|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Release|ARM64.Build.0 = Release|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Release|ARM64.Deploy.0 = Release|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Release|x64.ActiveCfg = Release|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Release|x64.Build.0 = Release|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Release|x64.Deploy.0 = Release|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Release|x86.ActiveCfg = Release|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Release|x86.Build.0 = Release|Any CPU
+		{3A150025-D770-4521-BA21-16843B2D5359}.Release|x86.Deploy.0 = Release|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Debug|ARM.Build.0 = Debug|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Debug|x64.Build.0 = Debug|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Debug|x86.Build.0 = Debug|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Release|Any CPU.Build.0 = Release|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Release|ARM.ActiveCfg = Release|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Release|ARM.Build.0 = Release|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Release|ARM64.Build.0 = Release|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Release|x64.ActiveCfg = Release|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Release|x64.Build.0 = Release|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Release|x86.ActiveCfg = Release|Any CPU
+		{814E327A-4148-44D8-9EB0-A4190A454540}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/eDosStation/DataInterface.cs
+++ b/eDosStation/DataInterface.cs
@ -1,11 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Navigation;

 namespace eDosStation
 {
@ -16,7 +11,7 @@ namespace eDosStation
        private string currentConStr, ConCentralStr;
        public  System.IO.StreamWriter stationLog;

-        public System.Data.SqlClient.SqlConnection localConnection, centralConnection;
+        public SqlConnection localConnection, centralConnection;
        public System.Data.SqlClient.SqlCommand VisitInitCommand;
        public static SqlCommand VisitExitCommand;
        public static SqlCommand NextIDCommand;
@ -25,7 +20,6 @@ namespace eDosStation
        public DataSet1.CommentOnEventDataTable dtCOE;
        private bool CheckUser;

-
        public static string tnow()
        {
            return DateTime.Now.ToString("HH:mm:ss.fff");
@ -37,7 +31,6 @@ namespace eDosStation
            nxtValue = NextIDCommand.ExecuteScalar() as int?;
                return nxtValue;
        }
-
        public static int? LastID()
        {
            int? lastValue = null;
@ -85,7 +78,6 @@ namespace eDosStation
            if (rv && !leaveOpen) centralConnection?.Close();
            return rv;
        }
-
        internal void SetStation(int curIDStation)
        {
            ID_Station = curIDStation;
@ -93,7 +85,6 @@ namespace eDosStation
            VisitInitCommand.Parameters["ID_Station"].Value = curIDStation;
            CheckStatus.Parameters["ID_Station"].Value = curIDStation;
        }
-
        public bool isOnline()
        {
            bool? online = false;
@ -105,7 +96,6 @@ namespace eDosStation
            isLocal = !online.Value;
            return online.Value;
        }
-
        static public void first()
        {
            var cb = new System.Data.SqlClient.SqlConnectionStringBuilder(Properties.Settings.Default.localConnectionString);
@ -119,7 +109,6 @@ namespace eDosStation
                System.Windows.Application.Current.Shutdown();
            }
        }
-
        private void init()
        {
            stationLog?.WriteLine($"Datainterface.Init start {tnow()}");
@ -150,7 +139,6 @@ namespace eDosStation
            }
            stationLog?.WriteLine($"Datainterface.Init end {tnow()}");
        }
-
        public DataInterface( )
        {
            init();
@ -201,56 +189,102 @@ namespace eDosStation
            LastIDCommand.CommandType = CommandType.StoredProcedure;
            var pa = new System.Data.SqlClient.SqlParameter("ID_Station", SqlDbType.Int, 4); LastIDCommand.Parameters.Add(pa);

-            CheckStatus = new SqlCommand("[syncLoc].[SyncStatusIsOK]",localConnection);
+            CheckStatus = new SqlCommand("[syncLoc].[SyncStatusIsOK]", localConnection);
            CheckStatus.CommandType = CommandType.StoredProcedure;
            pa = new System.Data.SqlClient.SqlParameter("ID_Station", SqlDbType.Int, 4); CheckStatus.Parameters.Add(pa);
+          
+            VisitInitCommand = new System.Data.SqlClient.SqlCommand("[dbo].[VisitInit]", localConnection) { CommandType = System.Data.CommandType.StoredProcedure };
+            VisitInitCommand.Parameters.AddRange(new System.Data.SqlClient.SqlParameter[] {
+                  new System.Data.SqlClient.SqlParameter("PersID",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+                , new System.Data.SqlClient.SqlParameter("ID_Task",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+                , new System.Data.SqlClient.SqlParameter("Inst_CODE",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+                , new System.Data.SqlClient.SqlParameter("EPD_InternalID",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+                , new System.Data.SqlClient.SqlParameter("isBG",SqlDbType.Bit,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+                , new System.Data.SqlClient.SqlParameter("EPDVisitID",SqlDbType.Int,0,System.Data.ParameterDirection.Output,false,0,0,null,System.Data.DataRowVersion.Default,null)
+                , new System.Data.SqlClient.SqlParameter("ID_Station",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+                , new System.Data.SqlClient.SqlParameter("ID_Visit",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+                , new System.Data.SqlClient.SqlParameter("ENTRY_EPD_CLOCK",SqlDbType.Decimal,0,System.Data.ParameterDirection.Input,false,10,0,null,System.Data.DataRowVersion.Default,null)
+                , new System.Data.SqlClient.SqlParameter("epdType",SqlDbType.TinyInt,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+                });

-            VisitInitCommand = new System.Data.SqlClient.SqlCommand("VisitInit", localConnection);
-            VisitInitCommand.CommandType = System.Data.CommandType.StoredProcedure;
-            pa = new System.Data.SqlClient.SqlParameter("ID_Station", SqlDbType.Int, 4); VisitInitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("ID_Visit", SqlDbType.Int, 4); pa.Direction = ParameterDirection.Input; VisitInitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("PersID", SqlDbType.Int, 4); VisitInitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("ID_Task", SqlDbType.Int, 4); VisitInitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("Inst_CODE", SqlDbType.Int, 4); VisitInitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("EPD_InternalID", SqlDbType.Int, 4); VisitInitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("isBG", SqlDbType.Bit, 4); VisitInitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("ENTRY_EPD_CLOCK", SqlDbType.Decimal, 9); VisitInitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("EPDVisitID", SqlDbType.Int, 4); pa.Direction = ParameterDirection.Output; VisitInitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("epdType", SqlDbType.TinyInt, 1); VisitInitCommand.Parameters.Add(pa);
+            //VisitExitCommand = new SqlCommand("VisitExit", localConnection);
+            //VisitExitCommand.CommandType = CommandType.StoredProcedure;
+            //pa = new System.Data.SqlClient.SqlParameter("EPDVisitID", SqlDbType.Int, 4); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("HP07", SqlDbType.Float); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("HP10", SqlDbType.Float); VisitExitCommand.Parameters.Add(pa);

-            VisitExitCommand = new SqlCommand("VisitExit", localConnection);
-            VisitExitCommand.CommandType = CommandType.StoredProcedure;
-            pa = new System.Data.SqlClient.SqlParameter("EPDVisitID", SqlDbType.Int, 4); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("HP07", SqlDbType.Float); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("HP10", SqlDbType.Float); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("Hp07Total", SqlDbType.Float); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("Hp10Total", SqlDbType.Float); VisitExitCommand.Parameters.Add(pa);

-            pa = new System.Data.SqlClient.SqlParameter("Hp07Total", SqlDbType.Float); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("Hp10Total", SqlDbType.Float); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("Hp07Peak", SqlDbType.Float); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("Hp10Peak", SqlDbType.Float); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("HP07PeakTime", SqlDbType.DateTime); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("HP10PeakTime", SqlDbType.DateTime); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("K1", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("K2", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("K3", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("K4", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("K5", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("K6", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("SG", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("BC", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("FB", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("HG", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);

-            pa = new System.Data.SqlClient.SqlParameter("Hp07Peak", SqlDbType.Float); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("Hp10Peak", SqlDbType.Float); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("HP07PeakTime", SqlDbType.DateTime); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("HP10PeakTime", SqlDbType.DateTime); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("K1", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("K2", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("K3", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("K4", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("K5", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("K6", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("SG", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("BC", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("FB", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("HG", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("QualityData", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);

-            pa = new System.Data.SqlClient.SqlParameter("QualityData", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("alarmStatus", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("otherAlarms", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("errorStatus", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("operatingStatus", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("ENTRY_EPD_CLOCK", SqlDbType.Decimal, 9); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("EXIT_EPD_CLOCK", SqlDbType.Decimal, 9); VisitExitCommand.Parameters.Add(pa);
+            //pa = new System.Data.SqlClient.SqlParameter("PersID", SqlDbType.Int, 4); VisitExitCommand.Parameters.Add(pa);

-            pa = new System.Data.SqlClient.SqlParameter("alarmStatus", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("otherAlarms", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("errorStatus", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("operatingStatus", SqlDbType.Int); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("ENTRY_EPD_CLOCK", SqlDbType.Decimal, 9); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("EXIT_EPD_CLOCK", SqlDbType.Decimal, 9); VisitExitCommand.Parameters.Add(pa);
-            pa = new System.Data.SqlClient.SqlParameter("PersID", SqlDbType.Int, 4); VisitExitCommand.Parameters.Add(pa);
+            VisitExitCommand = new System.Data.SqlClient.SqlCommand("[dbo].[VisitExit]", localConnection) { CommandType = System.Data.CommandType.StoredProcedure };
+            VisitExitCommand.Parameters.AddRange(new System.Data.SqlClient.SqlParameter[] {
+              new System.Data.SqlClient.SqlParameter("EPDVisitID",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("HP07",SqlDbType.Float,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("HP10",SqlDbType.Float,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("HP07Peak",SqlDbType.Float,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("HP10Peak",SqlDbType.Float,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("HP07PeakTime",SqlDbType.DateTime,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("HP10PeakTime",SqlDbType.DateTime,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("HP07Total",SqlDbType.Float,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("HP10Total",SqlDbType.Float,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("K1",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("K2",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("K3",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("K4",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("K5",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("K6",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("SG",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("BC",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("FB",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("HG",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("QualityData",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("alarmStatus",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("otherAlarms",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("errorStatus",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("operatingStatus",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("ENTRY_EPD_CLOCK",SqlDbType.Decimal,0,System.Data.ParameterDirection.Input,false,10,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("EXIT_EPD_CLOCK",SqlDbType.Decimal,0,System.Data.ParameterDirection.Input,false,10,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("PersID",SqlDbType.Int,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("eDosBatteryWarning",SqlDbType.Bit,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("eDosDose07Warning",SqlDbType.Bit,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("eDosDose07Alarm",SqlDbType.Bit,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("eDosRate07Warning",SqlDbType.Bit,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("eDosRate07Alarm",SqlDbType.Bit,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("eDosDose10Warning",SqlDbType.Bit,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("eDosDose10Alarm",SqlDbType.Bit,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("eDosRate10Warning",SqlDbType.Bit,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            , new System.Data.SqlClient.SqlParameter("eDosRate10Alarm",SqlDbType.Bit,0,System.Data.ParameterDirection.Input,false,0,0,null,System.Data.DataRowVersion.Default,null)
+            });
+        }
+
+        public void SetBoolParam(SqlCommand c , string pa, bool value)
+        {
+            if (c.Parameters.Contains(pa))c.Parameters[pa].Value = value;
        }

         public void VisitExit(int EpdVisitID, EpdBaseClr.Epd2 ep)
@ -303,6 +337,17 @@ namespace eDosStation
            else
                VisitExitCommand.Parameters["PersID"].Value = DBNull.Value;

+
+            SetBoolParam(VisitExitCommand,"eDosBatteryWarning",ep.eDosBatteryWarning);
+            SetBoolParam(VisitExitCommand, "eDosDose07Warning", ep.eDosDose07Warning);
+            SetBoolParam(VisitExitCommand, "eDosDose07Alarm", ep.eDosDose07Alarm);
+            SetBoolParam(VisitExitCommand, "eDosRate07Warning", ep.eDosRate07Warning);
+            SetBoolParam(VisitExitCommand, "eDosRate07Alarm", ep.eDosRate07Alarm);
+            SetBoolParam(VisitExitCommand, "eDosDose10Warning", ep.eDosDose10Warning);
+            SetBoolParam(VisitExitCommand, "eDosDose10Alarm", ep.eDosDose10Alarm);
+            SetBoolParam(VisitExitCommand, "eDosRate10Warning", ep.eDosRate10Warning);
+            SetBoolParam(VisitExitCommand, "eDosRate10Alarm", ep.eDosRate10Alarm);
+
            checkCon(true);
            VisitExitCommand.Connection = localConnection;
            VisitExitCommand.ExecuteNonQuery();
--- a/eDosStation/EntryBadge.xaml.cs
+++ b/eDosStation/EntryBadge.xaml.cs
@ -209,6 +209,7 @@ namespace eDosStation
                    dataInterface.VisitInitCommand.Parameters["isBG"].Value = isBG;
                    dataInterface.VisitInitCommand.Parameters["ENTRY_EPD_CLOCK"].Value = ep.CountsClock;
                    dataInterface.VisitInitCommand.Parameters["epdType"].Value = (byte)ep.epdType;
+                    dataInterface.VisitInitCommand.Parameters["EPDVisitID"].Value = 0;
                    using (var l = new SqlLog())
                        try
                        {
@ -233,10 +234,13 @@ namespace eDosStation

                ep.Hp07RateOn = CurTaskRow.HP07RateON;
                ep.Hp07RateOff = CurTaskRow.HP07RateOFF;
+
                ep.Hp10Rate1On = CurTaskRow.HP10Rate1ON;
-                ep.Hp10Rate1Off = CurTaskRow.HP10Rate1ON;
+                ep.Hp10Rate1Off = CurTaskRow.HP10Rate1OFF;
+
                ep.Hp10Rate2On = CurTaskRow.HP10Rate2ON;
-                ep.Hp10Rate2Off = CurTaskRow.HP10Rate2ON;
+                ep.Hp10Rate2Off = CurTaskRow.HP10Rate2OFF;
+
                ep.Hp10THDose1 = CurTaskRow.Hp10Dose1;
                ep.Hp10THDose2 = CurTaskRow.Hp10Dose2;
                ep.Hp07THDose = CurTaskRow.Hp07Dose;
--- a/eDosStation/EpdExit.xaml.cs
+++ b/eDosStation/EpdExit.xaml.cs
@ -98,12 +98,16 @@ namespace eDosStation
            if (ep.EpdID == 0)
            {
                endWithMessage("This EPD is not found");
+                return;
            }

+#if !DEBUG
            if (int.TryParse(ep.WearerID, out EpdVisitID) && EpdVisitID % 100 != thisStation.ID_Station)
            {
                endWithMessage($"This EPD was issued on another station (ID:{EpdVisitID % 100})");
+                return;
            }
+#endif

            //bool NoTimeout = false;

--- 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.9.0")]
-[assembly: AssemblyFileVersion("2.5.9.0")]
+[assembly: AssemblyVersion("2.5.14.0")]
+[assembly: AssemblyFileVersion("2.5.14.0")]
--- a/eDosStation/ShowEPDDose.xaml
+++ b/eDosStation/ShowEPDDose.xaml
@ -6,7 +6,7 @@
        xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
        xmlns:local="clr-namespace:eDosStation"
        mc:Ignorable="d"
-        Title="ShowEPDDose" Height="548.4" Width="858.8" 
+        Title="ShowEPDDose" Height="609.665" Width="858.8" 
        Loaded="Window_Loaded" 
        WindowStartupLocation="CenterScreen"
        FontFamily="Segoe UI"
@ -75,9 +75,17 @@
                    <TextBlock Name="HpDose07" />
                </StackPanel>
                <StackPanel Orientation="Horizontal">
-                    <TextBlock Name="HpDose10l" Width="200" />
+                    <TextBlock Name="HpPeak07l" Width="200" />
+                    <TextBlock Name="HpPeak07" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Name="HpDose10l" Width="200"/>
                    <TextBlock Name="HpDose10" />
                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Name="HpPeak10l" Width="200" />
+                    <TextBlock Name="HpPeak10" />
+                </StackPanel>
            </StackPanel>

            <TextBlock Grid.Row="7" Grid.Column="0" Text="Dose Tresholds :" Padding="20,0,20,0" VerticalAlignment="Center" HorizontalAlignment="Right"/>
--- a/eDosStation/ShowEPDDose.xaml.cs
+++ b/eDosStation/ShowEPDDose.xaml.cs
@ -61,8 +61,8 @@ namespace eDosStation
        private void LoadDoses()
        {
            int rv = 0;
+            if (ep == null) return;
            rv = ep.GetAll(true);
-
            if (rv != 0) MessageBox.Show("Communication  error");

            isIssued.Text = ep.EPDIssued ? "Yes" : "no";
@ -100,6 +100,12 @@ namespace eDosStation
            HP10AlarmDose2.Text = $"{ep.Hp10THDose2:0.00} µSv";
            HP07AlarmDose.Text = $"{ep.Hp07THDose:0.00} µSv";

+            HpPeak07l.Text = ep.Hp07Name +" Peak";
+            HpPeak07.Text = $"{ep.Hp07Peak:0.00} µSv {ep.Hp07PeakTime:yyyy-MM-dd HH:mm} ";
+
+            HpPeak10l.Text = ep.Hp10Name + " Peak";
+            HpPeak10.Text = $"{ep.Hp10Peak:0.00} µSv {ep.Hp10PeakTime:yyyy-MM-dd HH:mm} ";
+
            if (ep.isNG) { 
                lNGain.Visibility = NGain.Visibility = Visibility.Visible;
                NGain.Text = ep.NGgain.ToString();
--- a/eDosStation/Station.cs
+++ b/eDosStation/Station.cs
@ -32,24 +32,19 @@ namespace eDosStation
        public int EPDRetries { get; internal set; }
        public bool OnlyMK2 { get; internal set; }
        public bool RestartComFirst { get; internal set; }
-
        public bool Changed = false;
        public int Error = 0;
        public string ErrorMessage;
        public StringBuilder insComments;
        public TextBlock tbComments;
        public DataInterface dataInterface;
-
        public System.Collections.Generic.Dictionary<byte, ushort> beepMk3Map;
-
        public ushort useBeepMK3()
        {
            if (beepMk3Map.ContainsKey(useBeep))
                return beepMk3Map[useBeep];
            else return beepMk3Map[0b00011010];
        }
-
-
        public Station(DataInterface mDataInterface, string Station)
        {
            splunkLog = new spl1(Environment.MachineName);
@ -153,7 +148,6 @@ namespace eDosStation
                            }
                            catch { EPDRetries = 2; }

-
                            try
                            {
                                c = rs.GetOrdinal("RestartComFirst");
@ -236,8 +230,6 @@ namespace eDosStation
                co?.Close();
            }
        }
-
-
        private void CmdSetParams(SqlCommand cmd)
        {
            //for (int ix = 0; ix < cmd.Parameters.Count; ix++)
@ -276,7 +268,6 @@ namespace eDosStation
                if (stationLog != null) stationLog.WriteLine($"GetStationSettings error {ex.Message} {System.DateTime.Now}");
            }
        }
-
        private void UpdateToDb(SqlConnection co, SqlCommand cmd)
        {
            cmd.Connection = co;
--- a/syncEdosLocal/DataSet1.Designer.cs
+++ b/syncEdosLocal/DataSet1.Designer.cs
@ -404,6 +404,24 @@ namespace syncEdosLocal {
            
            private global::System.Data.DataColumn columnepdType;
            
+            private global::System.Data.DataColumn columneDosBatteryWarning;
+            
+            private global::System.Data.DataColumn columneDosDose07Warning;
+            
+            private global::System.Data.DataColumn columneDosDose07Alarm;
+            
+            private global::System.Data.DataColumn columneDosRate07Warning;
+            
+            private global::System.Data.DataColumn columneDosRate07Alarm;
+            
+            private global::System.Data.DataColumn columneDosDose10Warning;
+            
+            private global::System.Data.DataColumn columneDosDose10Alarm;
+            
+            private global::System.Data.DataColumn columneDosRate10Warning;
+            
+            private global::System.Data.DataColumn columneDosRate10Alarm;
+            
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
            public LocalVisitsDataTable() {
@ -797,6 +815,78 @@ namespace syncEdosLocal {
                }
            }
            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosBatteryWarningColumn {
+                get {
+                    return this.columneDosBatteryWarning;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosDose07WarningColumn {
+                get {
+                    return this.columneDosDose07Warning;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosDose07AlarmColumn {
+                get {
+                    return this.columneDosDose07Alarm;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosRate07WarningColumn {
+                get {
+                    return this.columneDosRate07Warning;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosRate07AlarmColumn {
+                get {
+                    return this.columneDosRate07Alarm;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosDose10WarningColumn {
+                get {
+                    return this.columneDosDose10Warning;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosDose10AlarmColumn {
+                get {
+                    return this.columneDosDose10Alarm;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosRate10WarningColumn {
+                get {
+                    return this.columneDosRate10Warning;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosRate10AlarmColumn {
+                get {
+                    return this.columneDosRate10Alarm;
+                }
+            }
+            
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
            [global::System.ComponentModel.Browsable(false)]
@ -879,7 +969,16 @@ namespace syncEdosLocal {
                        byte VisitStatus, 
                        bool syncedEntry, 
                        bool syncedExit, 
-                        byte epdType) {
+                        byte epdType, 
+                        bool eDosBatteryWarning, 
+                        bool eDosDose07Warning, 
+                        bool eDosDose07Alarm, 
+                        bool eDosRate07Warning, 
+                        bool eDosRate07Alarm, 
+                        bool eDosDose10Warning, 
+                        bool eDosDose10Alarm, 
+                        bool eDosRate10Warning, 
+                        bool eDosRate10Alarm) {
                LocalVisitsRow rowLocalVisitsRow = ((LocalVisitsRow)(this.NewRow()));
                object[] columnValuesArray = new object[] {
                        ID_Station,
@ -926,7 +1025,16 @@ namespace syncEdosLocal {
                        VisitStatus,
                        syncedEntry,
                        syncedExit,
-                        epdType};
+                        epdType,
+                        eDosBatteryWarning,
+                        eDosDose07Warning,
+                        eDosDose07Alarm,
+                        eDosRate07Warning,
+                        eDosRate07Alarm,
+                        eDosDose10Warning,
+                        eDosDose10Alarm,
+                        eDosRate10Warning,
+                        eDosRate10Alarm};
                rowLocalVisitsRow.ItemArray = columnValuesArray;
                this.Rows.Add(rowLocalVisitsRow);
                return rowLocalVisitsRow;
@ -1002,6 +1110,15 @@ namespace syncEdosLocal {
                this.columnsyncedEntry = base.Columns["syncedEntry"];
                this.columnsyncedExit = base.Columns["syncedExit"];
                this.columnepdType = base.Columns["epdType"];
+                this.columneDosBatteryWarning = base.Columns["eDosBatteryWarning"];
+                this.columneDosDose07Warning = base.Columns["eDosDose07Warning"];
+                this.columneDosDose07Alarm = base.Columns["eDosDose07Alarm"];
+                this.columneDosRate07Warning = base.Columns["eDosRate07Warning"];
+                this.columneDosRate07Alarm = base.Columns["eDosRate07Alarm"];
+                this.columneDosDose10Warning = base.Columns["eDosDose10Warning"];
+                this.columneDosDose10Alarm = base.Columns["eDosDose10Alarm"];
+                this.columneDosRate10Warning = base.Columns["eDosRate10Warning"];
+                this.columneDosRate10Alarm = base.Columns["eDosRate10Alarm"];
            }
            
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@ -1097,6 +1214,24 @@ namespace syncEdosLocal {
                base.Columns.Add(this.columnsyncedExit);
                this.columnepdType = new global::System.Data.DataColumn("epdType", typeof(byte), null, global::System.Data.MappingType.Element);
                base.Columns.Add(this.columnepdType);
+                this.columneDosBatteryWarning = new global::System.Data.DataColumn("eDosBatteryWarning", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosBatteryWarning);
+                this.columneDosDose07Warning = new global::System.Data.DataColumn("eDosDose07Warning", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosDose07Warning);
+                this.columneDosDose07Alarm = new global::System.Data.DataColumn("eDosDose07Alarm", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosDose07Alarm);
+                this.columneDosRate07Warning = new global::System.Data.DataColumn("eDosRate07Warning", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosRate07Warning);
+                this.columneDosRate07Alarm = new global::System.Data.DataColumn("eDosRate07Alarm", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosRate07Alarm);
+                this.columneDosDose10Warning = new global::System.Data.DataColumn("eDosDose10Warning", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosDose10Warning);
+                this.columneDosDose10Alarm = new global::System.Data.DataColumn("eDosDose10Alarm", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosDose10Alarm);
+                this.columneDosRate10Warning = new global::System.Data.DataColumn("eDosRate10Warning", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosRate10Warning);
+                this.columneDosRate10Alarm = new global::System.Data.DataColumn("eDosRate10Alarm", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosRate10Alarm);
                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                this.columnID_Station,
                                this.columnID_Visit}, true));
@ -1334,6 +1469,24 @@ namespace syncEdosLocal {
            
            private global::System.Data.DataColumn columnepdType;
            
+            private global::System.Data.DataColumn columneDosBatteryWarning;
+            
+            private global::System.Data.DataColumn columneDosDose07Warning;
+            
+            private global::System.Data.DataColumn columneDosDose07Alarm;
+            
+            private global::System.Data.DataColumn columneDosRate07Warning;
+            
+            private global::System.Data.DataColumn columneDosRate07Alarm;
+            
+            private global::System.Data.DataColumn columneDosDose10Warning;
+            
+            private global::System.Data.DataColumn columneDosDose10Alarm;
+            
+            private global::System.Data.DataColumn columneDosRate10Warning;
+            
+            private global::System.Data.DataColumn columneDosRate10Alarm;
+            
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
            public CentralVisitsDataTable() {
@ -1727,6 +1880,78 @@ namespace syncEdosLocal {
                }
            }
            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosBatteryWarningColumn {
+                get {
+                    return this.columneDosBatteryWarning;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosDose07WarningColumn {
+                get {
+                    return this.columneDosDose07Warning;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosDose07AlarmColumn {
+                get {
+                    return this.columneDosDose07Alarm;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosRate07WarningColumn {
+                get {
+                    return this.columneDosRate07Warning;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosRate07AlarmColumn {
+                get {
+                    return this.columneDosRate07Alarm;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosDose10WarningColumn {
+                get {
+                    return this.columneDosDose10Warning;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosDose10AlarmColumn {
+                get {
+                    return this.columneDosDose10Alarm;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosRate10WarningColumn {
+                get {
+                    return this.columneDosRate10Warning;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn eDosRate10AlarmColumn {
+                get {
+                    return this.columneDosRate10Alarm;
+                }
+            }
+            
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
            [global::System.ComponentModel.Browsable(false)]
@ -1809,7 +2034,16 @@ namespace syncEdosLocal {
                        byte VisitStatus, 
                        bool syncedEntry, 
                        bool syncedExit, 
-                        byte epdType) {
+                        byte epdType, 
+                        bool eDosBatteryWarning, 
+                        bool eDosDose07Warning, 
+                        bool eDosDose07Alarm, 
+                        bool eDosRate07Warning, 
+                        bool eDosRate07Alarm, 
+                        bool eDosDose10Warning, 
+                        bool eDosDose10Alarm, 
+                        bool eDosRate10Warning, 
+                        bool eDosRate10Alarm) {
                CentralVisitsRow rowCentralVisitsRow = ((CentralVisitsRow)(this.NewRow()));
                object[] columnValuesArray = new object[] {
                        ID_Station,
@ -1856,7 +2090,16 @@ namespace syncEdosLocal {
                        VisitStatus,
                        syncedEntry,
                        syncedExit,
-                        epdType};
+                        epdType,
+                        eDosBatteryWarning,
+                        eDosDose07Warning,
+                        eDosDose07Alarm,
+                        eDosRate07Warning,
+                        eDosRate07Alarm,
+                        eDosDose10Warning,
+                        eDosDose10Alarm,
+                        eDosRate10Warning,
+                        eDosRate10Alarm};
                rowCentralVisitsRow.ItemArray = columnValuesArray;
                this.Rows.Add(rowCentralVisitsRow);
                return rowCentralVisitsRow;
@ -1932,6 +2175,15 @@ namespace syncEdosLocal {
                this.columnsyncedEntry = base.Columns["syncedEntry"];
                this.columnsyncedExit = base.Columns["syncedExit"];
                this.columnepdType = base.Columns["epdType"];
+                this.columneDosBatteryWarning = base.Columns["eDosBatteryWarning"];
+                this.columneDosDose07Warning = base.Columns["eDosDose07Warning"];
+                this.columneDosDose07Alarm = base.Columns["eDosDose07Alarm"];
+                this.columneDosRate07Warning = base.Columns["eDosRate07Warning"];
+                this.columneDosRate07Alarm = base.Columns["eDosRate07Alarm"];
+                this.columneDosDose10Warning = base.Columns["eDosDose10Warning"];
+                this.columneDosDose10Alarm = base.Columns["eDosDose10Alarm"];
+                this.columneDosRate10Warning = base.Columns["eDosRate10Warning"];
+                this.columneDosRate10Alarm = base.Columns["eDosRate10Alarm"];
            }
            
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@ -2027,6 +2279,24 @@ namespace syncEdosLocal {
                base.Columns.Add(this.columnsyncedExit);
                this.columnepdType = new global::System.Data.DataColumn("epdType", typeof(byte), null, global::System.Data.MappingType.Element);
                base.Columns.Add(this.columnepdType);
+                this.columneDosBatteryWarning = new global::System.Data.DataColumn("eDosBatteryWarning", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosBatteryWarning);
+                this.columneDosDose07Warning = new global::System.Data.DataColumn("eDosDose07Warning", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosDose07Warning);
+                this.columneDosDose07Alarm = new global::System.Data.DataColumn("eDosDose07Alarm", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosDose07Alarm);
+                this.columneDosRate07Warning = new global::System.Data.DataColumn("eDosRate07Warning", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosRate07Warning);
+                this.columneDosRate07Alarm = new global::System.Data.DataColumn("eDosRate07Alarm", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosRate07Alarm);
+                this.columneDosDose10Warning = new global::System.Data.DataColumn("eDosDose10Warning", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosDose10Warning);
+                this.columneDosDose10Alarm = new global::System.Data.DataColumn("eDosDose10Alarm", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosDose10Alarm);
+                this.columneDosRate10Warning = new global::System.Data.DataColumn("eDosRate10Warning", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosRate10Warning);
+                this.columneDosRate10Alarm = new global::System.Data.DataColumn("eDosRate10Alarm", typeof(bool), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columneDosRate10Alarm);
                this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                this.columnID_Station,
                                this.columnID_Visit}, true));
@ -2851,6 +3121,150 @@ namespace syncEdosLocal {
                }
            }
            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosBatteryWarning {
+                get {
+                    try {
+                        return ((bool)(this[this.tableLocalVisits.eDosBatteryWarningColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosBatteryWarning\' in table \'LocalVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableLocalVisits.eDosBatteryWarningColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosDose07Warning {
+                get {
+                    try {
+                        return ((bool)(this[this.tableLocalVisits.eDosDose07WarningColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosDose07Warning\' in table \'LocalVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableLocalVisits.eDosDose07WarningColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosDose07Alarm {
+                get {
+                    try {
+                        return ((bool)(this[this.tableLocalVisits.eDosDose07AlarmColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosDose07Alarm\' in table \'LocalVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableLocalVisits.eDosDose07AlarmColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosRate07Warning {
+                get {
+                    try {
+                        return ((bool)(this[this.tableLocalVisits.eDosRate07WarningColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosRate07Warning\' in table \'LocalVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableLocalVisits.eDosRate07WarningColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosRate07Alarm {
+                get {
+                    try {
+                        return ((bool)(this[this.tableLocalVisits.eDosRate07AlarmColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosRate07Alarm\' in table \'LocalVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableLocalVisits.eDosRate07AlarmColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosDose10Warning {
+                get {
+                    try {
+                        return ((bool)(this[this.tableLocalVisits.eDosDose10WarningColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosDose10Warning\' in table \'LocalVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableLocalVisits.eDosDose10WarningColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosDose10Alarm {
+                get {
+                    try {
+                        return ((bool)(this[this.tableLocalVisits.eDosDose10AlarmColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosDose10Alarm\' in table \'LocalVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableLocalVisits.eDosDose10AlarmColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosRate10Warning {
+                get {
+                    try {
+                        return ((bool)(this[this.tableLocalVisits.eDosRate10WarningColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosRate10Warning\' in table \'LocalVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableLocalVisits.eDosRate10WarningColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosRate10Alarm {
+                get {
+                    try {
+                        return ((bool)(this[this.tableLocalVisits.eDosRate10AlarmColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosRate10Alarm\' in table \'LocalVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableLocalVisits.eDosRate10AlarmColumn] = value;
+                }
+            }
+            
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
            public bool IsPersIDNull() {
@ -3270,6 +3684,114 @@ namespace syncEdosLocal {
            public void SetepdTypeNull() {
                this[this.tableLocalVisits.epdTypeColumn] = global::System.Convert.DBNull;
            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosBatteryWarningNull() {
+                return this.IsNull(this.tableLocalVisits.eDosBatteryWarningColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosBatteryWarningNull() {
+                this[this.tableLocalVisits.eDosBatteryWarningColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosDose07WarningNull() {
+                return this.IsNull(this.tableLocalVisits.eDosDose07WarningColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosDose07WarningNull() {
+                this[this.tableLocalVisits.eDosDose07WarningColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosDose07AlarmNull() {
+                return this.IsNull(this.tableLocalVisits.eDosDose07AlarmColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosDose07AlarmNull() {
+                this[this.tableLocalVisits.eDosDose07AlarmColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosRate07WarningNull() {
+                return this.IsNull(this.tableLocalVisits.eDosRate07WarningColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosRate07WarningNull() {
+                this[this.tableLocalVisits.eDosRate07WarningColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosRate07AlarmNull() {
+                return this.IsNull(this.tableLocalVisits.eDosRate07AlarmColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosRate07AlarmNull() {
+                this[this.tableLocalVisits.eDosRate07AlarmColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosDose10WarningNull() {
+                return this.IsNull(this.tableLocalVisits.eDosDose10WarningColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosDose10WarningNull() {
+                this[this.tableLocalVisits.eDosDose10WarningColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosDose10AlarmNull() {
+                return this.IsNull(this.tableLocalVisits.eDosDose10AlarmColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosDose10AlarmNull() {
+                this[this.tableLocalVisits.eDosDose10AlarmColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosRate10WarningNull() {
+                return this.IsNull(this.tableLocalVisits.eDosRate10WarningColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosRate10WarningNull() {
+                this[this.tableLocalVisits.eDosRate10WarningColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosRate10AlarmNull() {
+                return this.IsNull(this.tableLocalVisits.eDosRate10AlarmColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosRate10AlarmNull() {
+                this[this.tableLocalVisits.eDosRate10AlarmColumn] = global::System.Convert.DBNull;
+            }
        }
        
        /// <summary>
@ -3966,6 +4488,150 @@ namespace syncEdosLocal {
                }
            }
            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosBatteryWarning {
+                get {
+                    try {
+                        return ((bool)(this[this.tableCentralVisits.eDosBatteryWarningColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosBatteryWarning\' in table \'CentralVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableCentralVisits.eDosBatteryWarningColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosDose07Warning {
+                get {
+                    try {
+                        return ((bool)(this[this.tableCentralVisits.eDosDose07WarningColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosDose07Warning\' in table \'CentralVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableCentralVisits.eDosDose07WarningColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosDose07Alarm {
+                get {
+                    try {
+                        return ((bool)(this[this.tableCentralVisits.eDosDose07AlarmColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosDose07Alarm\' in table \'CentralVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableCentralVisits.eDosDose07AlarmColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosRate07Warning {
+                get {
+                    try {
+                        return ((bool)(this[this.tableCentralVisits.eDosRate07WarningColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosRate07Warning\' in table \'CentralVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableCentralVisits.eDosRate07WarningColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosRate07Alarm {
+                get {
+                    try {
+                        return ((bool)(this[this.tableCentralVisits.eDosRate07AlarmColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosRate07Alarm\' in table \'CentralVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableCentralVisits.eDosRate07AlarmColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosDose10Warning {
+                get {
+                    try {
+                        return ((bool)(this[this.tableCentralVisits.eDosDose10WarningColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosDose10Warning\' in table \'CentralVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableCentralVisits.eDosDose10WarningColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosDose10Alarm {
+                get {
+                    try {
+                        return ((bool)(this[this.tableCentralVisits.eDosDose10AlarmColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosDose10Alarm\' in table \'CentralVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableCentralVisits.eDosDose10AlarmColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosRate10Warning {
+                get {
+                    try {
+                        return ((bool)(this[this.tableCentralVisits.eDosRate10WarningColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosRate10Warning\' in table \'CentralVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableCentralVisits.eDosRate10WarningColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool eDosRate10Alarm {
+                get {
+                    try {
+                        return ((bool)(this[this.tableCentralVisits.eDosRate10AlarmColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'eDosRate10Alarm\' in table \'CentralVisits\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableCentralVisits.eDosRate10AlarmColumn] = value;
+                }
+            }
+            
            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
            public bool IsPersIDNull() {
@ -4409,6 +5075,114 @@ namespace syncEdosLocal {
            public void SetepdTypeNull() {
                this[this.tableCentralVisits.epdTypeColumn] = global::System.Convert.DBNull;
            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosBatteryWarningNull() {
+                return this.IsNull(this.tableCentralVisits.eDosBatteryWarningColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosBatteryWarningNull() {
+                this[this.tableCentralVisits.eDosBatteryWarningColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosDose07WarningNull() {
+                return this.IsNull(this.tableCentralVisits.eDosDose07WarningColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosDose07WarningNull() {
+                this[this.tableCentralVisits.eDosDose07WarningColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosDose07AlarmNull() {
+                return this.IsNull(this.tableCentralVisits.eDosDose07AlarmColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosDose07AlarmNull() {
+                this[this.tableCentralVisits.eDosDose07AlarmColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosRate07WarningNull() {
+                return this.IsNull(this.tableCentralVisits.eDosRate07WarningColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosRate07WarningNull() {
+                this[this.tableCentralVisits.eDosRate07WarningColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosRate07AlarmNull() {
+                return this.IsNull(this.tableCentralVisits.eDosRate07AlarmColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosRate07AlarmNull() {
+                this[this.tableCentralVisits.eDosRate07AlarmColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosDose10WarningNull() {
+                return this.IsNull(this.tableCentralVisits.eDosDose10WarningColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosDose10WarningNull() {
+                this[this.tableCentralVisits.eDosDose10WarningColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosDose10AlarmNull() {
+                return this.IsNull(this.tableCentralVisits.eDosDose10AlarmColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosDose10AlarmNull() {
+                this[this.tableCentralVisits.eDosDose10AlarmColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosRate10WarningNull() {
+                return this.IsNull(this.tableCentralVisits.eDosRate10WarningColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosRate10WarningNull() {
+                this[this.tableCentralVisits.eDosRate10WarningColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IseDosRate10AlarmNull() {
+                return this.IsNull(this.tableCentralVisits.eDosRate10AlarmColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SeteDosRate10AlarmNull() {
+                this[this.tableCentralVisits.eDosRate10AlarmColumn] = global::System.Convert.DBNull;
+            }
        }
        
        /// <summary>
@ -4650,6 +5424,15 @@ namespace syncEdosLocal.DataSet1TableAdapters {
            tableMapping.ColumnMappings.Add("SyncedExit", "syncedExit");
            tableMapping.ColumnMappings.Add("syncedExit", "syncedExit");
            tableMapping.ColumnMappings.Add("epdType", "epdType");
+            tableMapping.ColumnMappings.Add("eDosBatteryWarning", "eDosBatteryWarning");
+            tableMapping.ColumnMappings.Add("eDosDose07Warning", "eDosDose07Warning");
+            tableMapping.ColumnMappings.Add("eDosDose07Alarm", "eDosDose07Alarm");
+            tableMapping.ColumnMappings.Add("eDosRate07Warning", "eDosRate07Warning");
+            tableMapping.ColumnMappings.Add("eDosRate07Alarm", "eDosRate07Alarm");
+            tableMapping.ColumnMappings.Add("eDosDose10Warning", "eDosDose10Warning");
+            tableMapping.ColumnMappings.Add("eDosDose10Alarm", "eDosDose10Alarm");
+            tableMapping.ColumnMappings.Add("eDosRate10Warning", "eDosRate10Warning");
+            tableMapping.ColumnMappings.Add("eDosRate10Alarm", "eDosRate10Alarm");
            this._adapter.TableMappings.Add(tableMapping);
            this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
            this._adapter.UpdateCommand.Connection = this.Connection;
@ -4901,6 +5684,15 @@ namespace syncEdosLocal.DataSet1TableAdapters {
            tableMapping.ColumnMappings.Add("SyncedExit", "syncedExit");
            tableMapping.ColumnMappings.Add("syncedExit", "syncedExit");
            tableMapping.ColumnMappings.Add("epdType", "epdType");
+            tableMapping.ColumnMappings.Add("eDosBatteryWarning", "eDosBatteryWarning");
+            tableMapping.ColumnMappings.Add("eDosDose07Warning", "eDosDose07Warning");
+            tableMapping.ColumnMappings.Add("eDosDose07Alarm", "eDosDose07Alarm");
+            tableMapping.ColumnMappings.Add("eDosRate07Warning", "eDosRate07Warning");
+            tableMapping.ColumnMappings.Add("eDosRate07Alarm", "eDosRate07Alarm");
+            tableMapping.ColumnMappings.Add("eDosDose10Warning", "eDosDose10Warning");
+            tableMapping.ColumnMappings.Add("eDosDose10Alarm", "eDosDose10Alarm");
+            tableMapping.ColumnMappings.Add("eDosRate10Warning", "eDosRate10Warning");
+            tableMapping.ColumnMappings.Add("eDosRate10Alarm", "eDosRate10Alarm");
            this._adapter.TableMappings.Add(tableMapping);
            this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
            this._adapter.InsertCommand.Connection = this.Connection;
--- a/syncEdosLocal/DataSet1.xsd
+++ b/syncEdosLocal/DataSet1.xsd
@ -80,6 +80,15 @@
              <Mapping SourceColumn="SyncedExit" DataSetColumn="syncedExit" />
              <Mapping SourceColumn="syncedExit" DataSetColumn="syncedExit" />
              <Mapping SourceColumn="epdType" DataSetColumn="epdType" />
+              <Mapping SourceColumn="eDosBatteryWarning" DataSetColumn="eDosBatteryWarning" />
+              <Mapping SourceColumn="eDosDose07Warning" DataSetColumn="eDosDose07Warning" />
+              <Mapping SourceColumn="eDosDose07Alarm" DataSetColumn="eDosDose07Alarm" />
+              <Mapping SourceColumn="eDosRate07Warning" DataSetColumn="eDosRate07Warning" />
+              <Mapping SourceColumn="eDosRate07Alarm" DataSetColumn="eDosRate07Alarm" />
+              <Mapping SourceColumn="eDosDose10Warning" DataSetColumn="eDosDose10Warning" />
+              <Mapping SourceColumn="eDosDose10Alarm" DataSetColumn="eDosDose10Alarm" />
+              <Mapping SourceColumn="eDosRate10Warning" DataSetColumn="eDosRate10Warning" />
+              <Mapping SourceColumn="eDosRate10Alarm" DataSetColumn="eDosRate10Alarm" />
            </Mappings>
            <Sources />
          </TableAdapter>
@ -245,6 +254,15 @@
              <Mapping SourceColumn="SyncedExit" DataSetColumn="syncedExit" />
              <Mapping SourceColumn="syncedExit" DataSetColumn="syncedExit" />
              <Mapping SourceColumn="epdType" DataSetColumn="epdType" />
+              <Mapping SourceColumn="eDosBatteryWarning" DataSetColumn="eDosBatteryWarning" />
+              <Mapping SourceColumn="eDosDose07Warning" DataSetColumn="eDosDose07Warning" />
+              <Mapping SourceColumn="eDosDose07Alarm" DataSetColumn="eDosDose07Alarm" />
+              <Mapping SourceColumn="eDosRate07Warning" DataSetColumn="eDosRate07Warning" />
+              <Mapping SourceColumn="eDosRate07Alarm" DataSetColumn="eDosRate07Alarm" />
+              <Mapping SourceColumn="eDosDose10Warning" DataSetColumn="eDosDose10Warning" />
+              <Mapping SourceColumn="eDosDose10Alarm" DataSetColumn="eDosDose10Alarm" />
+              <Mapping SourceColumn="eDosRate10Warning" DataSetColumn="eDosRate10Warning" />
+              <Mapping SourceColumn="eDosRate10Alarm" DataSetColumn="eDosRate10Alarm" />
            </Mappings>
            <Sources />
          </TableAdapter>
@ -256,7 +274,7 @@
  <xs:element name="DataSet1" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DataSet1" msprop:Generator_UserDSName="DataSet1">
    <xs:complexType>
      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="LocalVisits" msprop:Generator_TableClassName="LocalVisitsDataTable" msprop:Generator_TableVarName="tableLocalVisits" msprop:Generator_RowChangedName="LocalVisitsRowChanged" msprop:Generator_TablePropName="LocalVisits" msprop:Generator_RowDeletingName="LocalVisitsRowDeleting" msprop:Generator_RowChangingName="LocalVisitsRowChanging" msprop:Generator_RowEvHandlerName="LocalVisitsRowChangeEventHandler" msprop:Generator_RowDeletedName="LocalVisitsRowDeleted" msprop:Generator_RowClassName="LocalVisitsRow" msprop:Generator_UserTableName="LocalVisits" msprop:Generator_RowEvArgName="LocalVisitsRowChangeEvent">
+        <xs:element name="LocalVisits" msprop:Generator_TableClassName="LocalVisitsDataTable" msprop:Generator_TableVarName="tableLocalVisits" msprop:Generator_TablePropName="LocalVisits" msprop:Generator_RowDeletingName="LocalVisitsRowDeleting" msprop:Generator_RowChangingName="LocalVisitsRowChanging" msprop:Generator_RowEvHandlerName="LocalVisitsRowChangeEventHandler" msprop:Generator_RowDeletedName="LocalVisitsRowDeleted" msprop:Generator_UserTableName="LocalVisits" msprop:Generator_RowChangedName="LocalVisitsRowChanged" msprop:Generator_RowEvArgName="LocalVisitsRowChangeEvent" msprop:Generator_RowClassName="LocalVisitsRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="ID_Station" msprop:Generator_ColumnVarNameInTable="columnID_Station" msprop:Generator_ColumnPropNameInRow="ID_Station" msprop:Generator_ColumnPropNameInTable="ID_StationColumn" msprop:Generator_UserColumnName="ID_Station" type="xs:int" />
@ -304,10 +322,19 @@
              <xs:element name="syncedEntry" msprop:Generator_ColumnVarNameInTable="columnsyncedEntry" msprop:Generator_ColumnPropNameInRow="syncedEntry" msprop:Generator_ColumnPropNameInTable="syncedEntryColumn" msprop:Generator_UserColumnName="syncedEntry" type="xs:boolean" />
              <xs:element name="syncedExit" msprop:Generator_ColumnVarNameInTable="columnsyncedExit" msprop:Generator_ColumnPropNameInRow="syncedExit" msprop:Generator_ColumnPropNameInTable="syncedExitColumn" msprop:Generator_UserColumnName="syncedExit" type="xs:boolean" />
              <xs:element name="epdType" msprop:Generator_ColumnVarNameInTable="columnepdType" msprop:Generator_ColumnPropNameInRow="epdType" msprop:Generator_ColumnPropNameInTable="epdTypeColumn" msprop:Generator_UserColumnName="epdType" type="xs:unsignedByte" minOccurs="0" />
+              <xs:element name="eDosBatteryWarning" msprop:Generator_ColumnVarNameInTable="columneDosBatteryWarning" msprop:Generator_ColumnPropNameInRow="eDosBatteryWarning" msprop:Generator_ColumnPropNameInTable="eDosBatteryWarningColumn" msprop:Generator_UserColumnName="eDosBatteryWarning" type="xs:boolean" minOccurs="0" />
+              <xs:element name="eDosDose07Warning" msprop:Generator_ColumnVarNameInTable="columneDosDose07Warning" msprop:Generator_ColumnPropNameInRow="eDosDose07Warning" msprop:Generator_ColumnPropNameInTable="eDosDose07WarningColumn" msprop:Generator_UserColumnName="eDosDose07Warning" type="xs:boolean" minOccurs="0" />
+              <xs:element name="eDosDose07Alarm" msprop:Generator_ColumnVarNameInTable="columneDosDose07Alarm" msprop:Generator_ColumnPropNameInRow="eDosDose07Alarm" msprop:Generator_ColumnPropNameInTable="eDosDose07AlarmColumn" msprop:Generator_UserColumnName="eDosDose07Alarm" type="xs:boolean" minOccurs="0" />
+              <xs:element name="eDosRate07Warning" msprop:Generator_ColumnVarNameInTable="columneDosRate07Warning" msprop:Generator_ColumnPropNameInRow="eDosRate07Warning" msprop:Generator_ColumnPropNameInTable="eDosRate07WarningColumn" msprop:Generator_UserColumnName="eDosRate07Warning" type="xs:boolean" minOccurs="0" />
+              <xs:element name="eDosRate07Alarm" msprop:Generator_ColumnVarNameInTable="columneDosRate07Alarm" msprop:Generator_ColumnPropNameInRow="eDosRate07Alarm" msprop:Generator_ColumnPropNameInTable="eDosRate07AlarmColumn" msprop:Generator_UserColumnName="eDosRate07Alarm" type="xs:boolean" minOccurs="0" />
+              <xs:element name="eDosDose10Warning" msprop:Generator_ColumnVarNameInTable="columneDosDose10Warning" msprop:Generator_ColumnPropNameInRow="eDosDose10Warning" msprop:Generator_ColumnPropNameInTable="eDosDose10WarningColumn" msprop:Generator_UserColumnName="eDosDose10Warning" type="xs:boolean" minOccurs="0" />
+              <xs:element name="eDosDose10Alarm" msprop:Generator_ColumnVarNameInTable="columneDosDose10Alarm" msprop:Generator_ColumnPropNameInRow="eDosDose10Alarm" msprop:Generator_ColumnPropNameInTable="eDosDose10AlarmColumn" msprop:Generator_UserColumnName="eDosDose10Alarm" type="xs:boolean" minOccurs="0" />
+              <xs:element name="eDosRate10Warning" msprop:Generator_ColumnVarNameInTable="columneDosRate10Warning" msprop:Generator_ColumnPropNameInRow="eDosRate10Warning" msprop:Generator_ColumnPropNameInTable="eDosRate10WarningColumn" msprop:Generator_UserColumnName="eDosRate10Warning" type="xs:boolean" minOccurs="0" />
+              <xs:element name="eDosRate10Alarm" msprop:Generator_ColumnVarNameInTable="columneDosRate10Alarm" msprop:Generator_ColumnPropNameInRow="eDosRate10Alarm" msprop:Generator_ColumnPropNameInTable="eDosRate10AlarmColumn" msprop:Generator_UserColumnName="eDosRate10Alarm" type="xs:boolean" minOccurs="0" />
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="CentralVisits" msprop:Generator_TableClassName="CentralVisitsDataTable" msprop:Generator_TableVarName="tableCentralVisits" msprop:Generator_RowChangedName="CentralVisitsRowChanged" msprop:Generator_TablePropName="CentralVisits" msprop:Generator_RowDeletingName="CentralVisitsRowDeleting" msprop:Generator_RowChangingName="CentralVisitsRowChanging" msprop:Generator_RowEvHandlerName="CentralVisitsRowChangeEventHandler" msprop:Generator_RowDeletedName="CentralVisitsRowDeleted" msprop:Generator_RowClassName="CentralVisitsRow" msprop:Generator_UserTableName="CentralVisits" msprop:Generator_RowEvArgName="CentralVisitsRowChangeEvent">
+        <xs:element name="CentralVisits" msprop:Generator_TableClassName="CentralVisitsDataTable" msprop:Generator_TableVarName="tableCentralVisits" msprop:Generator_TablePropName="CentralVisits" msprop:Generator_RowDeletingName="CentralVisitsRowDeleting" msprop:Generator_RowChangingName="CentralVisitsRowChanging" msprop:Generator_RowEvHandlerName="CentralVisitsRowChangeEventHandler" msprop:Generator_RowDeletedName="CentralVisitsRowDeleted" msprop:Generator_UserTableName="CentralVisits" msprop:Generator_RowChangedName="CentralVisitsRowChanged" msprop:Generator_RowEvArgName="CentralVisitsRowChangeEvent" msprop:Generator_RowClassName="CentralVisitsRow">
          <xs:complexType>
            <xs:sequence>
              <xs:element name="ID_Station" msprop:Generator_ColumnVarNameInTable="columnID_Station" msprop:Generator_ColumnPropNameInRow="ID_Station" msprop:Generator_ColumnPropNameInTable="ID_StationColumn" msprop:Generator_UserColumnName="ID_Station" type="xs:int" />
@ -355,6 +382,15 @@
              <xs:element name="syncedEntry" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnsyncedEntry" msprop:Generator_ColumnPropNameInRow="syncedEntry" msprop:Generator_ColumnPropNameInTable="syncedEntryColumn" msprop:Generator_UserColumnName="syncedEntry" type="xs:boolean" minOccurs="0" />
              <xs:element name="syncedExit" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnsyncedExit" msprop:Generator_ColumnPropNameInRow="syncedExit" msprop:Generator_ColumnPropNameInTable="syncedExitColumn" msprop:Generator_UserColumnName="syncedExit" type="xs:boolean" minOccurs="0" />
              <xs:element name="epdType" msprop:Generator_ColumnVarNameInTable="columnepdType" msprop:Generator_ColumnPropNameInRow="epdType" msprop:Generator_ColumnPropNameInTable="epdTypeColumn" msprop:Generator_UserColumnName="epdType" type="xs:unsignedByte" minOccurs="0" />
+              <xs:element name="eDosBatteryWarning" msprop:Generator_ColumnVarNameInTable="columneDosBatteryWarning" msprop:Generator_ColumnPropNameInRow="eDosBatteryWarning" msprop:Generator_ColumnPropNameInTable="eDosBatteryWarningColumn" msprop:Generator_UserColumnName="eDosBatteryWarning" type="xs:boolean" minOccurs="0" />
+              <xs:element name="eDosDose07Warning" msprop:Generator_ColumnVarNameInTable="columneDosDose07Warning" msprop:Generator_ColumnPropNameInRow="eDosDose07Warning" msprop:Generator_ColumnPropNameInTable="eDosDose07WarningColumn" msprop:Generator_UserColumnName="eDosDose07Warning" type="xs:boolean" minOccurs="0" />
+              <xs:element name="eDosDose07Alarm" msprop:Generator_ColumnVarNameInTable="columneDosDose07Alarm" msprop:Generator_ColumnPropNameInRow="eDosDose07Alarm" msprop:Generator_ColumnPropNameInTable="eDosDose07AlarmColumn" msprop:Generator_UserColumnName="eDosDose07Alarm" type="xs:boolean" minOccurs="0" />
+              <xs:element name="eDosRate07Warning" msprop:Generator_ColumnVarNameInTable="columneDosRate07Warning" msprop:Generator_ColumnPropNameInRow="eDosRate07Warning" msprop:Generator_ColumnPropNameInTable="eDosRate07WarningColumn" msprop:Generator_UserColumnName="eDosRate07Warning" type="xs:boolean" minOccurs="0" />
+              <xs:element name="eDosRate07Alarm" msprop:Generator_ColumnVarNameInTable="columneDosRate07Alarm" msprop:Generator_ColumnPropNameInRow="eDosRate07Alarm" msprop:Generator_ColumnPropNameInTable="eDosRate07AlarmColumn" msprop:Generator_UserColumnName="eDosRate07Alarm" type="xs:boolean" minOccurs="0" />
+              <xs:element name="eDosDose10Warning" msprop:Generator_ColumnVarNameInTable="columneDosDose10Warning" msprop:Generator_ColumnPropNameInRow="eDosDose10Warning" msprop:Generator_ColumnPropNameInTable="eDosDose10WarningColumn" msprop:Generator_UserColumnName="eDosDose10Warning" type="xs:boolean" minOccurs="0" />
+              <xs:element name="eDosDose10Alarm" msprop:Generator_ColumnVarNameInTable="columneDosDose10Alarm" msprop:Generator_ColumnPropNameInRow="eDosDose10Alarm" msprop:Generator_ColumnPropNameInTable="eDosDose10AlarmColumn" msprop:Generator_UserColumnName="eDosDose10Alarm" type="xs:boolean" minOccurs="0" />
+              <xs:element name="eDosRate10Warning" msprop:Generator_ColumnVarNameInTable="columneDosRate10Warning" msprop:Generator_ColumnPropNameInRow="eDosRate10Warning" msprop:Generator_ColumnPropNameInTable="eDosRate10WarningColumn" msprop:Generator_UserColumnName="eDosRate10Warning" type="xs:boolean" minOccurs="0" />
+              <xs:element name="eDosRate10Alarm" msprop:Generator_ColumnVarNameInTable="columneDosRate10Alarm" msprop:Generator_ColumnPropNameInRow="eDosRate10Alarm" msprop:Generator_ColumnPropNameInTable="eDosRate10AlarmColumn" msprop:Generator_UserColumnName="eDosRate10Alarm" type="xs:boolean" minOccurs="0" />
            </xs:sequence>
          </xs:complexType>
        </xs:element>
--- a/syncEdosLocal/Program.cs
+++ b/syncEdosLocal/Program.cs
@ -7,7 +7,6 @@ using spl = LSWLib.CLog;

 namespace syncEdosLocal
 {
-
    class cResult
        {
        public DateTime timestamp;