%PDF- %PDF-
Mini Shell

Mini Shell

Direktori : /www/old2/_music/diplomka/
Upload File :
Create Path :
Current File : /www/old2/_music/diplomka/work_in_progress.patch

Index: AllSolutions.sln
===================================================================
--- AllSolutions.sln	(revision 3299)
+++ AllSolutions.sln	(working copy)
@@ -191,7 +191,6 @@
 		{AD78BC41-2220-4FF3-A800-552BF901152E}.Release|x86.ActiveCfg = Release|x86
 		{AD78BC41-2220-4FF3-A800-552BF901152E}.Release|x86.Build.0 = Release|x86
 		{5D515B9E-D4D3-49B0-84DD-F02145A2FFAD}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{5D515B9E-D4D3-49B0-84DD-F02145A2FFAD}.Debug|Any CPU.Build.0 = Debug|x86
 		{5D515B9E-D4D3-49B0-84DD-F02145A2FFAD}.Debug|x86.ActiveCfg = Debug|x86
 		{5D515B9E-D4D3-49B0-84DD-F02145A2FFAD}.Release|Any CPU.ActiveCfg = Release|x86
 		{5D515B9E-D4D3-49B0-84DD-F02145A2FFAD}.Release|Any CPU.Build.0 = Release|x86
Index: ConfigApp.Logic/DatapointNumberHelper.cs
===================================================================
--- ConfigApp.Logic/DatapointNumberHelper.cs	(revision 3299)
+++ ConfigApp.Logic/DatapointNumberHelper.cs	(working copy)
@@ -13,6 +13,8 @@
         public const int DoorEnd = 6631;
         public const int MacroStart = 6632;
         public const int MacroEnd = 8631;
+        public const int WirelessDeviceBaseStart = 8640;
+        public const int WirelessDeviceBaseEnd = 9982; // 9999 - 17 because we need entire range for last device
 
         public static int GetPartitionNumber(int number = 0)
         {
@@ -70,8 +72,30 @@
             return retVal;
         }
 
+        public static int GetWirelessDeviceBaseNumber(int number = 0)
+        {
+            int retVal = WirelessDeviceBaseStart;
+            if (number != 0 && IsWirelessDeviceBaseNumberAvailable(number))
+            {
+                return number;
+            }
+            while (!IsWirelessDeviceBaseNumberAvailable(retVal) && retVal <= WirelessDeviceBaseEnd)
+            {
+                retVal += 17;
+            }
+            return retVal;
+        }
 
 
+
+        private static bool IsWirelessDeviceBaseNumberAvailable(int number)
+        {
+            bool retVal =
+                InternalDataStore.DataSet.HWBus2Wireless4IOModule.Count(p => !p.IsDatapointNumberNull() && p.DatapointNumber == number) == 0
+                && number >= WirelessDeviceBaseStart && number <= WirelessDeviceBaseEnd && (number - WirelessDeviceBaseStart) % 17 == 0;
+            return retVal;
+        }
+
         private static bool IsPartitionNumberAvailable(int number)
         {
             bool retVal =
Index: ConfigApp/Views/Hardware/HardwareTreeDetails/HardwareDevices/Bus2Wireless4IOModuleDetail.cs
===================================================================
--- ConfigApp/Views/Hardware/HardwareTreeDetails/HardwareDevices/Bus2Wireless4IOModuleDetail.cs	(revision 3299)
+++ ConfigApp/Views/Hardware/HardwareTreeDetails/HardwareDevices/Bus2Wireless4IOModuleDetail.cs	(working copy)
@@ -15,6 +15,8 @@
 {
     public partial class Bus2Wireless4IOModuleDetail : BaseBus2DeviceDetail
     {
+        private int _oldDatapointNumber = 0;
+
         public Bus2Wireless4IOModuleDetail()
         {
             InitializeComponent();
@@ -22,6 +24,14 @@
 #else
    layoutControlItemBaseChannel.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
 #endif
+            var tmpRow = CurrentRow as InternalDataSet.HWBus2Wireless4IOModuleRow;
+            if (tmpRow != null)
+            {
+                _oldDatapointNumber = tmpRow.DatapointNumber;
+            }
+
+            spinEditDatapointNumber.Properties.MinValue = DatapointNumberHelper.WirelessDeviceBaseStart;
+            spinEditDatapointNumber.Properties.MaxValue = DatapointNumberHelper.WirelessDeviceBaseEnd;
         }
 
         protected override void SelectAdditionalDataID (uint UID)
@@ -98,5 +108,45 @@
             }
         }
 
+        private void checkEditIsDatapointNumberSet_CheckedChanged(object sender, EventArgs e)
+        {
+            spinEditDatapointNumber.Enabled = checkEditIsDatapointNumberSet.Checked;
+            if (checkEditIsDatapointNumberSet.Checked)
+            {
+                if (_oldDatapointNumber != 0)
+                {
+                    spinEditDatapointNumber.Value = _oldDatapointNumber;
+                }
+                else
+                {
+                    spinEditDatapointNumber.Value = DatapointNumberHelper.GetWirelessDeviceBaseNumber();
+                }
+
+            }
+            else
+            {
+                _oldDatapointNumber = (int) spinEditDatapointNumber.Value;
+                spinEditDatapointNumber.Value = 0;
+            }
+        }
+
+        /// <summary>
+        /// Checks if selected datapoint number is unique, if not, sets it to lowest free one
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void spinEditDatapointNumber_Leave(object sender, EventArgs e)
+        {
+            if (spinEditDatapointNumber.EditValue == null)
+                return;
+
+            int val = (int)spinEditDatapointNumber.Value;
+            int val2 = DatapointNumberHelper.GetWirelessDeviceBaseNumber(val);
+            if (val != val2)
+            {
+                spinEditDatapointNumber.EditValue = val2;
+            }
+        }
+
     }
 }
Index: ConfigApp/Views/Hardware/HardwareTreeDetails/HardwareDevices/Bus2Wireless4IOModuleDetail.Designer.cs
===================================================================
--- ConfigApp/Views/Hardware/HardwareTreeDetails/HardwareDevices/Bus2Wireless4IOModuleDetail.Designer.cs	(revision 3299)
+++ ConfigApp/Views/Hardware/HardwareTreeDetails/HardwareDevices/Bus2Wireless4IOModuleDetail.Designer.cs	(working copy)
@@ -28,311 +28,363 @@
         /// </summary>
         private void InitializeComponent()
         {
-   this.components = new System.ComponentModel.Container();
-   System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Bus2Wireless4IOModuleDetail));
-   this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-   this.imageComboBoxEditBaseChannel = new DevExpress.XtraEditors.ImageComboBoxEdit();
-   this.VirtualRFPeripheralBindingSource = new System.Windows.Forms.BindingSource(this.components);
-   this.comboBoxCommFailure = new DevExpress.XtraEditors.ImageComboBoxEdit();
-   this.imageComboBoxEditLowAccu = new DevExpress.XtraEditors.ImageComboBoxEdit();
-   this.imageComboBoxEditLowBattery = new DevExpress.XtraEditors.ImageComboBoxEdit();
-   this.imageComboBoxEditTamper = new DevExpress.XtraEditors.ImageComboBoxEdit();
-   this.imageComboBoxEditACLoss = new DevExpress.XtraEditors.ImageComboBoxEdit();
-   this.comboBoxCoverContact = new DevExpress.XtraEditors.ImageComboBoxEdit();
-   this.TypeTextEdit = new DevExpress.XtraEditors.TextEdit();
-   this.RoomPopUp = new Honeywell.MBEMEA.ConfigApp.CustomControls.FacilityPopUp();
-   this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
-   this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
-   this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
-   this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
-   this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
-   this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-   this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-   this.RoomLayoutControlItem = new DevExpress.XtraLayout.LayoutControlItem();
-   this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
-   this.layoutControlItemCoverContactOld = new DevExpress.XtraLayout.LayoutControlItem();
-   this.layoutControlItemACLoss = new DevExpress.XtraLayout.LayoutControlItem();
-   this.layoutControlItemTamper = new DevExpress.XtraLayout.LayoutControlItem();
-   this.layoutControlItemLowbattery = new DevExpress.XtraLayout.LayoutControlItem();
-   this.layoutControlItemLowAccu = new DevExpress.XtraLayout.LayoutControlItem();
-   this.layoutControlItemCommFailure = new DevExpress.XtraLayout.LayoutControlItem();
-   this.layoutControlItemBaseChannel = new DevExpress.XtraLayout.LayoutControlItem();
-   this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-   this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
-   ((System.ComponentModel.ISupportInitialize)(this.HardwareDeviceBindingSource)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.VirtualPeripheralBindingSource)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.RightPanel)).BeginInit();
-   this.RightPanel.SuspendLayout();
-   ((System.ComponentModel.ISupportInitialize)(this.MainBindingSource)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
-   this.layoutControl1.SuspendLayout();
-   ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditBaseChannel.Properties)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.VirtualRFPeripheralBindingSource)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.comboBoxCommFailure.Properties)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditLowAccu.Properties)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditLowBattery.Properties)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditTamper.Properties)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditACLoss.Properties)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.comboBoxCoverContact.Properties)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.TypeTextEdit.Properties)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.RoomPopUp.Properties)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.RoomLayoutControlItem)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemCoverContactOld)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemACLoss)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemTamper)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemLowbattery)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemLowAccu)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemCommFailure)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemBaseChannel)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-   ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
-   this.SuspendLayout();
-   // 
-   // RightPanel
-   // 
-   this.RightPanel.Controls.Add(this.layoutControl1);
-   resources.ApplyResources(this.RightPanel, "RightPanel");
-   // 
-   // MainBindingSource
-   // 
-   this.MainBindingSource.DataMember = "HWBus2Wireless4IOModule";
-   this.MainBindingSource.Position = -1;
-   // 
-   // layoutControl1
-   // 
-   this.layoutControl1.AllowCustomizationMenu = false;
-   this.layoutControl1.Controls.Add(this.imageComboBoxEditBaseChannel);
-   this.layoutControl1.Controls.Add(this.comboBoxCommFailure);
-   this.layoutControl1.Controls.Add(this.imageComboBoxEditLowAccu);
-   this.layoutControl1.Controls.Add(this.imageComboBoxEditLowBattery);
-   this.layoutControl1.Controls.Add(this.imageComboBoxEditTamper);
-   this.layoutControl1.Controls.Add(this.imageComboBoxEditACLoss);
-   this.layoutControl1.Controls.Add(this.comboBoxCoverContact);
-   this.layoutControl1.Controls.Add(this.TypeTextEdit);
-   this.layoutControl1.Controls.Add(this.RoomPopUp);
-   this.layoutControl1.Controls.Add(this.textEdit2);
-   this.layoutControl1.Controls.Add(this.textEdit1);
-   resources.ApplyResources(this.layoutControl1, "layoutControl1");
-   this.layoutControl1.Name = "layoutControl1";
-   this.layoutControl1.Root = this.layoutControlGroup1;
-   // 
-   // imageComboBoxEditBaseChannel
-   // 
-   this.imageComboBoxEditBaseChannel.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.VirtualRFPeripheralBindingSource, "feBaseChannel", true));
-   resources.ApplyResources(this.imageComboBoxEditBaseChannel, "imageComboBoxEditBaseChannel");
-   this.imageComboBoxEditBaseChannel.Name = "imageComboBoxEditBaseChannel";
-   this.imageComboBoxEditBaseChannel.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Bus2Wireless4IOModuleDetail));
+            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.checkEditIsDatapointNumberSet = new DevExpress.XtraEditors.CheckEdit();
+            this.spinEditDatapointNumber = new DevExpress.XtraEditors.SpinEdit();
+            this.imageComboBoxEditBaseChannel = new DevExpress.XtraEditors.ImageComboBoxEdit();
+            this.VirtualRFPeripheralBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            this.comboBoxCommFailure = new DevExpress.XtraEditors.ImageComboBoxEdit();
+            this.imageComboBoxEditLowAccu = new DevExpress.XtraEditors.ImageComboBoxEdit();
+            this.imageComboBoxEditLowBattery = new DevExpress.XtraEditors.ImageComboBoxEdit();
+            this.imageComboBoxEditTamper = new DevExpress.XtraEditors.ImageComboBoxEdit();
+            this.imageComboBoxEditACLoss = new DevExpress.XtraEditors.ImageComboBoxEdit();
+            this.comboBoxCoverContact = new DevExpress.XtraEditors.ImageComboBoxEdit();
+            this.TypeTextEdit = new DevExpress.XtraEditors.TextEdit();
+            this.RoomPopUp = new Honeywell.MBEMEA.ConfigApp.CustomControls.FacilityPopUp();
+            this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
+            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
+            this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.RoomLayoutControlItem = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItemCoverContactOld = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItemACLoss = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItemTamper = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItemLowbattery = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItemLowAccu = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItemCommFailure = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItemBaseChannel = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.layoutControlItemDatapointNumber = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            ((System.ComponentModel.ISupportInitialize)(this.HardwareDeviceBindingSource)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.VirtualPeripheralBindingSource)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.RightPanel)).BeginInit();
+            this.RightPanel.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.MainBindingSource)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
+            this.layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.checkEditIsDatapointNumberSet.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.spinEditDatapointNumber.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditBaseChannel.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.VirtualRFPeripheralBindingSource)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.comboBoxCommFailure.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditLowAccu.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditLowBattery.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditTamper.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditACLoss.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.comboBoxCoverContact.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.TypeTextEdit.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.RoomPopUp.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.RoomLayoutControlItem)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemCoverContactOld)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemACLoss)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemTamper)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemLowbattery)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemLowAccu)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemCommFailure)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemBaseChannel)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemDatapointNumber)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // RightPanel
+            // 
+            this.RightPanel.Controls.Add(this.layoutControl1);
+            resources.ApplyResources(this.RightPanel, "RightPanel");
+            // 
+            // MainBindingSource
+            // 
+            this.MainBindingSource.DataMember = "HWBus2Wireless4IOModule";
+            this.MainBindingSource.Position = -1;
+            // 
+            // layoutControl1
+            // 
+            this.layoutControl1.AllowCustomizationMenu = false;
+            this.layoutControl1.Controls.Add(this.checkEditIsDatapointNumberSet);
+            this.layoutControl1.Controls.Add(this.spinEditDatapointNumber);
+            this.layoutControl1.Controls.Add(this.imageComboBoxEditBaseChannel);
+            this.layoutControl1.Controls.Add(this.comboBoxCommFailure);
+            this.layoutControl1.Controls.Add(this.imageComboBoxEditLowAccu);
+            this.layoutControl1.Controls.Add(this.imageComboBoxEditLowBattery);
+            this.layoutControl1.Controls.Add(this.imageComboBoxEditTamper);
+            this.layoutControl1.Controls.Add(this.imageComboBoxEditACLoss);
+            this.layoutControl1.Controls.Add(this.comboBoxCoverContact);
+            this.layoutControl1.Controls.Add(this.TypeTextEdit);
+            this.layoutControl1.Controls.Add(this.RoomPopUp);
+            this.layoutControl1.Controls.Add(this.textEdit2);
+            this.layoutControl1.Controls.Add(this.textEdit1);
+            resources.ApplyResources(this.layoutControl1, "layoutControl1");
+            this.layoutControl1.Name = "layoutControl1";
+            this.layoutControl1.Root = this.layoutControlGroup1;
+            // 
+            // checkEditIsDatapointNumberSet
+            // 
+            this.checkEditIsDatapointNumberSet.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.MainBindingSource, "expIsDatapointNumberSet", true));
+            resources.ApplyResources(this.checkEditIsDatapointNumberSet, "checkEditIsDatapointNumberSet");
+            this.checkEditIsDatapointNumberSet.Name = "checkEditIsDatapointNumberSet";
+            this.checkEditIsDatapointNumberSet.Properties.Caption = resources.GetString("checkEditIsDatapointNumberSet.Properties.Caption");
+            this.checkEditIsDatapointNumberSet.StyleController = this.layoutControl1;
+            this.checkEditIsDatapointNumberSet.CheckedChanged += new System.EventHandler(this.checkEditIsDatapointNumberSet_CheckedChanged);
+            // 
+            // spinEditDatapointNumber
+            // 
+            this.spinEditDatapointNumber.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.MainBindingSource, "DatapointNumber", true));
+            this.spinEditDatapointNumber.DataBindings.Add(new System.Windows.Forms.Binding("Enabled", this.MainBindingSource, "expIsDatapointNumberSet", true));
+            resources.ApplyResources(this.spinEditDatapointNumber, "spinEditDatapointNumber");
+            this.spinEditDatapointNumber.Name = "spinEditDatapointNumber";
+            this.spinEditDatapointNumber.Properties.Appearance.Options.UseTextOptions = true;
+            this.spinEditDatapointNumber.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
+            this.spinEditDatapointNumber.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("spinEditDatapointNumber.Properties.Buttons"))))});
+            this.spinEditDatapointNumber.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
+            this.spinEditDatapointNumber.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
+            this.spinEditDatapointNumber.Properties.Increment = new decimal(new int[] {
+            17,
+            0,
+            0,
+            0});
+            this.spinEditDatapointNumber.Properties.Mask.EditMask = resources.GetString("spinEditDatapointNumber.Properties.Mask.EditMask");
+            this.spinEditDatapointNumber.Properties.MaxValue = new decimal(new int[] {
+            9999,
+            0,
+            0,
+            0});
+            this.spinEditDatapointNumber.Properties.MinValue = new decimal(new int[] {
+            8640,
+            0,
+            0,
+            0});
+            this.spinEditDatapointNumber.StyleController = this.layoutControl1;
+            this.spinEditDatapointNumber.Leave += new System.EventHandler(this.spinEditDatapointNumber_Leave);
+            // 
+            // imageComboBoxEditBaseChannel
+            // 
+            this.imageComboBoxEditBaseChannel.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.VirtualRFPeripheralBindingSource, "feBaseChannel", true));
+            resources.ApplyResources(this.imageComboBoxEditBaseChannel, "imageComboBoxEditBaseChannel");
+            this.imageComboBoxEditBaseChannel.Name = "imageComboBoxEditBaseChannel";
+            this.imageComboBoxEditBaseChannel.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("imageComboBoxEditBaseChannel.Properties.Buttons"))))});
-   this.imageComboBoxEditBaseChannel.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
+            this.imageComboBoxEditBaseChannel.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditBaseChannel.Properties.Items"), resources.GetString("imageComboBoxEditBaseChannel.Properties.Items1"), ((int)(resources.GetObject("imageComboBoxEditBaseChannel.Properties.Items2")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditBaseChannel.Properties.Items3"), resources.GetString("imageComboBoxEditBaseChannel.Properties.Items4"), ((int)(resources.GetObject("imageComboBoxEditBaseChannel.Properties.Items5")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditBaseChannel.Properties.Items6"), resources.GetString("imageComboBoxEditBaseChannel.Properties.Items7"), ((int)(resources.GetObject("imageComboBoxEditBaseChannel.Properties.Items8")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditBaseChannel.Properties.Items9"), resources.GetString("imageComboBoxEditBaseChannel.Properties.Items10"), ((int)(resources.GetObject("imageComboBoxEditBaseChannel.Properties.Items11"))))});
-   this.imageComboBoxEditBaseChannel.StyleController = this.layoutControl1;
-   // 
-   // VirtualRFPeripheralBindingSource
-   // 
-   this.VirtualRFPeripheralBindingSource.DataMember = "VirtualWirelessPeripheral";
-   this.VirtualRFPeripheralBindingSource.DataSource = this.internalDataStore;
-   // 
-   // comboBoxCommFailure
-   // 
-   this.comboBoxCommFailure.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.VirtualPeripheralBindingSource, "feCommFailure", true));
-   resources.ApplyResources(this.comboBoxCommFailure, "comboBoxCommFailure");
-   this.comboBoxCommFailure.Name = "comboBoxCommFailure";
-   this.comboBoxCommFailure.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.imageComboBoxEditBaseChannel.StyleController = this.layoutControl1;
+            // 
+            // VirtualRFPeripheralBindingSource
+            // 
+            this.VirtualRFPeripheralBindingSource.DataMember = "VirtualWirelessPeripheral";
+            this.VirtualRFPeripheralBindingSource.DataSource = this.internalDataStore;
+            // 
+            // comboBoxCommFailure
+            // 
+            this.comboBoxCommFailure.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.VirtualPeripheralBindingSource, "feCommFailure", true));
+            resources.ApplyResources(this.comboBoxCommFailure, "comboBoxCommFailure");
+            this.comboBoxCommFailure.Name = "comboBoxCommFailure";
+            this.comboBoxCommFailure.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("comboBoxCommFailure.Properties.Buttons"))))});
-   this.comboBoxCommFailure.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
+            this.comboBoxCommFailure.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("comboBoxCommFailure.Properties.Items"), resources.GetString("comboBoxCommFailure.Properties.Items1"), ((int)(resources.GetObject("comboBoxCommFailure.Properties.Items2")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("comboBoxCommFailure.Properties.Items3"), resources.GetString("comboBoxCommFailure.Properties.Items4"), ((int)(resources.GetObject("comboBoxCommFailure.Properties.Items5")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("comboBoxCommFailure.Properties.Items6"), resources.GetString("comboBoxCommFailure.Properties.Items7"), ((int)(resources.GetObject("comboBoxCommFailure.Properties.Items8")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("comboBoxCommFailure.Properties.Items9"), resources.GetString("comboBoxCommFailure.Properties.Items10"), ((int)(resources.GetObject("comboBoxCommFailure.Properties.Items11"))))});
-   this.comboBoxCommFailure.StyleController = this.layoutControl1;
-   // 
-   // imageComboBoxEditLowAccu
-   // 
-   this.imageComboBoxEditLowAccu.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.VirtualPeripheralBindingSource, "feLowAccu", true));
-   resources.ApplyResources(this.imageComboBoxEditLowAccu, "imageComboBoxEditLowAccu");
-   this.imageComboBoxEditLowAccu.Name = "imageComboBoxEditLowAccu";
-   this.imageComboBoxEditLowAccu.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.comboBoxCommFailure.StyleController = this.layoutControl1;
+            // 
+            // imageComboBoxEditLowAccu
+            // 
+            this.imageComboBoxEditLowAccu.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.VirtualPeripheralBindingSource, "feLowAccu", true));
+            resources.ApplyResources(this.imageComboBoxEditLowAccu, "imageComboBoxEditLowAccu");
+            this.imageComboBoxEditLowAccu.Name = "imageComboBoxEditLowAccu";
+            this.imageComboBoxEditLowAccu.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("imageComboBoxEditLowAccu.Properties.Buttons"))))});
-   this.imageComboBoxEditLowAccu.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
+            this.imageComboBoxEditLowAccu.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditLowAccu.Properties.Items"), resources.GetString("imageComboBoxEditLowAccu.Properties.Items1"), ((int)(resources.GetObject("imageComboBoxEditLowAccu.Properties.Items2")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditLowAccu.Properties.Items3"), resources.GetString("imageComboBoxEditLowAccu.Properties.Items4"), ((int)(resources.GetObject("imageComboBoxEditLowAccu.Properties.Items5")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditLowAccu.Properties.Items6"), resources.GetString("imageComboBoxEditLowAccu.Properties.Items7"), ((int)(resources.GetObject("imageComboBoxEditLowAccu.Properties.Items8")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditLowAccu.Properties.Items9"), resources.GetString("imageComboBoxEditLowAccu.Properties.Items10"), ((int)(resources.GetObject("imageComboBoxEditLowAccu.Properties.Items11"))))});
-   this.imageComboBoxEditLowAccu.StyleController = this.layoutControl1;
-   // 
-   // imageComboBoxEditLowBattery
-   // 
-   this.imageComboBoxEditLowBattery.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.VirtualPeripheralBindingSource, "feLowBattery", true));
-   resources.ApplyResources(this.imageComboBoxEditLowBattery, "imageComboBoxEditLowBattery");
-   this.imageComboBoxEditLowBattery.Name = "imageComboBoxEditLowBattery";
-   this.imageComboBoxEditLowBattery.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.imageComboBoxEditLowAccu.StyleController = this.layoutControl1;
+            // 
+            // imageComboBoxEditLowBattery
+            // 
+            this.imageComboBoxEditLowBattery.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.VirtualPeripheralBindingSource, "feLowBattery", true));
+            resources.ApplyResources(this.imageComboBoxEditLowBattery, "imageComboBoxEditLowBattery");
+            this.imageComboBoxEditLowBattery.Name = "imageComboBoxEditLowBattery";
+            this.imageComboBoxEditLowBattery.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("imageComboBoxEditLowBattery.Properties.Buttons"))))});
-   this.imageComboBoxEditLowBattery.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
+            this.imageComboBoxEditLowBattery.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditLowBattery.Properties.Items"), resources.GetString("imageComboBoxEditLowBattery.Properties.Items1"), ((int)(resources.GetObject("imageComboBoxEditLowBattery.Properties.Items2")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditLowBattery.Properties.Items3"), resources.GetString("imageComboBoxEditLowBattery.Properties.Items4"), ((int)(resources.GetObject("imageComboBoxEditLowBattery.Properties.Items5")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditLowBattery.Properties.Items6"), resources.GetString("imageComboBoxEditLowBattery.Properties.Items7"), ((int)(resources.GetObject("imageComboBoxEditLowBattery.Properties.Items8")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditLowBattery.Properties.Items9"), resources.GetString("imageComboBoxEditLowBattery.Properties.Items10"), ((int)(resources.GetObject("imageComboBoxEditLowBattery.Properties.Items11"))))});
-   this.imageComboBoxEditLowBattery.StyleController = this.layoutControl1;
-   // 
-   // imageComboBoxEditTamper
-   // 
-   this.imageComboBoxEditTamper.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.VirtualPeripheralBindingSource, "feTamper", true));
-   resources.ApplyResources(this.imageComboBoxEditTamper, "imageComboBoxEditTamper");
-   this.imageComboBoxEditTamper.Name = "imageComboBoxEditTamper";
-   this.imageComboBoxEditTamper.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.imageComboBoxEditLowBattery.StyleController = this.layoutControl1;
+            // 
+            // imageComboBoxEditTamper
+            // 
+            this.imageComboBoxEditTamper.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.VirtualPeripheralBindingSource, "feTamper", true));
+            resources.ApplyResources(this.imageComboBoxEditTamper, "imageComboBoxEditTamper");
+            this.imageComboBoxEditTamper.Name = "imageComboBoxEditTamper";
+            this.imageComboBoxEditTamper.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("imageComboBoxEditTamper.Properties.Buttons"))))});
-   this.imageComboBoxEditTamper.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
+            this.imageComboBoxEditTamper.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditTamper.Properties.Items"), resources.GetString("imageComboBoxEditTamper.Properties.Items1"), ((int)(resources.GetObject("imageComboBoxEditTamper.Properties.Items2")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditTamper.Properties.Items3"), resources.GetString("imageComboBoxEditTamper.Properties.Items4"), ((int)(resources.GetObject("imageComboBoxEditTamper.Properties.Items5")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditTamper.Properties.Items6"), resources.GetString("imageComboBoxEditTamper.Properties.Items7"), ((int)(resources.GetObject("imageComboBoxEditTamper.Properties.Items8")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditTamper.Properties.Items9"), resources.GetString("imageComboBoxEditTamper.Properties.Items10"), ((int)(resources.GetObject("imageComboBoxEditTamper.Properties.Items11"))))});
-   this.imageComboBoxEditTamper.StyleController = this.layoutControl1;
-   // 
-   // imageComboBoxEditACLoss
-   // 
-   this.imageComboBoxEditACLoss.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.VirtualPeripheralBindingSource, "feACLoss", true));
-   resources.ApplyResources(this.imageComboBoxEditACLoss, "imageComboBoxEditACLoss");
-   this.imageComboBoxEditACLoss.Name = "imageComboBoxEditACLoss";
-   this.imageComboBoxEditACLoss.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.imageComboBoxEditTamper.StyleController = this.layoutControl1;
+            // 
+            // imageComboBoxEditACLoss
+            // 
+            this.imageComboBoxEditACLoss.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.VirtualPeripheralBindingSource, "feACLoss", true));
+            resources.ApplyResources(this.imageComboBoxEditACLoss, "imageComboBoxEditACLoss");
+            this.imageComboBoxEditACLoss.Name = "imageComboBoxEditACLoss";
+            this.imageComboBoxEditACLoss.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("imageComboBoxEditACLoss.Properties.Buttons"))))});
-   this.imageComboBoxEditACLoss.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
+            this.imageComboBoxEditACLoss.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditACLoss.Properties.Items"), resources.GetString("imageComboBoxEditACLoss.Properties.Items1"), ((int)(resources.GetObject("imageComboBoxEditACLoss.Properties.Items2")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditACLoss.Properties.Items3"), resources.GetString("imageComboBoxEditACLoss.Properties.Items4"), ((int)(resources.GetObject("imageComboBoxEditACLoss.Properties.Items5")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditACLoss.Properties.Items6"), resources.GetString("imageComboBoxEditACLoss.Properties.Items7"), ((int)(resources.GetObject("imageComboBoxEditACLoss.Properties.Items8")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("imageComboBoxEditACLoss.Properties.Items9"), resources.GetString("imageComboBoxEditACLoss.Properties.Items10"), ((int)(resources.GetObject("imageComboBoxEditACLoss.Properties.Items11"))))});
-   this.imageComboBoxEditACLoss.StyleController = this.layoutControl1;
-   // 
-   // comboBoxCoverContact
-   // 
-   this.comboBoxCoverContact.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.VirtualPeripheralBindingSource, "feCoverContact", true));
-   resources.ApplyResources(this.comboBoxCoverContact, "comboBoxCoverContact");
-   this.comboBoxCoverContact.Name = "comboBoxCoverContact";
-   this.comboBoxCoverContact.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.imageComboBoxEditACLoss.StyleController = this.layoutControl1;
+            // 
+            // comboBoxCoverContact
+            // 
+            this.comboBoxCoverContact.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.VirtualPeripheralBindingSource, "feCoverContact", true));
+            resources.ApplyResources(this.comboBoxCoverContact, "comboBoxCoverContact");
+            this.comboBoxCoverContact.Name = "comboBoxCoverContact";
+            this.comboBoxCoverContact.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("comboBoxCoverContact.Properties.Buttons"))))});
-   this.comboBoxCoverContact.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
+            this.comboBoxCoverContact.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("comboBoxCoverContact.Properties.Items"), resources.GetString("comboBoxCoverContact.Properties.Items1"), ((int)(resources.GetObject("comboBoxCoverContact.Properties.Items2")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("comboBoxCoverContact.Properties.Items3"), resources.GetString("comboBoxCoverContact.Properties.Items4"), ((int)(resources.GetObject("comboBoxCoverContact.Properties.Items5")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("comboBoxCoverContact.Properties.Items6"), resources.GetString("comboBoxCoverContact.Properties.Items7"), ((int)(resources.GetObject("comboBoxCoverContact.Properties.Items8")))),
             new DevExpress.XtraEditors.Controls.ImageComboBoxItem(resources.GetString("comboBoxCoverContact.Properties.Items9"), resources.GetString("comboBoxCoverContact.Properties.Items10"), ((int)(resources.GetObject("comboBoxCoverContact.Properties.Items11"))))});
-   this.comboBoxCoverContact.StyleController = this.layoutControl1;
-   // 
-   // TypeTextEdit
-   // 
-   this.TypeTextEdit.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.HardwareDeviceBindingSource, "Type", true));
-   resources.ApplyResources(this.TypeTextEdit, "TypeTextEdit");
-   this.TypeTextEdit.Name = "TypeTextEdit";
-   this.TypeTextEdit.Properties.ReadOnly = true;
-   this.TypeTextEdit.StyleController = this.layoutControl1;
-   this.TypeTextEdit.FormatEditValue += new DevExpress.XtraEditors.Controls.ConvertEditValueEventHandler(this.TypeTextEdit_FormatEditValue);
-   this.TypeTextEdit.CustomDisplayText += new DevExpress.XtraEditors.Controls.CustomDisplayTextEventHandler(this.TypeTextEdit_CustomDisplayText);
-   // 
-   // RoomPopUp
-   // 
-   this.RoomPopUp.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.HardwareDeviceBindingSource, "RoomUID", true));
-   resources.ApplyResources(this.RoomPopUp, "RoomPopUp");
-   this.RoomPopUp.Name = "RoomPopUp";
-   this.RoomPopUp.Properties.Appearance.Options.UseTextOptions = true;
-   this.RoomPopUp.Properties.Appearance.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisPath;
-   this.RoomPopUp.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.comboBoxCoverContact.StyleController = this.layoutControl1;
+            // 
+            // TypeTextEdit
+            // 
+            this.TypeTextEdit.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.HardwareDeviceBindingSource, "Type", true));
+            resources.ApplyResources(this.TypeTextEdit, "TypeTextEdit");
+            this.TypeTextEdit.Name = "TypeTextEdit";
+            this.TypeTextEdit.Properties.ReadOnly = true;
+            this.TypeTextEdit.StyleController = this.layoutControl1;
+            this.TypeTextEdit.FormatEditValue += new DevExpress.XtraEditors.Controls.ConvertEditValueEventHandler(this.TypeTextEdit_FormatEditValue);
+            this.TypeTextEdit.CustomDisplayText += new DevExpress.XtraEditors.Controls.CustomDisplayTextEventHandler(this.TypeTextEdit_CustomDisplayText);
+            // 
+            // RoomPopUp
+            // 
+            this.RoomPopUp.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.HardwareDeviceBindingSource, "RoomUID", true));
+            resources.ApplyResources(this.RoomPopUp, "RoomPopUp");
+            this.RoomPopUp.Name = "RoomPopUp";
+            this.RoomPopUp.Properties.Appearance.Options.UseTextOptions = true;
+            this.RoomPopUp.Properties.Appearance.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisPath;
+            this.RoomPopUp.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("RoomPopUp.Properties.Buttons"))))});
-   this.RoomPopUp.Properties.PopupFormSize = new System.Drawing.Size(337, 250);
-   this.RoomPopUp.StyleController = this.layoutControl1;
-   // 
-   // textEdit2
-   // 
-   this.textEdit2.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.MainBindingSource, "MSB", true));
-   resources.ApplyResources(this.textEdit2, "textEdit2");
-   this.textEdit2.Name = "textEdit2";
-   this.textEdit2.StyleController = this.layoutControl1;
-   // 
-   // textEdit1
-   // 
-   this.textEdit1.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.HardwareDeviceBindingSource, "Name", true));
-   resources.ApplyResources(this.textEdit1, "textEdit1");
-   this.textEdit1.Name = "textEdit1";
-   this.textEdit1.Properties.MaxLength = 50;
-   this.textEdit1.StyleController = this.layoutControl1;
-   // 
-   // layoutControlGroup1
-   // 
-   resources.ApplyResources(this.layoutControlGroup1, "layoutControlGroup1");
-   this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-   this.layoutControlGroup1.GroupBordersVisible = false;
-   this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.RoomPopUp.Properties.PopupFormSize = new System.Drawing.Size(303, 250);
+            this.RoomPopUp.StyleController = this.layoutControl1;
+            // 
+            // textEdit2
+            // 
+            this.textEdit2.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.MainBindingSource, "MSB", true));
+            resources.ApplyResources(this.textEdit2, "textEdit2");
+            this.textEdit2.Name = "textEdit2";
+            this.textEdit2.StyleController = this.layoutControl1;
+            // 
+            // textEdit1
+            // 
+            this.textEdit1.DataBindings.Add(new System.Windows.Forms.Binding("EditValue", this.HardwareDeviceBindingSource, "Name", true));
+            resources.ApplyResources(this.textEdit1, "textEdit1");
+            this.textEdit1.Name = "textEdit1";
+            this.textEdit1.Properties.MaxLength = 50;
+            this.textEdit1.StyleController = this.layoutControl1;
+            // 
+            // layoutControlGroup1
+            // 
+            resources.ApplyResources(this.layoutControlGroup1, "layoutControlGroup1");
+            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup1.GroupBordersVisible = false;
+            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.tabbedControlGroup1});
-   this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0);
-   this.layoutControlGroup1.Name = "layoutControlGroup1";
-   this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-   this.layoutControlGroup1.Size = new System.Drawing.Size(438, 359);
-   this.layoutControlGroup1.TextVisible = false;
-   // 
-   // tabbedControlGroup1
-   // 
-   resources.ApplyResources(this.tabbedControlGroup1, "tabbedControlGroup1");
-   this.tabbedControlGroup1.Location = new System.Drawing.Point(0, 0);
-   this.tabbedControlGroup1.Name = "tabbedControlGroup1";
-   this.tabbedControlGroup1.SelectedTabPage = this.layoutControlGroup2;
-   this.tabbedControlGroup1.SelectedTabPageIndex = 0;
-   this.tabbedControlGroup1.Size = new System.Drawing.Size(438, 359);
-   this.tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlGroup1.Name = "layoutControlGroup1";
+            this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(421, 373);
+            this.layoutControlGroup1.TextVisible = false;
+            // 
+            // tabbedControlGroup1
+            // 
+            resources.ApplyResources(this.tabbedControlGroup1, "tabbedControlGroup1");
+            this.tabbedControlGroup1.Location = new System.Drawing.Point(0, 0);
+            this.tabbedControlGroup1.Name = "tabbedControlGroup1";
+            this.tabbedControlGroup1.SelectedTabPage = this.layoutControlGroup2;
+            this.tabbedControlGroup1.SelectedTabPageIndex = 0;
+            this.tabbedControlGroup1.Size = new System.Drawing.Size(421, 373);
+            this.tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlGroup2});
-   // 
-   // layoutControlGroup2
-   // 
-   resources.ApplyResources(this.layoutControlGroup2, "layoutControlGroup2");
-   this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            // 
+            // layoutControlGroup2
+            // 
+            resources.ApplyResources(this.layoutControlGroup2, "layoutControlGroup2");
+            this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem1,
             this.layoutControlItem2,
             this.RoomLayoutControlItem,
             this.layoutControlGroup4,
             this.layoutControlItem4,
-            this.emptySpaceItem1});
-   this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0);
-   this.layoutControlGroup2.Name = "layoutControlGroup2";
-   this.layoutControlGroup2.Size = new System.Drawing.Size(414, 315);
-   // 
-   // layoutControlItem1
-   // 
-   this.layoutControlItem1.Control = this.textEdit1;
-   resources.ApplyResources(this.layoutControlItem1, "layoutControlItem1");
-   this.layoutControlItem1.Location = new System.Drawing.Point(0, 24);
-   this.layoutControlItem1.Name = "layoutControlItem1";
-   this.layoutControlItem1.Size = new System.Drawing.Size(414, 24);
-   this.layoutControlItem1.TextSize = new System.Drawing.Size(70, 13);
-   // 
-   // layoutControlItem2
-   // 
-   this.layoutControlItem2.Control = this.textEdit2;
-   resources.ApplyResources(this.layoutControlItem2, "layoutControlItem2");
-   this.layoutControlItem2.Location = new System.Drawing.Point(0, 48);
-   this.layoutControlItem2.Name = "layoutControlItem2";
-   this.layoutControlItem2.Size = new System.Drawing.Size(414, 24);
-   this.layoutControlItem2.TextSize = new System.Drawing.Size(70, 13);
-   // 
-   // RoomLayoutControlItem
-   // 
-   this.RoomLayoutControlItem.Control = this.RoomPopUp;
-   resources.ApplyResources(this.RoomLayoutControlItem, "RoomLayoutControlItem");
-   this.RoomLayoutControlItem.Location = new System.Drawing.Point(0, 72);
-   this.RoomLayoutControlItem.Name = "RoomLayoutControlItem";
-   this.RoomLayoutControlItem.Size = new System.Drawing.Size(414, 24);
-   this.RoomLayoutControlItem.TextSize = new System.Drawing.Size(70, 13);
-   // 
-   // layoutControlGroup4
-   // 
-   resources.ApplyResources(this.layoutControlGroup4, "layoutControlGroup4");
-   this.layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.emptySpaceItem1,
+            this.layoutControlItemDatapointNumber,
+            this.layoutControlItem3});
+            this.layoutControlGroup2.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlGroup2.Name = "layoutControlGroup2";
+            this.layoutControlGroup2.Size = new System.Drawing.Size(397, 327);
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.textEdit1;
+            resources.ApplyResources(this.layoutControlItem1, "layoutControlItem1");
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 24);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(397, 24);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 13);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.textEdit2;
+            resources.ApplyResources(this.layoutControlItem2, "layoutControlItem2");
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 48);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.Size = new System.Drawing.Size(397, 24);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 13);
+            // 
+            // RoomLayoutControlItem
+            // 
+            this.RoomLayoutControlItem.Control = this.RoomPopUp;
+            resources.ApplyResources(this.RoomLayoutControlItem, "RoomLayoutControlItem");
+            this.RoomLayoutControlItem.Location = new System.Drawing.Point(0, 72);
+            this.RoomLayoutControlItem.Name = "RoomLayoutControlItem";
+            this.RoomLayoutControlItem.Size = new System.Drawing.Size(397, 24);
+            this.RoomLayoutControlItem.TextSize = new System.Drawing.Size(87, 13);
+            // 
+            // layoutControlGroup4
+            // 
+            resources.ApplyResources(this.layoutControlGroup4, "layoutControlGroup4");
+            this.layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItemCoverContactOld,
             this.layoutControlItemACLoss,
             this.layoutControlItemTamper,
@@ -340,133 +392,157 @@
             this.layoutControlItemLowAccu,
             this.layoutControlItemCommFailure,
             this.layoutControlItemBaseChannel});
-   this.layoutControlGroup4.Location = new System.Drawing.Point(0, 96);
-   this.layoutControlGroup4.Name = "layoutControlGroup4";
-   this.layoutControlGroup4.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 2, 2);
-   this.layoutControlGroup4.Size = new System.Drawing.Size(414, 197);
-   // 
-   // layoutControlItemCoverContactOld
-   // 
-   this.layoutControlItemCoverContactOld.Control = this.comboBoxCoverContact;
-   resources.ApplyResources(this.layoutControlItemCoverContactOld, "layoutControlItemCoverContactOld");
-   this.layoutControlItemCoverContactOld.Location = new System.Drawing.Point(0, 24);
-   this.layoutControlItemCoverContactOld.Name = "layoutControlItemCoverContactOld";
-   this.layoutControlItemCoverContactOld.Size = new System.Drawing.Size(404, 24);
-   this.layoutControlItemCoverContactOld.TextSize = new System.Drawing.Size(70, 13);
-   // 
-   // layoutControlItemACLoss
-   // 
-   this.layoutControlItemACLoss.Control = this.imageComboBoxEditACLoss;
-   resources.ApplyResources(this.layoutControlItemACLoss, "layoutControlItemACLoss");
-   this.layoutControlItemACLoss.Location = new System.Drawing.Point(0, 48);
-   this.layoutControlItemACLoss.Name = "layoutControlItemACLoss";
-   this.layoutControlItemACLoss.Size = new System.Drawing.Size(404, 24);
-   this.layoutControlItemACLoss.TextSize = new System.Drawing.Size(70, 13);
-   // 
-   // layoutControlItemTamper
-   // 
-   this.layoutControlItemTamper.Control = this.imageComboBoxEditTamper;
-   resources.ApplyResources(this.layoutControlItemTamper, "layoutControlItemTamper");
-   this.layoutControlItemTamper.Location = new System.Drawing.Point(0, 72);
-   this.layoutControlItemTamper.Name = "layoutControlItemTamper";
-   this.layoutControlItemTamper.Size = new System.Drawing.Size(404, 24);
-   this.layoutControlItemTamper.TextSize = new System.Drawing.Size(70, 13);
-   // 
-   // layoutControlItemLowbattery
-   // 
-   this.layoutControlItemLowbattery.Control = this.imageComboBoxEditLowBattery;
-   resources.ApplyResources(this.layoutControlItemLowbattery, "layoutControlItemLowbattery");
-   this.layoutControlItemLowbattery.Location = new System.Drawing.Point(0, 96);
-   this.layoutControlItemLowbattery.Name = "layoutControlItemLowbattery";
-   this.layoutControlItemLowbattery.Size = new System.Drawing.Size(404, 24);
-   this.layoutControlItemLowbattery.TextSize = new System.Drawing.Size(70, 13);
-   // 
-   // layoutControlItemLowAccu
-   // 
-   this.layoutControlItemLowAccu.Control = this.imageComboBoxEditLowAccu;
-   resources.ApplyResources(this.layoutControlItemLowAccu, "layoutControlItemLowAccu");
-   this.layoutControlItemLowAccu.Location = new System.Drawing.Point(0, 120);
-   this.layoutControlItemLowAccu.Name = "layoutControlItemLowAccu";
-   this.layoutControlItemLowAccu.Size = new System.Drawing.Size(404, 24);
-   this.layoutControlItemLowAccu.TextSize = new System.Drawing.Size(70, 13);
-   // 
-   // layoutControlItemCommFailure
-   // 
-   this.layoutControlItemCommFailure.Control = this.comboBoxCommFailure;
-   resources.ApplyResources(this.layoutControlItemCommFailure, "layoutControlItemCommFailure");
-   this.layoutControlItemCommFailure.Location = new System.Drawing.Point(0, 0);
-   this.layoutControlItemCommFailure.Name = "layoutControlItemCommFailure";
-   this.layoutControlItemCommFailure.Size = new System.Drawing.Size(404, 24);
-   this.layoutControlItemCommFailure.TextSize = new System.Drawing.Size(70, 13);
-   // 
-   // layoutControlItemBaseChannel
-   // 
-   this.layoutControlItemBaseChannel.Control = this.imageComboBoxEditBaseChannel;
-   resources.ApplyResources(this.layoutControlItemBaseChannel, "layoutControlItemBaseChannel");
-   this.layoutControlItemBaseChannel.Location = new System.Drawing.Point(0, 144);
-   this.layoutControlItemBaseChannel.Name = "layoutControlItemBaseChannel";
-   this.layoutControlItemBaseChannel.Size = new System.Drawing.Size(404, 24);
-   this.layoutControlItemBaseChannel.TextSize = new System.Drawing.Size(70, 13);
-   // 
-   // layoutControlItem4
-   // 
-   this.layoutControlItem4.Control = this.TypeTextEdit;
-   resources.ApplyResources(this.layoutControlItem4, "layoutControlItem4");
-   this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
-   this.layoutControlItem4.Name = "layoutControlItem4";
-   this.layoutControlItem4.Size = new System.Drawing.Size(414, 24);
-   this.layoutControlItem4.TextSize = new System.Drawing.Size(70, 13);
-   // 
-   // emptySpaceItem1
-   // 
-   this.emptySpaceItem1.AllowHotTrack = false;
-   resources.ApplyResources(this.emptySpaceItem1, "emptySpaceItem1");
-   this.emptySpaceItem1.Location = new System.Drawing.Point(0, 293);
-   this.emptySpaceItem1.Name = "emptySpaceItem1";
-   this.emptySpaceItem1.Size = new System.Drawing.Size(414, 22);
-   this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
-   // 
-   // Bus2Wireless4IOModuleDetail
-   // 
-   resources.ApplyResources(this, "$this");
-   this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-   this.Name = "Bus2Wireless4IOModuleDetail";
-   ((System.ComponentModel.ISupportInitialize)(this.HardwareDeviceBindingSource)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.VirtualPeripheralBindingSource)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.RightPanel)).EndInit();
-   this.RightPanel.ResumeLayout(false);
-   ((System.ComponentModel.ISupportInitialize)(this.MainBindingSource)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
-   this.layoutControl1.ResumeLayout(false);
-   ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditBaseChannel.Properties)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.VirtualRFPeripheralBindingSource)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.comboBoxCommFailure.Properties)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditLowAccu.Properties)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditLowBattery.Properties)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditTamper.Properties)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditACLoss.Properties)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.comboBoxCoverContact.Properties)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.TypeTextEdit.Properties)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.RoomPopUp.Properties)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.RoomLayoutControlItem)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemCoverContactOld)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemACLoss)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemTamper)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemLowbattery)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemLowAccu)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemCommFailure)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemBaseChannel)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-   ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
-   this.ResumeLayout(false);
+            this.layoutControlGroup4.Location = new System.Drawing.Point(0, 120);
+            this.layoutControlGroup4.Name = "layoutControlGroup4";
+            this.layoutControlGroup4.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 2, 2);
+            this.layoutControlGroup4.Size = new System.Drawing.Size(397, 197);
+            // 
+            // layoutControlItemCoverContactOld
+            // 
+            this.layoutControlItemCoverContactOld.Control = this.comboBoxCoverContact;
+            resources.ApplyResources(this.layoutControlItemCoverContactOld, "layoutControlItemCoverContactOld");
+            this.layoutControlItemCoverContactOld.Location = new System.Drawing.Point(0, 24);
+            this.layoutControlItemCoverContactOld.Name = "layoutControlItemCoverContactOld";
+            this.layoutControlItemCoverContactOld.Size = new System.Drawing.Size(387, 24);
+            this.layoutControlItemCoverContactOld.TextSize = new System.Drawing.Size(87, 13);
+            // 
+            // layoutControlItemACLoss
+            // 
+            this.layoutControlItemACLoss.Control = this.imageComboBoxEditACLoss;
+            resources.ApplyResources(this.layoutControlItemACLoss, "layoutControlItemACLoss");
+            this.layoutControlItemACLoss.Location = new System.Drawing.Point(0, 48);
+            this.layoutControlItemACLoss.Name = "layoutControlItemACLoss";
+            this.layoutControlItemACLoss.Size = new System.Drawing.Size(387, 24);
+            this.layoutControlItemACLoss.TextSize = new System.Drawing.Size(87, 13);
+            // 
+            // layoutControlItemTamper
+            // 
+            this.layoutControlItemTamper.Control = this.imageComboBoxEditTamper;
+            resources.ApplyResources(this.layoutControlItemTamper, "layoutControlItemTamper");
+            this.layoutControlItemTamper.Location = new System.Drawing.Point(0, 72);
+            this.layoutControlItemTamper.Name = "layoutControlItemTamper";
+            this.layoutControlItemTamper.Size = new System.Drawing.Size(387, 24);
+            this.layoutControlItemTamper.TextSize = new System.Drawing.Size(87, 13);
+            // 
+            // layoutControlItemLowbattery
+            // 
+            this.layoutControlItemLowbattery.Control = this.imageComboBoxEditLowBattery;
+            resources.ApplyResources(this.layoutControlItemLowbattery, "layoutControlItemLowbattery");
+            this.layoutControlItemLowbattery.Location = new System.Drawing.Point(0, 96);
+            this.layoutControlItemLowbattery.Name = "layoutControlItemLowbattery";
+            this.layoutControlItemLowbattery.Size = new System.Drawing.Size(387, 24);
+            this.layoutControlItemLowbattery.TextSize = new System.Drawing.Size(87, 13);
+            // 
+            // layoutControlItemLowAccu
+            // 
+            this.layoutControlItemLowAccu.Control = this.imageComboBoxEditLowAccu;
+            resources.ApplyResources(this.layoutControlItemLowAccu, "layoutControlItemLowAccu");
+            this.layoutControlItemLowAccu.Location = new System.Drawing.Point(0, 120);
+            this.layoutControlItemLowAccu.Name = "layoutControlItemLowAccu";
+            this.layoutControlItemLowAccu.Size = new System.Drawing.Size(387, 24);
+            this.layoutControlItemLowAccu.TextSize = new System.Drawing.Size(87, 13);
+            // 
+            // layoutControlItemCommFailure
+            // 
+            this.layoutControlItemCommFailure.Control = this.comboBoxCommFailure;
+            resources.ApplyResources(this.layoutControlItemCommFailure, "layoutControlItemCommFailure");
+            this.layoutControlItemCommFailure.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItemCommFailure.Name = "layoutControlItemCommFailure";
+            this.layoutControlItemCommFailure.Size = new System.Drawing.Size(387, 24);
+            this.layoutControlItemCommFailure.TextSize = new System.Drawing.Size(87, 13);
+            // 
+            // layoutControlItemBaseChannel
+            // 
+            this.layoutControlItemBaseChannel.Control = this.imageComboBoxEditBaseChannel;
+            resources.ApplyResources(this.layoutControlItemBaseChannel, "layoutControlItemBaseChannel");
+            this.layoutControlItemBaseChannel.Location = new System.Drawing.Point(0, 144);
+            this.layoutControlItemBaseChannel.Name = "layoutControlItemBaseChannel";
+            this.layoutControlItemBaseChannel.Size = new System.Drawing.Size(387, 24);
+            this.layoutControlItemBaseChannel.TextSize = new System.Drawing.Size(87, 13);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.TypeTextEdit;
+            resources.ApplyResources(this.layoutControlItem4, "layoutControlItem4");
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Size = new System.Drawing.Size(397, 24);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 13);
+            // 
+            // emptySpaceItem1
+            // 
+            this.emptySpaceItem1.AllowHotTrack = false;
+            resources.ApplyResources(this.emptySpaceItem1, "emptySpaceItem1");
+            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 317);
+            this.emptySpaceItem1.Name = "emptySpaceItem1";
+            this.emptySpaceItem1.Size = new System.Drawing.Size(397, 10);
+            this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
+            // 
+            // layoutControlItemDatapointNumber
+            // 
+            this.layoutControlItemDatapointNumber.Control = this.spinEditDatapointNumber;
+            resources.ApplyResources(this.layoutControlItemDatapointNumber, "layoutControlItemDatapointNumber");
+            this.layoutControlItemDatapointNumber.Location = new System.Drawing.Point(0, 96);
+            this.layoutControlItemDatapointNumber.Name = "layoutControlItemDatapointNumber";
+            this.layoutControlItemDatapointNumber.Size = new System.Drawing.Size(198, 24);
+            this.layoutControlItemDatapointNumber.TextSize = new System.Drawing.Size(87, 13);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.checkEditIsDatapointNumberSet;
+            resources.ApplyResources(this.layoutControlItem3, "layoutControlItem3");
+            this.layoutControlItem3.Location = new System.Drawing.Point(198, 96);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.Size = new System.Drawing.Size(199, 24);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem3.TextToControlDistance = 0;
+            this.layoutControlItem3.TextVisible = false;
+            // 
+            // Bus2Wireless4IOModuleDetail
+            // 
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Name = "Bus2Wireless4IOModuleDetail";
+            ((System.ComponentModel.ISupportInitialize)(this.HardwareDeviceBindingSource)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.VirtualPeripheralBindingSource)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.RightPanel)).EndInit();
+            this.RightPanel.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.MainBindingSource)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
+            this.layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.checkEditIsDatapointNumberSet.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.spinEditDatapointNumber.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditBaseChannel.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.VirtualRFPeripheralBindingSource)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.comboBoxCommFailure.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditLowAccu.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditLowBattery.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditTamper.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.imageComboBoxEditACLoss.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.comboBoxCoverContact.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.TypeTextEdit.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.RoomPopUp.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tabbedControlGroup1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.RoomLayoutControlItem)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemCoverContactOld)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemACLoss)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemTamper)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemLowbattery)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemLowAccu)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemCommFailure)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemBaseChannel)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemDatapointNumber)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            this.ResumeLayout(false);
 
         }
 
@@ -501,5 +577,9 @@
         private System.Windows.Forms.BindingSource VirtualRFPeripheralBindingSource;
         public DevExpress.XtraEditors.ImageComboBoxEdit imageComboBoxEditBaseChannel;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItemBaseChannel;
+        private DevExpress.XtraEditors.CheckEdit checkEditIsDatapointNumberSet;
+        private DevExpress.XtraEditors.SpinEdit spinEditDatapointNumber;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItemDatapointNumber;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
     }
 }
Index: ConfigApp/Views/Hardware/HardwareTreeDetails/HardwareDevices/Bus2Wireless4IOModuleDetail.resx
===================================================================
--- ConfigApp/Views/Hardware/HardwareTreeDetails/HardwareDevices/Bus2Wireless4IOModuleDetail.resx	(revision 3299)
+++ ConfigApp/Views/Hardware/HardwareTreeDetails/HardwareDevices/Bus2Wireless4IOModuleDetail.resx	(working copy)
@@ -123,21 +123,78 @@
   <metadata name="VirtualPeripheralBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>236, 17</value>
   </metadata>
+  <metadata name="MainBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>604, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="checkEditIsDatapointNumberSet.Location" type="System.Drawing.Point, System.Drawing">
+    <value>212, 132</value>
+  </data>
+  <data name="checkEditIsDatapointNumberSet.Properties.Caption" xml:space="preserve">
+    <value>Set Datapoint Number</value>
+  </data>
+  <data name="checkEditIsDatapointNumberSet.Size" type="System.Drawing.Size, System.Drawing">
+    <value>195, 19</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="checkEditIsDatapointNumberSet.TabIndex" type="System.Int32, mscorlib">
+    <value>98</value>
+  </data>
+  <data name="&gt;&gt;checkEditIsDatapointNumberSet.Name" xml:space="preserve">
+    <value>checkEditIsDatapointNumberSet</value>
+  </data>
+  <data name="&gt;&gt;checkEditIsDatapointNumberSet.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;checkEditIsDatapointNumberSet.Parent" xml:space="preserve">
+    <value>layoutControl1</value>
+  </data>
+  <data name="&gt;&gt;checkEditIsDatapointNumberSet.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="spinEditDatapointNumber.EditValue" type="System.Decimal, mscorlib">
+    <value>8640</value>
+  </data>
+  <data name="spinEditDatapointNumber.Location" type="System.Drawing.Point, System.Drawing">
+    <value>104, 132</value>
+  </data>
+  <assembly alias="DevExpress.Utils.v13.1" name="DevExpress.Utils.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="spinEditDatapointNumber.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
+    <value>Combo</value>
+  </data>
+  <data name="spinEditDatapointNumber.Properties.Mask.EditMask" xml:space="preserve">
+    <value>d</value>
+  </data>
+  <data name="spinEditDatapointNumber.Size" type="System.Drawing.Size, System.Drawing">
+    <value>104, 20</value>
+  </data>
+  <data name="spinEditDatapointNumber.TabIndex" type="System.Int32, mscorlib">
+    <value>97</value>
+  </data>
+  <data name="&gt;&gt;spinEditDatapointNumber.Name" xml:space="preserve">
+    <value>spinEditDatapointNumber</value>
+  </data>
+  <data name="&gt;&gt;spinEditDatapointNumber.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.SpinEdit, DevExpress.XtraEditors.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;spinEditDatapointNumber.Parent" xml:space="preserve">
+    <value>layoutControl1</value>
+  </data>
+  <data name="&gt;&gt;spinEditDatapointNumber.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
   <metadata name="VirtualRFPeripheralBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
+    <value>919, 17</value>
   </metadata>
   <metadata name="internalDataStore.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>457, 17</value>
   </metadata>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="imageComboBoxEditBaseChannel.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="imageComboBoxEditBaseChannel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>92, 298</value>
+    <value>109, 324</value>
   </data>
-  <assembly alias="DevExpress.Utils.v13.1" name="DevExpress.Utils.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="imageComboBoxEditBaseChannel.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
   </data>
@@ -178,7 +235,7 @@
     <value>-1</value>
   </data>
   <data name="imageComboBoxEditBaseChannel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>327, 20</value>
+    <value>293, 20</value>
   </data>
   <data name="imageComboBoxEditBaseChannel.TabIndex" type="System.Int32, mscorlib">
     <value>39</value>
@@ -193,10 +250,10 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;imageComboBoxEditBaseChannel.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>6</value>
   </data>
   <data name="comboBoxCommFailure.Location" type="System.Drawing.Point, System.Drawing">
-    <value>92, 154</value>
+    <value>109, 180</value>
   </data>
   <data name="comboBoxCommFailure.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -238,7 +295,7 @@
     <value>-1</value>
   </data>
   <data name="comboBoxCommFailure.Size" type="System.Drawing.Size, System.Drawing">
-    <value>327, 20</value>
+    <value>293, 20</value>
   </data>
   <data name="comboBoxCommFailure.TabIndex" type="System.Int32, mscorlib">
     <value>38</value>
@@ -253,10 +310,10 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxCommFailure.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>7</value>
   </data>
   <data name="imageComboBoxEditLowAccu.Location" type="System.Drawing.Point, System.Drawing">
-    <value>92, 274</value>
+    <value>109, 300</value>
   </data>
   <data name="imageComboBoxEditLowAccu.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -298,7 +355,7 @@
     <value>-1</value>
   </data>
   <data name="imageComboBoxEditLowAccu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>327, 20</value>
+    <value>293, 20</value>
   </data>
   <data name="imageComboBoxEditLowAccu.TabIndex" type="System.Int32, mscorlib">
     <value>35</value>
@@ -313,10 +370,10 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;imageComboBoxEditLowAccu.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>8</value>
   </data>
   <data name="imageComboBoxEditLowBattery.Location" type="System.Drawing.Point, System.Drawing">
-    <value>92, 250</value>
+    <value>109, 276</value>
   </data>
   <data name="imageComboBoxEditLowBattery.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -358,7 +415,7 @@
     <value>-1</value>
   </data>
   <data name="imageComboBoxEditLowBattery.Size" type="System.Drawing.Size, System.Drawing">
-    <value>327, 20</value>
+    <value>293, 20</value>
   </data>
   <data name="imageComboBoxEditLowBattery.TabIndex" type="System.Int32, mscorlib">
     <value>34</value>
@@ -373,10 +430,10 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;imageComboBoxEditLowBattery.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>9</value>
   </data>
   <data name="imageComboBoxEditTamper.Location" type="System.Drawing.Point, System.Drawing">
-    <value>92, 226</value>
+    <value>109, 252</value>
   </data>
   <data name="imageComboBoxEditTamper.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -418,7 +475,7 @@
     <value>-1</value>
   </data>
   <data name="imageComboBoxEditTamper.Size" type="System.Drawing.Size, System.Drawing">
-    <value>327, 20</value>
+    <value>293, 20</value>
   </data>
   <data name="imageComboBoxEditTamper.TabIndex" type="System.Int32, mscorlib">
     <value>32</value>
@@ -433,10 +490,10 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;imageComboBoxEditTamper.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>10</value>
   </data>
   <data name="imageComboBoxEditACLoss.Location" type="System.Drawing.Point, System.Drawing">
-    <value>92, 202</value>
+    <value>109, 228</value>
   </data>
   <data name="imageComboBoxEditACLoss.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -478,7 +535,7 @@
     <value>-1</value>
   </data>
   <data name="imageComboBoxEditACLoss.Size" type="System.Drawing.Size, System.Drawing">
-    <value>327, 20</value>
+    <value>293, 20</value>
   </data>
   <data name="imageComboBoxEditACLoss.TabIndex" type="System.Int32, mscorlib">
     <value>32</value>
@@ -493,10 +550,10 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;imageComboBoxEditACLoss.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>11</value>
   </data>
   <data name="comboBoxCoverContact.Location" type="System.Drawing.Point, System.Drawing">
-    <value>92, 178</value>
+    <value>109, 204</value>
   </data>
   <data name="comboBoxCoverContact.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
@@ -538,7 +595,7 @@
     <value>-1</value>
   </data>
   <data name="comboBoxCoverContact.Size" type="System.Drawing.Size, System.Drawing">
-    <value>327, 20</value>
+    <value>293, 20</value>
   </data>
   <data name="comboBoxCoverContact.TabIndex" type="System.Int32, mscorlib">
     <value>31</value>
@@ -553,13 +610,13 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;comboBoxCoverContact.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>12</value>
   </data>
   <data name="TypeTextEdit.Location" type="System.Drawing.Point, System.Drawing">
-    <value>87, 34</value>
+    <value>104, 36</value>
   </data>
   <data name="TypeTextEdit.Size" type="System.Drawing.Size, System.Drawing">
-    <value>337, 20</value>
+    <value>303, 20</value>
   </data>
   <data name="TypeTextEdit.TabIndex" type="System.Int32, mscorlib">
     <value>14</value>
@@ -574,16 +631,16 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;TypeTextEdit.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>13</value>
   </data>
   <data name="RoomPopUp.Location" type="System.Drawing.Point, System.Drawing">
-    <value>87, 106</value>
+    <value>104, 108</value>
   </data>
   <data name="RoomPopUp.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v13.1">
     <value>Combo</value>
   </data>
   <data name="RoomPopUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>337, 20</value>
+    <value>303, 20</value>
   </data>
   <data name="RoomPopUp.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -592,22 +649,19 @@
     <value>RoomPopUp</value>
   </data>
   <data name="&gt;&gt;RoomPopUp.Type" xml:space="preserve">
-    <value>Honeywell.MBEMEA.ConfigApp.CustomControls.FacilityPopUp, ConfigApp, Version=0.3.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>Honeywell.MBEMEA.ConfigApp.CustomControls.FacilityPopUp, ConfigApp, Version=0.3.0.1, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;RoomPopUp.Parent" xml:space="preserve">
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;RoomPopUp.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>14</value>
   </data>
-  <metadata name="MainBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>604, 17</value>
-  </metadata>
   <data name="textEdit2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>87, 82</value>
+    <value>104, 84</value>
   </data>
   <data name="textEdit2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>337, 20</value>
+    <value>303, 20</value>
   </data>
   <data name="textEdit2.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -622,13 +676,13 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;textEdit2.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>15</value>
   </data>
   <data name="textEdit1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>87, 58</value>
+    <value>104, 60</value>
   </data>
   <data name="textEdit1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>337, 20</value>
+    <value>303, 20</value>
   </data>
   <data name="textEdit1.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -643,7 +697,7 @@
     <value>layoutControl1</value>
   </data>
   <data name="&gt;&gt;textEdit1.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>16</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="layoutControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@@ -739,6 +793,18 @@
   <data name="emptySpaceItem1.Text" xml:space="preserve">
     <value>emptySpaceItem1</value>
   </data>
+  <data name="layoutControlItemDatapointNumber.CustomizationFormText" xml:space="preserve">
+    <value>Datapoint Number</value>
+  </data>
+  <data name="layoutControlItemDatapointNumber.Text" xml:space="preserve">
+    <value>Datapoint Number</value>
+  </data>
+  <data name="layoutControlItem3.CustomizationFormText" xml:space="preserve">
+    <value>layoutControlItem3</value>
+  </data>
+  <data name="layoutControlItem3.Text" xml:space="preserve">
+    <value>layoutControlItem3</value>
+  </data>
   <data name="layoutControlGroup2.Text" xml:space="preserve">
     <value>General</value>
   </data>
@@ -976,10 +1042,22 @@
   <data name="&gt;&gt;emptySpaceItem1.Type" xml:space="preserve">
     <value>DevExpress.XtraLayout.EmptySpaceItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;layoutControlItemDatapointNumber.Name" xml:space="preserve">
+    <value>layoutControlItemDatapointNumber</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItemDatapointNumber.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem3.Name" xml:space="preserve">
+    <value>layoutControlItem3</value>
+  </data>
+  <data name="&gt;&gt;layoutControlItem3.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v13.1, Version=13.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>Bus2Wireless4IOModuleDetail</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>Honeywell.MBEMEA.ConfigApp.Views.Hardware.HardwareTreeDetails.HardwareDevices.BaseBus2DeviceDetail, ConfigApp, Version=0.3.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>Honeywell.MBEMEA.ConfigApp.Views.Hardware.HardwareTreeDetails.HardwareDevices.BaseBus2DeviceDetail, ConfigApp, Version=0.3.0.1, Culture=neutral, PublicKeyToken=null</value>
   </data>
 </root>
\ No newline at end of file
Index: EMBSecureEventTool/EMBSecureEventTool.csproj
===================================================================
--- EMBSecureEventTool/EMBSecureEventTool.csproj	(revision 3299)
+++ EMBSecureEventTool/EMBSecureEventTool.csproj	(working copy)
@@ -112,10 +112,6 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Examples\EventConverter\EventConverter\EventXmlConverter.Lib\EventXmlConverter.Lib.csproj">
-      <Project>{ed8b643e-6047-4f0a-91cc-dbb195359593}</Project>
-      <Name>EventXmlConverter.Lib</Name>
-    </ProjectReference>
     <ProjectReference Include="..\CommonViews\CommonViews.csproj">
       <Project>{940d9a23-d894-453b-8957-a2cac0a6cda8}</Project>
       <Name>CommonViews</Name>

Zerion Mini Shell 1.0