Merge branch 'feat/mono' of Common/Utils into dev

This commit is contained in:
Drew Tingen
2019-01-17 23:12:09 +00:00
committed by Gogs
5 changed files with 20 additions and 1 deletions

View File

@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
## [Unreleased] ## [Unreleased]
### Added
- Added SimplSharpProMono to eRuntimeEnvironment enum
### Changed
- Small fixes for better VC4 support
## [8.2.0] - 2019-01-10 ## [8.2.0] - 2019-01-10
### Added ### Added

View File

@@ -123,6 +123,10 @@ namespace ICD.Common.Utils
public static bool SendControlSystemCommand(string command, ref string result) public static bool SendControlSystemCommand(string command, ref string result)
{ {
#if SIMPLSHARP #if SIMPLSHARP
// No console on VC4
if (IcdEnvironment.RuntimeEnvironment == IcdEnvironment.eRuntimeEnvironment.SimplSharpProMono)
return false;
return CrestronConsole.SendControlSystemCommand(command, ref result); return CrestronConsole.SendControlSystemCommand(command, ref result);
#else #else
return false; return false;

View File

@@ -12,7 +12,12 @@ namespace ICD.Common.Utils
public static eRuntimeEnvironment RuntimeEnvironment public static eRuntimeEnvironment RuntimeEnvironment
{ {
get { return GetRuntimeEnvironment(CrestronEnvironment.RuntimeEnvironment); } get
{
return CrestronEnvironment.DevicePlatform == eDevicePlatform.Server
? eRuntimeEnvironment.SimplSharpProMono
: GetRuntimeEnvironment(CrestronEnvironment.RuntimeEnvironment);
}
} }
/// <summary> /// <summary>

View File

@@ -11,6 +11,7 @@ namespace ICD.Common.Utils
{ {
SimplSharp, SimplSharp,
SimplSharpPro, SimplSharpPro,
SimplSharpProMono,
Standard Standard
} }

View File

@@ -33,6 +33,10 @@ namespace ICD.Common.Utils
name = name.Substring(0, proLength).PadRight(26); name = name.Substring(0, proLength).PadRight(26);
break; break;
case IcdEnvironment.eRuntimeEnvironment.SimplSharpProMono:
// No console
return;
case IcdEnvironment.eRuntimeEnvironment.Standard: case IcdEnvironment.eRuntimeEnvironment.Standard:
name += ' '; name += ' ';
break; break;