pepperdash/PepperDashCore
1
0
Fork 0
mirror of https://github.com/PepperDash/PepperDashCore.git synced 2026-01-29 04:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 in PEC/pepperdash-simplsharp-core from feature/eControlMethod.Cresnet to master

Browse Source 
* commit 'd5fa4311a22f2be1479ce6a8816bbafe9b6f2fa2':
  Added eControlMethod.Cresnet to enum
  Saved local project settings (no code changes)
  Fixes Null Reference Exceptions with GenericTcpIpClient and GenericSshClient
This commit is contained in:
Heath Volmer
2018-01-26 11:51:19 -05:00
parent fcd15573bd d5fa4311a2
commit e16c2cbee8
8 changed files with 13 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Pepperdash Core/Pepperdash Core.suo
View File

Binary file not shown.

13
Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs
View File

@@ -303,11 +303,16 @@ namespace PepperDash.Core
ReconnectTimer.Stop();
ReconnectTimer = null;
}
KillStream();
Client.Disconnect();
Client = null;
ClientStatus = SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY;
Debug.Console(1, this, "Disconnected");
if (Client != null)
{
Client.Disconnect();
Client = null;
ClientStatus = SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY;
Debug.Console(1, this, "Disconnected");
}
}
/// <summary>

3
Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs
View File

@@ -287,7 +287,8 @@ namespace PepperDash.Core
// Check debug level before processing byte array
//if (Debug.Level == 2)
// Debug.Console(2, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
Client.SendData(bytes, bytes.Length);
if(Client != null)
Client.SendData(bytes, bytes.Length);
}
/// <summary>

2
Pepperdash Core/Pepperdash Core/Comm/eControlMethods.cs
View File

@@ -8,6 +8,6 @@ namespace PepperDash.Core
{
public enum eControlMethod
{
None = 0, Com, IpId, IR, Ssh, Tcpip, Telnet
None = 0, Com, IpId, IR, Ssh, Tcpip, Telnet, Cresnet
}
}

59
Pepperdash Core/Pepperdash Core/DeviceConfig.cs
View File

@@ -1,59 +0,0 @@
//using System;
//using System.Collections.Generic;
//using System.Linq;
//using System.Text;
//using Crestron.SimplSharp;
//using Newtonsoft.Json;
//using Newtonsoft.Json.Linq;
//namespace PepperDash.Core
//{
// public class DeviceConfig
// {
// [JsonProperty("key")]
// public string Key { get; set; }
// [JsonProperty("name")]
// public string Name { get; set; }
// [JsonProperty("group")]
// public string Group { get; set; }
// [JsonProperty("type")]
// public string Type { get; set; }
// [JsonProperty("properties")]
// [JsonConverter(typeof(DevicePropertiesConverter))]
// public JToken Properties { get; set; }
// }
// /// <summary>
// ///
// /// </summary>
// public class DevicePropertiesConverter : JsonConverter
// {
// public override bool CanConvert(Type objectType)
// {
// return objectType == typeof(JToken);
// }
// public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
// {
// return JToken.ReadFrom(reader);
// }
// public override bool CanWrite
// {
// get
// {
// return false;
// }
// }
// public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
// {
// throw new NotImplementedException("SOD OFF HOSER");
// }
// }
//}

1
Pepperdash Core/Pepperdash Core/PepperDash_Core.csproj
View File

@@ -79,7 +79,6 @@
<Compile Include="Logging\DebugContext.cs" />
<Compile Include="Logging\DebugMemory.cs" />
<Compile Include="Device.cs" />
<Compile Include="DeviceConfig.cs" />
<Compile Include="Comm\GenericTcpIpServer.cs" />
<Compile Include="EthernetHelper.cs" />
<Compile Include="Comm\GenericTcpIpClient.cs" />

BIN
Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo
View File

Binary file not shown.

2
Pepperdash Core/Pepperdash Core/Properties/AssemblyInfo.cs
View File

@@ -4,4 +4,4 @@
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Pepperdash_Core")]
[assembly: AssemblyCopyright("Copyright © PepperDash 2016")]
[assembly: AssemblyVersion("1.0.1.*")]
[assembly: AssemblyVersion("1.0.3.*")]