From 91c58e822d935371c131afdb1ba17986db089572 Mon Sep 17 00:00:00 2001
From: Generoso Martello <generoso.martello@gmail.com>
Date: Mon, 10 Dec 2018 00:23:27 +0100
Subject: [PATCH] added support for CM19 Transceiver

---
 .../MIG.HomeAutomation.Tests.csproj           | 105 ++--
 MIG.HomeAutomation.Tests/packages.config      |   2 +-
 MIG.HomeAutomation/MIG.HomeAutomation.csproj  |   6 +-
 MIG.HomeAutomation/X10.cs                     | 491 ++++++++++++++----
 MIG.HomeAutomation/packages.config            |   3 +-
 README.md                                     |   5 +-
 6 files changed, 464 insertions(+), 148 deletions(-)

diff --git a/MIG.HomeAutomation.Tests/MIG.HomeAutomation.Tests.csproj b/MIG.HomeAutomation.Tests/MIG.HomeAutomation.Tests.csproj
index 20e56ad..4a445ec 100644
--- a/MIG.HomeAutomation.Tests/MIG.HomeAutomation.Tests.csproj
+++ b/MIG.HomeAutomation.Tests/MIG.HomeAutomation.Tests.csproj
@@ -1,58 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
-            Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
+  <Import Project="..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{D5F0C9C4-CB64-4259-B590-84B30728C23E}</ProjectGuid>
+    <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MIG.HomeAutomation.Tests</RootNamespace>
+    <AssemblyName>MIG.HomeAutomation.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
+      <HintPath>..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Tests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <ProjectGuid>{D5F0C9C4-CB64-4259-B590-84B30728C23E}</ProjectGuid>
-        <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-        <OutputType>Library</OutputType>
-        <AppDesignerFolder>Properties</AppDesignerFolder>
-        <RootNamespace>MIG.HomeAutomation.Tests</RootNamespace>
-        <AssemblyName>MIG.HomeAutomation.Tests</AssemblyName>
-        <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-        <FileAlignment>512</FileAlignment>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <PlatformTarget>AnyCPU</PlatformTarget>
-        <DebugSymbols>true</DebugSymbols>
-        <DebugType>full</DebugType>
-        <Optimize>false</Optimize>
-        <OutputPath>bin\Debug\</OutputPath>
-        <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-        <PlatformTarget>AnyCPU</PlatformTarget>
-        <DebugType>pdbonly</DebugType>
-        <Optimize>true</Optimize>
-        <OutputPath>bin\Release\</OutputPath>
-        <DefineConstants>TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
-    <ItemGroup>
-        <Reference Include="System"/>
-        <Reference Include="System.Core"/>
-        <Reference Include="System.Data"/>
-        <Reference Include="System.Xml"/>
-        <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb">
-            <HintPath>..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
-        </Reference>
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Include="Tests.cs"/>
-        <Compile Include="Properties\AssemblyInfo.cs"/>
-    </ItemGroup>
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
-    <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+    <Error Condition="!Exists('..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.10.1\build\NUnit.props'))" />
+  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
          Other similar extension points exist, see Microsoft.Common.targets.
     <Target Name="BeforeBuild">
     </Target>
     <Target Name="AfterBuild">
     </Target>
     -->
-
-</Project>
+</Project>
\ No newline at end of file
diff --git a/MIG.HomeAutomation.Tests/packages.config b/MIG.HomeAutomation.Tests/packages.config
index c108d44..391f728 100644
--- a/MIG.HomeAutomation.Tests/packages.config
+++ b/MIG.HomeAutomation.Tests/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.5.0" targetFramework="net45" />
+  <package id="NUnit" version="3.10.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/MIG.HomeAutomation/MIG.HomeAutomation.csproj b/MIG.HomeAutomation/MIG.HomeAutomation.csproj
index f00dd86..7be138e 100644
--- a/MIG.HomeAutomation/MIG.HomeAutomation.csproj
+++ b/MIG.HomeAutomation/MIG.HomeAutomation.csproj
@@ -31,6 +31,10 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="CM19Lib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\CM19Lib.1.0.3\lib\CM19Lib.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="CommonMark, Version=0.1.0.0, Culture=neutral, PublicKeyToken=001ef8810438905d">
       <HintPath>..\packages\CommonMark.NET.0.15.1\lib\net45\CommonMark.dll</HintPath>
       <Private>True</Private>
@@ -85,7 +89,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="XTenLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\XTenLib.1.0.10\lib\XTenLib.dll</HintPath>
+      <HintPath>..\packages\XTenLib.1.0.11\lib\XTenLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ZWaveLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
diff --git a/MIG.HomeAutomation/X10.cs b/MIG.HomeAutomation/X10.cs
index 68a529e..1957d30 100644
--- a/MIG.HomeAutomation/X10.cs
+++ b/MIG.HomeAutomation/X10.cs
@@ -24,13 +24,19 @@ limitations under the License.
 using System;
 using System.IO;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Threading;
 
 using MIG.Interfaces.HomeAutomation.Commons;
 using MIG.Config;
 
+using CM19Lib;
+using CM19Lib.X10;
+
 using XTenLib;
 
+using RfCommandReceivedEventArgs = CM19Lib.Events.RfCommandReceivedEventArgs;
+
 namespace MIG.Interfaces.HomeAutomation
 {
     public class X10 : MigInterface
@@ -51,17 +57,24 @@ public enum Commands
             Control_Level_Adjust,
             Control_Toggle,
             Control_AllLightsOn,
-            Control_AllLightsOff
+            Control_AllUnitsOff
         }
 
         #endregion
 
         #region Private fields
 
-        private XTenManager x10lib;
+        private const string Cm19LibDriverPort = "CM19-USB";
+        private const string Cm15LibDriverPort = "USB";
+        private readonly Cm19Manager cm19Lib;
+        private readonly XTenManager x10Lib;
         private Timer rfPulseTimer;
+        private int RfPulseDelay = 300;
         private List<InterfaceModule> securityModules;
         private List<Option> options;
+        // this is used to set the interface port (CM11 Serial, CM15 USB or CM19 USB)
+        private string portName;
+        private string lastAddressedModule;
 
         #endregion
 
@@ -81,15 +94,28 @@ public List<Option> Options
             set
             {
                 options = value;
-                if (this.GetOption("Port") != null)
-                    x10lib.PortName = this.GetOption("Port").Value.Replace("|", "/");
-                if (this.GetOption("HouseCodes") != null)
-                    x10lib.HouseCode = this.GetOption("HouseCodes").Value;
+                if (this.GetOption("Port") != null && this.GetOption("Port").Value != null)
+                {
+                    portName = this.GetOption("Port").Value.Replace("|", "/");
+                }
+                if (portName != Cm19LibDriverPort)
+                {
+                    // set x10Lib options
+                    x10Lib.PortName = portName;
+                    if (this.GetOption("HouseCodes") != null)
+                        x10Lib.HouseCode = this.GetOption("HouseCodes").Value;
+                }
             }
         }
 
         public void OnSetOption(Option option)
         {
+            // parse option
+            if (option.Name == "Port" && option.Value != null)
+            {
+                portName = this.GetOption("Port").Value.Replace("|", "/");
+                Disconnect();
+            }
             if (IsEnabled)
                 Connect();
         }
@@ -97,31 +123,37 @@ public void OnSetOption(Option option)
         public List<InterfaceModule> GetModules()
         {
             List<InterfaceModule> modules = new List<InterfaceModule>();
-            if (x10lib != null)
+            if (x10Lib != null)
             {
 
                 InterfaceModule module = new InterfaceModule();
 
-                // CM-15 RF receiver
-                if (this.GetOption("Port").Value.Equals("USB"))
+                if (portName == Cm15LibDriverPort)
                 {
+                    // CM-15 RF receiver
                     module.Domain = this.GetDomain();
                     module.Address = "RF";
                     module.ModuleType = ModuleTypes.Sensor;
                     modules.Add(module);
                 }
+                else if (portName == Cm19LibDriverPort)
+                {
+                    // CM-19 RF receiver
+                    module.Domain = this.GetDomain();
+                    module.Address = "CM19";
+                    module.ModuleType = ModuleTypes.Sensor;
+                    modules.Add(module);
+                }
 
                 // Standard X10 modules
-                foreach (var kv in x10lib.Modules)
+                foreach (var kv in x10Lib.Modules)
                 {
-
                     module = new InterfaceModule();
                     module.Domain = this.GetDomain();
                     module.Address = kv.Value.Code;
                     module.ModuleType = ModuleTypes.Switch;
                     module.Description = "X10 Module";
                     modules.Add(module);
-
                 }
 
                 // CM-15 RF Security modules
@@ -133,24 +165,41 @@ public List<InterfaceModule> GetModules()
 
         public bool Connect()
         {
-            x10lib.PortName = this.GetOption("Port").Value.Replace("|", "/");
-            x10lib.HouseCode = this.GetOption("HouseCodes").Value;
+            x10Lib.HouseCode = this.GetOption("HouseCodes").Value;
+            if (portName == Cm19LibDriverPort)
+            {
+                // use CM19 driver
+                OnInterfaceModulesChanged(this.GetDomain());
+                return cm19Lib.Connect();
+            }
+            // use default driver for CM11 / CM15
+            x10Lib.PortName = portName;
             OnInterfaceModulesChanged(this.GetDomain());
-            return x10lib.Connect();
+            return x10Lib.Connect();
         }
 
         public void Disconnect()
         {
-            x10lib.Disconnect();
+            if (portName == Cm19LibDriverPort)
+            {
+                // use CM19 driver
+                cm19Lib.Disconnect();
+            }
+            else
+            {
+                // use default driver for CM11 / CM15
+                x10Lib.Disconnect();
+            }
         }
 
         public bool IsConnected
         {
-            get { return x10lib.IsConnected; }
+            get { return cm19Lib.IsConnected || x10Lib.IsConnected; }
         }
 
         public bool IsDevicePresent()
         {
+            // AUTO-Detect CM15 / CM19 devices
             //bool present = false;
             ////
             ////TODO: implement serial port scanning for CM11 as well
@@ -159,11 +208,18 @@ public bool IsDevicePresent()
             //    //Console.WriteLine(o.Vid + " " + o.SymbolicName + " " + o.Pid + " " + o.Rev + " " + o.FullName + " " + o.Name + " ");
             //    if ((usbdev.Vid == 0x0BC7 && usbdev.Pid == 0x0001) || usbdev.FullName.ToUpper().Contains("X10"))
             //    {
-            //        present = true;
+            //        // CM15
+            //        cm15Found = true;
+            //        break;
+            //    }
+            //    else if ((usbdev.Vid == 0x0BC7 && usbdev.Pid == 0x0001) || usbdev.FullName.ToUpper().Contains("X10"))
+            //    {
+            //        // CM19
+            //        cm19Found = true;
             //        break;
             //    }
             //}
-            //return present;
+            //return cm15Found || cm19Found;
             return true;
         }
 
@@ -171,67 +227,143 @@ public object InterfaceControl(MigInterfaceCommand request)
         {
             ResponseText response = new ResponseText("OK");
 
-            string nodeId = request.Address;
+            string nodeId = lastAddressedModule = request.Address;
             string option = request.GetOption(0);
 
             Commands command;
             Enum.TryParse<Commands>(request.Command.Replace(".", "_"), out command);
 
-            // Parse house/unit
-            var houseCode = XTenLib.Utility.HouseCodeFromString(nodeId);
-            var unitCode = XTenLib.Utility.UnitCodeFromString(nodeId);
-
-            switch (command)
+            if (portName == Cm19LibDriverPort)
             {
-            case Commands.Parameter_Status:
-                x10lib.StatusRequest(houseCode, unitCode);
-                break;
-            case Commands.Control_On:
-                x10lib.UnitOn(houseCode, unitCode);
-                break;
-            case Commands.Control_Off:
-                x10lib.UnitOff(houseCode, unitCode);
-                break;
-            case Commands.Control_Bright:
-                x10lib.Bright(houseCode, unitCode, int.Parse(option));
-                break;
-            case Commands.Control_Dim:
-                x10lib.Dim(houseCode, unitCode, int.Parse(option));
-                break;
-            case Commands.Control_Level_Adjust:
-                int adjvalue = int.Parse(option);
-                //x10lib.Modules[nodeId].Level = ((double)adjvalue/100D);
-                OnInterfacePropertyChanged(this.GetDomain(), nodeId, "X10 Module", ModuleEvents.Status_Level, x10lib.Modules[nodeId].Level);
-                throw(new NotImplementedException("X10 CONTROL_LEVEL_ADJUST Not Implemented"));
-                break;
-            case Commands.Control_Level:
-                int dimvalue = int.Parse(option) - (int)(x10lib.Modules[nodeId].Level * 100.0);
-                if (dimvalue > 0)
-                {
-                    x10lib.Bright(houseCode, unitCode, dimvalue);
-                }
-                else if (dimvalue < 0)
-                {
-                    x10lib.Dim(houseCode, unitCode, -dimvalue);
-                }
-                break;
-            case Commands.Control_Toggle:
-                string huc = XTenLib.Utility.HouseUnitCodeFromEnum(houseCode, unitCode);
-                if (x10lib.Modules[huc].Level == 0)
+                // Parse house/unit
+                var houseCode = CM19Lib.Utility.HouseCodeFromString(nodeId);
+                var unitCode = CM19Lib.Utility.UnitCodeFromString(nodeId);
+                var module = GetModuleByAddress(nodeId, ModuleTypes.Switch);
+                // module.CustomData is used to store the current level
+                switch (command)
                 {
-                    x10lib.UnitOn(houseCode, unitCode);
+                case Commands.Control_On:
+                    cm19Lib.UnitOn(houseCode, unitCode);
+                    module.CustomData = 1D;
+                    UpdateModuleLevel(module);
+                    break;
+                case Commands.Control_Off:
+                    cm19Lib.UnitOff(houseCode, unitCode);
+                    module.CustomData = 0D;
+                    UpdateModuleLevel(module);
+                    break;
+                case Commands.Control_Bright:
+                    cm19Lib.Bright(houseCode);
+                    module.CustomData = module.CustomData + (5 / 100D);
+                    if (module.CustomData > 1) module.CustomData = 1D;
+                    UpdateModuleLevel(module);
+                    break;
+                case Commands.Control_Dim:
+                    cm19Lib.Dim(houseCode);
+                    module.CustomData = module.CustomData - (5 / 100D);
+                    if (module.CustomData < 0) module.CustomData = 0D;
+                    UpdateModuleLevel(module);
+                    break;
+                case Commands.Control_Level:
+                    int dimValue = (int.Parse(option) - (int) (module.CustomData * 100.0)) / 5;
+                    if (dimValue > 0)
+                    {
+                        for (int i = 0; i < dimValue; i++)
+                        {
+                            cm19Lib.Bright(houseCode);
+                            Thread.Sleep(200);
+                        }
+                    }
+                    else if (dimValue < 0)
+                    {
+                        for (int i = 0; i < -dimValue; i++)
+                        {
+                            cm19Lib.Dim(houseCode);
+                            Thread.Sleep(200);
+                        }
+                    }
+                    module.CustomData = module.CustomData + (dimValue * 5 / 100D);
+                    UpdateModuleLevel(module);
+                    break;
+                case Commands.Control_Toggle:
+                    if (module.CustomData == 0D)
+                    {
+                        cm19Lib.UnitOn(houseCode, unitCode);
+                        UpdateModuleLevel(module);
+                    }
+                    else
+                    {
+                        cm19Lib.UnitOff(houseCode, unitCode);
+                        UpdateModuleLevel(module);
+                    }
+                    break;
+                case Commands.Control_AllLightsOn:
+                    cm19Lib.AllLightsOn(houseCode);
+                    // TODO: update modules status
+                    break;
+                case Commands.Control_AllUnitsOff:
+                    cm19Lib.AllUnitsOff(houseCode);
+                    // TODO: update modules status
+                    break;
                 }
-                else
+            }
+            else
+            {
+                // Parse house/unit
+                var houseCode = XTenLib.Utility.HouseCodeFromString(nodeId);
+                var unitCode = XTenLib.Utility.UnitCodeFromString(nodeId);
+                switch (command)
                 {
-                    x10lib.UnitOff(houseCode, unitCode);
+                case Commands.Parameter_Status:
+                    x10Lib.StatusRequest(houseCode, unitCode);
+                    break;
+                case Commands.Control_On:
+                    x10Lib.UnitOn(houseCode, unitCode);
+                    break;
+                case Commands.Control_Off:
+                    x10Lib.UnitOff(houseCode, unitCode);
+                    break;
+                case Commands.Control_Bright:
+                    x10Lib.Bright(houseCode, unitCode, int.Parse(option));
+                    break;
+                case Commands.Control_Dim:
+                    x10Lib.Dim(houseCode, unitCode, int.Parse(option));
+                    break;
+                case Commands.Control_Level_Adjust:
+                    int adjvalue = int.Parse(option);
+                    //x10Lib.Modules[nodeId].Level = ((double)adjvalue/100D);
+                    OnInterfacePropertyChanged(this.GetDomain(), nodeId, "X10 Module", ModuleEvents.Status_Level, x10Lib.Modules[nodeId].Level);
+                    throw(new NotImplementedException("X10 CONTROL_LEVEL_ADJUST Not Implemented"));
+                    break;
+                case Commands.Control_Level:
+                    int dimvalue = int.Parse(option) - (int)(x10Lib.Modules[nodeId].Level * 100.0);
+                    if (dimvalue > 0)
+                    {
+                        x10Lib.Bright(houseCode, unitCode, dimvalue);
+                    }
+                    else if (dimvalue < 0)
+                    {
+                        x10Lib.Dim(houseCode, unitCode, -dimvalue);
+                    }
+                    break;
+                case Commands.Control_Toggle:
+                    string huc = XTenLib.Utility.HouseUnitCodeFromEnum(houseCode, unitCode);
+                    if (x10Lib.Modules[huc].Level == 0)
+                    {
+                        x10Lib.UnitOn(houseCode, unitCode);
+                    }
+                    else
+                    {
+                        x10Lib.UnitOff(houseCode, unitCode);
+                    }
+                    break;
+                case Commands.Control_AllLightsOn:
+                    x10Lib.AllLightsOn(houseCode);
+                    break;
+                case Commands.Control_AllUnitsOff:
+                    x10Lib.AllUnitsOff(houseCode);
+                    break;
                 }
-                break;
-            case Commands.Control_AllLightsOn:
-                x10lib.AllLightsOn(houseCode);
-                break;
-            case Commands.Control_AllLightsOff:
-                x10lib.AllUnitsOff(houseCode);
-                break;
             }
 
             return response;
@@ -243,6 +375,7 @@ public object InterfaceControl(MigInterfaceCommand request)
 
         public X10()
         {
+            // Fix libusb symbolic link
             string assemblyFolder = MigService.GetAssemblyDirectory(this.GetType().Assembly);
             var libusblink = Path.Combine(assemblyFolder, "libusb-1.0.so");
             // RaspBerry Pi armel dependency check and needed symlink
@@ -256,10 +389,20 @@ public X10()
                 MigService.ShellCommand("ln", " -s \"/lib/x86_64-linux-gnu/libusb-1.0.so.0\" \"" + libusblink + "\"");
             }
 
-            x10lib = new XTenManager();
-            x10lib.ModuleChanged += X10lib_ModuleChanged;
-            x10lib.RfDataReceived += X10lib_RfDataReceived;
-            x10lib.RfSecurityReceived += X10lib_RfSecurityReceived;
+            // CM19 Transceiver driver
+            // TODO: should "rmmod" CM19 kernel modules for CM19Lib to work (Linux)
+            cm19Lib = new Cm19Manager();
+            cm19Lib.RfCameraReceived += Cm19LibOnRfCameraReceived;
+            cm19Lib.RfDataReceived += Cm19LibOnRfDataReceived;
+            cm19Lib.RfCommandReceived += Cm19LibOnRfCommandReceived;
+            cm19Lib.RfSecurityReceived += Cm19LibOnRfSecurityReceived;
+
+            // CM11 and CM15 PLC driver
+            x10Lib = new XTenManager();
+            x10Lib.ModuleChanged += X10lib_ModuleChanged;
+            x10Lib.RfDataReceived += X10lib_RfDataReceived;
+            x10Lib.RfSecurityReceived += X10lib_RfSecurityReceived;
+
             securityModules = new List<InterfaceModule>();
         }
 
@@ -267,44 +410,201 @@ public X10()
 
         #region Private fields
 
-        #region XTenLib events
+        #region Utility methods
+        
+        private InterfaceModule AddModule(ModuleTypes moduleType, string address)
+        {
+            InterfaceModule module = new InterfaceModule();
+            module.Domain = this.GetDomain();
+            module.Address = address;
+            module.Description = "X10 Security";
+            module.ModuleType = moduleType;
+            module.CustomData = 0D;
+            securityModules.Add(module);
+            OnInterfacePropertyChanged(module.Domain, "RF", "X10 RF Receiver", ModuleEvents.Receiver_Status, "Added module " + address + " (" + moduleType + ")");
+            OnInterfaceModulesChanged(module.Domain);
+            return module;
+        }
 
-        private void X10lib_RfSecurityReceived(object sender, RfSecurityReceivedEventArgs args)
+        private void ParseModuleAddress(String eventAddress, String eventName, out ModuleTypes moduleType, out string address)
         {
-            string address = "S-" + args.Address.ToString("X6");
-            var moduleType = ModuleTypes.Sensor;
-            if (args.Event.ToString().StartsWith("DoorSensor1_"))
+            address = "S-" + eventAddress;
+            moduleType = ModuleTypes.Sensor;
+            if (eventName.StartsWith("DoorSensor1_"))
             {
                 address += "01";
                 moduleType = ModuleTypes.DoorWindow;
             }
-            else if (args.Event.ToString().StartsWith("DoorSensor2_"))
+            else if (eventName.StartsWith("DoorSensor2_"))
             {
                 address += "02";
                 moduleType = ModuleTypes.DoorWindow;
             }
-            else if (args.Event.ToString().StartsWith("Motion_"))
+            else if (eventName.StartsWith("Motion_"))
             {
                 moduleType = ModuleTypes.Sensor;
             }
-            else if (args.Event.ToString().StartsWith("Remote_"))
+            else if (eventName.StartsWith("Remote_"))
             {
                 address = "S-REMOTE";
                 moduleType = ModuleTypes.Sensor;
             }
+        }
+
+        private InterfaceModule GetModuleByAddress(string address, ModuleTypes? defaultType = null)
+        {
             var module = securityModules.Find(m => m.Address == address);
-            if (module == null)
+            if (module == null && defaultType != null)
             {
-                module = new InterfaceModule();
-                module.Domain = this.GetDomain();
-                module.Address = address;
-                module.Description = "X10 Security";
-                module.ModuleType = moduleType;
-                module.CustomData = 0.0D;
-                securityModules.Add(module);
-                OnInterfacePropertyChanged(this.GetDomain(), "RF", "X10 RF Receiver", ModuleEvents.Receiver_Status, "Added security module " + address);
-                OnInterfaceModulesChanged(this.GetDomain());
+                module = AddModule((ModuleTypes)defaultType, address);
             }
+            return module;
+        }
+
+        private void UpdateModuleLevel(InterfaceModule module)
+        {
+            OnInterfacePropertyChanged(module.Domain, module.Address, "X10 Module", ModuleEvents.Status_Level, module.CustomData.ToString(CultureInfo.InvariantCulture));
+        }
+        
+        #endregion
+
+        #region CM19Lib events
+        
+        private void Cm19LibOnRfSecurityReceived(object sender, CM19Lib.Events.RfSecurityReceivedEventArgs args)
+        {
+            ModuleTypes moduleType; string address;
+            ParseModuleAddress(args.Address.ToString("X6"), args.Event.ToString(), out moduleType, out address);
+            var module = GetModuleByAddress(address, moduleType);
+            switch (args.Event)
+            {
+            case RfSecurityEvent.DoorSensor1_Alert:
+            case RfSecurityEvent.DoorSensor2_Alert:
+                OnInterfacePropertyChanged(module.Domain, module.Address, "X10 Security Sensor", ModuleEvents.Status_Level, 1);
+                OnInterfacePropertyChanged(module.Domain, module.Address, "X10 Security Sensor", ModuleEvents.Sensor_Tamper, 0);
+                break;
+            case RfSecurityEvent.DoorSensor1_Alert_Tarmper:
+            case RfSecurityEvent.DoorSensor2_Alert_Tamper:
+                OnInterfacePropertyChanged(module.Domain, module.Address, "X10 Security Sensor", ModuleEvents.Status_Level, 1);
+                OnInterfacePropertyChanged(module.Domain, module.Address, "X10 Security Sensor", ModuleEvents.Sensor_Tamper, 1);
+                break;
+            case RfSecurityEvent.DoorSensor1_Normal:
+            case RfSecurityEvent.DoorSensor2_Normal:
+                OnInterfacePropertyChanged(module.Domain, module.Address, "X10 Security Sensor", ModuleEvents.Status_Level, 0);
+                OnInterfacePropertyChanged(module.Domain, module.Address, "X10 Security Sensor", ModuleEvents.Sensor_Tamper, 0);
+                break;
+            case RfSecurityEvent.DoorSensor1_Normal_Tamper:
+            case RfSecurityEvent.DoorSensor2_Normal_Tamper:
+                OnInterfacePropertyChanged(module.Domain, module.Address, "X10 Security Sensor", ModuleEvents.Status_Level, 0);
+                OnInterfacePropertyChanged(module.Domain, module.Address, "X10 Security Sensor", ModuleEvents.Sensor_Tamper, 1);
+                break;
+            case RfSecurityEvent.DoorSensor1_BatteryLow:
+            case RfSecurityEvent.DoorSensor2_BatteryLow:
+            case RfSecurityEvent.Motion_BatteryLow:
+                OnInterfacePropertyChanged(module.Domain, module.Address, "X10 Security Sensor", ModuleEvents.Status_Battery, 10);
+                break;
+            case RfSecurityEvent.DoorSensor1_BatteryOk:
+            case RfSecurityEvent.DoorSensor2_BatteryOk:
+            case RfSecurityEvent.Motion_BatteryOk:
+                OnInterfacePropertyChanged(module.Domain, module.Address, "X10 Security Sensor", ModuleEvents.Status_Battery, 100);
+                break;
+            case RfSecurityEvent.Motion_Alert:
+                OnInterfacePropertyChanged(module.Domain, module.Address, "X10 Security Sensor", ModuleEvents.Status_Level, 1);
+                break;
+            case RfSecurityEvent.Motion_Normal:
+                OnInterfacePropertyChanged(module.Domain, module.Address, "X10 Security Sensor", ModuleEvents.Status_Level, 0);
+                break;
+            case RfSecurityEvent.Remote_ArmAway:
+            case RfSecurityEvent.Remote_ArmHome:
+            case RfSecurityEvent.Remote_Disarm:
+            case RfSecurityEvent.Remote_Panic:
+            case RfSecurityEvent.Remote_Panic_15:
+            case RfSecurityEvent.Remote_LightOn:
+            case RfSecurityEvent.Remote_LightOff:
+                var evt = args.Event.ToString();
+                evt = evt.Substring(evt.IndexOf('_') + 1);
+                OnInterfacePropertyChanged(module.Domain, module.Address, "X10 Security Remote", ModuleEvents.Sensor_Key, evt);
+                break;
+            }
+        }
+
+        private void Cm19LibOnRfDataReceived(object sender, CM19Lib.Events.RfDataReceivedEventArgs args)
+        {
+            var code = BitConverter.ToString(args.Data).Replace("-", " ");
+            OnInterfacePropertyChanged(this.GetDomain(), "CM19", "X10 RF Receiver", ModuleEvents.Receiver_RawData, code);
+            if (rfPulseTimer == null)
+            {
+                rfPulseTimer = new Timer(delegate(object target)
+                {
+                    OnInterfacePropertyChanged(this.GetDomain(), "CM19", "X10 RF Receiver", ModuleEvents.Receiver_RawData, "");
+                });
+            }
+            rfPulseTimer.Change(RfPulseDelay, Timeout.Infinite);
+        }
+
+        // TODO: Cm19LibOnRfCameraReceived not implemented (perhaps not needed)
+        private void Cm19LibOnRfCameraReceived(object sender, RfCommandReceivedEventArgs args)
+        {
+            var address = lastAddressedModule = "CAMERA-" + args.HouseCode;
+            switch (args.Command)
+            {
+                    case RfFunction.CameraLeft:
+                        break;
+                    case RfFunction.CameraUp:
+                        break;
+                    case RfFunction.CameraRight:
+                        break;
+                    case RfFunction.CameraDown:
+                        break;
+            }
+            // TODO: not implemented (perhaps not needed)
+        }
+
+        private void Cm19LibOnRfCommandReceived(object sender, RfCommandReceivedEventArgs args)
+        {
+            var address = lastAddressedModule;
+            if (args.UnitCode != UnitCode.UnitNotSet)
+            {
+                address = lastAddressedModule = args.HouseCode + args.UnitCode.ToString().Replace("Unit_", "");
+            }
+            var module = GetModuleByAddress(address, ModuleTypes.Sensor);
+            switch (args.Command)
+            {
+                case RfFunction.On:
+                    module.CustomData = 1D;
+                    UpdateModuleLevel(module);
+                    break;
+                case RfFunction.Off:
+                    module.CustomData = 0D;
+                    UpdateModuleLevel(module);
+                    break;
+                case RfFunction.Bright:
+                    module.CustomData = module.CustomData + 1D/22D;
+                    if (module.CustomData > 1) module.CustomData = 1D;
+                    UpdateModuleLevel(module);
+                    break;
+                case RfFunction.Dim:
+                    module.CustomData = module.CustomData - 1D/22D;
+                    if (module.CustomData < 0) module.CustomData = 0D;
+                    UpdateModuleLevel(module);
+                    break;
+                case RfFunction.AllLightsOn:
+                    // TODO: not implemented
+                    break;
+                case RfFunction.AllUnitsOff:
+                    // TODO: not implemented
+                    break;
+            }
+        }
+
+        #endregion
+        
+        #region XTenLib events
+
+        private void X10lib_RfSecurityReceived(object sender, RfSecurityReceivedEventArgs args)
+        {
+            ModuleTypes moduleType; string address;
+            ParseModuleAddress(args.Address.ToString("X6"), args.Event.ToString(), out moduleType, out address);
+            var module = GetModuleByAddress(address, moduleType);
             switch (args.Event)
             {
             case X10RfSecurityEvent.DoorSensor1_Alert:
@@ -343,7 +643,8 @@ private void X10lib_RfSecurityReceived(object sender, RfSecurityReceivedEventArg
             case X10RfSecurityEvent.Motion_Normal:
                 OnInterfacePropertyChanged(module.Domain, module.Address, "X10 Security Sensor", ModuleEvents.Status_Level, 0);
                 break;
-            case X10RfSecurityEvent.Remote_Arm:
+            case X10RfSecurityEvent.Remote_ArmAway:
+            case X10RfSecurityEvent.Remote_ArmHome:
             case X10RfSecurityEvent.Remote_Disarm:
             case X10RfSecurityEvent.Remote_Panic:
             case X10RfSecurityEvent.Remote_Panic_15:
@@ -367,13 +668,13 @@ private void X10lib_RfDataReceived(object sender, RfDataReceivedEventArgs args)
                     OnInterfacePropertyChanged(this.GetDomain(), "RF", "X10 RF Receiver", ModuleEvents.Receiver_RawData, "");
                 });
             }
-            rfPulseTimer.Change(1000, Timeout.Infinite);
+            rfPulseTimer.Change(RfPulseDelay, Timeout.Infinite);
         }
 
         private void X10lib_ModuleChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             if (e.PropertyName == "Level")
-                OnInterfacePropertyChanged(this.GetDomain(), (sender as X10Module).Code, (sender as X10Module).Description, ModuleEvents.Status_Level, (sender as X10Module).Level.ToString());
+                OnInterfacePropertyChanged(this.GetDomain(), (sender as X10Module).Code, (sender as X10Module).Description, ModuleEvents.Status_Level, (sender as X10Module).Level.ToString(CultureInfo.InvariantCulture));
         }
 
         #endregion
diff --git a/MIG.HomeAutomation/packages.config b/MIG.HomeAutomation/packages.config
index 1866e94..8c03086 100644
--- a/MIG.HomeAutomation/packages.config
+++ b/MIG.HomeAutomation/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="CM19Lib" version="1.0.3" targetFramework="net45" />
   <package id="CommonMark.NET" version="0.15.1" targetFramework="net45" />
   <package id="LibUsb.Common" version="2.2.18" targetFramework="net45" />
   <package id="LibUsbDotNet" version="2.2.18" targetFramework="net45" />
@@ -10,6 +11,6 @@
   <package id="SharpZipLib" version="1.0.0" targetFramework="net45" />
   <package id="UDE.CSharp" version="1.1.0" targetFramework="net45" />
   <package id="WebSocketSharp-netstandard" version="1.0.1" targetFramework="net45" />
-  <package id="XTenLib" version="1.0.10" targetFramework="net45" />
+  <package id="XTenLib" version="1.0.11" targetFramework="net45" />
   <package id="ZWaveLib" version="1.0.18" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/README.md b/README.md
index 84091f6..b6aad7b 100644
--- a/README.md
+++ b/README.md
@@ -13,13 +13,14 @@ Implemented API domains:
 
 ## Supported Hardware
 
-- **X10**: CM11 and CM15+RF
-- **Z-Wave**: most z-wave serial controllers
+- **X10**: CM11, CM15, CM19
+- **Z-Wave**: most Z-Wave serial controllers
 
 ## Related Projects
 
 - https://github.com/genielabs/mig-service-dotnet
 - https://github.com/genielabs/x10-lib-dotnet
+- https://github.com/genielabs/cm19-lib-dotnet
 - https://github.com/genielabs/zwave-lib-dotnet
 - https://github.com/genielabs/homegenie