Bläddra i källkod

修改为急停按钮为常闭触点

luo 8 månader sedan
förälder
incheckning
b12f4c7a6b

+ 1 - 1
ShakerManger/MainWindow.xaml

@@ -87,7 +87,7 @@
                 Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Grid}, Path=ActualHeight}"
                 Stroke="#9FFF0000"
                 StrokeThickness="10"
-                Visibility="{Binding SystemConfig.GPIOControl.Level, Converter={StaticResource Boolean2VisibilityReConverter}}" />
+                Visibility="{Binding SystemConfig.GPIOControl.Level, Converter={StaticResource Boolean2VisibilityConverter}}" />
             <StackPanel
                 Grid.Row="2"
                 HorizontalAlignment="Center"

+ 4 - 4
ShakerManger/ViewModel/GPIOControlViewModel.cs

@@ -17,7 +17,7 @@ namespace ShakerManger.ViewModel
         
         private bool isSupport = false;
         private CancellationTokenSource source = new CancellationTokenSource();
-        private bool level = true;
+        private bool level = false;
         private bool isEnabled = true;
 
         public GPIOControlViewModel()
@@ -76,11 +76,11 @@ namespace ShakerManger.ViewModel
         public void Stop()
         {
             source?.Cancel();
-            Level = true;
+            Level = false;
         }
         public void Close()
         {
-            Level = true;
+            Level = false;
             source.Cancel();
             Susi4.SusiGPIOControl.Default.Close();
         }
@@ -91,7 +91,7 @@ namespace ShakerManger.ViewModel
             {
                 if (level == value) return;
                 UpdateProperty(ref level, value);
-                if (value) return;
+                if (!value) return;
                 foreach(var val in MainWindowViewModel.Default.Shakers.Shakers)
                 {
                     if (!val.IsConnected) continue;

+ 1 - 1
ShakerManger/ViewModel/ShakersViewModel.cs

@@ -241,7 +241,7 @@ namespace ShakerManger.ViewModel
         }
         private async void Start()
         {
-            if (!MainWindowViewModel.Default.SystemConfig.GPIOControl.Level) return;
+            if (MainWindowViewModel.Default.SystemConfig.GPIOControl.Level) return;
             int count = Shakers.Count(x => x.IsConnected && x.IsDeviceControl);
             if (count == 0) return;
             ViewModel.ProgressViewModel.Default.Init();