%PDF- %PDF-
Mini Shell

Mini Shell

Direktori : /var/www_old/music/diplomka/
Upload File :
Create Path :
Current File : //var/www_old/music/diplomka/Bus2DatapointHelper_2.cs.patch

Index: Datapoints/Bus2DatapointHelper.cs
===================================================================
--- Datapoints/Bus2DatapointHelper.cs	(revision 3874)
+++ Datapoints/Bus2DatapointHelper.cs	(working copy)
@@ -193,11 +193,10 @@
         private static void SaveBus2DuoModule(int baseDataPoint, InternalDataSet.HardwareDeviceRow device)
         {
             InsertInputs(device.UID, baseDataPoint);
-            int ledCnt = 1;
             int outCnt = 1;
             var outputs =
                 InternalDataStore.DataSet.LogicalDevice.Where(
-                    p => !p.IsClassTypeNull() && p.HardwareDeviceUID == device.UID && p.ClassType == "ccBusOutput").OrderBy(p => p.Number);
+                    p => !p.IsClassTypeNull() && p.HardwareDeviceUID == device.UID && p.ClassType == "ccBusOutput");
             foreach (var output in outputs)
             {
                 var row = InternalDataStore.DataSet.DatapointNumbers.NewDatapointNumbersRow();
@@ -205,21 +204,9 @@
                 row.VirtualItemUID = HardwareUIDToVirtualUID(device.UID);
                 row.ItemUID = LogicalUIDToVirtualUID(output.UID);
                 row.Name = output.Name;
-                row.DatapointNumber = baseDataPoint + 5 + outCnt;
+                row.DatapointNumber = baseDataPoint + 5 + outCnt++;
                 row.DatapointType = "300070005";
 
-                // Separate LEDs
-                if (row.Name.ToUpper().IndexOf("LED", System.StringComparison.Ordinal) >= 0)
-                {
-                    row.DatapointNumber = baseDataPoint + 10 + ledCnt;
-                    row.DatapointType = "300070006";
-                    ledCnt++;
-                }
-                else
-                {
-                    outCnt++;
-                }
-
                 InternalDataStore.DataSet.DatapointNumbers.AddDatapointNumbersRow(row);
             }
         }
@@ -260,7 +247,8 @@
         private static void SaveBus2SounderFlasherModule(int baseDataPoint, InternalDataSet.HardwareDeviceRow device)
         {
             InsertInputs(device.UID, baseDataPoint);
-            var outputs =
+            // No outputs for Sounder/Flasher module
+            /*var outputs =
                 InternalDataStore.DataSet.LogicalDevice.Where(
                     p => !p.IsClassTypeNull() && p.HardwareDeviceUID == device.UID && p.ClassType == "ccBusOutput");
             foreach (var output in outputs)
@@ -280,13 +268,13 @@
                     row.DatapointType = "300070052";
                 }
                 // Flasher
-                if (row.Name.ToUpper().IndexOf("FLASH", System.StringComparison.Ordinal) >= 0)
+                if (output.Number == 1)
                 {
                     row.DatapointNumber = baseDataPoint + 7;
                     row.DatapointType = "300070051";
                 }
                 InternalDataStore.DataSet.DatapointNumbers.AddDatapointNumbersRow(row);
-            }
+            }*/
         }
 
         private static string GetDatapointData(string deviceType)
@@ -424,6 +412,7 @@
 
         internal static void InsertOutputs(uint deviceUid, int baseDataPoint)
         {
+            int outCnt = 1;
             var outputs =
                 InternalDataStore.DataSet.LogicalDevice.Where(
                     p => !p.IsClassTypeNull() && p.HardwareDeviceUID == deviceUid && p.ClassType == "ccBusOutput");
@@ -434,21 +423,9 @@
                 row.VirtualItemUID = HardwareUIDToVirtualUID(deviceUid);
                 row.ItemUID = LogicalUIDToVirtualUID(output.UID);
                 row.Name = output.Name;
-                row.DatapointNumber = baseDataPoint + 5 + output.Number;
+                row.DatapointNumber = baseDataPoint + 5 + outCnt++;
                 row.DatapointType = "300070005";
 
-                // Separate LEDs
-                if (row.Name.ToUpper().IndexOf("LED", System.StringComparison.Ordinal) >= 0)
-                {
-                    row.DatapointNumber += 5;
-                    row.DatapointType = "300070006";
-                }
-                // Set correct type for flasher
-                if (row.Name.ToUpper().IndexOf("FLASH", System.StringComparison.Ordinal) >= 0)
-                {
-                    row.DatapointType = "300070051";
-                }
-
                 InternalDataStore.DataSet.DatapointNumbers.AddDatapointNumbersRow(row);
             }
         }

Zerion Mini Shell 1.0