jkocon/archived-g-helper
1
0
Fork 0
mirror of https://github.com/jkocon/g-helper.git synced 2026-02-23 13:00:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved packet handling to deal better with empty packets and errors.

Browse Source
This commit is contained in:
IceStormNG
2023-08-18 15:05:55 +02:00
parent f79a91fb78
commit 18b54886ed
1 changed files with 70 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/Peripherals/Mouse/AsusMouse.cs
View File

@@ -314,12 +314,22 @@ namespace GHelper.Peripherals.Mouse
[MethodImpl(MethodImplOptions.Synchronized)] [MethodImpl(MethodImplOptions.Synchronized)]
protected virtual byte[]? WriteForResponse(byte[] packet) protected virtual byte[]? WriteForResponse(byte[] packet)
{ {
Array.Resize(ref packet, ASUS_MOUSE_PACKET_SIZE);
byte[] response = new byte[ASUS_MOUSE_PACKET_SIZE]; byte[] response = new byte[ASUS_MOUSE_PACKET_SIZE];
int retries = 3;
while (retries > 0)
{
response = new byte[ASUS_MOUSE_PACKET_SIZE];
try try
{ {
if (IsPacketLoggerEnabled()) if (IsPacketLoggerEnabled())
Logger.WriteLine(GetDisplayName() + ": Sending packet: " + ByteArrayToString(packet)); Logger.WriteLine(GetDisplayName() + ": Sending packet: " + ByteArrayToString(packet)
+ " Try " + (retries - 2) + " of 3");
long time = MeasuredIO(Write, packet); long time = MeasuredIO(Write, packet);
Logger.WriteLine(GetDisplayName() + ": Write took " + time + "ms"); Logger.WriteLine(GetDisplayName() + ": Write took " + time + "ms");
@@ -327,25 +337,42 @@ namespace GHelper.Peripherals.Mouse
time = MeasuredIO(Read, response); time = MeasuredIO(Read, response);
Logger.WriteLine(GetDisplayName() + ": Read took " + time + "ms"); Logger.WriteLine(GetDisplayName() + ": Read took " + time + "ms");
if (IsPacketLoggerEnabled())
Logger.WriteLine(GetDisplayName() + ": Read packet: " + ByteArrayToString(response));
if (IsMouseError(response)) if (IsMouseError(response))
{ {
if (IsPacketLoggerEnabled())
Logger.WriteLine(GetDisplayName() + ": Read packet: " + ByteArrayToString(response));
Logger.WriteLine(GetDisplayName() + ": Mouse returned error (FF AA). Packet probably not supported by mouse firmware."); Logger.WriteLine(GetDisplayName() + ": Mouse returned error (FF AA). Packet probably not supported by mouse firmware.");
//Error. Mouse could not understand or process the sent packet //Error. Mouse could not understand or process the sent packet
return response; return response;
} }
if (response[1] == 0 && response[2] == 0 && response[3] == 0)
{
if (IsPacketLoggerEnabled())
Logger.WriteLine(GetDisplayName() + ": Read packet: " + ByteArrayToString(response));
Logger.WriteLine(GetDisplayName() + ": Received empty packet. Stopping here.");
//Empty packet
return null;
}
//Not the response we were looking for, continue reading //Not the response we were looking for, continue reading
while (response[0] != packet[0] || response[1] != packet[1] || response[2] != packet[2]) while (response[0] != packet[0] || response[1] != packet[1] || response[2] != packet[2])
{ {
if (IsPacketLoggerEnabled())
Logger.WriteLine(GetDisplayName() + ": Read wrong packet left in buffer: " + ByteArrayToString(response) + ". Retrying..."); Logger.WriteLine(GetDisplayName() + ": Read wrong packet left in buffer: " + ByteArrayToString(response) + ". Retrying...");
//Read again //Read again
time = MeasuredIO(Read, response); time = MeasuredIO(Read, response);
Logger.WriteLine(GetDisplayName() + ": Read took " + time + "ms"); Logger.WriteLine(GetDisplayName() + ": Read took " + time + "ms");
} }
if (IsPacketLoggerEnabled())
Logger.WriteLine(GetDisplayName() + ": Read packet: " + ByteArrayToString(response));
return response;
} }
catch (IOException e) catch (IOException e)
{ {
@@ -355,8 +382,9 @@ namespace GHelper.Peripherals.Mouse
} }
catch (TimeoutException e) catch (TimeoutException e)
{ {
Logger.WriteLine(GetDisplayName() + ": Timeout reading packet " + e.Message); Logger.WriteLine(GetDisplayName() + ": Timeout reading packet " + e.Message + " Trying again.");
return null; retries--;
continue;
} }
catch (ObjectDisposedException) catch (ObjectDisposedException)
{ {
@@ -364,9 +392,8 @@ namespace GHelper.Peripherals.Mouse
OnDisconnect(); OnDisconnect();
return null; return null;
} }
}
return null;
return response;
} }
public abstract string GetDisplayName(); public abstract string GetDisplayName();