diff --git a/uniper_hmi/UniperHMI/Pages/ViewModels/AlignmentStationPageVM.cs b/uniper_hmi/UniperHMI/Pages/ViewModels/AlignmentStationPageVM.cs index 6eba4f5..c7b119d 100644 --- a/uniper_hmi/UniperHMI/Pages/ViewModels/AlignmentStationPageVM.cs +++ b/uniper_hmi/UniperHMI/Pages/ViewModels/AlignmentStationPageVM.cs @@ -33,7 +33,7 @@ public sealed partial class AlignmentStationPageVM : ObservableValidator, IDispo _variableName = variableName; VacuumValveControlVm = new BinaryValveControlVM(_adsManager, _variableName + ".stVacuumValve"); - AlignmentPackMLControlVm = new(_adsManager, _variableName + "stStationCmds"); + AlignmentPackMLControlVm = new(_adsManager, _variableName + ".stStationCmds"); AlignmentPackMLControlVm.STitle = "Ausrichtstation"; } diff --git a/uniper_hmi/UniperHMI/Pages/ViewModels/HighVoltageStationPageVM.cs b/uniper_hmi/UniperHMI/Pages/ViewModels/HighVoltageStationPageVM.cs index d63b0cb..e98a76b 100644 --- a/uniper_hmi/UniperHMI/Pages/ViewModels/HighVoltageStationPageVM.cs +++ b/uniper_hmi/UniperHMI/Pages/ViewModels/HighVoltageStationPageVM.cs @@ -59,16 +59,16 @@ public sealed partial class HighVoltageStationPageVM : ObservableValidator, IDis _adsManager = adsManager; _variableName = variableName; - DoorValveHotControlVm = new BinaryValveControlVM(_adsManager, _variableName + "Hot.stDoorValve"); - TestChamberHotValveVm = new BinaryValveControlVM(_adsManager, _variableName + "Hot.stTestChamberValve"); - TempSPHotVm = new AnalogValueVM(_adsManager, _variableName + "Hot.stTempSP", false); + DoorValveHotControlVm = new BinaryValveControlVM(_adsManager, _variableName + ".stHVTesterHot.stDoorValve"); + TestChamberHotValveVm = new BinaryValveControlVM(_adsManager, _variableName + ".stHVTesterHot.stTestChamberValve"); + TempSPHotVm = new AnalogValueVM(_adsManager, _variableName + ".stHVTesterHot.stTempSP", false); - DoorValveColdControlVm = new BinaryValveControlVM(_adsManager, _variableName + "Cold.stDoorValve"); - TestChamberColdValveVm = new BinaryValveControlVM(_adsManager, _variableName + "Cold.stTestChamberValve"); - TempSPColdVm = new AnalogValueVM(_adsManager, _variableName + "Cold.stTempSP", false); + DoorValveColdControlVm = new BinaryValveControlVM(_adsManager, _variableName + ".stHVTesterCold.stDoorValve"); + TestChamberColdValveVm = new BinaryValveControlVM(_adsManager, _variableName + ".stHVTesterCold.stTestChamberValve"); + TempSPColdVm = new AnalogValueVM(_adsManager, _variableName + ".stHVTesterCold.stTempSP", false); - HighVoltageColdPackMLControlVm = new(_adsManager, _variableName + "Cold.stStationCmds"); - HighVoltageHotPackMLControlVm = new(_adsManager, _variableName + "Hot.stStationCmds"); + HighVoltageColdPackMLControlVm = new(_adsManager, _variableName + ".stHVTesterCold.stStationCmds"); + HighVoltageHotPackMLControlVm = new(_adsManager, _variableName + ".stHVTesterHot.stStationCmds"); HighVoltageColdPackMLControlVm.STitle = "Hochvoltstation\nKalt"; diff --git a/uniper_hmi/UniperHMI/Pages/ViewModels/HotCoolPlatePageVM.cs b/uniper_hmi/UniperHMI/Pages/ViewModels/HotCoolPlatePageVM.cs index 8b3b66e..8c557b5 100644 --- a/uniper_hmi/UniperHMI/Pages/ViewModels/HotCoolPlatePageVM.cs +++ b/uniper_hmi/UniperHMI/Pages/ViewModels/HotCoolPlatePageVM.cs @@ -155,8 +155,8 @@ public sealed partial class HotCoolPlatePageVM : ObservableValidator, IDisposabl HotPlateTargetTemperature = new AnalogValueVM(_adsManager, _variableName + ".stHotplate.stSetpoint", false); CoolPlateTargetTemperature = new AnalogValueVM(_adsManager, _variableName + ".stCoolplate.stSetpoint", false); - HotplatePackMLControlVm = new(_adsManager, _variableName + "stHotplate.stStationCmds"); - CoolplatePackMLControlVm = new(_adsManager, _variableName + "stCoolplate.stStationCmds"); + HotplatePackMLControlVm = new(_adsManager, _variableName + ".stHotplate.stStationCmds"); + CoolplatePackMLControlVm = new(_adsManager, _variableName + ".stCoolplate.stStationCmds"); HotplatePackMLControlVm.STitle = "Heizplatte"; CoolplatePackMLControlVm.STitle = "Kühlplatte"; diff --git a/uniper_hmi/UniperHMI/Pages/Views/AlignmentStationPage.xaml.cs b/uniper_hmi/UniperHMI/Pages/Views/AlignmentStationPage.xaml.cs index 2d96c3a..3193152 100644 --- a/uniper_hmi/UniperHMI/Pages/Views/AlignmentStationPage.xaml.cs +++ b/uniper_hmi/UniperHMI/Pages/Views/AlignmentStationPage.xaml.cs @@ -8,7 +8,7 @@ namespace InfineonHMI; /// public partial class AlignmentStationPage : Page { - public static string AdsVariableName = "GVL_SCADA.stMachine.TrayFeeder"; + public static string AdsVariableName = "GVL_SCADA.stMachine.stAligner"; public static AlignmentStationPageVM CreateModel(IAdsManager adsManager) { diff --git a/uniper_hmi/UniperHMI/Pages/Views/EtchingStation1Page.xaml.cs b/uniper_hmi/UniperHMI/Pages/Views/EtchingStation1Page.xaml.cs index daf815f..6d0db19 100644 --- a/uniper_hmi/UniperHMI/Pages/Views/EtchingStation1Page.xaml.cs +++ b/uniper_hmi/UniperHMI/Pages/Views/EtchingStation1Page.xaml.cs @@ -8,7 +8,7 @@ namespace InfineonHMI; /// public partial class EtchingStation1Page : Page { - public static string AdsVariableName = "GVL_SCADA.stMachine.TrayFeeder"; + public static string AdsVariableName = "GVL_SCADA.stMachine.stEtcher1"; public static EtchingStation1PageVM CreateModel(IAdsManager adsManager) { diff --git a/uniper_hmi/UniperHMI/Pages/Views/EtchingStation2Page.xaml.cs b/uniper_hmi/UniperHMI/Pages/Views/EtchingStation2Page.xaml.cs index 3d465b7..9f7e54f 100644 --- a/uniper_hmi/UniperHMI/Pages/Views/EtchingStation2Page.xaml.cs +++ b/uniper_hmi/UniperHMI/Pages/Views/EtchingStation2Page.xaml.cs @@ -8,7 +8,7 @@ namespace InfineonHMI; /// public partial class EtchingStation2Page : Page { - public static string AdsVariableName = "GVL_SCADA.stMachine.TrayFeeder"; + public static string AdsVariableName = "GVL_SCADA.stMachine.stEtcher2"; public static EtchingStation2PageVM CreateModel(IAdsManager adsManager) { diff --git a/uniper_hmi/UniperHMI/Pages/Views/HighVoltageStationPage.xaml.cs b/uniper_hmi/UniperHMI/Pages/Views/HighVoltageStationPage.xaml.cs index 1ac3cbf..ea72791 100644 --- a/uniper_hmi/UniperHMI/Pages/Views/HighVoltageStationPage.xaml.cs +++ b/uniper_hmi/UniperHMI/Pages/Views/HighVoltageStationPage.xaml.cs @@ -8,7 +8,7 @@ namespace InfineonHMI; /// public partial class HighVoltageStationPage : Page { - public static string AdsVariableName = "GVL_SCADA.stMachine.TrayFeeder"; + public static string AdsVariableName = "GVL_SCADA.stMachine"; public static HighVoltageStationPageVM CreateModel(IAdsManager adsManager) { diff --git a/uniper_hmi/UniperHMI/Pages/Views/HotCoolPlatePage.xaml.cs b/uniper_hmi/UniperHMI/Pages/Views/HotCoolPlatePage.xaml.cs index 07b47b2..fd6e827 100644 --- a/uniper_hmi/UniperHMI/Pages/Views/HotCoolPlatePage.xaml.cs +++ b/uniper_hmi/UniperHMI/Pages/Views/HotCoolPlatePage.xaml.cs @@ -8,7 +8,7 @@ namespace InfineonHMI; /// public partial class HotCoolPlatePage : Page { - public static string AdsVariableName = "GVL_SCADA.stMachine.TrayFeeder"; + public static string AdsVariableName = "GVL_SCADA.stMachine"; public static HotCoolPlatePageVM CreateModel(IAdsManager adsManager) { diff --git a/uniper_hmi/UniperHMI/Pages/Views/MediaCabinetPage.xaml.cs b/uniper_hmi/UniperHMI/Pages/Views/MediaCabinetPage.xaml.cs index d8a154f..208f24e 100644 --- a/uniper_hmi/UniperHMI/Pages/Views/MediaCabinetPage.xaml.cs +++ b/uniper_hmi/UniperHMI/Pages/Views/MediaCabinetPage.xaml.cs @@ -8,7 +8,7 @@ namespace InfineonHMI; /// public partial class MediaCabinetPage : Page { - public static string AdsVariableName = "GVL_SCADA.stMachine.TrayFeeder"; + public static string AdsVariableName = "GVL_SCADA.stMachine.stMediaCabinet"; public static MediaCabinetPageVM CreateModel(IAdsManager adsManager) { diff --git a/uniper_hmi/UniperHMI/Pages/Views/NIOStationPage.xaml.cs b/uniper_hmi/UniperHMI/Pages/Views/NIOStationPage.xaml.cs index 1ed3a40..7f97e85 100644 --- a/uniper_hmi/UniperHMI/Pages/Views/NIOStationPage.xaml.cs +++ b/uniper_hmi/UniperHMI/Pages/Views/NIOStationPage.xaml.cs @@ -8,7 +8,7 @@ namespace InfineonHMI; /// public partial class NIOStationPage : Page { - public static string AdsVariableName = "GVL_SCADA.stMachine.TrayFeeder"; + public static string AdsVariableName = "GVL_SCADA.stMachine.stNOK"; public static NIOStationPageVM CreateModel(IAdsManager adsManager) { diff --git a/uniper_hmi/UniperHMI/Pages/Views/OverviewPage.xaml.cs b/uniper_hmi/UniperHMI/Pages/Views/OverviewPage.xaml.cs index 8d75465..094c033 100644 --- a/uniper_hmi/UniperHMI/Pages/Views/OverviewPage.xaml.cs +++ b/uniper_hmi/UniperHMI/Pages/Views/OverviewPage.xaml.cs @@ -8,7 +8,7 @@ namespace InfineonHMI /// public partial class OverviewPage : Page { - public static string AdsVariableName = "GVL_SCADA.stMachine.Overview"; + public static string AdsVariableName = "GVL_SCADA.stMachine"; private static IAdsManager _adsManager; public static OverviewPageVM CreateModel(IAdsManager adsManager)