diff --git a/Common/Docu/SoftwareDesign/Lastenheft Prüfstandsoftware - RIVER.docx b/Common/Docu/SoftwareDesign/Lastenheft Prüfstandsoftware - RIVER.docx index 9913c8c8..0eb309f0 100644 Binary files a/Common/Docu/SoftwareDesign/Lastenheft Prüfstandsoftware - RIVER.docx and b/Common/Docu/SoftwareDesign/Lastenheft Prüfstandsoftware - RIVER.docx differ diff --git a/Common/Docu/SoftwareDesign/Lastenheft Prüfstandsoftware - RIVER_V1_230608.docx b/Common/Docu/SoftwareDesign/Lastenheft Prüfstandsoftware - RIVER_V1_230608.docx new file mode 100644 index 00000000..e149019d Binary files /dev/null and b/Common/Docu/SoftwareDesign/Lastenheft Prüfstandsoftware - RIVER_V1_230608.docx differ diff --git a/Common/Docu/SoftwareDesign/RIVER.pptx b/Common/Docu/SoftwareDesign/RIVER.pptx new file mode 100644 index 00000000..c637d2d0 Binary files /dev/null and b/Common/Docu/SoftwareDesign/RIVER.pptx differ diff --git a/Common/Docu/SoftwareDesign/TBF_COMMON_SDDe.vsd b/Common/Docu/SoftwareDesign/TBF_COMMON_SDDe.vsd index 9a609fb3..252a06f0 100644 Binary files a/Common/Docu/SoftwareDesign/TBF_COMMON_SDDe.vsd and b/Common/Docu/SoftwareDesign/TBF_COMMON_SDDe.vsd differ diff --git a/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs b/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs index e05fed63..61d22dd6 100644 --- a/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs +++ b/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs @@ -766,8 +766,14 @@ namespace Xylem.Common.Hardware.WaterMeter.MagFlux.MagFluxCore /// - Unique Id introduced, /// - Sensor Serial number mapped as PcbId. /// + /// + /// -Introduced readout of calibration values. + /// public Boolean Login() { + if (RequestProtocol == null) + return false; + if (!RequestProtocol.Connect(RequestPort.GetPortName())) return IsLoggedOn; @@ -798,6 +804,7 @@ namespace Xylem.Common.Hardware.WaterMeter.MagFlux.MagFluxCore PcbId = pcbId; } + RequestProtocol?.GetCalibrationPoints(out _); StreamingProtocol?.SetDecodingMask(pcbId, uniqueId); return IsLoggedOn; }