From f8644792490c2479a9ab36344ca2d1cfcae93851 Mon Sep 17 00:00:00 2001
From: WoodsterDK <woodster@sol.dk>
Date: Mon, 3 Apr 2017 10:09:50 +0200
Subject: [PATCH 01/13] Begun addition of additional types of transceiver
 modules

Added support of PL1167_LT8900 module.
Missing settings in webapp.
---
 data/web/index.html                       | 325 +++++------
 lib/MiLight/MiLightClient.cpp             |  66 ++-
 lib/MiLight/MiLightClient.h               |  73 ++-
 lib/MiLight/MiLightRadio.h                |   7 +-
 lib/MiLight/MiLightRadioInterface.h       |  29 +
 lib/MiLight/MiLightRadioPL1167_LT8900.h   | 104 ++++
 lib/MiLight/MiLightRadioPL1197_LT8900.cpp | 631 ++++++++++++++++++++++
 lib/MiLight/RadioStack.h                  |  42 +-
 lib/Settings/Settings.cpp                 |  90 ++-
 lib/Settings/Settings.h                   |  26 +-
 platformio.ini                            |  11 +-
 src/main.cpp                              |  38 +-
 12 files changed, 1169 insertions(+), 273 deletions(-)
 create mode 100644 lib/MiLight/MiLightRadioInterface.h
 create mode 100644 lib/MiLight/MiLightRadioPL1167_LT8900.h
 create mode 100644 lib/MiLight/MiLightRadioPL1197_LT8900.cpp

diff --git a/data/web/index.html b/data/web/index.html
index 4f3fe383..59bad930 100644
--- a/data/web/index.html
+++ b/data/web/index.html
@@ -16,7 +16,7 @@
   <!--[if lt IE 9]>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js"></script>
   <![endif]-->
-  
+
   <style>
     .header-row { border-bottom: 1px solid #ccc; }
     label { display: block; }
@@ -31,8 +31,8 @@
     .error-info:before { content: '('; }
     .error-info:after { content: ')'; }
     .header-btn { margin: 20px; }
-    .btn-secondary { 
-      background-color: #fff; 
+    .btn-secondary {
+      background-color: #fff;
       border: 1px solid #ccc;
     }
     .inline { display: inline-block; }
@@ -46,41 +46,41 @@
       width: calc(100% - 3em);
       display: inline-block;
       cursor: pointer;
-      background: linear-gradient(to right, 
-        rgb(255, 0, 0) 0%, 
-        rgb(255, 255, 0) 16.6667%, 
-        rgb(0, 255, 0) 33.3333%, 
-        rgb(0, 255, 255) 50%, 
-        rgb(0, 0, 255) 66.6667%, 
-        rgb(255, 0, 255) 83.3333%, 
+      background: linear-gradient(to right,
+        rgb(255, 0, 0) 0%,
+        rgb(255, 255, 0) 16.6667%,
+        rgb(0, 255, 0) 33.3333%,
+        rgb(0, 255, 255) 50%,
+        rgb(0, 0, 255) 66.6667%,
+        rgb(255, 0, 255) 83.3333%,
         rgb(255, 0, 0) 100%
       );
     }
-    .hue-value-display { 
+    .hue-value-display {
       border: 1px solid #000;
       margin-left: 0.5em;
       width: 2em;
       height: 2em;
       display: inline-block;
     }
-    .plus-minus-group { 
+    .plus-minus-group {
       overflow: auto;
       width: 100%;
       clear: both;
       display: block;
     }
-    .plus-minus-group button:first-of-type { 
+    .plus-minus-group button:first-of-type {
       border-bottom-right-radius: 0;
       border-top-right-radius: 0;
       float: left;
       display: block;
     }
-    .plus-minus-group button:last-of-type { 
+    .plus-minus-group button:last-of-type {
       border-bottom-left-radius: 0;
       border-top-left-radius: 0;
       display: block;
     }
-    .plus-minus-group .title { 
+    .plus-minus-group .title {
       border-width: 1px 0;
       border-color: #ccc;
       border-style: solid;
@@ -100,12 +100,12 @@
       animation: spin 1s infinite linear;
       -webkit-animation: spin2 1s infinite linear;
     }
-    
+
     @keyframes spin {
       from { transform: scale(1) rotate(0deg); }
       to { transform: scale(1) rotate(360deg); }
     }
-    
+
     @-webkit-keyframes spin2 {
       from { -webkit-transform: rotate(0deg); }
       to { -webkit-transform: rotate(360deg); }
@@ -120,14 +120,15 @@
   <script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-slider/9.7.0/bootstrap-slider.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.12.4/js/standalone/selectize.min.js"></script>
-  
+
   <script lang="text/javascript">
     var FORM_SETTINGS = [
-      "admin_username", "admin_password", "ce_pin", "csn_pin", "packet_repeats",
+      "admin_username", "admin_password", "ce_pin", "csn_pin", "reset_pin","packet_repeats",
       "http_repeat_factor", "auto_restart_period"
     ];
-    
+
     var FORM_SETTINGS_HELP = {
+      csn_pin_RxReady : "'csn' for 'nRF24' interface, and RxReady for 'PL1167_LT8900' interface",
       packet_repeats : "The number of times to repeat RF packets sent to bulbs",
       http_repeat_factor : "Multiplicative factor on packet_repeats for " +
         "requests initiated by the HTTP API. UDP API typically receives " +
@@ -135,37 +136,37 @@
       auto_restart_period : "Automatically restart the device every number of " +
         "minutes specified. Use 0 for disabled."
     }
-    
+
     var UDP_PROTOCOL_VERSIONS = [ 5, 6 ];
     var DEFAULT_UDP_PROTOCL_VERSION = 5;
-    
+
     var selectize;
-    
+
     var toHex = function(v) {
       return "0x" + (v).toString(16).toUpperCase();
     }
-  
+
     var activeUrl = function() {
       var deviceId = $('#deviceId option:selected').val()
         , groupId = $('#groupId .active input').data('value')
         , mode = getCurrentMode();
-        
+
       if (deviceId == "") {
         alert("Please enter a device ID.");
         throw "Must enter device ID";
       }
-      
+
       if (! $('#group-option').data('for').split(',').includes(mode)) {
         groupId = 0;
       }
-        
+
       return "/gateways/" + deviceId + "/" + mode + "/" + groupId;
     }
-    
+
     var getCurrentMode = function() {
       return $('input[name="mode"]:checked').data('value');
     };
-    
+
     var updateGroup = _.throttle(
       function(params) {
         $.ajax(
@@ -179,7 +180,7 @@
       },
       1000
     );
-    
+
     var sendCommand = _.throttle(
       function(params) {
         $.ajax(
@@ -193,18 +194,18 @@
       },
       1000
     )
-    
+
     var sniffRequest;
     var sniffing = false;
     var getTraffic = function() {
       var sniffType = $('#sniff-type input:checked').data('value');
-      
+
       sniffRequest = $.get('/gateway_traffic/' + sniffType, function(data) {
         $('#sniffed-traffic').html(data + $('#sniffed-traffic').html());
         getTraffic();
       });
     };
-    
+
     var gatewayServerRow = function(deviceId, port, version) {
       var elmt = '<tr>';
       elmt += '<td>';
@@ -215,17 +216,17 @@
       elmt += '</td>';
       elmt += '<td>';
       elmt += '<div class="btn-group" data-toggle="buttons">';
-      
+
       for (var i = 0; i < UDP_PROTOCOL_VERSIONS.length; i++) {
         var val = UDP_PROTOCOL_VERSIONS[i]
           , selected = (version == val || (val == DEFAULT_UDP_PROTOCL_VERSION && !UDP_PROTOCOL_VERSIONS.includes(version)));
-        
+
         elmt += '<label class="btn btn-secondary' + (selected ? ' active' : '') + '">';
-        elmt += '<input type="radio" name="versions[]" autocomplete="off" data-value="' + val + '" ' 
+        elmt += '<input type="radio" name="versions[]" autocomplete="off" data-value="' + val + '" '
           + (selected ? 'checked' : '') +'> ' + val;
         elmt += '</label>';
       }
-      
+
       elmt += '</div></td>';
       elmt += '<td>';
       elmt += '<button class="btn btn-danger remove-gateway-server">';
@@ -235,17 +236,17 @@
       elmt += '</tr>';
       return elmt;
     }
-    
+
     var loadSettings = function() {
       $.getJSON('/settings', function(val) {
         Object.keys(val).forEach(function(k) {
           var field = $('#settings input[name="' + k + '"]');
-          
+
           if (field.length > 0) {
             field.val(val[k]);
           }
         });
-        
+
         if (val.device_ids) {
           selectize.clearOptions();
           val.device_ids.forEach(function(v) {
@@ -253,7 +254,7 @@
           });
           selectize.refreshOptions();
         }
-        
+
         var gatewayForm = $('#gateway-server-configs').html('');
         if (val.gateway_configs) {
           val.gateway_configs.forEach(function(v) {
@@ -262,16 +263,16 @@
         }
       });
     };
-    
+
     var saveGatewayConfigs = function() {
       var form = $('#gateway-server-form')
         , errors = false;
-        
+
       $('input', form).removeClass('error');
-      
+
       var deviceIds = $('input[name="deviceIds[]"]', form).map(function(i, v) {
         var val = $(v).val();
-        
+
         if (isNaN(val)) {
           errors = true;
           $(v).addClass('error');
@@ -280,10 +281,10 @@
           return val;
         }
       });
-      
+
       var ports = $('input[name="ports[]"]', form).map(function(i, v) {
         var val = $(v).val();
-        
+
         if (isNaN(val)) {
           errors = true;
           $(v).addClass('error');
@@ -292,11 +293,11 @@
           return val;
         }
       });
-      
+
       var versions = $('.active input[name="versions[]"]', form).map(function(i, v) {
         return $(v).data('value');
       });
-        
+
       if (!errors) {
         var data = [];
         for (var i = 0; i < deviceIds.length; i++) {
@@ -312,7 +313,7 @@
         )
       }
     };
-    
+
     var deviceIdError = function(v) {
       if (!v) {
         $('#device-id-label').removeClass('error');
@@ -321,10 +322,10 @@
         $('#device-id-label .error-info').html(v);
       }
     };
-    
+
     var updateModeOptions = function() {
       var currentMode = getCurrentMode();
-      
+
       $('.mode-option').map(function() {
         if ($(this).data('for').split(',').includes(currentMode)) {
           $(this).show();
@@ -333,10 +334,10 @@
         }
       });
     };
-    
+
     var parseVersion = function(v) {
       var matches = v.match(/(\d+)\.(\d+)\.(\d+)(-(.*))?/);
-      
+
       return {
         major: matches[1],
         minor: matches[2],
@@ -345,28 +346,28 @@
         parts: [matches[1], matches[2], matches[3], matches[5]]
       };
     };
-    
+
     var isNewerVersion = function(a, b) {
       var va = parseVersion(a)
         , vb = parseVersion(b);
-        
+
       return va.parts > vb.parts;
     };
-    
+
     var handleCheckForUpdates = function() {
       var currentVersion = null
         , latestRelease = null;
-        
+
       var handleReceiveData = function() {
         if (currentVersion != null) {
           $('#current-version').html(currentVersion.version + " (" + currentVersion.variant + ")");
         }
-        
+
         if (latestRelease != null) {
           $('#latest-version .info-key').each(function() {
             var value = latestRelease[$(this).data('key')];
             var prop = $(this).data('prop');
-            
+
             if (prop) {
               $(this).prop(prop, value);
             } else {
@@ -374,11 +375,11 @@
             }
           });
         }
-        
+
         if (currentVersion != null && latestRelease != null) {
           $('#latest-version .status').html('');
           $('#latest-version-info').show();
-          
+
           var summary;
           if (isNewerVersion(latestRelease.tag_name, currentVersion.version)) {
             summary = "New version available!";
@@ -386,30 +387,30 @@
             summary = "You're on the most recent version.";
           }
           $('#version-summary').html(summary);
-          
+
           var releaseAsset = latestRelease.assets.filter(function(x) {
             return x.name.indexOf(currentVersion.variant) != -1;
           });
-          
+
           if (releaseAsset.length > 0) {
             console.log(releaseAsset[0].url);
             $('#firmware-link').prop('href', releaseAsset[0].browser_download_url);
           }
         }
-        
+
         console.log(latestRelease);
       }
-      
+
       var handleError = function(e, d) {
         console.log(e);
         console.log(d);
       }
-      
+
       $('#current-version,#latest-version .status').html('<i class="spinning glyphicon glyphicon-refresh"></i>');
       $('#version-summary').html('');
       $('#latest-version-info').hide();
       $('#updates-modal').modal();
-      
+
       $.ajax(
         '/about',
         {
@@ -420,7 +421,7 @@
           failure: handleError
         }
       );
-      
+
       $.ajax(
         '/latest_release',
         {
@@ -432,26 +433,26 @@
         }
       );
     };
-    
+
     $(function() {
       $('.radio-option').click(function() {
         $(this).prev().prop('checked', true);
       });
-      
+
       var hueDragging = false;
       var colorUpdated = function(e) {
         var x = e.pageX - $(this).offset().left
           , pct = x/(1.0*$(this).width())
           , hue = Math.round(360*pct)
           ;
-          
+
         $('.hue-value-display').css({
           backgroundColor: "hsl(" + hue + ",100%,50%)"
         });
-        
+
         updateGroup({hue: hue});
       };
-      
+
       $('.hue-picker-inner')
         .mousedown(function(e) {
           hueDragging = true;
@@ -468,26 +469,26 @@
             colorUpdated.call(this, e);
           }
         });
-        
+
       $('.slider').slider();
-      
+
       $('.raw-update').change(function() {
         var data = {}
           , val = $(this).attr('type') == 'checkbox' ? $(this).is(':checked') : $(this).val()
           ;
-          
+
         data[$(this).attr('name')] = val;
         updateGroup(data);
       });
-      
+
       $('.command-btn').click(function() {
         updateGroup({command: $(this).data('command')});
       });
-      
+
       $('.system-btn').click(function() {
         sendCommand({command: $(this).data('command')});
       });
-      
+
       $('#sniff').click(function() {
         if (sniffing) {
           sniffRequest.abort();
@@ -499,17 +500,17 @@
           $(this).html('Stop Sniffing');
         }
       });
-      
+
       $('#add-server-btn').click(function() {
         $('#gateway-server-configs').append(gatewayServerRow('', ''));
       });
-      
+
       $('#mode').change(updateModeOptions);
-      
+
       $('body').on('click', '.remove-gateway-server', function() {
         $(this).closest('tr').remove();
       });
-      
+
       selectize = $('#deviceId').selectize({
         create: true,
         sortField: 'text',
@@ -521,53 +522,71 @@
             deviceIdError("Must be an integer between 0x0000 and 0xFFFF");
             return false;
           }
-          
+
           var value = parseInt(v);
-          
+
           if (! (0 <= v && v <= 0xFFFF)) {
             deviceIdError("Must be an integer between 0x0000 and 0xFFFF");
             return false;
-          } 
-          
+          }
+
           deviceIdError(false);
-          
+
           return true;
         }
       });
       selectize = selectize[0].selectize;
-      
+
       var settings = "";
-      
+
       FORM_SETTINGS.forEach(function(k) {
         var elmt = '<div class="form-entry">';
         elmt += '<label for="' + k + '">' + k + '</label>';
-        
+
+        if (FORM_SETTINGS_HELP[k]) {
+          elmt += '<div class="field-help" data-help-text="' + FORM_SETTINGS_HELP[k] + '"></div>';
+        }
+
         if (FORM_SETTINGS_HELP[k]) {
           elmt += '<div class="field-help" data-help-text="' + FORM_SETTINGS_HELP[k] + '"></div>';
         }
-        
-        elmt += '<input type="text" class="form-control" name="' + k + '"/>';
-        elmt += '</div>';
-        
+
+        if(k === "radio_interface_type")
+        {
+          elmt += '<div class="btn-group" id="sniff-type" data-toggle="buttons">' +
+            '<label class="btn btn-secondary active">' +
+            '<input type="radio" name="options" autocomplete="off" data-value="nRF24" > nRF24' +
+            '</label>'+
+            '<label class="btn btn-secondary">' +
+              '<input type="radio" name="options" autocomplete="off" data-value="LT1167_PL8900"> LT1167_PL8900' +
+            '</label>' +
+          '</div>';
+        }
+        else
+        {
+          elmt += '<input type="text" class="form-control" name="' + k + '"/>';
+          elmt += '</div>';
+        }
+
         settings += elmt;
       });
-        
+
       $('#settings').prepend(settings);
       $('#settings').submit(function(e) {
         var obj = {};
-        
+
         FORM_SETTINGS.forEach(function(k) {
           obj[k] = $('#settings input[name="' + k + '"]').val();
         });
-        
+
         // pretty hacky. whatever.
         obj.device_ids = _.map(
           $('.selectize-control .option'),
-          function(x) { 
+          function(x) {
             return $(x).data('value')
           }
         );
-        
+
         $.ajax(
           "/settings",
           {
@@ -576,17 +595,17 @@
             data: JSON.stringify(obj)
           }
         );
-        
+
         e.preventDefault();
         return false;
       });
-      
+
       $('#gateway-server-form').submit(function(e) {
         saveGatewayConfigs();
         e.preventDefault();
         return false;
       });
-      
+
       $('.field-help').each(function() {
         var elmt = $('<i></i>')
           .addClass('glyphicon glyphicon-question-sign')
@@ -597,14 +616,14 @@
           });
         $(this).append(elmt);
       });
-      
+
       $('#updates-btn').click(handleCheckForUpdates);
-      
+
       loadSettings();
       updateModeOptions();
     });
   </script>
-  
+
   <div id="update-firmware-modal" class="modal fade" role="dialog">
     <div class="modal-dialog">
       <!-- Modal content-->
@@ -620,10 +639,10 @@ <h2 class="modal-title">Update Firmware</h2>
             <a href="https://github.com/sidoh/esp8266_milight_hub/releases">GitHub releases page</a>.
             Check for a new version by clicking on the "Check for Updates" button.
             </p>
-            
+
             <p>
               <b>Make sure the binary you're uploading was compiled for your board!</b>
-              Firmware with incompatible settings could prevent boots. If this happens, 
+              Firmware with incompatible settings could prevent boots. If this happens,
               reflash the board with USB.
             </p>
           </div>
@@ -637,10 +656,10 @@ <h2 class="modal-title">Update Firmware</h2>
           <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
         </div>
       </div>
-      
+
     </div>
   </div>
-  
+
   <div id="updates-modal" class="modal fade" role="dialog">
     <div class="modal-dialog">
       <!-- Modal content-->
@@ -651,29 +670,29 @@ <h2 class="modal-title">Update</h2>
         </div>
         <div class="modal-body">
           <div id="version-summary"></div>
-          
+
           <hr />
-          
+
           <h4>Current Version</h4>
           <div id="current-version"></div>
-          
+
           <div id="latest-version">
             <h4>Latest Version</h4>
             <div class="status"></div>
             <div id="latest-version-info">
               <label>Version</label>
               <div class="info-key" data-key="tag_name"></div>
-              
+
               <label>Release Date</label>
               <div class="info-key" data-key="published_at"></div>
-              
+
               <label>Release Notes</label>
               <pre class="info-key" data-key="body"></pre>
-              
+
               <div>
                 <a class="info-key" data-prop="href" data-key="html_url">View on GitHub</a>
               </div>
-              
+
               <div>
                 <a class="info-key" id="firmware-link">Download Firmware</a>
               </div>
@@ -685,10 +704,10 @@ <h4>Latest Version</h4>
           <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
         </div>
       </div>
-      
+
     </div>
   </div>
-  
+
   <div class="container">
     <div class="row header-row">
       <div class="col-sm-12">
@@ -697,9 +716,9 @@ <h1>
         </h1>
       </div>
     </div>
-    
+
     <div>&nbsp;</div>
-    
+
     <div class="row">
       <div class="col-sm-4">
         <label for="deviceId" id="device-id-label">
@@ -709,11 +728,11 @@ <h1>
         <select id="deviceId" placeholder="Enter hub ID">
 				</select>
       </div>
-      
+
       <div class="col-sm-3">
         <div class="mode-option" id="group-option" data-for="cct,rgbw,rgb_cct">
           <label for="groupId">Group</label>
-        
+
           <div class="btn-group" id="groupId" data-toggle="buttons">
             <label class="btn btn-secondary active">
               <input type="radio" name="options" autocomplete="off" data-value="1" checked> 1
@@ -733,10 +752,10 @@ <h1>
           </div>
         </div>
       </div>
-      
+
       <div class="col-sm-4">
         <label for="groupId">Mode</label>
-        
+
         <div class="btn-group" id="mode" data-toggle="buttons">
           <label class="btn btn-secondary active">
             <input type="radio" name="mode" autocomplete="off" data-value="rgbw" checked> RGBW
@@ -753,7 +772,7 @@ <h1>
         </div>
       </div>
     </div>
-    
+
     <div class="row"><div class="col-sm-12">
     <div class="mode-option" data-for="rgbw,rgb_cct,rgb">
       <div class="row">
@@ -761,7 +780,7 @@ <h1>
           <h5>Hue</h5>
         </div>
       </div>
-      
+
       <div class="row">
         <div class="col-sm-6">
           <span class="hue-picker">
@@ -772,7 +791,7 @@ <h5>Hue</h5>
       </div>
     </div>
     </div></div>
-    
+
     <div class="mode-option" data-for="rgb_cct">
       <div class="row">
         <div class="col-sm-12">
@@ -789,7 +808,7 @@ <h5>Saturation</h5>
         </div>
       </div>
     </div>
-          
+
     <div class="mode-option" data-for="cct,rgb_cct">
       <div class="row">
         <div class="col-sm-12">
@@ -806,13 +825,13 @@ <h5>Color Temperature</h5>
         </div>
       </div>
     </div>
-    
+
     <div class="row">
       <div class="col-sm-12">
         <h5>Brightness</h5>
       </div>
     </div>
-      
+
     <div class="row">
       <div class="col-sm-12">
         <input class="slider raw-update" name="level"
@@ -822,13 +841,13 @@ <h5>Brightness</h5>
         />
       </div>
     </div>
-    
+
     <div class="row">
       <div class="col-sm-12">
         <h5>Commands</h5>
       </div>
     </div>
-    
+
     <div class="row">
       <div class="col-sm-12">
         <ul class="command-buttons">
@@ -886,12 +905,12 @@ <h5>Commands</h5>
         </ul>
       </div>
     </div>
-    
+
     <div class="row header-row">
       <div class="col col-sm-10">
         <h1>Gateway Servers</h1>
       </div>
-      
+
       <div class="col col-sm-2">
         <button class="btn btn-success header-btn" id="add-server-btn">
           <i class="glyphicon glyphicon-plus"></i>
@@ -899,7 +918,7 @@ <h1>Gateway Servers</h1>
         </button>
       </div>
     </div>
-    
+
     <div class="row">
       <div class="col col-sm-12">
         <form id="gateway-server-form">
@@ -918,17 +937,17 @@ <h1>Gateway Servers</h1>
         </form>
       </div>
     </div>
-    
+
     <div>&nbsp;</div>
-    
+
     <div class="row header-row">
       <div class="col-sm-12">
         <h1>Settings</h1>
       </div>
     </div>
-    
+
     <div>&nbsp;</div>
-    
+
     <div class="row">
       <div class="col-sm-12">
         <form action="#" id="settings">
@@ -936,19 +955,19 @@ <h1>Settings</h1>
         </form>
       </div>
     </div>
-    
+
     <div class="row header-row">
       <div class="col-sm-12">
         <h1>Sniff Traffic</h1>
       </div>
     </div>
-    
+
     <div>&nbsp;</div>
-    
+
     <div class="row">
       <div class="col-sm-12">
         <button type="button" id="sniff" class="btn btn-primary">Start Sniffing</button>
-        
+
         <div class="btn-group" id="sniff-type" data-toggle="buttons">
           <label class="btn btn-secondary active">
             <input type="radio" name="options" autocomplete="off" data-value="rgbw" checked> RGBW
@@ -963,31 +982,31 @@ <h1>Sniff Traffic</h1>
             <input type="radio" name="options" autocomplete="off" data-value="rgb"> RGB
           </label>
         </div>
-        
+
         <div> &nbsp; </div>
-        
+
         <pre id="sniffed-traffic"></pre>
       </div>
     </div>
-    
+
     <div class="row header-row">
       <div class="col-sm-12">
         <h1>Admin</h1>
       </div>
     </div>
-    
+
     <div>&nbsp;</div>
-    
+
     <div class="row">
       <div class="col-sm-12">
         <button type="button" class="btn btn-danger system-btn" data-command="restart">
           Restart
         </button>
-        
+
         <button type="button" id="updates-btn" class="btn btn-primary">
           Check for Updates
         </button>
-        
+
         <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#update-firmware-modal">
           Update Firmware
         </button>
@@ -995,4 +1014,4 @@ <h1>Admin</h1>
     </div>
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/lib/MiLight/MiLightClient.cpp b/lib/MiLight/MiLightClient.cpp
index 2cecdebb..650d66f5 100644
--- a/lib/MiLight/MiLightClient.cpp
+++ b/lib/MiLight/MiLightClient.cpp
@@ -2,40 +2,42 @@
 #include <MiLightRadioConfig.h>
 #include <Arduino.h>
 
-MiLightRadio* MiLightClient::switchRadio(const MiLightRadioType type) {
+
+MiLightRadioInterface* MiLightClient::switchRadio(const MiLightRadioType type) {
   RadioStack* stack = NULL;
-  
+
   for (int i = 0; i < numRadios; i++) {
     if (radios[i]->config.type == type) {
       stack = radios[i];
       break;
     }
   }
-  
+
   if (stack != NULL) {
-    MiLightRadio *radio = stack->getRadio();
-    
+    MiLightRadioInterface *radio = stack->getRadioInterface();
+
     if (currentRadio->config.type != stack->config.type) {
       radio->configure();
     }
-    
+
     currentRadio = stack;
     formatter = stack->config.packetFormatter;
     return radio;
   } else {
-    Serial.print(F("MiLightClient - tried to get radio for unknown type: "));
+    Serial.print("MiLightClient - tried to get radio for unknown type: ");
     Serial.println(type);
   }
-  
+
   return NULL;
 }
 
-void MiLightClient::prepare(MiLightRadioConfig& config, 
-  const uint16_t deviceId, 
+
+void MiLightClient::prepare(MiLightRadioConfig& config,
+  const uint16_t deviceId,
   const uint8_t groupId) {
-  
+
   switchRadio(config.type);
-  
+
   if (deviceId >= 0 && groupId >= 0) {
     formatter->prepare(deviceId, groupId);
   }
@@ -45,28 +47,29 @@ void MiLightClient::setResendCount(const unsigned int resendCount) {
   this->resendCount = resendCount;
 }
 
+
 bool MiLightClient::available() {
   if (currentRadio == NULL) {
     return false;
   }
-  
-  return currentRadio->getRadio()->available();
-}
 
+  return currentRadio->getRadioInterface()->available();
+}
 void MiLightClient::read(uint8_t packet[]) {
   if (currentRadio == NULL) {
     return;
   }
-  
-  size_t length;
-  currentRadio->getRadio()->read(packet, length);
+
+  size_t length = currentRadio->config.getPacketLength();
+
+  currentRadio->getRadioInterface()->read(packet, length);
 }
 
 void MiLightClient::write(uint8_t packet[]) {
   if (currentRadio == NULL) {
     return;
   }
-  
+
 #ifdef DEBUG_PRINTF
   printf("Sending packet: ");
   for (int i = 0; i < currentRadio->config.getPacketLength(); i++) {
@@ -74,12 +77,15 @@ void MiLightClient::write(uint8_t packet[]) {
   }
   printf("\n");
 #endif
-  
+  int iStart = millis();
   for (int i = 0; i < this->resendCount; i++) {
-    currentRadio->getRadio()->write(packet, currentRadio->config.getPacketLength());
+        currentRadio->getRadioInterface()->write(packet, currentRadio->config.getPacketLength());
   }
+  int iElapsed = millis() - iStart;
+  Serial.print("Elapsed: ");
+  Serial.println(iElapsed);
 }
-    
+
 void MiLightClient::updateColorRaw(const uint8_t color) {
   formatter->updateColorRaw(color);
   flushPacket();
@@ -94,7 +100,7 @@ void MiLightClient::updateBrightness(const uint8_t brightness) {
   formatter->updateBrightness(brightness);
   flushPacket();
 }
-    
+
 void MiLightClient::updateMode(uint8_t mode) {
   formatter->updateMode(mode);
   flushPacket();
@@ -118,7 +124,7 @@ void MiLightClient::modeSpeedUp() {
   formatter->modeSpeedUp();
   flushPacket();
 }
-    
+
 void MiLightClient::updateStatus(MiLightStatus status, uint8_t groupId) {
   formatter->updateStatus(status, groupId);
   flushPacket();
@@ -148,7 +154,7 @@ void MiLightClient::unpair() {
   formatter->unpair();
   flushPacket();
 }
-    
+
 void MiLightClient::increaseBrightness() {
   formatter->increaseBrightness();
   flushPacket();
@@ -182,24 +188,24 @@ void MiLightClient::command(uint8_t command, uint8_t arg) {
 void MiLightClient::formatPacket(uint8_t* packet, char* buffer) {
   formatter->format(packet, buffer);
 }
-    
+
 void MiLightClient::flushPacket() {
   PacketStream& stream = formatter->buildPackets();
   const size_t prevNumRepeats = this->resendCount;
-  
+
   // When sending multiple packets, normalize the number of repeats
   if (stream.numPackets > 1) {
     setResendCount(MILIGHT_DEFAULT_RESEND_COUNT);
   }
-  
+
   while (stream.hasNext()) {
     write(stream.next());
-    
+
     if (stream.hasNext()) {
       delay(10);
     }
   }
-  
+
   setResendCount(prevNumRepeats);
   formatter->reset();
 }
diff --git a/lib/MiLight/MiLightClient.h b/lib/MiLight/MiLightClient.h
index 51a38aa7..e306a152 100644
--- a/lib/MiLight/MiLightClient.h
+++ b/lib/MiLight/MiLightClient.h
@@ -1,9 +1,11 @@
 #include <Arduino.h>
 #include <MiLightRadio.h>
+#include <MiLightRadioPL1167_LT8900.h>
 #include <PL1167_nRF24.h>
 #include <RF24.h>
 #include <MiLightButtons.h>
 #include <RadioStack.h>
+#include <Settings.h>
 
 #ifndef _MILIGHTCLIENT_H
 #define _MILIGHTCLIENT_H
@@ -14,38 +16,53 @@
 
 class MiLightClient {
   public:
-    MiLightClient(uint8_t cePin, uint8_t csnPin)
-      : rf(RF24(cePin, csnPin)),
-      resendCount(MILIGHT_DEFAULT_RESEND_COUNT),
-      currentRadio(NULL),
-      numRadios(MiLightRadioConfig::NUM_CONFIGS)
+  MiLightClient(byte byCSPin, byte byResetPin, byte byPktFlag, eRadioInterfaceType InterfaceType)
+  :
+  resendCount(MILIGHT_DEFAULT_RESEND_COUNT),
+  currentRadio(NULL),
+  numRadios(MiLightRadioConfig::NUM_CONFIGS)
+
+  {
+    radios = new RadioStack*[numRadios];
+
+    for (size_t i = 0; i < numRadios; i++)
     {
-      radios = new RadioStack*[numRadios];
-      
-      for (size_t i = 0; i < numRadios; i++) {
-        radios[i] = new RadioStack(rf, *MiLightRadioConfig::ALL_CONFIGS[i]);
+      if(InterfaceType == LT1167_PL8900)
+      {
+        radios[i] = new RadioStack(byCSPin, byResetPin, byPktFlag, *MiLightRadioConfig::ALL_CONFIGS[i]);
+      }
+      else if(InterfaceType == nRF24)
+      {
+        pRF = new RF24(byCSPin, byPktFlag);
+        radios[i] = new RadioStack(*pRF, *MiLightRadioConfig::ALL_CONFIGS[i]);
       }
-      
-      currentRadio = radios[0];
-      currentRadio->getRadio()->configure();
     }
-    
+
+    currentRadio = radios[0];
+
+    currentRadio->getRadioInterface()->configure();
+  }
+
+
     ~MiLightClient() {
+      delete pRF;
       delete[] radios;
     }
-    
+
     void begin() {
       for (size_t i = 0; i < numRadios; i++) {
-        radios[i]->getRadio()->begin();
+        radios[i]->getRadioInterface()->begin();
       }
     }
-    
+
+
     void prepare(MiLightRadioConfig& config, const uint16_t deviceId = -1, const uint8_t groupId = -1);
+
     void setResendCount(const unsigned int resendCount);
     bool available();
     void read(uint8_t packet[]);
     void write(uint8_t packet[]);
-    
+
     // Common methods
     void updateStatus(MiLightStatus status);
     void updateStatus(MiLightStatus status, uint8_t groupId);
@@ -57,7 +74,7 @@ class MiLightClient {
     void previousMode();
     void modeSpeedDown();
     void modeSpeedUp();
-    
+
     // RGBW methods
     void updateHue(const uint16_t hue);
     void updateBrightness(const uint8_t brightness);
@@ -70,23 +87,25 @@ class MiLightClient {
     void increaseTemperature();
     void increaseBrightness();
     void decreaseBrightness();
-    
+
     void updateSaturation(const uint8_t saturation);
-    
+
     void formatPacket(uint8_t* packet, char* buffer);
-    
-    
+
+
   protected:
-    RF24 rf;
+
+    RF24 *pRF;
     RadioStack** radios;
     RadioStack* currentRadio;
     PacketFormatter* formatter;
     const size_t numRadios;
-    
+
     unsigned int resendCount;
-    
-    MiLightRadio* switchRadio(const MiLightRadioType type);
+
+    MiLightRadioInterface* switchRadio(const MiLightRadioType type);
+
     void flushPacket();
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/lib/MiLight/MiLightRadio.h b/lib/MiLight/MiLightRadio.h
index 6cf5b0cf..437d9a93 100644
--- a/lib/MiLight/MiLightRadio.h
+++ b/lib/MiLight/MiLightRadio.h
@@ -15,16 +15,17 @@
 
 #include "AbstractPL1167.h"
 #include <MiLightRadioConfig.h>
+#include <MiLightRadioInterface.h>
 
 // #define DEBUG_PRINTF
 
 #ifndef MILIGHTRADIO_H_
 #define MILIGHTRADIO_H_
 
-class MiLightRadio {
+class MiLightRadio : public MiLightRadioInterface{
   public:
     MiLightRadio(AbstractPL1167 &pl1167, const MiLightRadioConfig& config);
-    
+
     int begin();
     bool available();
     int read(uint8_t frame[], size_t &frame_length);
@@ -32,7 +33,7 @@ class MiLightRadio {
     int write(uint8_t frame[], size_t frame_length);
     int resend();
     int configure();
-    
+
   private:
     AbstractPL1167 &_pl1167;
     const MiLightRadioConfig& config;
diff --git a/lib/MiLight/MiLightRadioInterface.h b/lib/MiLight/MiLightRadioInterface.h
new file mode 100644
index 00000000..b8aae382
--- /dev/null
+++ b/lib/MiLight/MiLightRadioInterface.h
@@ -0,0 +1,29 @@
+
+#ifdef ARDUINO
+#include "Arduino.h"
+#else
+#include <stdint.h>
+#include <stdlib.h>
+#endif
+
+#ifndef MILIGHTRADIOINTERFACE_H_
+#define MILIGHTRADIOINTERFACE_H_
+
+class MiLightRadioInterface
+{
+  public:
+
+    virtual int begin();
+    virtual bool available();
+    virtual int read(uint8_t frame[], size_t &frame_length);
+    virtual int dupesReceived();
+    virtual int write(uint8_t frame[], size_t frame_length);
+    virtual int resend();
+    virtual int configure();
+
+};
+
+
+
+
+#endif /* MILIGHTRADIOINTERFACE_H_ */
diff --git a/lib/MiLight/MiLightRadioPL1167_LT8900.h b/lib/MiLight/MiLightRadioPL1167_LT8900.h
new file mode 100644
index 00000000..3bb80e21
--- /dev/null
+++ b/lib/MiLight/MiLightRadioPL1167_LT8900.h
@@ -0,0 +1,104 @@
+/*
+ * MiLightRadio.h
+ *
+ *  Created on: 29 May 2015
+ *      Author: henryk
+ */
+
+#ifdef ARDUINO
+#include "Arduino.h"
+#else
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#endif
+
+#include <MiLightRadioConfig.h>
+#include <MiLightButtons.h>
+#include <MiLightRadioInterface.h>
+
+/*
+#define MODE_RGB			0
+#define MODE_DUAL_WHITE		1
+#define MODE_DUAL_WHITE_RGB 2
+
+#define MILIGHT_SYNCWORD_RGB 0x258B00000000147A
+#define MILIGHT_SYNCWORD_DUAL_WHITE 0x55AA00000000050A
+#define MILIGHT_SYNCWORD_DUALWHITE_RGB 0x1809000000007236
+*/
+// Register defines
+#define REGISTER_READ       0b10000000  //bin
+#define REGISTER_WRITE      0b00000000  //bin
+#define REGISTER_MASK       0b01111111  //bin
+
+#define R_CHANNEL           7
+#define CHANNEL_RX_BIT      7
+#define CHANNEL_TX_BIT      8
+#define CHANNEL_MASK        0b01111111  ///bin
+
+#define STATUS_PKT_BIT_MASK	0x40
+
+#define R_STATUS            48
+#define STATUS_CRC_BIT      15
+
+#define R_FIFO              50
+#define R_FIFO_CONTROL      52
+
+#define R_SYNCWORD1         36
+#define R_SYNCWORD2         37
+#define R_SYNCWORD3         38
+#define R_SYNCWORD4         39
+
+#define DEFAULT_TIME_BETWEEN_RETRANSMISSIONS_uS	350
+// #define DEBUG_PRINTF
+
+#ifndef MILIGHTRADIOPL1167_LT8900_H_
+#define MILIGHTRADIOPL1167_LT8900_H_
+
+class MiLightRadioPL1167_LT8900 : public MiLightRadioInterface{
+  public:
+    MiLightRadioPL1167_LT8900(byte byCSPin, byte byResetPin, byte byPktFlag, const MiLightRadioConfig& config);
+
+    virtual int begin();
+    virtual bool available();
+    virtual int read(uint8_t frame[], size_t &frame_length);
+    virtual int dupesReceived();
+    virtual int write(uint8_t frame[], size_t frame_length);
+    virtual int resend();
+    virtual int configure();
+
+  private:
+
+
+        void vInitRadioModule(MiLightRadioType type);
+        //void vSetSyncWord(uint64_t syncWord);
+        void vSetSyncWord(uint16_t syncWord3, uint16_t syncWord2, uint16_t syncWord1, uint16_t syncWord0);
+        uint16_t uiReadRegister(uint8_t reg);
+        void regWrite16(byte ADDR, byte V1, byte V2, byte WAIT);
+        uint8_t uiWriteRegister(uint8_t reg, uint16_t data);
+
+        bool bAvailablePin(void);
+        bool bAvailableRegister(void);
+        void vStartListening(uint uiChannelToListenTo);
+        void vResumeRX(void);
+        int iReadRXBuffer(uint8_t *buffer, size_t maxBuffer);
+        void vSetChannel(uint8_t channel);
+        void vGenericSendPacket(int iMode, int iLength, byte *pbyFrame, byte byChannel );
+        bool bCheckRadioConnection(void);
+        bool sendPacket(uint8_t *data, size_t packetSize,byte byChannel);
+
+        byte _pin_pktflag;
+      	byte _csPin;
+
+    const MiLightRadioConfig& config;
+    uint32_t _prev_packet_id;
+    uint8_t _channel = 0;
+    uint8_t _packet[10];
+    uint8_t _out_packet[10];
+    bool _waiting;
+    int _dupes_received;
+};
+
+
+
+#endif /* MILIGHTRADIO_H_ */
diff --git a/lib/MiLight/MiLightRadioPL1197_LT8900.cpp b/lib/MiLight/MiLightRadioPL1197_LT8900.cpp
new file mode 100644
index 00000000..27d843b5
--- /dev/null
+++ b/lib/MiLight/MiLightRadioPL1197_LT8900.cpp
@@ -0,0 +1,631 @@
+/*
+ * MiLightRadioPL1167_LT89000.cpp
+ *
+ *  Created on: 31 March 2017
+ *      Author: WoodsterDK
+ *
+ *  Very inspired by:
+ *  https://github.com/pmoscetta/authometion-milight/tree/master/Authometion-MiLight
+ *  https://bitbucket.org/robvanderveer/lt8900lib
+ */
+
+#include "MiLightRadioPL1167_LT8900.h"
+#include <SPI.h>
+
+#define DEBUG_PRINTF
+
+/**************************************************************************/
+// Constructor
+/**************************************************************************/
+MiLightRadioPL1167_LT8900::MiLightRadioPL1167_LT8900(byte byCSPin, byte byResetPin, byte byPktFlag, const MiLightRadioConfig& config)
+  :  config(config)
+{
+  _csPin = byCSPin;
+	_pin_pktflag = byPktFlag;
+
+  pinMode(_pin_pktflag, INPUT);
+
+	if (byResetPin > 0)					// If zero then bypass hardware reset
+	{
+		pinMode(byResetPin, OUTPUT);
+		digitalWrite(byResetPin, LOW);
+		delay(200);
+		digitalWrite(byResetPin, HIGH);
+		delay(200);
+	}
+
+  pinMode(_csPin, OUTPUT);
+  digitalWrite(_csPin, HIGH);
+
+  SPI.begin();
+
+  SPI.setFrequency(1000000);
+  SPI.setDataMode(SPI_MODE1);
+  //SPI.setClockDivider(SPI_CLOCK_DIV64); // UNO and 328
+  SPI.setClockDivider(SPI_CLOCK_DIV128); // MEGA and FASTER
+  SPI.setBitOrder(MSBFIRST);
+
+  //Initialize transceiver with correct settings
+  vInitRadioModule(config.type);
+  delay(50);
+
+  // Check if HW is connected
+  bCheckRadioConnection();
+
+  //Reset SPI MODE to default
+  SPI.setDataMode(SPI_MODE0);
+  _waiting = false;
+}
+
+
+
+
+/**************************************************************************/
+// Checks the connection to the radio module by verifying a register setting
+/**************************************************************************/
+bool MiLightRadioPL1167_LT8900::bCheckRadioConnection(void)
+{
+	int iRetValue = 0;
+	uint16_t value_0 = uiReadRegister(0);
+	uint16_t value_1 = uiReadRegister(1);
+
+	if ((value_0 == 0x6fe0) && (value_1 == 0x5681))
+	{
+    #ifdef DEBUG_PRINTF
+		  Serial.println("Radio module running correctly...");
+    #endif
+		iRetValue = 1;
+	}
+	else
+	{
+    #ifdef DEBUG_PRINTF
+		  Serial.println("Failed initializing the radio module...");
+    #endif
+	}
+
+	return iRetValue;
+}
+
+/**************************************************************************/
+// Initialize radio module
+/**************************************************************************/
+void MiLightRadioPL1167_LT8900::vInitRadioModule(MiLightRadioType type)
+{
+	if (type == RGB_CCT)
+	{
+		bool bWriteDefaultDefault = true;  // Is it okay to use the default power up values, without setting them
+
+		regWrite16(0x00, 0x6F, 0xE0, 7);  // Recommended value by PMmicro
+		regWrite16(0x02, 0x66, 0x17, 7);  // Recommended value by PMmicro
+		regWrite16(0x04, 0x9C, 0xC9, 7);  // Recommended value by PMmicro
+
+		regWrite16(0x05, 0x66, 0x37, 7);  // Recommended value by PMmicro
+		regWrite16(0x07, 0x00, 0x4C, 7);  // PL1167's TX/RX Enable and Channel Register, Default channel 76
+		regWrite16(0x08, 0x6C, 0x90, 7);  // Recommended value by PMmicro
+		regWrite16(0x09, 0x48, 0x00, 7);  // PA Control register
+
+		regWrite16(0x0B, 0x00, 0x08, 7);  // Recommended value by PMmicro
+		regWrite16(0x0D, 0x48, 0xBD, 7);  // Recommended value by PMmicro
+		regWrite16(0x16, 0x00, 0xFF, 7);  // Recommended value by PMmicro
+		regWrite16(0x18, 0x00, 0x67, 7);  // Recommended value by PMmicro
+
+		regWrite16(0x1A, 0x19, 0xE0, 7);  // Recommended value by PMmicro
+		regWrite16(0x1B, 0x13, 0x00, 7);  // Recommended value by PMmicro
+
+		regWrite16(0x20, 0x48, 0x00, 7);  // Recommended value by PMmicro
+		regWrite16(0x21, 0x3F, 0xC7, 7);  // Recommended value by PMmicro
+		regWrite16(0x22, 0x20, 0x00, 7);  // Recommended value by PMmicro
+		regWrite16(0x23, 0x03, 0x00, 7);  // Recommended value by PMmicro
+
+		regWrite16(0x24, 0x72, 0x36, 7);  // Sync R0
+		regWrite16(0x27, 0x18, 0x09, 7);  // Sync R3
+		regWrite16(0x28, 0x44, 0x02, 7);  // Recommended value by PMmicro
+		regWrite16(0x29, 0xB0, 0x00, 7);  // Recommended value by PMmicro
+		regWrite16(0x2A, 0xFD, 0xB0, 7);  // Recommended value by PMmicro
+
+		if (bWriteDefaultDefault == true)
+		{
+			regWrite16(0x01, 0x56, 0x81, 7);  // Recommended value by PMmicro
+			regWrite16(0x0A, 0x7F, 0xFD, 7);  // Recommended value by PMmicro
+			regWrite16(0x0C, 0x00, 0x00, 7);  // Recommended value by PMmicro
+			regWrite16(0x17, 0x80, 0x05, 7);  // Recommended value by PMmicro
+			regWrite16(0x19, 0x16, 0x59, 7);  // Recommended value by PMmicro
+			regWrite16(0x1C, 0x18, 0x00, 7);  // Recommended value by PMmicro
+
+			regWrite16(0x25, 0x00, 0x00, 7);  // Recommended value by PMmicro
+			regWrite16(0x26, 0x00, 0x00, 7);  // Recommended value by PMmicro
+			regWrite16(0x2B, 0x00, 0x0F, 7);  // Recommended value by PMmicro
+		}
+	}
+	else if((type == RGBW) || (type == CCT) || (type == RGB) )
+	{
+		regWrite16(0, 111, 224, 7);  // Recommended value by PMmicro
+		regWrite16(1, 86, 129, 7);   // Recommended value by PMmicro
+		regWrite16(2, 102, 23, 7);   // Recommended value by PMmicro
+		regWrite16(4, 156, 201, 7);  // Recommended value by PMmicro
+		regWrite16(5, 102, 55, 7);   // Recommended value by PMmicro
+		regWrite16(7, 0, 76, 7);     // PL1167's TX/RX Enable and Channel Register
+		regWrite16(8, 108, 144, 7);  // Recommended value by PMmicro
+		regWrite16(9, 72, 0, 7);     // PL1167's PA Control Register
+		regWrite16(10, 127, 253, 7); // Recommended value by PMmicro
+		regWrite16(11, 0, 8, 7);     // PL1167's RSSI OFF Control Register -- ???
+		regWrite16(12, 0, 0, 7);     // Recommended value by PMmicro
+		regWrite16(13, 72, 189, 7);  // Recommended value by PMmicro
+		regWrite16(22, 0, 255, 7);   // Recommended value by PMmicro
+		regWrite16(23, 128, 5, 7);   // PL1167's VCO Calibration Enable Register
+		regWrite16(24, 0, 103, 7);   // Recommended value by PMmicro
+		regWrite16(25, 22, 89, 7);   // Recommended value by PMmicro
+		regWrite16(26, 25, 224, 7);  // Recommended value by PMmicro
+		regWrite16(27, 19, 0, 7);    // Recommended value by PMmicro
+		regWrite16(28, 24, 0, 7);    // Recommended value by PMmicro
+		regWrite16(32, 72, 0, 7);    // PL1167's Data Configure Register: LEN_PREAMBLE = 010 -> (0xAAAAAA) 3 bytes, LEN_SYNCWORD = 01 -> 32 bits, LEN_TRAILER = 000 -> (0x05) 4 bits, TYPE_PKT_DAT = 00 -> NRZ law data, TYPE_FEC = 00 -> No FEC
+		regWrite16(33, 63, 199, 7);  // PL1167's Delay Time Control Register 0
+		regWrite16(34, 32, 0, 7);    // PL1167's Delay Time Control Register 1
+		regWrite16(35, 3, 0, 7);     // PL1167's Power Management and Miscellaneous Register
+		regWrite16(40, 68, 2, 7);    // PL1167's FIFO and SYNCWORD Threshold Register
+		regWrite16(41, 176, 0, 7);   // PL1167's Miscellaneous Register: CRC_ON = 1 -> ON, SCR_ON = 0 -> OFF, EN_PACK_LEN = 1 -> ON, FW_TERM_TX = 1 -> ON, AUTO_ACK = 0 -> OFF, PKT_LEVEL = 0 -> PKT active high, CRC_INIT_DAT = 0
+		regWrite16(42, 253, 176, 7); // PL1167's SCAN RSSI Register 0
+		regWrite16(43, 0, 15, 7);    // PL1167's SCAN RSSI Register 1
+		delay(200);
+		regWrite16(128, 0, 0, 7);
+		regWrite16(129, 255, 255, 7);
+		regWrite16(130, 0, 0, 7);
+		regWrite16(132, 0, 0, 7);
+		regWrite16(133, 255, 255, 7);
+		regWrite16(135, 255, 255, 7);
+		regWrite16(136, 0, 0, 7);
+		regWrite16(137, 255, 255, 7);
+		regWrite16(138, 0, 0, 7);
+		regWrite16(139, 255, 255, 7);
+		regWrite16(140, 0, 0, 7);
+		regWrite16(141, 255, 255, 7);
+		regWrite16(150, 0, 0, 7);
+		regWrite16(151, 255, 255, 7);
+		regWrite16(152, 0, 0, 7);
+		regWrite16(153, 255, 255, 7);
+		regWrite16(154, 0, 0, 7);
+		regWrite16(155, 255, 255, 7);
+		regWrite16(156, 0, 0, 7);
+		regWrite16(160, 0, 0, 7);
+		regWrite16(161, 255, 255, 7);
+		regWrite16(162, 0, 0, 7);
+		regWrite16(163, 255, 255, 7);
+		regWrite16(168, 0, 0, 7);
+		regWrite16(169, 255, 255, 7);
+		regWrite16(170, 0, 0, 7);
+		regWrite16(171, 255, 255, 7);
+		regWrite16(7, 0, 0, 7);       // Disable TX/RX and set radio channel to 0
+	}
+}
+
+/**************************************************************************/
+// Set sync word
+/**************************************************************************/
+void MiLightRadioPL1167_LT8900::vSetSyncWord(uint16_t syncWord3, uint16_t syncWord2, uint16_t syncWord1, uint16_t syncWord0)
+{
+	uiWriteRegister(R_SYNCWORD1, syncWord0);
+	uiWriteRegister(R_SYNCWORD2, syncWord1);
+	uiWriteRegister(R_SYNCWORD3, syncWord1);
+	uiWriteRegister(R_SYNCWORD4, syncWord3);
+}
+
+/**************************************************************************/
+// Low level register write with delay
+/**************************************************************************/
+void MiLightRadioPL1167_LT8900::regWrite16(byte ADDR, byte V1, byte V2, byte WAIT)
+{
+	digitalWrite(_csPin, LOW);
+	SPI.transfer(ADDR);
+	SPI.transfer(V1);
+	SPI.transfer(V2);
+	digitalWrite(_csPin, HIGH);
+	delayMicroseconds(WAIT);
+}
+
+
+/**************************************************************************/
+// Low level register read
+/**************************************************************************/
+uint16_t MiLightRadioPL1167_LT8900::uiReadRegister(uint8_t reg)
+{
+	SPI.setDataMode(SPI_MODE1);
+	digitalWrite(_csPin, LOW);
+	SPI.transfer(REGISTER_READ | (REGISTER_MASK & reg));
+	uint8_t high = SPI.transfer(0x00);
+	uint8_t low = SPI.transfer(0x00);
+
+	digitalWrite(_csPin, HIGH);
+
+	SPI.setDataMode(SPI_MODE0);
+	return (high << 8 | low);
+}
+
+
+/**************************************************************************/
+// Low level 16bit register write
+/**************************************************************************/
+uint8_t MiLightRadioPL1167_LT8900::uiWriteRegister(uint8_t reg, uint16_t data)
+{
+	uint8_t high = data >> 8;
+	uint8_t low = data & 0xFF;
+
+	digitalWrite(_csPin, LOW);
+
+	uint8_t result = SPI.transfer(REGISTER_WRITE | (REGISTER_MASK & reg));
+	SPI.transfer(high);
+	SPI.transfer(low);
+
+	digitalWrite(_csPin, HIGH);
+
+	return result;
+}
+
+/**************************************************************************/
+// Start listening on specified channel and syncword
+/**************************************************************************/
+void MiLightRadioPL1167_LT8900::vStartListening(uint uiChannelToListenTo)
+{
+  _dupes_received = 0;
+  vSetSyncWord(config.syncword3, 0,0,config.syncword0);
+	vSetChannel(uiChannelToListenTo);
+
+	uiWriteRegister(R_CHANNEL, _channel & CHANNEL_MASK);   //turn off rx/tx
+	delay(3);
+	uiWriteRegister(R_FIFO_CONTROL, 0x0080);  //flush rx
+	uiWriteRegister(R_CHANNEL, (_channel & CHANNEL_MASK) | _BV(CHANNEL_RX_BIT));   //enable RX
+	delay(5);
+}
+
+/**************************************************************************/
+// Resume listening - without changing the channel and syncword
+/**************************************************************************/
+void MiLightRadioPL1167_LT8900::vResumeRX(void)
+{
+  _dupes_received = 0;
+	uiWriteRegister(R_CHANNEL, _channel & CHANNEL_MASK);   //turn off rx/tx
+	delay(3);
+	uiWriteRegister(R_FIFO_CONTROL, 0x0080);  //flush rx
+	uiWriteRegister(R_CHANNEL, (_channel & CHANNEL_MASK) | _BV(CHANNEL_RX_BIT));   //enable RX
+}
+
+/**************************************************************************/
+// Check if data is available using the hardware pin PKT_FLAG
+/**************************************************************************/
+bool MiLightRadioPL1167_LT8900::bAvailablePin()
+{
+	//read the PKT_FLAG pin.
+	if (digitalRead(_pin_pktflag) != 0)
+	{
+		return true;
+	}
+
+	return false;
+}
+
+/**************************************************************************/
+// Check if data is available using the PKT_FLAG state in the status register
+/**************************************************************************/
+bool MiLightRadioPL1167_LT8900::bAvailableRegister()
+{
+	//read the PKT_FLAG state; this can also be done with a hard wire.
+	uint16_t value = uiReadRegister(R_STATUS);
+
+	if (value & STATUS_PKT_BIT_MASK != 0)
+	{
+		return true;
+	}
+
+	return false;
+}
+
+/**************************************************************************/
+// Read the RX buffer
+/**************************************************************************/
+int MiLightRadioPL1167_LT8900::iReadRXBuffer(uint8_t *buffer, size_t maxBuffer)
+{
+	uint16_t value = uiReadRegister(R_STATUS);
+	if (bitRead(value, STATUS_CRC_BIT) == 0)
+	{
+		uint16_t data = uiReadRegister(R_FIFO);
+		uint8_t packetSize = data >> 8;
+		if (maxBuffer < packetSize + 1)
+		{
+			//BUFFER TOO SMALL
+			return -2;
+		}
+
+		uint8_t pos = 0;;
+		buffer[pos++] = (data & 0xFF);
+		while (pos < packetSize)
+		{
+			data = uiReadRegister(R_FIFO);
+			buffer[pos++] = data >> 8;
+			buffer[pos++] = data & 0xFF;
+		}
+
+		return packetSize;
+	}
+	else
+	{
+		//CRC error
+		return -1;
+	}
+}
+
+
+/**************************************************************************/
+// Set the active channel for the radio module
+/**************************************************************************/
+void MiLightRadioPL1167_LT8900::vSetChannel(uint8_t channel)
+{
+	_channel = channel;
+	uiWriteRegister(R_CHANNEL, (_channel & CHANNEL_MASK));
+}
+
+/**************************************************************************/
+// Startup
+/**************************************************************************/
+int MiLightRadioPL1167_LT8900::begin()
+{
+  vSetChannel(config.channels[0]);
+  configure();
+  available();
+  return 0;
+}
+
+/**************************************************************************/
+// Configure the module according to type, and start listening
+/**************************************************************************/
+int MiLightRadioPL1167_LT8900::configure()
+{
+  vInitRadioModule(config.type);
+  vSetSyncWord(config.syncword3, 0,0,config.syncword0);
+  vStartListening(config.channels[0]);
+  return 0;
+}
+
+/**************************************************************************/
+// Check if data is available
+/**************************************************************************/
+bool MiLightRadioPL1167_LT8900::available()
+{
+  _waiting = false;
+
+  if(bAvailablePin())
+  {
+    int iStartTime = millis();
+    int iUpdateStamp = 0;
+    static byte byLastReceived[32];
+
+    byte byaFramesSizes[20];
+    byte byaFramesReceivedCount[20];
+    byte byaFramesReceived[20][32];
+    byte byFrameCounter = 0;
+
+    bool bDifference = false;
+
+    bool bRetVal = false;
+
+    if (bAvailablePin())
+    {
+      unsigned long ulTimeStamp = millis();
+      unsigned long ulElapsedTime = 0;
+
+      do
+      {
+        if (bAvailablePin())
+        {
+          iUpdateStamp = millis();
+          uint8_t buf[32];
+
+          int packetSize = iReadRXBuffer(buf, 32);
+          if (packetSize > 0)
+          {
+            bRetVal = true;
+            bDifference = false;
+
+            for (int iCounter = 0; iCounter < packetSize && bDifference == false; iCounter++)
+            {
+              if (buf[iCounter] != byLastReceived[iCounter])
+              {
+                bDifference = true;
+              }
+            }
+
+            if (bDifference == true)
+            {
+              for (int i = 0; i < packetSize; i++)
+              {
+                byaFramesReceived[byFrameCounter][i] = buf[i];
+                byLastReceived[i] = buf[i];
+                byaFramesSizes[i] = packetSize;
+              }
+
+              byaFramesReceivedCount[byFrameCounter] = 1;
+              byFrameCounter++;
+            }
+            else
+            {
+              byaFramesReceivedCount[byFrameCounter-1]++;
+              //Serial.print(".");
+            }
+          }
+          else
+          {
+            if (packetSize < 0)
+            {
+              Serial.println(F("Packet less than zero, buffer to small"));
+            }
+            else
+            {
+              Serial.println(F("Packet read fail"));
+            }
+          }
+
+          vResumeRX();
+        }
+
+        ulElapsedTime = millis();
+        yield();
+        ulElapsedTime = ulElapsedTime - ulTimeStamp;
+      }while (ulElapsedTime <1000 );
+
+      Serial.print("ElapsedRX: ");
+      Serial.println(iUpdateStamp - iStartTime);
+
+      if (byFrameCounter != 0)
+      {
+      Serial.println("");
+      Serial.print(F("Packets received: "));
+      Serial.print(byFrameCounter);
+
+      for (byte byCounterFrame = 0; byCounterFrame < byFrameCounter; byCounterFrame++)
+      {
+        _dupes_received = byaFramesReceivedCount[byCounterFrame];
+        Serial.println("");
+        Serial.print(F("Packet read OK, rec: "));
+        Serial.print(byaFramesReceivedCount[byCounterFrame]);
+        Serial.println(F(" Frame: "));
+        //dump the packet.
+
+          _packet[0]=byaFramesSizes[byCounterFrame];
+          for (int iByteCounter = 0; iByteCounter < byaFramesSizes[byCounterFrame]; iByteCounter++)
+          {
+            byte byReceivedvalue = byaFramesReceived[byCounterFrame][iByteCounter];
+            _packet[iByteCounter+1] = byReceivedvalue;
+
+            String stringOne = String(byReceivedvalue, HEX);
+            String stringToWrite = "0x";
+
+            if (byReceivedvalue < 0x10)
+            {
+              stringToWrite += "0";
+            }
+            stringToWrite += stringOne;
+            stringToWrite += " ";
+
+
+            Serial.print(stringToWrite);
+          }
+
+          _waiting = true;
+        }
+        Serial.println("");
+      }
+    }
+    yield();
+  }
+
+  return _waiting;
+}
+
+int MiLightRadioPL1167_LT8900::dupesReceived()
+{
+  return _dupes_received;
+}
+
+/**************************************************************************/
+// Read received data from buffer to upper layer
+/**************************************************************************/
+int MiLightRadioPL1167_LT8900::read(uint8_t frame[], size_t &frame_length)
+{
+  if (!_waiting)
+  {
+    frame_length = 0;
+    return -1;
+  }
+
+  if (frame_length > sizeof(_packet) - 1)
+  {
+    frame_length = sizeof(_packet) - 1;
+  }
+
+  if (frame_length > _packet[0])
+  {
+    frame_length = _packet[0];
+  }
+
+  memcpy(frame, _packet +1 , frame_length);
+  _waiting = false;
+
+  // Start RX mode again
+  vResumeRX();
+
+  return _packet[0];
+}
+
+/**************************************************************************/
+// Write data
+/**************************************************************************/
+int MiLightRadioPL1167_LT8900::write(uint8_t frame[], size_t frame_length)
+{
+  if (frame_length > sizeof(_out_packet) - 1) {
+    return -1;
+  }
+
+  memcpy(_out_packet + 1, frame, frame_length);
+  _out_packet[0] = frame_length;
+
+  SPI.setDataMode(SPI_MODE1);
+
+  int retval = resend();
+  yield();
+
+  SPI.setDataMode(SPI_MODE0);
+
+  if (retval < 0) {
+    return retval;
+  }
+  return frame_length;
+}
+
+/**************************************************************************/
+// Handle the transmission to regarding to freq diversity and repeats
+/**************************************************************************/
+int MiLightRadioPL1167_LT8900::resend()
+{
+  byte Length =  _out_packet[0];
+
+  for (size_t i = 0; i < MiLightRadioConfig::NUM_CHANNELS; i++)
+  {
+    sendPacket(_out_packet, Length, config.channels[i]);
+    delayMicroseconds(DEFAULT_TIME_BETWEEN_RETRANSMISSIONS_uS);
+  }
+
+  return 0;
+}
+
+/**************************************************************************/
+// The actual transmit happens here
+/**************************************************************************/
+bool MiLightRadioPL1167_LT8900::sendPacket(uint8_t *data, size_t packetSize, byte byChannel)
+{
+  if (packetSize < 1 || packetSize > 255)
+  {
+    return false;
+  }
+
+  uiWriteRegister(R_CHANNEL, 0x0000);
+  uiWriteRegister(R_FIFO_CONTROL, 0x8080);  //flush tx and RX
+
+  digitalWrite(_csPin, LOW);        // Enable PL1167 SPI transmission
+  SPI.transfer(R_FIFO);             // Start writing PL1167's FIFO Data register
+  SPI.transfer(packetSize);         // Length of data buffer: x bytes
+
+  for (byte iCounter = 0; iCounter < packetSize; iCounter++)
+  {
+    SPI.transfer((data[1+iCounter]));
+  }
+  digitalWrite(_csPin, HIGH);  // Disable PL1167 SPI transmission
+  delayMicroseconds(10);
+
+  uiWriteRegister(R_CHANNEL,  (byChannel & CHANNEL_MASK) | _BV(CHANNEL_TX_BIT));   //enable RX
+
+  //Wait until the packet is sent.
+  while (digitalRead(_pin_pktflag) == 0)
+  {
+      //do nothing.
+  }
+
+  return true;
+}
diff --git a/lib/MiLight/RadioStack.h b/lib/MiLight/RadioStack.h
index 3ff649a6..336f76e6 100644
--- a/lib/MiLight/RadioStack.h
+++ b/lib/MiLight/RadioStack.h
@@ -2,33 +2,55 @@
 #include <PL1167_nRF24.h>
 #include <MiLightRadioConfig.h>
 #include <MiLightRadio.h>
+#include <MiLightRadioPL1167_LT8900.h>
+#include <MiLightRadioInterface.h>
+#include <Settings.h>
 
 #ifndef _RADIO_STACK_H
-#define _RADIO_STACK_H 
+#define _RADIO_STACK_H
 
 class RadioStack {
 public:
-  RadioStack(RF24& rf, const MiLightRadioConfig& config) 
-    : config(config)
+  RadioStack(RF24& rf, const MiLightRadioConfig& config)
+    : config(config),UsedInterfaceType(nRF24)
   {
     nrf = new PL1167_nRF24(rf);
     radio = new MiLightRadio(*nrf, config);
   }
-  
+
+  RadioStack(byte byCSPin, byte byResetPin, byte byPktFlag, const MiLightRadioConfig& config)
+      : config(config),UsedInterfaceType(LT1167_PL8900)
+    {
+      radioPL1167_LT8900 = new MiLightRadioPL1167_LT8900(byCSPin, byResetPin, byPktFlag, config);
+    }
+
   ~RadioStack() {
     delete radio;
     delete nrf;
+    delete radioPL1167_LT8900;
+
   }
-  
-  inline MiLightRadio* getRadio() {
-    return this->radio;
+
+  inline MiLightRadioInterface* getRadioInterface()
+  {
+    if(UsedInterfaceType == nRF24)
+    {
+      return this->radio;
+    }
+    else if(UsedInterfaceType == LT1167_PL8900)
+    {
+      return this->radioPL1167_LT8900;
+    }
   }
-  
+
   const MiLightRadioConfig& config;
-  
+
 private:
   PL1167_nRF24 *nrf;
   MiLightRadio *radio;
+  MiLightRadioPL1167_LT8900 *radioPL1167_LT8900;
+  eRadioInterfaceType UsedInterfaceType;
+
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/lib/Settings/Settings.cpp b/lib/Settings/Settings.cpp
index 809e7ff3..d1a503b3 100644
--- a/lib/Settings/Settings.cpp
+++ b/lib/Settings/Settings.cpp
@@ -3,7 +3,7 @@
 #include <FS.h>
 #include <IntParsing.h>
 #include <algorithm>
-  
+
 bool Settings::hasAuthSettings() {
   return adminUsername.length() > 0 && adminPassword.length() > 0;
 }
@@ -16,7 +16,7 @@ size_t Settings::getAutoRestartPeriod() {
   if (_autoRestartPeriod == 0) {
     return 0;
   }
-  
+
   return std::max(_autoRestartPeriod, static_cast<size_t>(MINIMUM_RESTART_PERIOD));
 }
 
@@ -31,34 +31,51 @@ void Settings::deserialize(Settings& settings, JsonObject& parsedSettings) {
     if (parsedSettings.containsKey("admin_username")) {
       settings.adminUsername = parsedSettings.get<String>("admin_username");
     }
-    
+
     if (parsedSettings.containsKey("admin_password")) {
       settings.adminPassword = parsedSettings.get<String>("admin_password");
     }
-    
+
     if (parsedSettings.containsKey("ce_pin")) {
       settings.cePin = parsedSettings["ce_pin"];
     }
-    
+
     if (parsedSettings.containsKey("csn_pin")) {
       settings.csnPin = parsedSettings["csn_pin"];
     }
-    
+
+    if (parsedSettings.containsKey("reset_pin")) {
+      settings.resetPin = parsedSettings["reset_pin"];
+    }
+
+    if (parsedSettings.containsKey("radio_interface_type"))
+    {
+      String InterfaceType = parsedSettings["radio_interface_type"];
+      if(InterfaceType == "nRF24")
+      {
+        settings.radioInterfaceType =  nRF24;
+      }
+      else if(InterfaceType == "nRF24")
+      {
+        settings.radioInterfaceType =  LT1167_PL8900;
+      }
+    }
+
     if (parsedSettings.containsKey("packet_repeats")) {
       settings.packetRepeats = parsedSettings["packet_repeats"];
     }
-    
+
     if (parsedSettings.containsKey("http_repeat_factor")) {
       settings.httpRepeatFactor = parsedSettings["http_repeat_factor"];
     }
-    
+
     if (parsedSettings.containsKey("auto_restart_period")) {
       settings._autoRestartPeriod = parsedSettings["auto_restart_period"];
     }
-    
+
     JsonArray& arr = parsedSettings["device_ids"];
     settings.updateDeviceIds(arr);
-    
+
     JsonArray& gatewayArr = parsedSettings["gateway_configs"];
     settings.updateGatewayConfigs(gatewayArr);
   }
@@ -69,7 +86,7 @@ void Settings::updateDeviceIds(JsonArray& arr) {
     if (this->deviceIds) {
       delete this->deviceIds;
     }
-    
+
     this->deviceIds = new uint16_t[arr.size()];
     this->numDeviceIds = arr.size();
     arr.copyTo(this->deviceIds, arr.size());
@@ -81,13 +98,13 @@ void Settings::updateGatewayConfigs(JsonArray& arr) {
     if (this->gatewayConfigs) {
       delete[] this->gatewayConfigs;
     }
-    
+
     this->gatewayConfigs = new GatewayConfig*[arr.size()];
     this->numGatewayConfigs = arr.size();
-    
+
     for (size_t i = 0; i < arr.size(); i++) {
       JsonArray& params = arr[i];
-      
+
       if (params.success() && params.size() == 3) {
         this->gatewayConfigs[i] = new GatewayConfig(parseInt<uint16_t>(params[0]), params[1], params[2]);
       } else {
@@ -112,6 +129,24 @@ void Settings::patch(JsonObject& parsedSettings) {
     if (parsedSettings.containsKey("csn_pin")) {
       this->csnPin = parsedSettings["csn_pin"];
     }
+
+    if (parsedSettings.containsKey("reset_pin")) {
+      this->resetPin = parsedSettings["reset_pin"];
+    }
+
+    if (parsedSettings.containsKey("radio_interface_type"))
+    {
+      String InterfaceType = parsedSettings["radio_interface_type"];
+      if(InterfaceType == "nRF24")
+      {
+        this->radioInterfaceType =  nRF24;
+      }
+      else if(InterfaceType == "LT1167_PL8900")
+      {
+        this->radioInterfaceType =  LT1167_PL8900;
+      }
+    }
+
     if (parsedSettings.containsKey("packet_repeats")) {
       this->packetRepeats = parsedSettings["packet_repeats"];
     }
@@ -137,7 +172,7 @@ void Settings::load(Settings& settings) {
     File f = SPIFFS.open(SETTINGS_FILE, "r");
     String settingsContents = f.readStringUntil(SETTINGS_TERMINATOR);
     f.close();
-    
+
     deserialize(settings, settingsContents);
   } else {
     settings.save();
@@ -153,7 +188,7 @@ String Settings::toJson(const bool prettyPrint) {
 
 void Settings::save() {
   File f = SPIFFS.open(SETTINGS_FILE, "w");
-  
+
   if (!f) {
     Serial.println(F("Opening settings file failed"));
   } else {
@@ -165,21 +200,32 @@ void Settings::save() {
 void Settings::serialize(Stream& stream, const bool prettyPrint) {
   DynamicJsonBuffer jsonBuffer;
   JsonObject& root = jsonBuffer.createObject();
-  
+
   root["admin_username"] = this->adminUsername;
   root["admin_password"] = this->adminPassword;
   root["ce_pin"] = this->cePin;
   root["csn_pin"] = this->csnPin;
+  root["reset_pin"] = this->resetPin;
+
+  if(this->radioInterfaceType == nRF24)
+  {
+    root["radio_interface_type"] = "nRF24";
+  }
+  else if(this->radioInterfaceType == LT1167_PL8900)
+  {
+    root["radio_interface_type"] = "LT1167_PL8900";
+  }
+
   root["packet_repeats"] = this->packetRepeats;
   root["http_repeat_factor"] = this->httpRepeatFactor;
   root["auto_restart_period"] = this->_autoRestartPeriod;
-  
+
   if (this->deviceIds) {
     JsonArray& arr = jsonBuffer.createArray();
     arr.copyFrom(this->deviceIds, this->numDeviceIds);
     root["device_ids"] = arr;
   }
-  
+
   if (this->gatewayConfigs) {
     JsonArray& arr = jsonBuffer.createArray();
     for (size_t i = 0; i < this->numGatewayConfigs; i++) {
@@ -189,13 +235,13 @@ void Settings::serialize(Stream& stream, const bool prettyPrint) {
       elmt.add(this->gatewayConfigs[i]->protocolVersion);
       arr.add(elmt);
     }
-    
+
     root["gateway_configs"] = arr;
   }
-  
+
   if (prettyPrint) {
     root.prettyPrintTo(stream);
   } else {
     root.printTo(stream);
   }
-}
\ No newline at end of file
+}
diff --git a/lib/Settings/Settings.h b/lib/Settings/Settings.h
index 005ac1a7..96df2e6b 100644
--- a/lib/Settings/Settings.h
+++ b/lib/Settings/Settings.h
@@ -24,14 +24,20 @@
 
 #define MINIMUM_RESTART_PERIOD 1
 
+enum eRadioInterfaceType
+{
+  nRF24 = 0,
+  LT1167_PL8900 =1,
+};
+
 class GatewayConfig {
 public:
-  GatewayConfig(uint16_t deviceId, uint16_t port, uint8_t protocolVersion) 
+  GatewayConfig(uint16_t deviceId, uint16_t port, uint8_t protocolVersion)
     : deviceId(deviceId),
       port(port),
       protocolVersion(protocolVersion)
     { }
-  
+
   const uint16_t deviceId;
   const uint16_t port;
   const uint8_t protocolVersion;
@@ -45,6 +51,8 @@ class Settings {
     // CE and CSN pins from nrf24l01
     cePin(D0),
     csnPin(D8),
+    resetPin(0),
+    radioInterfaceType(LT1167_PL8900),
     deviceIds(NULL),
     gatewayConfigs(NULL),
     numDeviceIds(0),
@@ -53,13 +61,13 @@ class Settings {
     httpRepeatFactor(5),
     _autoRestartPeriod(0)
   { }
-  
+
   ~Settings() {
     if (deviceIds) {
       delete deviceIds;
     }
   }
-  
+
   bool hasAuthSettings();
   bool isAutoRestartEnabled();
   size_t getAutoRestartPeriod();
@@ -67,27 +75,29 @@ class Settings {
   static void deserialize(Settings& settings, String json);
   static void deserialize(Settings& settings, JsonObject& json);
   static void load(Settings& settings);
-  
+
   void save();
   String toJson(const bool prettyPrint = true);
   void serialize(Stream& stream, const bool prettyPrint = false);
   void updateDeviceIds(JsonArray& arr);
   void updateGatewayConfigs(JsonArray& arr);
   void patch(JsonObject& obj);
-  
+
   String adminUsername;
   String adminPassword;
   uint8_t cePin;
   uint8_t csnPin;
+  uint8_t resetPin;
+  eRadioInterfaceType radioInterfaceType;
   uint16_t *deviceIds;
   GatewayConfig **gatewayConfigs;
   size_t numGatewayConfigs;
   size_t numDeviceIds;
   size_t packetRepeats;
   size_t httpRepeatFactor;
-  
+
 protected:
   size_t _autoRestartPeriod;
 };
 
-#endif 
\ No newline at end of file
+#endif
diff --git a/platformio.ini b/platformio.ini
index 57a4b192..7873b1cd 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -10,13 +10,14 @@
 
 [common]
 board_f_cpu = 160000000L
-lib_deps_builtin = 
+lib_deps_builtin =
   SPI
-lib_deps_external = 
+lib_deps_external =
   RF24
   WiFiManager
   ArduinoJson
-build_flags = !echo -D MILIGHT_HUB_VERSION=\\\"$(git describe --always)\\\"
+build_flags = !echo -D MILIGHT_HUB_VERSION="\"$(git describe --always)\""
+//build_flags = -D MILIGHT_HUB_VERSION=\"1.1.0\" -D MILIGHT_UDP_DEBUG
 # -D MILIGHT_UDP_DEBUG
 
 [env:nodemcuv2]
@@ -26,7 +27,7 @@ board = nodemcuv2
 lib_deps =
   ${common.lib_deps_builtin}
   ${common.lib_deps_external}
-build_flags = ${common.build_flags} -D FIRMWARE_VARIANT=\\\"nodemcuv2\\\"
+build_flags = ${common.build_flags} -D FIRMWARE_VARIANT="\"nodemcuv2\""
 
 [env:d1_mini]
 platform = espressif8266
@@ -35,7 +36,7 @@ board = d1_mini
 lib_deps =
   ${common.lib_deps_builtin}
   ${common.lib_deps_external}
-build_flags = ${common.build_flags} -D FIRMWARE_VARIANT=\\\"d1_mini\\\"
+build_flags = ${common.build_flags} -D FIRMWARE_VARIANT="\"d1_mini\""
 
 [env:esp12]
 platform = espressif8266
diff --git a/src/main.cpp b/src/main.cpp
index 9511dcff..9fae0d69 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,13 +29,13 @@ void initMilightUdpServers() {
         delete udpServers[i];
       }
     }
-    
+
     delete udpServers;
   }
-  
+
   udpServers = new MiLightUdpServer*[settings.numGatewayConfigs];
   numUdpServers = settings.numGatewayConfigs;
-  
+
   for (size_t i = 0; i < settings.numGatewayConfigs; i++) {
     GatewayConfig* config = settings.gatewayConfigs[i];
     MiLightUdpServer* server = MiLightUdpServer::fromVersion(
@@ -44,7 +44,7 @@ void initMilightUdpServers() {
       config->port,
       config->deviceId
     );
-    
+
     if (server == NULL) {
       Serial.print(F("Error creating UDP server with protocol version: "));
       Serial.println(config->protocolVersion);
@@ -55,17 +55,25 @@ void initMilightUdpServers() {
   }
 }
 
-void initMilightClient() {
+
+void applySettings() 
+{
   if (milightClient) {
     delete milightClient;
   }
-  
-  milightClient = new MiLightClient(settings.cePin, settings.csnPin);
-  milightClient->begin();
-}
 
-void applySettings() {
-  initMilightClient();
+  if(settings.radioInterfaceType == nRF24)
+  {
+      Serial.println("Starting using 'nRF24' interface...");
+      milightClient = new MiLightClient(settings.cePin, settings.resetPin, settings.csnPin, nRF24);
+      milightClient->begin();
+  }
+  else if(settings.radioInterfaceType == LT1167_PL8900)
+  {
+      Serial.println("Starting using 'PL1167_LT8900' interface...");
+      milightClient = new MiLightClient(settings.cePin, settings.resetPin, settings.csnPin, LT1167_PL8900);
+      milightClient->begin();
+  }
   initMilightUdpServers();
 }
 
@@ -73,7 +81,7 @@ bool shouldRestart() {
   if (! settings.isAutoRestartEnabled()) {
     return false;
   }
-  
+
   return settings.getAutoRestartPeriod()*60*1000 < millis();
 }
 
@@ -83,7 +91,7 @@ void setup() {
   SPIFFS.begin();
   Settings::load(settings);
   applySettings();
-  
+
   httpServer = new MiLightHttpServer(settings, milightClient);
   httpServer->onSettingsSaved(applySettings);
   httpServer->begin();
@@ -91,13 +99,13 @@ void setup() {
 
 void loop() {
   httpServer->handleClient();
-  
+
   if (udpServers) {
     for (size_t i = 0; i < settings.numGatewayConfigs; i++) {
       udpServers[i]->handleClient();
     }
   }
-  
+
   if (shouldRestart()) {
     Serial.println(F("Auto-restart triggered. Restarting..."));
     ESP.restart();

From 3a10265c7ac65c93f2df9c52b3dbdf6819acca09 Mon Sep 17 00:00:00 2001
From: WoodsterDK <woodster@sol.dk>
Date: Mon, 3 Apr 2017 12:51:04 +0200
Subject: [PATCH 02/13] Cleaned up code a bit - web app still needs to save
 interface type

- Cleaned up code a bit
- web app still needs to save interface type
- Submit changes causes a reset.
---
 data/web/index.html                       |  2 +-
 lib/MiLight/MiLightRadioPL1167_LT8900.h   | 15 +++---------
 lib/MiLight/MiLightRadioPL1197_LT8900.cpp | 30 +++++++++++------------
 3 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/data/web/index.html b/data/web/index.html
index 59bad930..7e2cf9e6 100644
--- a/data/web/index.html
+++ b/data/web/index.html
@@ -124,7 +124,7 @@
   <script lang="text/javascript">
     var FORM_SETTINGS = [
       "admin_username", "admin_password", "ce_pin", "csn_pin", "reset_pin","packet_repeats",
-      "http_repeat_factor", "auto_restart_period"
+      "http_repeat_factor", "auto_restart_period","radio_interface_type"
     ];
 
     var FORM_SETTINGS_HELP = {
diff --git a/lib/MiLight/MiLightRadioPL1167_LT8900.h b/lib/MiLight/MiLightRadioPL1167_LT8900.h
index 3bb80e21..57ff9c6a 100644
--- a/lib/MiLight/MiLightRadioPL1167_LT8900.h
+++ b/lib/MiLight/MiLightRadioPL1167_LT8900.h
@@ -17,15 +17,7 @@
 #include <MiLightButtons.h>
 #include <MiLightRadioInterface.h>
 
-/*
-#define MODE_RGB			0
-#define MODE_DUAL_WHITE		1
-#define MODE_DUAL_WHITE_RGB 2
-
-#define MILIGHT_SYNCWORD_RGB 0x258B00000000147A
-#define MILIGHT_SYNCWORD_DUAL_WHITE 0x55AA00000000050A
-#define MILIGHT_SYNCWORD_DUALWHITE_RGB 0x1809000000007236
-*/
+
 // Register defines
 #define REGISTER_READ       0b10000000  //bin
 #define REGISTER_WRITE      0b00000000  //bin
@@ -50,7 +42,7 @@
 #define R_SYNCWORD4         39
 
 #define DEFAULT_TIME_BETWEEN_RETRANSMISSIONS_uS	350
-// #define DEBUG_PRINTF
+
 
 #ifndef MILIGHTRADIOPL1167_LT8900_H_
 #define MILIGHTRADIOPL1167_LT8900_H_
@@ -71,7 +63,6 @@ class MiLightRadioPL1167_LT8900 : public MiLightRadioInterface{
 
 
         void vInitRadioModule(MiLightRadioType type);
-        //void vSetSyncWord(uint64_t syncWord);
         void vSetSyncWord(uint16_t syncWord3, uint16_t syncWord2, uint16_t syncWord1, uint16_t syncWord0);
         uint16_t uiReadRegister(uint8_t reg);
         void regWrite16(byte ADDR, byte V1, byte V2, byte WAIT);
@@ -91,7 +82,7 @@ class MiLightRadioPL1167_LT8900 : public MiLightRadioInterface{
       	byte _csPin;
 
     const MiLightRadioConfig& config;
-    uint32_t _prev_packet_id;
+    //uint32_t _prev_packet_id;
     uint8_t _channel = 0;
     uint8_t _packet[10];
     uint8_t _out_packet[10];
diff --git a/lib/MiLight/MiLightRadioPL1197_LT8900.cpp b/lib/MiLight/MiLightRadioPL1197_LT8900.cpp
index 27d843b5..e4f733f5 100644
--- a/lib/MiLight/MiLightRadioPL1197_LT8900.cpp
+++ b/lib/MiLight/MiLightRadioPL1197_LT8900.cpp
@@ -267,7 +267,9 @@ void MiLightRadioPL1167_LT8900::vStartListening(uint uiChannelToListenTo)
 {
   _dupes_received = 0;
   vSetSyncWord(config.syncword3, 0,0,config.syncword0);
-	vSetChannel(uiChannelToListenTo);
+	//vSetChannel(uiChannelToListenTo);
+
+  _channel = uiChannelToListenTo;
 
 	uiWriteRegister(R_CHANNEL, _channel & CHANNEL_MASK);   //turn off rx/tx
 	delay(3);
@@ -447,7 +449,6 @@ bool MiLightRadioPL1167_LT8900::available()
             else
             {
               byaFramesReceivedCount[byFrameCounter-1]++;
-              //Serial.print(".");
             }
           }
           else
@@ -468,25 +469,25 @@ bool MiLightRadioPL1167_LT8900::available()
         ulElapsedTime = millis();
         yield();
         ulElapsedTime = ulElapsedTime - ulTimeStamp;
-      }while (ulElapsedTime <1000 );
+      }while (ulElapsedTime < 1000 );
 
       Serial.print("ElapsedRX: ");
       Serial.println(iUpdateStamp - iStartTime);
 
       if (byFrameCounter != 0)
       {
-      Serial.println("");
-      Serial.print(F("Packets received: "));
-      Serial.print(byFrameCounter);
-
-      for (byte byCounterFrame = 0; byCounterFrame < byFrameCounter; byCounterFrame++)
-      {
-        _dupes_received = byaFramesReceivedCount[byCounterFrame];
         Serial.println("");
-        Serial.print(F("Packet read OK, rec: "));
-        Serial.print(byaFramesReceivedCount[byCounterFrame]);
-        Serial.println(F(" Frame: "));
-        //dump the packet.
+        Serial.print(F("Packets received: "));
+        Serial.print(byFrameCounter);
+
+        for (byte byCounterFrame = 0; byCounterFrame < byFrameCounter; byCounterFrame++)
+        {
+          _dupes_received = byaFramesReceivedCount[byCounterFrame];
+          Serial.println("");
+          Serial.print(F("Packet read OK, rec: "));
+          Serial.print(byaFramesReceivedCount[byCounterFrame]);
+          Serial.println(F(" Frame: "));
+          //dump the packet.
 
           _packet[0]=byaFramesSizes[byCounterFrame];
           for (int iByteCounter = 0; iByteCounter < byaFramesSizes[byCounterFrame]; iByteCounter++)
@@ -504,7 +505,6 @@ bool MiLightRadioPL1167_LT8900::available()
             stringToWrite += stringOne;
             stringToWrite += " ";
 
-
             Serial.print(stringToWrite);
           }
 

From cd1f819b8f8eecb8f338b4929c566e095b826a96 Mon Sep 17 00:00:00 2001
From: WoodsterDK <woodster@sol.dk>
Date: Mon, 3 Apr 2017 22:15:02 +0200
Subject: [PATCH 03/13] Clean up - fixed misspellings

Clean up - fixed misspellings, bugs in web app.
Still can't save interface type though
---
 data/web/index.html         | 19 +++++++-------
 lib/MiLight/MiLightClient.h |  2 +-
 lib/MiLight/RadioStack.h    |  4 +--
 lib/Settings/Settings.cpp   | 12 ++++-----
 lib/Settings/Settings.h     |  4 +--
 platformio.ini              | 51 +++++++++++++++++++------------------
 src/main.cpp                |  4 +--
 7 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/data/web/index.html b/data/web/index.html
index 7e2cf9e6..01054342 100644
--- a/data/web/index.html
+++ b/data/web/index.html
@@ -128,7 +128,7 @@
     ];
 
     var FORM_SETTINGS_HELP = {
-      csn_pin_RxReady : "'csn' for 'nRF24' interface, and RxReady for 'PL1167_LT8900' interface",
+      csn_pin : "'csn' for 'nRF24' interface, and 'PKT' for 'PL1167_LT8900' interface",
       packet_repeats : "The number of times to repeat RF packets sent to bulbs",
       http_repeat_factor : "Multiplicative factor on packet_repeats for " +
         "requests initiated by the HTTP API. UDP API typically receives " +
@@ -547,18 +547,14 @@
           elmt += '<div class="field-help" data-help-text="' + FORM_SETTINGS_HELP[k] + '"></div>';
         }
 
-        if (FORM_SETTINGS_HELP[k]) {
-          elmt += '<div class="field-help" data-help-text="' + FORM_SETTINGS_HELP[k] + '"></div>';
-        }
-
         if(k === "radio_interface_type")
         {
-          elmt += '<div class="btn-group" id="sniff-type" data-toggle="buttons">' +
+          elmt += '<div class="btn-group" id="radiointerface" data-toggle="buttons">' +
             '<label class="btn btn-secondary active">' +
-            '<input type="radio" name="options" autocomplete="off" data-value="nRF24" > nRF24' +
+            '<input type="radio" name="radiointerface_nRF" autocomplete="off" data-value="nRF24" > nRF24' +
             '</label>'+
             '<label class="btn btn-secondary">' +
-              '<input type="radio" name="options" autocomplete="off" data-value="LT1167_PL8900"> LT1167_PL8900' +
+              '<input type="radio" name="radiointerface_PL1167" autocomplete="off" data-value="PL1167/LT8900/8910/8920" > PL1167/LT8900/8910/8920' +
             '</label>' +
           '</div>';
         }
@@ -576,7 +572,10 @@
         var obj = {};
 
         FORM_SETTINGS.forEach(function(k) {
-          obj[k] = $('#settings input[name="' + k + '"]').val();
+          
+            obj[k] = $('#settings input[name="' + k + '"]').val();
+          
+
         });
 
         // pretty hacky. whatever.
@@ -595,6 +594,8 @@
             data: JSON.stringify(obj)
           }
         );
+        //console.log(obj);
+        //console.log(JSON.stringify(obj));
 
         e.preventDefault();
         return false;
diff --git a/lib/MiLight/MiLightClient.h b/lib/MiLight/MiLightClient.h
index e306a152..de114cbe 100644
--- a/lib/MiLight/MiLightClient.h
+++ b/lib/MiLight/MiLightClient.h
@@ -27,7 +27,7 @@ class MiLightClient {
 
     for (size_t i = 0; i < numRadios; i++)
     {
-      if(InterfaceType == LT1167_PL8900)
+      if(InterfaceType == PL1167_LT8900)
       {
         radios[i] = new RadioStack(byCSPin, byResetPin, byPktFlag, *MiLightRadioConfig::ALL_CONFIGS[i]);
       }
diff --git a/lib/MiLight/RadioStack.h b/lib/MiLight/RadioStack.h
index 336f76e6..4582806b 100644
--- a/lib/MiLight/RadioStack.h
+++ b/lib/MiLight/RadioStack.h
@@ -19,7 +19,7 @@ class RadioStack {
   }
 
   RadioStack(byte byCSPin, byte byResetPin, byte byPktFlag, const MiLightRadioConfig& config)
-      : config(config),UsedInterfaceType(LT1167_PL8900)
+      : config(config),UsedInterfaceType(PL1167_LT8900)
     {
       radioPL1167_LT8900 = new MiLightRadioPL1167_LT8900(byCSPin, byResetPin, byPktFlag, config);
     }
@@ -37,7 +37,7 @@ class RadioStack {
     {
       return this->radio;
     }
-    else if(UsedInterfaceType == LT1167_PL8900)
+    else if(UsedInterfaceType == PL1167_LT8900)
     {
       return this->radioPL1167_LT8900;
     }
diff --git a/lib/Settings/Settings.cpp b/lib/Settings/Settings.cpp
index d1a503b3..15abd553 100644
--- a/lib/Settings/Settings.cpp
+++ b/lib/Settings/Settings.cpp
@@ -55,9 +55,9 @@ void Settings::deserialize(Settings& settings, JsonObject& parsedSettings) {
       {
         settings.radioInterfaceType =  nRF24;
       }
-      else if(InterfaceType == "nRF24")
+      else if(InterfaceType == "PL1167/LT8900/8910/8920")
       {
-        settings.radioInterfaceType =  LT1167_PL8900;
+        settings.radioInterfaceType =  PL1167_LT8900;
       }
     }
 
@@ -141,9 +141,9 @@ void Settings::patch(JsonObject& parsedSettings) {
       {
         this->radioInterfaceType =  nRF24;
       }
-      else if(InterfaceType == "LT1167_PL8900")
+      else if(InterfaceType == "PL1167/LT8900/8910/8920")
       {
-        this->radioInterfaceType =  LT1167_PL8900;
+        this->radioInterfaceType =  PL1167_LT8900;
       }
     }
 
@@ -211,9 +211,9 @@ void Settings::serialize(Stream& stream, const bool prettyPrint) {
   {
     root["radio_interface_type"] = "nRF24";
   }
-  else if(this->radioInterfaceType == LT1167_PL8900)
+  else if(this->radioInterfaceType == PL1167_LT8900)
   {
-    root["radio_interface_type"] = "LT1167_PL8900";
+    root["radio_interface_type"] = "PL1167/LT8900/8910/8920";
   }
 
   root["packet_repeats"] = this->packetRepeats;
diff --git a/lib/Settings/Settings.h b/lib/Settings/Settings.h
index 96df2e6b..b3e9011a 100644
--- a/lib/Settings/Settings.h
+++ b/lib/Settings/Settings.h
@@ -27,7 +27,7 @@
 enum eRadioInterfaceType
 {
   nRF24 = 0,
-  LT1167_PL8900 =1,
+  PL1167_LT8900 =1,
 };
 
 class GatewayConfig {
@@ -52,7 +52,7 @@ class Settings {
     cePin(D0),
     csnPin(D8),
     resetPin(0),
-    radioInterfaceType(LT1167_PL8900),
+    radioInterfaceType(PL1167_LT8900),
     deviceIds(NULL),
     gatewayConfigs(NULL),
     numDeviceIds(0),
diff --git a/platformio.ini b/platformio.ini
index 7873b1cd..558be060 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -17,17 +17,18 @@ lib_deps_external =
   WiFiManager
   ArduinoJson
 build_flags = !echo -D MILIGHT_HUB_VERSION="\"$(git describe --always)\""
-//build_flags = -D MILIGHT_HUB_VERSION=\"1.1.0\" -D MILIGHT_UDP_DEBUG
+; build_flags = -D MILIGHT_HUB_VERSION=\"1.1.0\" -D MILIGHT_UDP_DEBUG
 # -D MILIGHT_UDP_DEBUG
+upload_speed = 9600
 
-[env:nodemcuv2]
-platform = espressif8266
-framework = arduino
-board = nodemcuv2
-lib_deps =
-  ${common.lib_deps_builtin}
-  ${common.lib_deps_external}
-build_flags = ${common.build_flags} -D FIRMWARE_VARIANT="\"nodemcuv2\""
+; [env:nodemcuv2]
+; platform = espressif8266
+; framework = arduino
+; board = nodemcuv2
+; lib_deps =
+;   ${common.lib_deps_builtin}
+;   ${common.lib_deps_external}
+; build_flags = ${common.build_flags} -D FIRMWARE_VARIANT="\"nodemcuv2\""
 
 [env:d1_mini]
 platform = espressif8266
@@ -38,20 +39,20 @@ lib_deps =
   ${common.lib_deps_external}
 build_flags = ${common.build_flags} -D FIRMWARE_VARIANT="\"d1_mini\""
 
-[env:esp12]
-platform = espressif8266
-board = esp12e
-framework = arduino
-build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld -D FIRMWARE_VARIANT=\\\"esp12\\\"
-lib_deps =
-  ${common.lib_deps_builtin}
-  ${common.lib_deps_external}
+; [env:esp12]
+; platform = espressif8266
+; board = esp12e
+; framework = arduino
+; build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld -D FIRMWARE_VARIANT=\\\"esp12\\\"
+; lib_deps =
+;   ${common.lib_deps_builtin}
+;   ${common.lib_deps_external}
 
-[env:esp07]
-platform = espressif8266
-board = esp07
-framework = arduino
-build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.1m64.ld -D FIRMWARE_VARIANT=\\\"esp07\\\"
-lib_deps =
-  ${common.lib_deps_builtin}
-  ${common.lib_deps_external}
+; [env:esp07]
+; platform = espressif8266
+; board = esp07
+; framework = arduino
+; build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.1m64.ld -D FIRMWARE_VARIANT=\\\"esp07\\\"
+; lib_deps =
+;   ${common.lib_deps_builtin}
+;   ${common.lib_deps_external}
diff --git a/src/main.cpp b/src/main.cpp
index 9fae0d69..8c2103f0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -68,10 +68,10 @@ void applySettings()
       milightClient = new MiLightClient(settings.cePin, settings.resetPin, settings.csnPin, nRF24);
       milightClient->begin();
   }
-  else if(settings.radioInterfaceType == LT1167_PL8900)
+  else if(settings.radioInterfaceType == PL1167_LT8900)
   {
       Serial.println("Starting using 'PL1167_LT8900' interface...");
-      milightClient = new MiLightClient(settings.cePin, settings.resetPin, settings.csnPin, LT1167_PL8900);
+      milightClient = new MiLightClient(settings.cePin, settings.resetPin, settings.csnPin, PL1167_LT8900);
       milightClient->begin();
   }
   initMilightUdpServers();

From a57fb3f0dc69f6533c89c8db050407a7f61f95c2 Mon Sep 17 00:00:00 2001
From: WoodsterDK <woodster@sol.dk>
Date: Tue, 4 Apr 2017 07:00:20 +0200
Subject: [PATCH 04/13] Reverted settings in platformio.ini

---
 platformio.ini | 53 +++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 558be060..fa1b991d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -16,19 +16,18 @@ lib_deps_external =
   RF24
   WiFiManager
   ArduinoJson
-build_flags = !echo -D MILIGHT_HUB_VERSION="\"$(git describe --always)\""
+build_flags = !echo -D MILIGHT_HUB_VERSION=\\\"$(git describe --always)\\\"
 ; build_flags = -D MILIGHT_HUB_VERSION=\"1.1.0\" -D MILIGHT_UDP_DEBUG
 # -D MILIGHT_UDP_DEBUG
-upload_speed = 9600
 
-; [env:nodemcuv2]
-; platform = espressif8266
-; framework = arduino
-; board = nodemcuv2
-; lib_deps =
-;   ${common.lib_deps_builtin}
-;   ${common.lib_deps_external}
-; build_flags = ${common.build_flags} -D FIRMWARE_VARIANT="\"nodemcuv2\""
+[env:nodemcuv2]
+platform = espressif8266
+framework = arduino
+board = nodemcuv2
+lib_deps =
+  ${common.lib_deps_builtin}
+  ${common.lib_deps_external}
+build_flags = ${common.build_flags} -D FIRMWARE_VARIANT=\\\"nodemcuv2\\\"
 
 [env:d1_mini]
 platform = espressif8266
@@ -37,22 +36,22 @@ board = d1_mini
 lib_deps =
   ${common.lib_deps_builtin}
   ${common.lib_deps_external}
-build_flags = ${common.build_flags} -D FIRMWARE_VARIANT="\"d1_mini\""
+build_flags = ${common.build_flags} -D FIRMWARE_VARIANT=\\\"d1_mini\\\"
 
-; [env:esp12]
-; platform = espressif8266
-; board = esp12e
-; framework = arduino
-; build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld -D FIRMWARE_VARIANT=\\\"esp12\\\"
-; lib_deps =
-;   ${common.lib_deps_builtin}
-;   ${common.lib_deps_external}
+[env:esp12]
+platform = espressif8266
+board = esp12e
+framework = arduino
+build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld -D FIRMWARE_VARIANT=\\\"esp12\\\"
+lib_deps =
+  ${common.lib_deps_builtin}
+  ${common.lib_deps_external}
 
-; [env:esp07]
-; platform = espressif8266
-; board = esp07
-; framework = arduino
-; build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.1m64.ld -D FIRMWARE_VARIANT=\\\"esp07\\\"
-; lib_deps =
-;   ${common.lib_deps_builtin}
-;   ${common.lib_deps_external}
+[env:esp07]
+platform = espressif8266
+board = esp07
+framework = arduino
+build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.1m64.ld -D FIRMWARE_VARIANT=\\\"esp07\\\"
+lib_deps =
+  ${common.lib_deps_builtin}
+  ${common.lib_deps_external}

From d387f9abccffbce7992908ec3690f57fbfef6046 Mon Sep 17 00:00:00 2001
From: Chris Mullins <cmullins@liveramp.com>
Date: Tue, 4 Apr 2017 10:51:58 -0700
Subject: [PATCH 05/13] Change flash settings to 3MB/1MB. Refactor to use radio
 factory

---
 lib/MiLight/AbstractPL1167.h                  |  36 -----
 ...1197_LT8900.cpp => LT8900MiLightRadio.cpp} |  65 ++++-----
 ...ioPL1167_LT8900.h => LT8900MiLightRadio.h} |  54 ++++----
 lib/MiLight/MiLightClient.cpp                 |  57 +++++---
 lib/MiLight/MiLightClient.h                   | 125 ++++++------------
 lib/MiLight/MiLightRadio.h                    |  49 +++----
 lib/MiLight/MiLightRadioFactory.cpp           |  32 +++++
 lib/MiLight/MiLightRadioFactory.h             |  49 +++++++
 lib/MiLight/MiLightRadioInterface.h           |  29 ----
 ...MiLightRadio.cpp => NRF24MiLightRadio.cpp} |  60 ++++-----
 lib/MiLight/NRF24MiLightRadio.h               |  43 ++++++
 lib/MiLight/PL1167_nRF24.cpp                  |  11 +-
 lib/MiLight/PL1167_nRF24.h                    |   5 +-
 lib/MiLight/RadioStack.h                      |  56 --------
 lib/Settings/Settings.cpp                     |  59 ++++-----
 lib/Settings/Settings.h                       |  12 +-
 platformio.ini                                |   4 +-
 src/main.cpp                                  |  26 ++--
 18 files changed, 366 insertions(+), 406 deletions(-)
 delete mode 100644 lib/MiLight/AbstractPL1167.h
 rename lib/MiLight/{MiLightRadioPL1197_LT8900.cpp => LT8900MiLightRadio.cpp} (91%)
 rename lib/MiLight/{MiLightRadioPL1167_LT8900.h => LT8900MiLightRadio.h} (54%)
 create mode 100644 lib/MiLight/MiLightRadioFactory.cpp
 create mode 100644 lib/MiLight/MiLightRadioFactory.h
 delete mode 100644 lib/MiLight/MiLightRadioInterface.h
 rename lib/MiLight/{MiLightRadio.cpp => NRF24MiLightRadio.cpp} (64%)
 create mode 100644 lib/MiLight/NRF24MiLightRadio.h
 delete mode 100644 lib/MiLight/RadioStack.h

diff --git a/lib/MiLight/AbstractPL1167.h b/lib/MiLight/AbstractPL1167.h
deleted file mode 100644
index 4ac6d4ac..00000000
--- a/lib/MiLight/AbstractPL1167.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * AbstractPL1167.h
- *
- *  Created on: 29 May 2015
- *      Author: henryk
- */
-
-#ifdef ARDUINO
-#include "Arduino.h"
-#else
-#include <stdint.h>
-#include <stdlib.h>
-#endif
-
-#ifndef ABSTRACTPL1167_H_
-#define ABSTRACTPL1167_H_
-
-class AbstractPL1167 {
-  public:
-    virtual int open() = 0;
-
-    virtual int setPreambleLength(uint8_t preambleLength) = 0;
-    virtual int setSyncword(uint16_t syncword0, uint16_t syncword3) = 0;
-    virtual int setTrailerLength(uint8_t trailerLength) = 0;
-    virtual int setMaxPacketLength(uint8_t maxPacketLength) = 0;
-    virtual int setCRC(bool crc) = 0;
-    virtual int writeFIFO(const uint8_t data[], size_t data_length) = 0;
-    virtual int transmit(uint8_t channel) = 0;
-    virtual int receive(uint8_t channel) = 0;
-    virtual int readFIFO(uint8_t data[], size_t &data_length) = 0;
-};
-
-
-
-
-#endif /* ABSTRACTPL1167_H_ */
diff --git a/lib/MiLight/MiLightRadioPL1197_LT8900.cpp b/lib/MiLight/LT8900MiLightRadio.cpp
similarity index 91%
rename from lib/MiLight/MiLightRadioPL1197_LT8900.cpp
rename to lib/MiLight/LT8900MiLightRadio.cpp
index e4f733f5..f829c700 100644
--- a/lib/MiLight/MiLightRadioPL1197_LT8900.cpp
+++ b/lib/MiLight/LT8900MiLightRadio.cpp
@@ -9,16 +9,15 @@
  *  https://bitbucket.org/robvanderveer/lt8900lib
  */
 
-#include "MiLightRadioPL1167_LT8900.h"
+#include "LT8900MiLightRadio.h"
 #include <SPI.h>
 
-#define DEBUG_PRINTF
-
 /**************************************************************************/
 // Constructor
 /**************************************************************************/
-MiLightRadioPL1167_LT8900::MiLightRadioPL1167_LT8900(byte byCSPin, byte byResetPin, byte byPktFlag, const MiLightRadioConfig& config)
-  :  config(config)
+LT8900MiLightRadio::LT8900MiLightRadio(byte byCSPin, byte byResetPin, byte byPktFlag, const MiLightRadioConfig& config)
+  : _config(config),
+    _channel(0)
 {
   _csPin = byCSPin;
 	_pin_pktflag = byPktFlag;
@@ -63,7 +62,7 @@ MiLightRadioPL1167_LT8900::MiLightRadioPL1167_LT8900(byte byCSPin, byte byResetP
 /**************************************************************************/
 // Checks the connection to the radio module by verifying a register setting
 /**************************************************************************/
-bool MiLightRadioPL1167_LT8900::bCheckRadioConnection(void)
+bool LT8900MiLightRadio::bCheckRadioConnection(void)
 {
 	int iRetValue = 0;
 	uint16_t value_0 = uiReadRegister(0);
@@ -89,7 +88,7 @@ bool MiLightRadioPL1167_LT8900::bCheckRadioConnection(void)
 /**************************************************************************/
 // Initialize radio module
 /**************************************************************************/
-void MiLightRadioPL1167_LT8900::vInitRadioModule(MiLightRadioType type)
+void LT8900MiLightRadio::vInitRadioModule(MiLightRadioType type)
 {
 	if (type == RGB_CCT)
 	{
@@ -201,7 +200,7 @@ void MiLightRadioPL1167_LT8900::vInitRadioModule(MiLightRadioType type)
 /**************************************************************************/
 // Set sync word
 /**************************************************************************/
-void MiLightRadioPL1167_LT8900::vSetSyncWord(uint16_t syncWord3, uint16_t syncWord2, uint16_t syncWord1, uint16_t syncWord0)
+void LT8900MiLightRadio::vSetSyncWord(uint16_t syncWord3, uint16_t syncWord2, uint16_t syncWord1, uint16_t syncWord0)
 {
 	uiWriteRegister(R_SYNCWORD1, syncWord0);
 	uiWriteRegister(R_SYNCWORD2, syncWord1);
@@ -212,7 +211,7 @@ void MiLightRadioPL1167_LT8900::vSetSyncWord(uint16_t syncWord3, uint16_t syncWo
 /**************************************************************************/
 // Low level register write with delay
 /**************************************************************************/
-void MiLightRadioPL1167_LT8900::regWrite16(byte ADDR, byte V1, byte V2, byte WAIT)
+void LT8900MiLightRadio::regWrite16(byte ADDR, byte V1, byte V2, byte WAIT)
 {
 	digitalWrite(_csPin, LOW);
 	SPI.transfer(ADDR);
@@ -226,7 +225,7 @@ void MiLightRadioPL1167_LT8900::regWrite16(byte ADDR, byte V1, byte V2, byte WAI
 /**************************************************************************/
 // Low level register read
 /**************************************************************************/
-uint16_t MiLightRadioPL1167_LT8900::uiReadRegister(uint8_t reg)
+uint16_t LT8900MiLightRadio::uiReadRegister(uint8_t reg)
 {
 	SPI.setDataMode(SPI_MODE1);
 	digitalWrite(_csPin, LOW);
@@ -244,7 +243,7 @@ uint16_t MiLightRadioPL1167_LT8900::uiReadRegister(uint8_t reg)
 /**************************************************************************/
 // Low level 16bit register write
 /**************************************************************************/
-uint8_t MiLightRadioPL1167_LT8900::uiWriteRegister(uint8_t reg, uint16_t data)
+uint8_t LT8900MiLightRadio::uiWriteRegister(uint8_t reg, uint16_t data)
 {
 	uint8_t high = data >> 8;
 	uint8_t low = data & 0xFF;
@@ -263,10 +262,10 @@ uint8_t MiLightRadioPL1167_LT8900::uiWriteRegister(uint8_t reg, uint16_t data)
 /**************************************************************************/
 // Start listening on specified channel and syncword
 /**************************************************************************/
-void MiLightRadioPL1167_LT8900::vStartListening(uint uiChannelToListenTo)
+void LT8900MiLightRadio::vStartListening(uint uiChannelToListenTo)
 {
   _dupes_received = 0;
-  vSetSyncWord(config.syncword3, 0,0,config.syncword0);
+  vSetSyncWord(_config.syncword3, 0,0,_config.syncword0);
 	//vSetChannel(uiChannelToListenTo);
 
   _channel = uiChannelToListenTo;
@@ -281,7 +280,7 @@ void MiLightRadioPL1167_LT8900::vStartListening(uint uiChannelToListenTo)
 /**************************************************************************/
 // Resume listening - without changing the channel and syncword
 /**************************************************************************/
-void MiLightRadioPL1167_LT8900::vResumeRX(void)
+void LT8900MiLightRadio::vResumeRX(void)
 {
   _dupes_received = 0;
 	uiWriteRegister(R_CHANNEL, _channel & CHANNEL_MASK);   //turn off rx/tx
@@ -293,7 +292,7 @@ void MiLightRadioPL1167_LT8900::vResumeRX(void)
 /**************************************************************************/
 // Check if data is available using the hardware pin PKT_FLAG
 /**************************************************************************/
-bool MiLightRadioPL1167_LT8900::bAvailablePin()
+bool LT8900MiLightRadio::bAvailablePin()
 {
 	//read the PKT_FLAG pin.
 	if (digitalRead(_pin_pktflag) != 0)
@@ -307,7 +306,7 @@ bool MiLightRadioPL1167_LT8900::bAvailablePin()
 /**************************************************************************/
 // Check if data is available using the PKT_FLAG state in the status register
 /**************************************************************************/
-bool MiLightRadioPL1167_LT8900::bAvailableRegister()
+bool LT8900MiLightRadio::bAvailableRegister()
 {
 	//read the PKT_FLAG state; this can also be done with a hard wire.
 	uint16_t value = uiReadRegister(R_STATUS);
@@ -323,7 +322,7 @@ bool MiLightRadioPL1167_LT8900::bAvailableRegister()
 /**************************************************************************/
 // Read the RX buffer
 /**************************************************************************/
-int MiLightRadioPL1167_LT8900::iReadRXBuffer(uint8_t *buffer, size_t maxBuffer)
+int LT8900MiLightRadio::iReadRXBuffer(uint8_t *buffer, size_t maxBuffer)
 {
 	uint16_t value = uiReadRegister(R_STATUS);
 	if (bitRead(value, STATUS_CRC_BIT) == 0)
@@ -358,7 +357,7 @@ int MiLightRadioPL1167_LT8900::iReadRXBuffer(uint8_t *buffer, size_t maxBuffer)
 /**************************************************************************/
 // Set the active channel for the radio module
 /**************************************************************************/
-void MiLightRadioPL1167_LT8900::vSetChannel(uint8_t channel)
+void LT8900MiLightRadio::vSetChannel(uint8_t channel)
 {
 	_channel = channel;
 	uiWriteRegister(R_CHANNEL, (_channel & CHANNEL_MASK));
@@ -367,9 +366,9 @@ void MiLightRadioPL1167_LT8900::vSetChannel(uint8_t channel)
 /**************************************************************************/
 // Startup
 /**************************************************************************/
-int MiLightRadioPL1167_LT8900::begin()
+int LT8900MiLightRadio::begin()
 {
-  vSetChannel(config.channels[0]);
+  vSetChannel(_config.channels[0]);
   configure();
   available();
   return 0;
@@ -378,18 +377,18 @@ int MiLightRadioPL1167_LT8900::begin()
 /**************************************************************************/
 // Configure the module according to type, and start listening
 /**************************************************************************/
-int MiLightRadioPL1167_LT8900::configure()
+int LT8900MiLightRadio::configure()
 {
-  vInitRadioModule(config.type);
-  vSetSyncWord(config.syncword3, 0,0,config.syncword0);
-  vStartListening(config.channels[0]);
+  vInitRadioModule(_config.type);
+  vSetSyncWord(_config.syncword3, 0,0,_config.syncword0);
+  vStartListening(_config.channels[0]);
   return 0;
 }
 
 /**************************************************************************/
 // Check if data is available
 /**************************************************************************/
-bool MiLightRadioPL1167_LT8900::available()
+bool LT8900MiLightRadio::available()
 {
   _waiting = false;
 
@@ -519,7 +518,7 @@ bool MiLightRadioPL1167_LT8900::available()
   return _waiting;
 }
 
-int MiLightRadioPL1167_LT8900::dupesReceived()
+int LT8900MiLightRadio::dupesReceived()
 {
   return _dupes_received;
 }
@@ -527,7 +526,7 @@ int MiLightRadioPL1167_LT8900::dupesReceived()
 /**************************************************************************/
 // Read received data from buffer to upper layer
 /**************************************************************************/
-int MiLightRadioPL1167_LT8900::read(uint8_t frame[], size_t &frame_length)
+int LT8900MiLightRadio::read(uint8_t frame[], size_t &frame_length)
 {
   if (!_waiting)
   {
@@ -557,7 +556,7 @@ int MiLightRadioPL1167_LT8900::read(uint8_t frame[], size_t &frame_length)
 /**************************************************************************/
 // Write data
 /**************************************************************************/
-int MiLightRadioPL1167_LT8900::write(uint8_t frame[], size_t frame_length)
+int LT8900MiLightRadio::write(uint8_t frame[], size_t frame_length)
 {
   if (frame_length > sizeof(_out_packet) - 1) {
     return -1;
@@ -582,13 +581,13 @@ int MiLightRadioPL1167_LT8900::write(uint8_t frame[], size_t frame_length)
 /**************************************************************************/
 // Handle the transmission to regarding to freq diversity and repeats
 /**************************************************************************/
-int MiLightRadioPL1167_LT8900::resend()
+int LT8900MiLightRadio::resend()
 {
   byte Length =  _out_packet[0];
 
   for (size_t i = 0; i < MiLightRadioConfig::NUM_CHANNELS; i++)
   {
-    sendPacket(_out_packet, Length, config.channels[i]);
+    sendPacket(_out_packet, Length, _config.channels[i]);
     delayMicroseconds(DEFAULT_TIME_BETWEEN_RETRANSMISSIONS_uS);
   }
 
@@ -598,7 +597,7 @@ int MiLightRadioPL1167_LT8900::resend()
 /**************************************************************************/
 // The actual transmit happens here
 /**************************************************************************/
-bool MiLightRadioPL1167_LT8900::sendPacket(uint8_t *data, size_t packetSize, byte byChannel)
+bool LT8900MiLightRadio::sendPacket(uint8_t *data, size_t packetSize, byte byChannel)
 {
   if (packetSize < 1 || packetSize > 255)
   {
@@ -629,3 +628,7 @@ bool MiLightRadioPL1167_LT8900::sendPacket(uint8_t *data, size_t packetSize, byt
 
   return true;
 }
+
+const MiLightRadioConfig& LT8900MiLightRadio::config() {
+  return _config;
+}
diff --git a/lib/MiLight/MiLightRadioPL1167_LT8900.h b/lib/MiLight/LT8900MiLightRadio.h
similarity index 54%
rename from lib/MiLight/MiLightRadioPL1167_LT8900.h
rename to lib/MiLight/LT8900MiLightRadio.h
index 57ff9c6a..fa169338 100644
--- a/lib/MiLight/MiLightRadioPL1167_LT8900.h
+++ b/lib/MiLight/LT8900MiLightRadio.h
@@ -15,8 +15,7 @@
 
 #include <MiLightRadioConfig.h>
 #include <MiLightButtons.h>
-#include <MiLightRadioInterface.h>
-
+#include <MiLightRadio.h>
 
 // Register defines
 #define REGISTER_READ       0b10000000  //bin
@@ -43,13 +42,12 @@
 
 #define DEFAULT_TIME_BETWEEN_RETRANSMISSIONS_uS	350
 
-
 #ifndef MILIGHTRADIOPL1167_LT8900_H_
 #define MILIGHTRADIOPL1167_LT8900_H_
 
-class MiLightRadioPL1167_LT8900 : public MiLightRadioInterface{
+class LT8900MiLightRadio : public MiLightRadio {
   public:
-    MiLightRadioPL1167_LT8900(byte byCSPin, byte byResetPin, byte byPktFlag, const MiLightRadioConfig& config);
+    LT8900MiLightRadio(byte byCSPin, byte byResetPin, byte byPktFlag, const MiLightRadioConfig& config);
 
     virtual int begin();
     virtual bool available();
@@ -58,32 +56,32 @@ class MiLightRadioPL1167_LT8900 : public MiLightRadioInterface{
     virtual int write(uint8_t frame[], size_t frame_length);
     virtual int resend();
     virtual int configure();
+    virtual const MiLightRadioConfig& config();
 
   private:
 
-
-        void vInitRadioModule(MiLightRadioType type);
-        void vSetSyncWord(uint16_t syncWord3, uint16_t syncWord2, uint16_t syncWord1, uint16_t syncWord0);
-        uint16_t uiReadRegister(uint8_t reg);
-        void regWrite16(byte ADDR, byte V1, byte V2, byte WAIT);
-        uint8_t uiWriteRegister(uint8_t reg, uint16_t data);
-
-        bool bAvailablePin(void);
-        bool bAvailableRegister(void);
-        void vStartListening(uint uiChannelToListenTo);
-        void vResumeRX(void);
-        int iReadRXBuffer(uint8_t *buffer, size_t maxBuffer);
-        void vSetChannel(uint8_t channel);
-        void vGenericSendPacket(int iMode, int iLength, byte *pbyFrame, byte byChannel );
-        bool bCheckRadioConnection(void);
-        bool sendPacket(uint8_t *data, size_t packetSize,byte byChannel);
-
-        byte _pin_pktflag;
-      	byte _csPin;
-
-    const MiLightRadioConfig& config;
+    void vInitRadioModule(MiLightRadioType type);
+    void vSetSyncWord(uint16_t syncWord3, uint16_t syncWord2, uint16_t syncWord1, uint16_t syncWord0);
+    uint16_t uiReadRegister(uint8_t reg);
+    void regWrite16(byte ADDR, byte V1, byte V2, byte WAIT);
+    uint8_t uiWriteRegister(uint8_t reg, uint16_t data);
+
+    bool bAvailablePin(void);
+    bool bAvailableRegister(void);
+    void vStartListening(uint uiChannelToListenTo);
+    void vResumeRX(void);
+    int iReadRXBuffer(uint8_t *buffer, size_t maxBuffer);
+    void vSetChannel(uint8_t channel);
+    void vGenericSendPacket(int iMode, int iLength, byte *pbyFrame, byte byChannel );
+    bool bCheckRadioConnection(void);
+    bool sendPacket(uint8_t *data, size_t packetSize,byte byChannel);
+
+    byte _pin_pktflag;
+    byte _csPin;
+
+    const MiLightRadioConfig& _config;
     //uint32_t _prev_packet_id;
-    uint8_t _channel = 0;
+    uint8_t _channel;
     uint8_t _packet[10];
     uint8_t _out_packet[10];
     bool _waiting;
@@ -92,4 +90,4 @@ class MiLightRadioPL1167_LT8900 : public MiLightRadioInterface{
 
 
 
-#endif /* MILIGHTRADIO_H_ */
+#endif
diff --git a/lib/MiLight/MiLightClient.cpp b/lib/MiLight/MiLightClient.cpp
index 650d66f5..063b4e4c 100644
--- a/lib/MiLight/MiLightClient.cpp
+++ b/lib/MiLight/MiLightClient.cpp
@@ -2,29 +2,48 @@
 #include <MiLightRadioConfig.h>
 #include <Arduino.h>
 
+MiLightClient::MiLightClient(MiLightRadioFactory* radioFactory)
+  : resendCount(MILIGHT_DEFAULT_RESEND_COUNT),
+    currentRadio(NULL),
+    numRadios(MiLightRadioConfig::NUM_CONFIGS)
+{
+  radios = new MiLightRadio*[numRadios];
+
+  for (size_t i = 0; i < numRadios; i++) {
+    radios[i] = radioFactory->create(*MiLightRadioConfig::ALL_CONFIGS[i]);
+  }
 
-MiLightRadioInterface* MiLightClient::switchRadio(const MiLightRadioType type) {
-  RadioStack* stack = NULL;
+  this->currentRadio = radios[0];
+  this->currentRadio->configure();
+}
+
+void MiLightClient::begin() {
+  for (size_t i = 0; i < numRadios; i++) {
+    radios[i]->begin();
+  }
+}
+
+MiLightRadio* MiLightClient::switchRadio(const MiLightRadioType type) {
+  MiLightRadio* radio = NULL;
 
   for (int i = 0; i < numRadios; i++) {
-    if (radios[i]->config.type == type) {
-      stack = radios[i];
+    if (this->radios[i]->config().type == type) {
+      radio = radios[i];
       break;
     }
   }
 
-  if (stack != NULL) {
-    MiLightRadioInterface *radio = stack->getRadioInterface();
-
-    if (currentRadio->config.type != stack->config.type) {
+  if (radio != NULL) {
+    if (currentRadio != radio) {
       radio->configure();
     }
 
-    currentRadio = stack;
-    formatter = stack->config.packetFormatter;
+    this->currentRadio = radio;
+    this->formatter = radio->config().packetFormatter;
+
     return radio;
   } else {
-    Serial.print("MiLightClient - tried to get radio for unknown type: ");
+    Serial.print(F("MiLightClient - tried to get radio for unknown type: "));
     Serial.println(type);
   }
 
@@ -53,16 +72,16 @@ bool MiLightClient::available() {
     return false;
   }
 
-  return currentRadio->getRadioInterface()->available();
+  return currentRadio->available();
 }
 void MiLightClient::read(uint8_t packet[]) {
   if (currentRadio == NULL) {
     return;
   }
 
-  size_t length = currentRadio->config.getPacketLength();
+  size_t length = currentRadio->config().getPacketLength();
 
-  currentRadio->getRadioInterface()->read(packet, length);
+  currentRadio->read(packet, length);
 }
 
 void MiLightClient::write(uint8_t packet[]) {
@@ -72,18 +91,22 @@ void MiLightClient::write(uint8_t packet[]) {
 
 #ifdef DEBUG_PRINTF
   printf("Sending packet: ");
-  for (int i = 0; i < currentRadio->config.getPacketLength(); i++) {
+  for (int i = 0; i < currentRadio->config().getPacketLength(); i++) {
     printf("%02X", packet[i]);
   }
   printf("\n");
-#endif
   int iStart = millis();
+#endif
+
   for (int i = 0; i < this->resendCount; i++) {
-        currentRadio->getRadioInterface()->write(packet, currentRadio->config.getPacketLength());
+    currentRadio->write(packet, currentRadio->config().getPacketLength());
   }
+
+#ifdef DEBUG_PRINTF
   int iElapsed = millis() - iStart;
   Serial.print("Elapsed: ");
   Serial.println(iElapsed);
+#endif
 }
 
 void MiLightClient::updateColorRaw(const uint8_t color) {
diff --git a/lib/MiLight/MiLightClient.h b/lib/MiLight/MiLightClient.h
index de114cbe..c62c0cf9 100644
--- a/lib/MiLight/MiLightClient.h
+++ b/lib/MiLight/MiLightClient.h
@@ -1,10 +1,7 @@
 #include <Arduino.h>
 #include <MiLightRadio.h>
-#include <MiLightRadioPL1167_LT8900.h>
-#include <PL1167_nRF24.h>
-#include <RF24.h>
+#include <MiLightRadioFactory.h>
 #include <MiLightButtons.h>
-#include <RadioStack.h>
 #include <Settings.h>
 
 #ifndef _MILIGHTCLIENT_H
@@ -15,97 +12,63 @@
 #define MILIGHT_DEFAULT_RESEND_COUNT 10
 
 class MiLightClient {
-  public:
-  MiLightClient(byte byCSPin, byte byResetPin, byte byPktFlag, eRadioInterfaceType InterfaceType)
-  :
-  resendCount(MILIGHT_DEFAULT_RESEND_COUNT),
-  currentRadio(NULL),
-  numRadios(MiLightRadioConfig::NUM_CONFIGS)
-
-  {
-    radios = new RadioStack*[numRadios];
-
-    for (size_t i = 0; i < numRadios; i++)
-    {
-      if(InterfaceType == PL1167_LT8900)
-      {
-        radios[i] = new RadioStack(byCSPin, byResetPin, byPktFlag, *MiLightRadioConfig::ALL_CONFIGS[i]);
-      }
-      else if(InterfaceType == nRF24)
-      {
-        pRF = new RF24(byCSPin, byPktFlag);
-        radios[i] = new RadioStack(*pRF, *MiLightRadioConfig::ALL_CONFIGS[i]);
-      }
-    }
-
-    currentRadio = radios[0];
-
-    currentRadio->getRadioInterface()->configure();
-  }
-
-
-    ~MiLightClient() {
-      delete pRF;
-      delete[] radios;
-    }
-
-    void begin() {
-      for (size_t i = 0; i < numRadios; i++) {
-        radios[i]->getRadioInterface()->begin();
-      }
-    }
+public:
+  MiLightClient(MiLightRadioFactory* radioFactory);
 
+  ~MiLightClient() {
+    delete[] radios;
+  }
 
-    void prepare(MiLightRadioConfig& config, const uint16_t deviceId = -1, const uint8_t groupId = -1);
+  void begin();
+  void prepare(MiLightRadioConfig& config, const uint16_t deviceId = -1, const uint8_t groupId = -1);
 
-    void setResendCount(const unsigned int resendCount);
-    bool available();
-    void read(uint8_t packet[]);
-    void write(uint8_t packet[]);
+  void setResendCount(const unsigned int resendCount);
+  bool available();
+  void read(uint8_t packet[]);
+  void write(uint8_t packet[]);
 
-    // Common methods
-    void updateStatus(MiLightStatus status);
-    void updateStatus(MiLightStatus status, uint8_t groupId);
-    void pair();
-    void unpair();
-    void command(uint8_t command, uint8_t arg);
-    void updateMode(uint8_t mode);
-    void nextMode();
-    void previousMode();
-    void modeSpeedDown();
-    void modeSpeedUp();
+  // Common methods
+  void updateStatus(MiLightStatus status);
+  void updateStatus(MiLightStatus status, uint8_t groupId);
+  void pair();
+  void unpair();
+  void command(uint8_t command, uint8_t arg);
+  void updateMode(uint8_t mode);
+  void nextMode();
+  void previousMode();
+  void modeSpeedDown();
+  void modeSpeedUp();
 
-    // RGBW methods
-    void updateHue(const uint16_t hue);
-    void updateBrightness(const uint8_t brightness);
-    void updateColorWhite();
-    void updateColorRaw(const uint8_t color);
+  // RGBW methods
+  void updateHue(const uint16_t hue);
+  void updateBrightness(const uint8_t brightness);
+  void updateColorWhite();
+  void updateColorRaw(const uint8_t color);
 
-    // CCT methods
-    void updateTemperature(const uint8_t colorTemperature);
-    void decreaseTemperature();
-    void increaseTemperature();
-    void increaseBrightness();
-    void decreaseBrightness();
+  // CCT methods
+  void updateTemperature(const uint8_t colorTemperature);
+  void decreaseTemperature();
+  void increaseTemperature();
+  void increaseBrightness();
+  void decreaseBrightness();
 
-    void updateSaturation(const uint8_t saturation);
+  void updateSaturation(const uint8_t saturation);
 
-    void formatPacket(uint8_t* packet, char* buffer);
+  void formatPacket(uint8_t* packet, char* buffer);
 
 
-  protected:
+protected:
 
-    RF24 *pRF;
-    RadioStack** radios;
-    RadioStack* currentRadio;
-    PacketFormatter* formatter;
-    const size_t numRadios;
+  MiLightRadio** radios;
+  MiLightRadio* currentRadio;
+  PacketFormatter* formatter;
+  const size_t numRadios;
 
-    unsigned int resendCount;
+  unsigned int resendCount;
 
-    MiLightRadioInterface* switchRadio(const MiLightRadioType type);
+  MiLightRadio* switchRadio(const MiLightRadioType type);
 
-    void flushPacket();
+  void flushPacket();
 };
 
 #endif
diff --git a/lib/MiLight/MiLightRadio.h b/lib/MiLight/MiLightRadio.h
index 437d9a93..5389ffc0 100644
--- a/lib/MiLight/MiLightRadio.h
+++ b/lib/MiLight/MiLightRadio.h
@@ -1,50 +1,31 @@
-/*
- * MiLightRadio.h
- *
- *  Created on: 29 May 2015
- *      Author: henryk
- */
 
 #ifdef ARDUINO
 #include "Arduino.h"
 #else
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #endif
 
-#include "AbstractPL1167.h"
 #include <MiLightRadioConfig.h>
-#include <MiLightRadioInterface.h>
 
-// #define DEBUG_PRINTF
+#ifndef _MILIGHT_RADIO_H_
+#define _MILIGHT_RADIO_H_
 
-#ifndef MILIGHTRADIO_H_
-#define MILIGHTRADIO_H_
-
-class MiLightRadio : public MiLightRadioInterface{
+class MiLightRadio {
   public:
-    MiLightRadio(AbstractPL1167 &pl1167, const MiLightRadioConfig& config);
-
-    int begin();
-    bool available();
-    int read(uint8_t frame[], size_t &frame_length);
-    int dupesReceived();
-    int write(uint8_t frame[], size_t frame_length);
-    int resend();
-    int configure();
-
-  private:
-    AbstractPL1167 &_pl1167;
-    const MiLightRadioConfig& config;
-    uint32_t _prev_packet_id;
-
-    uint8_t _packet[10];
-    uint8_t _out_packet[10];
-    bool _waiting;
-    int _dupes_received;
+
+    virtual int begin();
+    virtual bool available();
+    virtual int read(uint8_t frame[], size_t &frame_length);
+    virtual int dupesReceived();
+    virtual int write(uint8_t frame[], size_t frame_length);
+    virtual int resend();
+    virtual int configure();
+    virtual const MiLightRadioConfig& config();
+
 };
 
 
 
-#endif /* MILIGHTRADIO_H_ */
+
+#endif
diff --git a/lib/MiLight/MiLightRadioFactory.cpp b/lib/MiLight/MiLightRadioFactory.cpp
new file mode 100644
index 00000000..a5f295d4
--- /dev/null
+++ b/lib/MiLight/MiLightRadioFactory.cpp
@@ -0,0 +1,32 @@
+#include <MiLightRadioFactory.h>
+
+MiLightRadioFactory* MiLightRadioFactory::fromSettings(const Settings& settings) {
+  switch (settings.radioInterfaceType) {
+    case nRF24:
+      return new NRF24Factory(settings.csnPin, settings.cePin);
+
+    case LT8900:
+      return new LT8900Factory(settings.csnPin, settings.resetPin, settings.cePin);
+
+    default:
+      return NULL;
+  }
+}
+
+NRF24Factory::NRF24Factory(uint8_t csnPin, uint8_t cePin)
+  : rf24(RF24(cePin, csnPin))
+{ }
+
+MiLightRadio* NRF24Factory::create(const MiLightRadioConfig &config) {
+  return new NRF24MiLightRadio(rf24, config);
+}
+
+LT8900Factory::LT8900Factory(uint8_t csPin, uint8_t resetPin, uint8_t pktFlag)
+  : _csPin(csPin),
+    _resetPin(resetPin),
+    _pktFlag(pktFlag)
+{ }
+
+MiLightRadio* LT8900Factory::create(const MiLightRadioConfig& config) {
+  return new LT8900MiLightRadio(_csPin, _resetPin, _pktFlag, config);
+}
diff --git a/lib/MiLight/MiLightRadioFactory.h b/lib/MiLight/MiLightRadioFactory.h
new file mode 100644
index 00000000..feca4be6
--- /dev/null
+++ b/lib/MiLight/MiLightRadioFactory.h
@@ -0,0 +1,49 @@
+#include <RF24.h>
+#include <PL1167_nRF24.h>
+#include <MiLightRadioConfig.h>
+#include <MiLightRadio.h>
+#include <NRF24MiLightRadio.h>
+#include <LT8900MiLightRadio.h>
+#include <Settings.h>
+
+#ifndef _MILIGHT_RADIO_FACTORY_H
+#define _MILIGHT_RADIO_FACTORY_H
+
+class MiLightRadioFactory {
+public:
+
+  virtual MiLightRadio* create(const MiLightRadioConfig& config) = 0;
+
+  static MiLightRadioFactory* fromSettings(const Settings& settings);
+  
+};
+
+class NRF24Factory : public MiLightRadioFactory {
+public:
+
+  NRF24Factory(uint8_t cePin, uint8_t csnPin);
+
+  virtual MiLightRadio* create(const MiLightRadioConfig& config);
+
+protected:
+
+  RF24 rf24;
+
+};
+
+class LT8900Factory : public MiLightRadioFactory {
+public:
+
+  LT8900Factory(uint8_t csPin, uint8_t resetPin, uint8_t pktFlag);
+
+  virtual MiLightRadio* create(const MiLightRadioConfig& config);
+
+protected:
+
+  uint8_t _csPin;
+  uint8_t _resetPin;
+  uint8_t _pktFlag;
+
+};
+
+#endif
diff --git a/lib/MiLight/MiLightRadioInterface.h b/lib/MiLight/MiLightRadioInterface.h
deleted file mode 100644
index b8aae382..00000000
--- a/lib/MiLight/MiLightRadioInterface.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-#ifdef ARDUINO
-#include "Arduino.h"
-#else
-#include <stdint.h>
-#include <stdlib.h>
-#endif
-
-#ifndef MILIGHTRADIOINTERFACE_H_
-#define MILIGHTRADIOINTERFACE_H_
-
-class MiLightRadioInterface
-{
-  public:
-
-    virtual int begin();
-    virtual bool available();
-    virtual int read(uint8_t frame[], size_t &frame_length);
-    virtual int dupesReceived();
-    virtual int write(uint8_t frame[], size_t frame_length);
-    virtual int resend();
-    virtual int configure();
-
-};
-
-
-
-
-#endif /* MILIGHTRADIOINTERFACE_H_ */
diff --git a/lib/MiLight/MiLightRadio.cpp b/lib/MiLight/NRF24MiLightRadio.cpp
similarity index 64%
rename from lib/MiLight/MiLightRadio.cpp
rename to lib/MiLight/NRF24MiLightRadio.cpp
index 6828dc94..c2a09cd7 100644
--- a/lib/MiLight/MiLightRadio.cpp
+++ b/lib/MiLight/NRF24MiLightRadio.cpp
@@ -1,26 +1,22 @@
-/*
- * MiLightRadio.cpp
- *
- *  Created on: 29 May 2015
- *      Author: henryk
- */
+// Adapated from code from henryk
 
-#include "MiLightRadio.h"
+#include <PL1167_nRF24.h>
+#include <NRF24MiLightRadio.h>
 
 #define PACKET_ID(packet, packet_length) ( (packet[1] << 8) | packet[packet_length - 1] )
 
-MiLightRadio::MiLightRadio(AbstractPL1167 &pl1167, const MiLightRadioConfig& config)
-  : _pl1167(pl1167), config(config) {
-  _waiting = false;
-}
+NRF24MiLightRadio::NRF24MiLightRadio(RF24& rf24, const MiLightRadioConfig& config)
+  : _pl1167(PL1167_nRF24(rf24)),
+    _waiting(false),
+    _config(config)
+{ }
 
-int MiLightRadio::begin()
-{
+int NRF24MiLightRadio::begin() {
   int retval = _pl1167.open();
   if (retval < 0) {
     return retval;
   }
-  
+
   retval = configure();
   if (retval < 0) {
     return retval;
@@ -31,7 +27,7 @@ int MiLightRadio::begin()
   return 0;
 }
 
-int MiLightRadio::configure() {
+int NRF24MiLightRadio::configure() {
   int retval = _pl1167.setCRC(true);
   if (retval < 0) {
     return retval;
@@ -47,38 +43,38 @@ int MiLightRadio::configure() {
     return retval;
   }
 
-  retval = _pl1167.setSyncword(config.syncword0, config.syncword3);
+  retval = _pl1167.setSyncword(_config.syncword0, _config.syncword3);
   if (retval < 0) {
     return retval;
   }
 
-  // +1 to be able to buffer the length 
-  retval = _pl1167.setMaxPacketLength(config.getPacketLength() + 1);
+  // +1 to be able to buffer the length
+  retval = _pl1167.setMaxPacketLength(_config.getPacketLength() + 1);
   if (retval < 0) {
     return retval;
   }
-  
+
   return 0;
 }
 
-bool MiLightRadio::available() {
+bool NRF24MiLightRadio::available() {
   if (_waiting) {
 #ifdef DEBUG_PRINTF
   printf("_waiting\n");
 #endif
     return true;
   }
-  
-  if (_pl1167.receive(config.channels[0]) > 0) {
+
+  if (_pl1167.receive(_config.channels[0]) > 0) {
 #ifdef DEBUG_PRINTF
-  printf("MiLightRadio - received packet!\n");
+  printf("NRF24MiLightRadio - received packet!\n");
 #endif
     size_t packet_length = sizeof(_packet);
     if (_pl1167.readFIFO(_packet, packet_length) < 0) {
       return false;
     }
 #ifdef DEBUG_PRINTF
-  printf("MiLightRadio - Checking packet length (expecting %d, is %d)\n", _packet[0] + 1U, packet_length);
+  printf("NRF24MiLightRadio - Checking packet length (expecting %d, is %d)\n", _packet[0] + 1U, packet_length);
 #endif
     if (packet_length == 0 || packet_length != _packet[0] + 1U) {
       return false;
@@ -98,13 +94,13 @@ bool MiLightRadio::available() {
   return _waiting;
 }
 
-int MiLightRadio::dupesReceived()
+int NRF24MiLightRadio::dupesReceived()
 {
   return _dupes_received;
 }
 
 
-int MiLightRadio::read(uint8_t frame[], size_t &frame_length)
+int NRF24MiLightRadio::read(uint8_t frame[], size_t &frame_length)
 {
   if (!_waiting) {
     frame_length = 0;
@@ -125,8 +121,7 @@ int MiLightRadio::read(uint8_t frame[], size_t &frame_length)
   return _packet[0];
 }
 
-int MiLightRadio::write(uint8_t frame[], size_t frame_length)
-{
+int NRF24MiLightRadio::write(uint8_t frame[], size_t frame_length) {
   if (frame_length > sizeof(_out_packet) - 1) {
     return -1;
   }
@@ -141,11 +136,14 @@ int MiLightRadio::write(uint8_t frame[], size_t frame_length)
   return frame_length;
 }
 
-int MiLightRadio::resend()
-{
+int NRF24MiLightRadio::resend() {
   for (size_t i = 0; i < MiLightRadioConfig::NUM_CHANNELS; i++) {
     _pl1167.writeFIFO(_out_packet, _out_packet[0] + 1);
-    _pl1167.transmit(config.channels[i]);
+    _pl1167.transmit(_config.channels[i]);
   }
   return 0;
 }
+
+const MiLightRadioConfig& NRF24MiLightRadio::config() {
+  return _config;
+}
diff --git a/lib/MiLight/NRF24MiLightRadio.h b/lib/MiLight/NRF24MiLightRadio.h
new file mode 100644
index 00000000..83532d7e
--- /dev/null
+++ b/lib/MiLight/NRF24MiLightRadio.h
@@ -0,0 +1,43 @@
+#ifdef ARDUINO
+#include "Arduino.h"
+#else
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#endif
+
+#include <RF24.h>
+#include <PL1167_nRF24.h>
+#include <MiLightRadioConfig.h>
+#include <MiLightRadio.h>
+
+#ifndef _NRF24_MILIGHT_RADIO_H_
+#define _NRF24_MILIGHT_RADIO_H_
+
+class NRF24MiLightRadio : public MiLightRadio {
+  public:
+    NRF24MiLightRadio(RF24& rf, const MiLightRadioConfig& config);
+
+    int begin();
+    bool available();
+    int read(uint8_t frame[], size_t &frame_length);
+    int dupesReceived();
+    int write(uint8_t frame[], size_t frame_length);
+    int resend();
+    int configure();
+    const MiLightRadioConfig& config();
+
+  private:
+    PL1167_nRF24 _pl1167;
+    const MiLightRadioConfig& _config;
+    uint32_t _prev_packet_id;
+
+    uint8_t _packet[10];
+    uint8_t _out_packet[10];
+    bool _waiting;
+    int _dupes_received;
+};
+
+
+
+#endif
diff --git a/lib/MiLight/PL1167_nRF24.cpp b/lib/MiLight/PL1167_nRF24.cpp
index 7abef0d5..64fad728 100644
--- a/lib/MiLight/PL1167_nRF24.cpp
+++ b/lib/MiLight/PL1167_nRF24.cpp
@@ -12,7 +12,8 @@ static uint8_t reverse_bits(uint8_t data);
 static void demangle_packet(uint8_t *in, uint8_t *out) ;
 
 PL1167_nRF24::PL1167_nRF24(RF24 &radio)
-  : _radio(radio) { }
+  : _radio(radio)
+{ }
 
 static const uint8_t pipe[] = {0xd1, 0x28, 0x5e, 0x55, 0x55};
 
@@ -266,7 +267,7 @@ int PL1167_nRF24::transmit(uint8_t channel)
       buffer_fill -= 8;
     }
   }
-  
+
   yield();
 
   _radio.write(tmp, outp);
@@ -374,14 +375,14 @@ int PL1167_nRF24::internal_receive()
   }
 
   memcpy(_packet, tmp, outp);
-  
+
   _packet_length = outp;
   _received = true;
-  
+
 #ifdef DEBUG_PRINTF
   printf("Successfully parsed packet of length %d\n", _packet_length);
 #endif
-  
+
   return outp;
 }
 
diff --git a/lib/MiLight/PL1167_nRF24.h b/lib/MiLight/PL1167_nRF24.h
index f40c584c..42166004 100644
--- a/lib/MiLight/PL1167_nRF24.h
+++ b/lib/MiLight/PL1167_nRF24.h
@@ -9,7 +9,6 @@
 #include "Arduino.h"
 #endif
 
-#include "AbstractPL1167.h"
 #include "RF24.h"
 
 // #define DEBUG_PRINTF
@@ -17,9 +16,9 @@
 #ifndef PL1167_NRF24_H_
 #define PL1167_NRF24_H_
 
-class PL1167_nRF24 : public AbstractPL1167 {
+class PL1167_nRF24 {
   public:
-    PL1167_nRF24(RF24 &radio);
+    PL1167_nRF24(RF24& radio);
     int open();
     int setPreambleLength(uint8_t preambleLength);
     int setSyncword(uint16_t syncword0, uint16_t syncword3);
diff --git a/lib/MiLight/RadioStack.h b/lib/MiLight/RadioStack.h
deleted file mode 100644
index 4582806b..00000000
--- a/lib/MiLight/RadioStack.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#include <RF24.h>
-#include <PL1167_nRF24.h>
-#include <MiLightRadioConfig.h>
-#include <MiLightRadio.h>
-#include <MiLightRadioPL1167_LT8900.h>
-#include <MiLightRadioInterface.h>
-#include <Settings.h>
-
-#ifndef _RADIO_STACK_H
-#define _RADIO_STACK_H
-
-class RadioStack {
-public:
-  RadioStack(RF24& rf, const MiLightRadioConfig& config)
-    : config(config),UsedInterfaceType(nRF24)
-  {
-    nrf = new PL1167_nRF24(rf);
-    radio = new MiLightRadio(*nrf, config);
-  }
-
-  RadioStack(byte byCSPin, byte byResetPin, byte byPktFlag, const MiLightRadioConfig& config)
-      : config(config),UsedInterfaceType(PL1167_LT8900)
-    {
-      radioPL1167_LT8900 = new MiLightRadioPL1167_LT8900(byCSPin, byResetPin, byPktFlag, config);
-    }
-
-  ~RadioStack() {
-    delete radio;
-    delete nrf;
-    delete radioPL1167_LT8900;
-
-  }
-
-  inline MiLightRadioInterface* getRadioInterface()
-  {
-    if(UsedInterfaceType == nRF24)
-    {
-      return this->radio;
-    }
-    else if(UsedInterfaceType == PL1167_LT8900)
-    {
-      return this->radioPL1167_LT8900;
-    }
-  }
-
-  const MiLightRadioConfig& config;
-
-private:
-  PL1167_nRF24 *nrf;
-  MiLightRadio *radio;
-  MiLightRadioPL1167_LT8900 *radioPL1167_LT8900;
-  eRadioInterfaceType UsedInterfaceType;
-
-};
-
-#endif
diff --git a/lib/Settings/Settings.cpp b/lib/Settings/Settings.cpp
index 15abd553..fcf0b605 100644
--- a/lib/Settings/Settings.cpp
+++ b/lib/Settings/Settings.cpp
@@ -48,17 +48,8 @@ void Settings::deserialize(Settings& settings, JsonObject& parsedSettings) {
       settings.resetPin = parsedSettings["reset_pin"];
     }
 
-    if (parsedSettings.containsKey("radio_interface_type"))
-    {
-      String InterfaceType = parsedSettings["radio_interface_type"];
-      if(InterfaceType == "nRF24")
-      {
-        settings.radioInterfaceType =  nRF24;
-      }
-      else if(InterfaceType == "PL1167/LT8900/8910/8920")
-      {
-        settings.radioInterfaceType =  PL1167_LT8900;
-      }
+    if (parsedSettings.containsKey("radio_interface_type")) {
+      settings.radioInterfaceType = typeFromString(parsedSettings["radio_interface_type"]);
     }
 
     if (parsedSettings.containsKey("packet_repeats")) {
@@ -129,24 +120,12 @@ void Settings::patch(JsonObject& parsedSettings) {
     if (parsedSettings.containsKey("csn_pin")) {
       this->csnPin = parsedSettings["csn_pin"];
     }
-
     if (parsedSettings.containsKey("reset_pin")) {
       this->resetPin = parsedSettings["reset_pin"];
     }
-
-    if (parsedSettings.containsKey("radio_interface_type"))
-    {
-      String InterfaceType = parsedSettings["radio_interface_type"];
-      if(InterfaceType == "nRF24")
-      {
-        this->radioInterfaceType =  nRF24;
-      }
-      else if(InterfaceType == "PL1167/LT8900/8910/8920")
-      {
-        this->radioInterfaceType =  PL1167_LT8900;
-      }
+    if (parsedSettings.containsKey("radio_interface_type")) {
+      this->radioInterfaceType = typeFromString(parsedSettings["radio_interface_type"]);
     }
-
     if (parsedSettings.containsKey("packet_repeats")) {
       this->packetRepeats = parsedSettings["packet_repeats"];
     }
@@ -206,16 +185,7 @@ void Settings::serialize(Stream& stream, const bool prettyPrint) {
   root["ce_pin"] = this->cePin;
   root["csn_pin"] = this->csnPin;
   root["reset_pin"] = this->resetPin;
-
-  if(this->radioInterfaceType == nRF24)
-  {
-    root["radio_interface_type"] = "nRF24";
-  }
-  else if(this->radioInterfaceType == PL1167_LT8900)
-  {
-    root["radio_interface_type"] = "PL1167/LT8900/8910/8920";
-  }
-
+  root["radio_interface_type"] = typeToString(this->radioInterfaceType);
   root["packet_repeats"] = this->packetRepeats;
   root["http_repeat_factor"] = this->httpRepeatFactor;
   root["auto_restart_period"] = this->_autoRestartPeriod;
@@ -245,3 +215,22 @@ void Settings::serialize(Stream& stream, const bool prettyPrint) {
     root.printTo(stream);
   }
 }
+
+RadioInterfaceType Settings::typeFromString(const String& s) {
+  if (s.equalsIgnoreCase("lt8900")) {
+    return LT8900;
+  } else {
+    return nRF24;
+  }
+}
+
+String Settings::typeToString(RadioInterfaceType type) {
+  switch (type) {
+    case LT8900:
+      return "LT8900";
+
+    case nRF24:
+    default:
+      return "nRF24";
+  }
+}
diff --git a/lib/Settings/Settings.h b/lib/Settings/Settings.h
index b3e9011a..abfb9fb5 100644
--- a/lib/Settings/Settings.h
+++ b/lib/Settings/Settings.h
@@ -24,10 +24,9 @@
 
 #define MINIMUM_RESTART_PERIOD 1
 
-enum eRadioInterfaceType
-{
+enum RadioInterfaceType {
   nRF24 = 0,
-  PL1167_LT8900 =1,
+  LT8900 = 1,
 };
 
 class GatewayConfig {
@@ -52,7 +51,7 @@ class Settings {
     cePin(D0),
     csnPin(D8),
     resetPin(0),
-    radioInterfaceType(PL1167_LT8900),
+    radioInterfaceType(nRF24),
     deviceIds(NULL),
     gatewayConfigs(NULL),
     numDeviceIds(0),
@@ -76,6 +75,9 @@ class Settings {
   static void deserialize(Settings& settings, JsonObject& json);
   static void load(Settings& settings);
 
+  static RadioInterfaceType typeFromString(const String& s);
+  static String typeToString(RadioInterfaceType type);
+
   void save();
   String toJson(const bool prettyPrint = true);
   void serialize(Stream& stream, const bool prettyPrint = false);
@@ -88,7 +90,7 @@ class Settings {
   uint8_t cePin;
   uint8_t csnPin;
   uint8_t resetPin;
-  eRadioInterfaceType radioInterfaceType;
+  RadioInterfaceType radioInterfaceType;
   uint16_t *deviceIds;
   GatewayConfig **gatewayConfigs;
   size_t numGatewayConfigs;
diff --git a/platformio.ini b/platformio.ini
index fa1b991d..f8639134 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -27,7 +27,7 @@ board = nodemcuv2
 lib_deps =
   ${common.lib_deps_builtin}
   ${common.lib_deps_external}
-build_flags = ${common.build_flags} -D FIRMWARE_VARIANT=\\\"nodemcuv2\\\"
+build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld -D FIRMWARE_VARIANT=\\\"nodemcuv2\\\"
 
 [env:d1_mini]
 platform = espressif8266
@@ -36,7 +36,7 @@ board = d1_mini
 lib_deps =
   ${common.lib_deps_builtin}
   ${common.lib_deps_external}
-build_flags = ${common.build_flags} -D FIRMWARE_VARIANT=\\\"d1_mini\\\"
+build_flags = ${common.build_flags} -Wl,-Tesp8266.flash.4m1m.ld -D FIRMWARE_VARIANT=\\\"d1_mini\\\"
 
 [env:esp12]
 platform = espressif8266
diff --git a/src/main.cpp b/src/main.cpp
index 8c2103f0..567249b8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,6 +17,7 @@ WiFiManager wifiManager;
 Settings settings;
 
 MiLightClient* milightClient;
+MiLightRadioFactory* radioFactory;
 MiLightHttpServer *httpServer;
 
 int numUdpServers = 0;
@@ -56,24 +57,23 @@ void initMilightUdpServers() {
 }
 
 
-void applySettings() 
-{
+void applySettings() {
   if (milightClient) {
     delete milightClient;
   }
-
-  if(settings.radioInterfaceType == nRF24)
-  {
-      Serial.println("Starting using 'nRF24' interface...");
-      milightClient = new MiLightClient(settings.cePin, settings.resetPin, settings.csnPin, nRF24);
-      milightClient->begin();
+  if (radioFactory) {
+    delete radioFactory;
   }
-  else if(settings.radioInterfaceType == PL1167_LT8900)
-  {
-      Serial.println("Starting using 'PL1167_LT8900' interface...");
-      milightClient = new MiLightClient(settings.cePin, settings.resetPin, settings.csnPin, PL1167_LT8900);
-      milightClient->begin();
+
+  radioFactory = MiLightRadioFactory::fromSettings(settings);
+
+  if (radioFactory == NULL) {
+    Serial.println(F("ERROR: unable to construct radio factory"));
   }
+
+  milightClient = new MiLightClient(radioFactory);
+  milightClient->begin();
+
   initMilightUdpServers();
 }
 

From 4ecc67dd10e5a8b6d00f033ee031524e25de62e5 Mon Sep 17 00:00:00 2001
From: Chris Mullins <cmullins@liveramp.com>
Date: Tue, 4 Apr 2017 11:19:00 -0700
Subject: [PATCH 06/13] handle save radio type in UI

---
 data/web/index.html | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/data/web/index.html b/data/web/index.html
index 01054342..0296c9e1 100644
--- a/data/web/index.html
+++ b/data/web/index.html
@@ -242,7 +242,7 @@
         Object.keys(val).forEach(function(k) {
           var field = $('#settings input[name="' + k + '"]');
 
-          if (field.length > 0) {
+          if (field.length > 0 && field.attr('type') === 'text') {
             field.val(val[k]);
           }
         });
@@ -547,19 +547,16 @@
           elmt += '<div class="field-help" data-help-text="' + FORM_SETTINGS_HELP[k] + '"></div>';
         }
 
-        if(k === "radio_interface_type")
-        {
-          elmt += '<div class="btn-group" id="radiointerface" data-toggle="buttons">' +
+        if(k === "radio_interface_type") {
+          elmt += '<div class="btn-group" id="radio_interface_type" data-toggle="buttons">' +
             '<label class="btn btn-secondary active">' +
-            '<input type="radio" name="radiointerface_nRF" autocomplete="off" data-value="nRF24" > nRF24' +
+              '<input type="radio" id="nrf24" name="radio_interface_type" autocomplete="off" value="nRF24" /> nRF24' +
             '</label>'+
             '<label class="btn btn-secondary">' +
-              '<input type="radio" name="radiointerface_PL1167" autocomplete="off" data-value="PL1167/LT8900/8910/8920" > PL1167/LT8900/8910/8920' +
+              '<input type="radio" id="lt8900" name="radio_interface_type" autocomplete="off" value="LT8900" /> PL1167/LT8900' +
             '</label>' +
           '</div>';
-        }
-        else
-        {
+        } else {
           elmt += '<input type="text" class="form-control" name="' + k + '"/>';
           elmt += '</div>';
         }
@@ -572,10 +569,13 @@
         var obj = {};
 
         FORM_SETTINGS.forEach(function(k) {
-          
-            obj[k] = $('#settings input[name="' + k + '"]').val();
-          
+          var elmt = $('#settings input[name="' + k + '"]');
 
+          if (elmt.attr('type') === 'radio') {
+            obj[k] = elmt.filter(function() { return $(this).is(':checked'); }).val();
+          } else {
+            obj[k] = elmt.val();
+          }
         });
 
         // pretty hacky. whatever.
@@ -594,8 +594,6 @@
             data: JSON.stringify(obj)
           }
         );
-        //console.log(obj);
-        //console.log(JSON.stringify(obj));
 
         e.preventDefault();
         return false;

From 7abf605e20f9e257a2b4049492894db298324a23 Mon Sep 17 00:00:00 2001
From: Chris Mullins <cmullins@liveramp.com>
Date: Tue, 4 Apr 2017 11:42:47 -0700
Subject: [PATCH 07/13] load vlaue for radio buttons too

---
 data/web/index.html | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/data/web/index.html b/data/web/index.html
index 0296c9e1..49ff160b 100644
--- a/data/web/index.html
+++ b/data/web/index.html
@@ -242,8 +242,13 @@
         Object.keys(val).forEach(function(k) {
           var field = $('#settings input[name="' + k + '"]');
 
-          if (field.length > 0 && field.attr('type') === 'text') {
-            field.val(val[k]);
+          if (field.length > 0) {
+            if (field.attr('type') === 'radio') {
+              console.log(field.filter('[value="' + val + '"]'));
+              field.filter('[value="' + val + '"]').attr('checked', 'checked');
+            } else {
+              field.val(val[k]);
+            }
           }
         });
 
@@ -572,7 +577,7 @@
           var elmt = $('#settings input[name="' + k + '"]');
 
           if (elmt.attr('type') === 'radio') {
-            obj[k] = elmt.filter(function() { return $(this).is(':checked'); }).val();
+            obj[k] = elmt.filter(':checked').val();
           } else {
             obj[k] = elmt.val();
           }

From 723d69869d8860dc57c5df700df52e2a11556953 Mon Sep 17 00:00:00 2001
From: Chris Mullins <cmullins@liveramp.com>
Date: Tue, 4 Apr 2017 23:30:33 -0700
Subject: [PATCH 08/13] fix radio button selection, add documentation for field

---
 data/web/index.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/data/web/index.html b/data/web/index.html
index 49ff160b..7f512fa6 100644
--- a/data/web/index.html
+++ b/data/web/index.html
@@ -124,7 +124,7 @@
   <script lang="text/javascript">
     var FORM_SETTINGS = [
       "admin_username", "admin_password", "ce_pin", "csn_pin", "reset_pin","packet_repeats",
-      "http_repeat_factor", "auto_restart_period","radio_interface_type"
+      "http_repeat_factor", "auto_restart_period", "radio_interface_type"
     ];
 
     var FORM_SETTINGS_HELP = {
@@ -134,7 +134,9 @@
         "requests initiated by the HTTP API. UDP API typically receives " +
         "duplicate packets, so more repeats should be used for HTTP.",
       auto_restart_period : "Automatically restart the device every number of " +
-        "minutes specified. Use 0 for disabled."
+        "minutes specified. Use 0 for disabled.",
+      radio_interface_type : "2.4 GHz radio model. Only change this if you know " +
+        "You're not using an NRF24L01!"
     }
 
     var UDP_PROTOCOL_VERSIONS = [ 5, 6 ];
@@ -244,8 +246,7 @@
 
           if (field.length > 0) {
             if (field.attr('type') === 'radio') {
-              console.log(field.filter('[value="' + val + '"]'));
-              field.filter('[value="' + val + '"]').attr('checked', 'checked');
+              field.filter('[value="' + val[k] + '"]').click();
             } else {
               field.val(val[k]);
             }
@@ -546,12 +547,15 @@
 
       FORM_SETTINGS.forEach(function(k) {
         var elmt = '<div class="form-entry">';
+        elmt += '<div>';
         elmt += '<label for="' + k + '">' + k + '</label>';
 
         if (FORM_SETTINGS_HELP[k]) {
           elmt += '<div class="field-help" data-help-text="' + FORM_SETTINGS_HELP[k] + '"></div>';
         }
 
+        elmt += '</div>';
+
         if(k === "radio_interface_type") {
           elmt += '<div class="btn-group" id="radio_interface_type" data-toggle="buttons">' +
             '<label class="btn btn-secondary active">' +

From e7d54cf1d1fb995800cfca570b87febe89c40800 Mon Sep 17 00:00:00 2001
From: Chris Mullins <cmullins@liveramp.com>
Date: Wed, 5 Apr 2017 00:39:25 -0700
Subject: [PATCH 09/13] wrap prints in ifdefs

---
 lib/MiLight/LT8900MiLightRadio.cpp | 46 ++++++++++++++----------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/lib/MiLight/LT8900MiLightRadio.cpp b/lib/MiLight/LT8900MiLightRadio.cpp
index f829c700..c75abbf3 100644
--- a/lib/MiLight/LT8900MiLightRadio.cpp
+++ b/lib/MiLight/LT8900MiLightRadio.cpp
@@ -71,14 +71,14 @@ bool LT8900MiLightRadio::bCheckRadioConnection(void)
 	if ((value_0 == 0x6fe0) && (value_1 == 0x5681))
 	{
     #ifdef DEBUG_PRINTF
-		  Serial.println("Radio module running correctly...");
+		  Serial.println(F("Radio module running correctly..."));
     #endif
 		iRetValue = 1;
 	}
 	else
 	{
     #ifdef DEBUG_PRINTF
-		  Serial.println("Failed initializing the radio module...");
+		  Serial.println(F("Failed initializing the radio module..."));
     #endif
 	}
 
@@ -454,11 +454,11 @@ bool LT8900MiLightRadio::available()
           {
             if (packetSize < 0)
             {
-              Serial.println(F("Packet less than zero, buffer to small"));
+              Serial.println(F("LT8900: Packet less than zero, buffer to small"));
             }
             else
             {
-              Serial.println(F("Packet read fail"));
+              Serial.println(F("LT8900: Packet read fail"));
             }
           }
 
@@ -470,22 +470,23 @@ bool LT8900MiLightRadio::available()
         ulElapsedTime = ulElapsedTime - ulTimeStamp;
       }while (ulElapsedTime < 1000 );
 
-      Serial.print("ElapsedRX: ");
-      Serial.println(iUpdateStamp - iStartTime);
+      #ifdef DEBUG_PRINTF
+      printf_P(PSTR("ElapsedRX: %d\n"), iUpdateStamp - iStartTime);
+      #endif
 
       if (byFrameCounter != 0)
       {
-        Serial.println("");
-        Serial.print(F("Packets received: "));
-        Serial.print(byFrameCounter);
+        #ifdef DEBUG_PRINTF
+        printf_P(PSTR("Packets received: %d\n"), byFrameCounter);
+        #endif
 
         for (byte byCounterFrame = 0; byCounterFrame < byFrameCounter; byCounterFrame++)
         {
           _dupes_received = byaFramesReceivedCount[byCounterFrame];
-          Serial.println("");
-          Serial.print(F("Packet read OK, rec: "));
-          Serial.print(byaFramesReceivedCount[byCounterFrame]);
-          Serial.println(F(" Frame: "));
+
+          #ifdef DEBUG_PRINTF
+          printf_P(PSTR("Packet read OK, rec: %d Frame:\n"), byaFramesReceivedCount[byCounterFrame]);
+          #endif
           //dump the packet.
 
           _packet[0]=byaFramesSizes[byCounterFrame];
@@ -494,22 +495,17 @@ bool LT8900MiLightRadio::available()
             byte byReceivedvalue = byaFramesReceived[byCounterFrame][iByteCounter];
             _packet[iByteCounter+1] = byReceivedvalue;
 
-            String stringOne = String(byReceivedvalue, HEX);
-            String stringToWrite = "0x";
-
-            if (byReceivedvalue < 0x10)
-            {
-              stringToWrite += "0";
-            }
-            stringToWrite += stringOne;
-            stringToWrite += " ";
-
-            Serial.print(stringToWrite);
+            #ifdef DEBUG_PRINTF
+            printf_P(PSTR("%02X "), byReceivedvalue);
+            #endif
           }
 
           _waiting = true;
         }
-        Serial.println("");
+
+        #ifdef DEBUG_PRINTF
+        Serial.println();
+        #endif
       }
     }
     yield();

From 2aec4f4efc1f557fd88d9f78988c2a3dcb8e844b Mon Sep 17 00:00:00 2001
From: WoodsterDK <woodster@sol.dk>
Date: Wed, 5 Apr 2017 11:27:14 +0200
Subject: [PATCH 10/13] Speed optimisation and bug fixes

Speed optimisation and bug fixes:
- Changes to dual module has been verified to work.
---
 lib/MiLight/LT8900MiLightRadio.cpp  | 59 +++++++++++++++--------------
 lib/MiLight/LT8900MiLightRadio.h    | 15 +++-----
 lib/MiLight/MiLightClient.h         |  2 +-
 lib/MiLight/MiLightRadioFactory.cpp |  2 +-
 4 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/lib/MiLight/LT8900MiLightRadio.cpp b/lib/MiLight/LT8900MiLightRadio.cpp
index c75abbf3..dd8f1e3b 100644
--- a/lib/MiLight/LT8900MiLightRadio.cpp
+++ b/lib/MiLight/LT8900MiLightRadio.cpp
@@ -38,10 +38,10 @@ LT8900MiLightRadio::LT8900MiLightRadio(byte byCSPin, byte byResetPin, byte byPkt
 
   SPI.begin();
 
-  SPI.setFrequency(1000000);
   SPI.setDataMode(SPI_MODE1);
-  //SPI.setClockDivider(SPI_CLOCK_DIV64); // UNO and 328
-  SPI.setClockDivider(SPI_CLOCK_DIV128); // MEGA and FASTER
+  // The following speed settings depends upon the wiring and PCB
+  //SPI.setFrequency(8000000);
+  SPI.setFrequency(4000000);
   SPI.setBitOrder(MSBFIRST);
 
   //Initialize transceiver with correct settings
@@ -49,7 +49,7 @@ LT8900MiLightRadio::LT8900MiLightRadio(byte byCSPin, byte byResetPin, byte byPkt
   delay(50);
 
   // Check if HW is connected
-  bCheckRadioConnection();
+  _bConnected = bCheckRadioConnection();
 
   //Reset SPI MODE to default
   SPI.setDataMode(SPI_MODE0);
@@ -64,7 +64,7 @@ LT8900MiLightRadio::LT8900MiLightRadio(byte byCSPin, byte byResetPin, byte byPkt
 /**************************************************************************/
 bool LT8900MiLightRadio::bCheckRadioConnection(void)
 {
-	int iRetValue = 0;
+	bool bRetValue = false;
 	uint16_t value_0 = uiReadRegister(0);
 	uint16_t value_1 = uiReadRegister(1);
 
@@ -73,7 +73,7 @@ bool LT8900MiLightRadio::bCheckRadioConnection(void)
     #ifdef DEBUG_PRINTF
 		  Serial.println(F("Radio module running correctly..."));
     #endif
-		iRetValue = 1;
+		bRetValue = true;
 	}
 	else
 	{
@@ -82,7 +82,7 @@ bool LT8900MiLightRadio::bCheckRadioConnection(void)
     #endif
 	}
 
-	return iRetValue;
+	return bRetValue;
 }
 
 /**************************************************************************/
@@ -595,34 +595,37 @@ int LT8900MiLightRadio::resend()
 /**************************************************************************/
 bool LT8900MiLightRadio::sendPacket(uint8_t *data, size_t packetSize, byte byChannel)
 {
-  if (packetSize < 1 || packetSize > 255)
+  if(_bConnected) // Must be connected to module otherwise it might lookup waiting for _pin_pktflag
   {
-    return false;
-  }
+    if (packetSize < 1 || packetSize > 255)
+    {
+      return false;
+    }
 
-  uiWriteRegister(R_CHANNEL, 0x0000);
-  uiWriteRegister(R_FIFO_CONTROL, 0x8080);  //flush tx and RX
+    uiWriteRegister(R_CHANNEL, 0x0000);
+    uiWriteRegister(R_FIFO_CONTROL, 0x8080);  //flush tx and RX
 
-  digitalWrite(_csPin, LOW);        // Enable PL1167 SPI transmission
-  SPI.transfer(R_FIFO);             // Start writing PL1167's FIFO Data register
-  SPI.transfer(packetSize);         // Length of data buffer: x bytes
+    digitalWrite(_csPin, LOW);        // Enable PL1167 SPI transmission
+    SPI.transfer(R_FIFO);             // Start writing PL1167's FIFO Data register
+    SPI.transfer(packetSize);         // Length of data buffer: x bytes
 
-  for (byte iCounter = 0; iCounter < packetSize; iCounter++)
-  {
-    SPI.transfer((data[1+iCounter]));
-  }
-  digitalWrite(_csPin, HIGH);  // Disable PL1167 SPI transmission
-  delayMicroseconds(10);
+    for (byte iCounter = 0; iCounter < packetSize; iCounter++)
+    {
+      SPI.transfer((data[1+iCounter]));
+    }
+    digitalWrite(_csPin, HIGH);  // Disable PL1167 SPI transmission
+    delayMicroseconds(10);
 
-  uiWriteRegister(R_CHANNEL,  (byChannel & CHANNEL_MASK) | _BV(CHANNEL_TX_BIT));   //enable RX
+    uiWriteRegister(R_CHANNEL,  (byChannel & CHANNEL_MASK) | _BV(CHANNEL_TX_BIT));   //enable RX
 
-  //Wait until the packet is sent.
-  while (digitalRead(_pin_pktflag) == 0)
-  {
-      //do nothing.
-  }
+    //Wait until the packet is sent.
+    while (digitalRead(_pin_pktflag) == 0)
+    {
+        //do nothing.
+    }
 
-  return true;
+    return true;
+  }
 }
 
 const MiLightRadioConfig& LT8900MiLightRadio::config() {
diff --git a/lib/MiLight/LT8900MiLightRadio.h b/lib/MiLight/LT8900MiLightRadio.h
index fa169338..26846d5a 100644
--- a/lib/MiLight/LT8900MiLightRadio.h
+++ b/lib/MiLight/LT8900MiLightRadio.h
@@ -1,10 +1,3 @@
-/*
- * MiLightRadio.h
- *
- *  Created on: 29 May 2015
- *      Author: henryk
- */
-
 #ifdef ARDUINO
 #include "Arduino.h"
 #else
@@ -17,6 +10,8 @@
 #include <MiLightButtons.h>
 #include <MiLightRadio.h>
 
+//#define DEBUG_PRINTF
+
 // Register defines
 #define REGISTER_READ       0b10000000  //bin
 #define REGISTER_WRITE      0b00000000  //bin
@@ -40,7 +35,8 @@
 #define R_SYNCWORD3         38
 #define R_SYNCWORD4         39
 
-#define DEFAULT_TIME_BETWEEN_RETRANSMISSIONS_uS	350
+//#define DEFAULT_TIME_BETWEEN_RETRANSMISSIONS_uS	350
+#define DEFAULT_TIME_BETWEEN_RETRANSMISSIONS_uS	0
 
 #ifndef MILIGHTRADIOPL1167_LT8900_H_
 #define MILIGHTRADIOPL1167_LT8900_H_
@@ -78,9 +74,10 @@ class LT8900MiLightRadio : public MiLightRadio {
 
     byte _pin_pktflag;
     byte _csPin;
+    bool _bConnected;
 
     const MiLightRadioConfig& _config;
-    //uint32_t _prev_packet_id;
+
     uint8_t _channel;
     uint8_t _packet[10];
     uint8_t _out_packet[10];
diff --git a/lib/MiLight/MiLightClient.h b/lib/MiLight/MiLightClient.h
index c62c0cf9..56dbed21 100644
--- a/lib/MiLight/MiLightClient.h
+++ b/lib/MiLight/MiLightClient.h
@@ -7,7 +7,7 @@
 #ifndef _MILIGHTCLIENT_H
 #define _MILIGHTCLIENT_H
 
-// #define DEBUG_PRINTF
+//#define DEBUG_PRINTF
 
 #define MILIGHT_DEFAULT_RESEND_COUNT 10
 
diff --git a/lib/MiLight/MiLightRadioFactory.cpp b/lib/MiLight/MiLightRadioFactory.cpp
index a5f295d4..eadd3c6f 100644
--- a/lib/MiLight/MiLightRadioFactory.cpp
+++ b/lib/MiLight/MiLightRadioFactory.cpp
@@ -6,7 +6,7 @@ MiLightRadioFactory* MiLightRadioFactory::fromSettings(const Settings& settings)
       return new NRF24Factory(settings.csnPin, settings.cePin);
 
     case LT8900:
-      return new LT8900Factory(settings.csnPin, settings.resetPin, settings.cePin);
+      return new LT8900Factory(settings.cePin, settings.resetPin, settings.csnPin);
 
     default:
       return NULL;

From 8bbad4e06a88c93cc4480af7f368d986333b4aa5 Mon Sep 17 00:00:00 2001
From: Chris Mullins <cmullins@liveramp.com>
Date: Wed, 5 Apr 2017 20:35:59 -0700
Subject: [PATCH 11/13] flip arguments in UI and in factory

---
 data/web/index.html                 | 2 +-
 lib/MiLight/MiLightRadioFactory.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/web/index.html b/data/web/index.html
index 7f512fa6..b5499d4f 100644
--- a/data/web/index.html
+++ b/data/web/index.html
@@ -128,7 +128,7 @@
     ];
 
     var FORM_SETTINGS_HELP = {
-      csn_pin : "'csn' for 'nRF24' interface, and 'PKT' for 'PL1167_LT8900' interface",
+      ce_pin : "'CE' for NRF24L01 interface, and 'PKT' for 'PL1167/LT8900' interface",
       packet_repeats : "The number of times to repeat RF packets sent to bulbs",
       http_repeat_factor : "Multiplicative factor on packet_repeats for " +
         "requests initiated by the HTTP API. UDP API typically receives " +
diff --git a/lib/MiLight/MiLightRadioFactory.cpp b/lib/MiLight/MiLightRadioFactory.cpp
index eadd3c6f..a5f295d4 100644
--- a/lib/MiLight/MiLightRadioFactory.cpp
+++ b/lib/MiLight/MiLightRadioFactory.cpp
@@ -6,7 +6,7 @@ MiLightRadioFactory* MiLightRadioFactory::fromSettings(const Settings& settings)
       return new NRF24Factory(settings.csnPin, settings.cePin);
 
     case LT8900:
-      return new LT8900Factory(settings.cePin, settings.resetPin, settings.csnPin);
+      return new LT8900Factory(settings.csnPin, settings.resetPin, settings.cePin);
 
     default:
       return NULL;

From 056241a0e64a4379e4698090679bad07bd8b88ba Mon Sep 17 00:00:00 2001
From: Chris Mullins <cmullins@liveramp.com>
Date: Wed, 5 Apr 2017 20:46:24 -0700
Subject: [PATCH 12/13] update README to document how to connect an LT8900

---
 README.md | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index a44e73b7..9c86dc26 100644
--- a/README.md
+++ b/README.md
@@ -15,14 +15,24 @@ This is a replacement for a Milight/LimitlessLED remote/gateway hosted on an ESP
 ## What you'll need
 
 1. An ESP8266. I used a NodeMCU.
-2. A NRF24L01+ module (~$3 on ebay).
+2. A NRF24L01+ module (~$3 on ebay). Alternatively, you can use a LT8900.
 3. Some way to connect the two (7 female/female dupont cables is probably easiest).
 
 ## Installing
 
-#### Connect the NRF24L01+
+#### Connect the NRF24L01+ / LT8900
 
-This module is an SPI device. [This guide](https://www.mysensors.org/build/esp8266_gateway) details how to connect it. I used GPIO 16 for CE and GPIO 15 for CSN. These can be configured later.
+This project is compatible with both NRF24L01 and LT8900 radios. LT8900 is the same model used in the official MiLight devices. NRF24s are a very common 2.4 GHz radio device, but require software emulation of the LT8900's packet structure. As such, the LT8900 is more performant.
+
+Both modules are SPI devices and should be connected to the standard SPI pins on the ESP8266.
+
+##### NRF24L01+
+
+[This guide](https://www.mysensors.org/build/esp8266_gateway) details how to connect an NRF24 to an ESP8266. I used GPIO 16 for CE and GPIO 15 for CSN. These can be configured later.
+
+##### LT8900
+
+Connect SPI pins (CS, SCK, MOSI, MISO) to appropriate SPI pins on the ESP8266. With default settings, connect RST to GPIO 0, and PKT to GPIO 16.
 
 #### Setting up the ESP
 
@@ -61,7 +71,7 @@ The HTTP endpoints (shown below) will be fully functional at this point. You sho
 1. `PUT /settings`. Patches settings (e.g., doesn't overwrite keys that aren't present). Accepts a JSON blob in the body.
 1. `GET /radio_configs`. Get a list of supported radio configs (aka `device_type`s).
 1. `GET /gateway_traffic/:device_type`. Starts an HTTP long poll. Returns any Milight traffic it hears. Useful if you need to know what your Milight gateway/remote ID is. Since protocols for RGBW/CCT are different, specify one of `rgbw`, `cct`, or `rgb_cct` as `:device_type. Accepts a JSON blob.
-1. `PUT /gateways/:device_id/:device_type/:group_id`. Controls or sends commands to `:group_id` from `:device_id`. 
+1. `PUT /gateways/:device_id/:device_type/:group_id`. Controls or sends commands to `:group_id` from `:device_id`.
 1. `POST /raw_commands/:device_type`. Sends a raw RF packet with radio configs associated with `:device_type`. Example body:
     ```
     {"packet": "01 02 03 04 05 06 07 08 09", "num_repeats": 10}
@@ -83,13 +93,13 @@ Route (5) supports these commands. Note that each bulb type has support for a di
    * `unpair`. Emulates the unpairing process. Send as you connect a paired bulb to have it disassociate with the device ID being used.
    * `next_mode`. Cycles to the next "disco mode".
    * `previous_mode`. Cycles to the previous disco mode.
-   * `mode_speed_up`. 
+   * `mode_speed_up`.
    * `mode_speed_down`.
    * `level_down`. Turns down the brightness. Not all dimmable bulbs support this command.
    * `level_up`. Turns down the brightness. Not all dimmable bulbs support this command.
    * `temperature_down`. Turns down the white temperature. Not all bulbs with adjustable white temperature support this command.
    * `temperature_up`. Turns up the white temperature. Not all bulbs with adjustable white temperature support this command.
-   
+
 If you'd like to control bulbs in all groups paired with a particular device ID, set `:group_id` to 0.
 
 #### Examples

From d70a942c2fc1ce42321de59a9015a46edc772b60 Mon Sep 17 00:00:00 2001
From: Chris Mullins <cmullins@liveramp.com>
Date: Wed, 5 Apr 2017 20:48:44 -0700
Subject: [PATCH 13/13] credit where credit is due!

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 9c86dc26..f551cdea 100644
--- a/README.md
+++ b/README.md
@@ -123,3 +123,7 @@ true%
 You can add an arbitrary number of UDP gateways through the REST API or through the web UI. Each gateway server listens on a port and responds to the standard set of commands supported by the Milight protocol. This should allow you to use one of these with standard Milight integrations (SmartThings, Home Assistant, OpenHAB, etc.).
 
 You can select between versions 5 and 6 of the UDP protocol (documented [here](http://www.limitlessled.com/dev/)). Version 6 has support for the newer RGB+CCT bulbs and also includes response packets, which can theoretically improve reliability. Version 5 has much smaller packets and is probably lower latency.
+
+## Acknowledgements
+
+* @WoodsterDK added support for LT8900 radios.