archive
/
MaiTouchSensorEmulator
mirror of https://github.com/Leapward-Koex/MaiTouchSensorEmulator
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Better shutdown handling

pull/7/head
LeapwardKoex 2024-02-11 23:34:51 +13:00
parent 752b5453a5
commit 6f364833a8
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
MaiTouchComConnector.cs
View File

@ -45,6 +45,7 @@ internal class MaiTouchComConnector
{ {
OnConnectStatusChange("Conecting..."); OnConnectStatusChange("Conecting...");
serialPort = new SerialPort(virtualPort, 9600, Parity.None, 8, StopBits.One); serialPort = new SerialPort(virtualPort, 9600, Parity.None, 8, StopBits.One);
serialPort.WriteTimeout = 100;
serialPort.DataReceived += SerialPort_DataReceived; serialPort.DataReceived += SerialPort_DataReceived;
serialPort.Open(); serialPort.Open();
Console.WriteLine("Serial port opened successfully."); Console.WriteLine("Serial port opened successfully.");
@ -65,6 +66,7 @@ internal class MaiTouchComConnector
} }
} }
catch (TimeoutException) { }
catch (Exception ex) catch (Exception ex)
{ {
OnConnectError(); OnConnectError();
@ -86,15 +88,27 @@ internal class MaiTouchComConnector
} }
} }
public async void Disconnect() public async Task Disconnect()
{ {
_shouldReconnect = false; _shouldReconnect = false;
if (serialPort?.IsOpen == true)
{
serialPort.Close();
serialPort.Dispose();
}
_connected = false; _connected = false;
try
{
serialPort.DtrEnable = false;
serialPort.RtsEnable = false;
serialPort.DataReceived -= SerialPort_DataReceived;
await Task.Delay(200);
if (serialPort.IsOpen == true)
{
serialPort.DiscardInBuffer();
serialPort.DiscardOutBuffer();
serialPort.Close();
}
}
catch (Exception ex)
{
MessageBox.Show(ex.Message);
}
} }
void SerialPort_DataReceived(object sender, SerialDataReceivedEventArgs e) void SerialPort_DataReceived(object sender, SerialDataReceivedEventArgs e)
@ -138,7 +152,10 @@ internal class MaiTouchComConnector
void SendTouchscreenState() void SendTouchscreenState()
{ {
var currentState = _buttonState.GetCurrentState(); if (_connected)
serialPort?.Write(currentState, 0, currentState.Length); {
var currentState = _buttonState.GetCurrentState();
serialPort?.Write(currentState, 0, currentState.Length);
}
} }
} }

4
MainWindow.xaml.cs
View File

@ -101,7 +101,7 @@ public partial class MainWindow : Window
var dataContext = (MainWindowViewModel)DataContext; var dataContext = (MainWindowViewModel)DataContext;
if (dataContext.IsExitWithSinmaiEnabled) if (dataContext.IsExitWithSinmaiEnabled)
{ {
connector.Disconnect(); await connector.Disconnect();
Application.Current.Shutdown(); Application.Current.Shutdown();
} }
} }
@ -154,7 +154,7 @@ public partial class MainWindow : Window
var dataContext = (MainWindowViewModel)DataContext; var dataContext = (MainWindowViewModel)DataContext;
var enabled = !dataContext.IsAutomaticPositioningEnabled; var enabled = !dataContext.IsAutomaticPositioningEnabled;
dataContext.IsAutomaticPositioningEnabled = !enabled; dataContext.IsAutomaticPositioningEnabled = !enabled;
Properties.Settings.Default.IsAutomaticPositioningEnabled = enabled; Properties.Settings.Default.IsAutomaticPositioningEnabled = dataContext.IsAutomaticPositioningEnabled;
Properties.Settings.Default.Save(); Properties.Settings.Default.Save();
} }