Astronomy/MeadeGeneric
1
0
Fork 0
Code Pull Requests Wiki Activity

Removed redundant qualifiers

Browse Source
This commit is contained in:
Colin Dawson
2019-07-19 13:12:22 +01:00
parent dfef48ff0c
commit 2ce8c4e123
9 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Meade.net/LocalServer.cs
+2 -2
View File
@@ -420,7 +420,7 @@ namespace ASCOM.Meade.net
// Pull the display name from the ServedClassName attribute.
attr = Attribute.GetCustomAttribute(type, typeof(ServedClassNameAttribute)); //PWGS Changed to search type for attribute rather than assembly
string chooserName = ((ServedClassNameAttribute)attr).DisplayName ?? "MultiServer";
using (var P = new ASCOM.Utilities.Profile())
using (var P = new Profile())
{
P.DeviceType = deviceType;
P.Register(progid, chooserName);
@@ -490,7 +490,7 @@ namespace ASCOM.Meade.net
//
// ASCOM
//
using (var P = new ASCOM.Utilities.Profile())
using (var P = new Profile())
{
P.DeviceType = deviceType;
P.Unregister(progid);
Meade.net/SetupDialogForm.cs
+2 -2
View File
@@ -29,12 +29,12 @@ namespace ASCOM.Meade.net
{
System.Diagnostics.Process.Start("http://ascom-standards.org/");
}
catch (System.ComponentModel.Win32Exception noBrowser)
catch (Win32Exception noBrowser)
{
if (noBrowser.ErrorCode == -2147467259)
MessageBox.Show(noBrowser.Message);
}
catch (System.Exception other)
catch (Exception other)
{
MessageBox.Show(other.Message);
}
Meade.net/SharedResources.cs
+12 -12
View File
@@ -35,7 +35,7 @@ namespace ASCOM.Meade.net
private static readonly object lockObject = new object();
// Shared serial port. This will allow multiple drivers to use one single serial port.
private static ASCOM.Utilities.Serial s_sharedSerial; // Shared serial port
private static Serial s_sharedSerial; // Shared serial port
//
// Public access to shared resources
@@ -60,7 +60,7 @@ namespace ASCOM.Meade.net
/// <summary>
/// Shared serial port
/// </summary>
public static ASCOM.Utilities.Serial SharedSerial => s_sharedSerial ?? (s_sharedSerial = new ASCOM.Utilities.Serial());
public static Serial SharedSerial => s_sharedSerial ?? (s_sharedSerial = new Serial());
/// <summary>
/// number of connections to the shared serial port
@@ -266,15 +266,15 @@ namespace ASCOM.Meade.net
if (connectedDevices[deviceId].count == 1)
{
var profileProperties = ReadProfile();
SharedResources.SharedSerial.PortName = profileProperties.ComPort;
SharedResources.SharedSerial.DTREnable = false;
SharedResources.SharedSerial.RTSEnable = false;
SharedResources.SharedSerial.DataBits = 8;
SharedResources.SharedSerial.StopBits = SerialStopBits.One;
SharedResources.SharedSerial.Parity = SerialParity.None;
SharedResources.SharedSerial.Speed = SerialSpeed.ps9600;
SharedResources.SharedSerial.Handshake = SerialHandshake.None;
SharedResources.SharedSerial.Connected = true;
SharedSerial.PortName = profileProperties.ComPort;
SharedSerial.DTREnable = false;
SharedSerial.RTSEnable = false;
SharedSerial.DataBits = 8;
SharedSerial.StopBits = SerialStopBits.One;
SharedSerial.Parity = SerialParity.None;
SharedSerial.Speed = SerialSpeed.ps9600;
SharedSerial.Handshake = SerialHandshake.None;
SharedSerial.Connected = true;
ProductName = SendString(":GVP#");
FirmwareVersion = SendString(":GVN#");
@@ -295,7 +295,7 @@ namespace ASCOM.Meade.net
connectedDevices.Remove(deviceId);
if (deviceId == "Serial")
{
SharedResources.SharedSerial.Connected = false;
SharedSerial.Connected = false;
}
}
}