merge settings files

diff --git a/installation/power_outputs.db b/installation/power_outputs.db
index 1f663a19aa8fcc8af23b00bcc9a637516e7b0ba4..cbe1246fc75d56961571e922e03ef81d6016a5aa 100644 (file)
--- a/installation/power_outputs.db
+++ b/installation/power_outputs.db
@@ -1,34 +1,34 @@
 #Plane   Sector   MBO     Power   Output
 ##########################################
-0        0        0        0        0
-0        0        1        0        1
-0        0        2        0        2
-0        0        3        0        3
-0        0        4        1        0
-0        0        5        1        1
-0        0        6        1        2
-0        0        7        1        3
-0        0        8        2        0
-0        0        9        2        1
-0        0        10       2        2
-0        0        11       2        3
-0        0        12       3        0
-0        0        13       3        1
+# 0        0        0        0        0
+# 0        0        1        0        1
+# 0        0        2        0        2
+# 0        0        3        0        3
+# 0        0        4        1        0
+# 0        0        5        1        1
+# 0        0        6        1        2
+# 0        0        7        1        3
+# 0        0        8        2        0
+# 0        0        9        2        1
+# 0        0        10       2        2
+# 0        0        11       2        3
+# 0        0        12       3        0
+# 0        0        13       3        2
 
-0        1        0        0        0
-0        1        1        0        1
-0        1        2        0        2
-0        1        3        0        3
-0        1        4        1        0
-0        1        5        1        1
-0        1        6        0        2 #Frankfurt
-0        1        7        0        3 #Frankfurt
-0        1        8        2        0
-0        1        9        2        1
-0        1        10       2        2
-0        1        11       2        3
-0        1        12       3        0
-0        1        13       3        1
+ 0        1        0        1        3
+0        1        1        0        3
+0        1        2        1        2
+# 0        1        3        1        3
+# 0        1        4        0        0
+0        1        5        1        1 #Frankfurt
+0        1        6        0        1 #Frankfurt
+0        1        7        0        2 #Frankfurt
+0        1        8        0        3 #Frankfurt
+# 0        1        9        2        1
+0        1        10       1        0
+# 0        1        11       2        3
+0        1        12       1        1
+# 0        1        13       3        1
 
 0        2        0        0        0
 0        2        1        0        1

diff --git a/installation/powerdistributor_positions.db b/installation/powerdistributor_positions.db
index d9ac1b0526012660d36ca91475ebdf35646f12fc..6cee7271a644f77baa1cf6434c3d3258022cf6ec 100644 (file)
--- a/installation/powerdistributor_positions.db
+++ b/installation/powerdistributor_positions.db
@@ -5,7 +5,7 @@
 ###################################
     0           0          052
     0           1          070  #Frankfurt
-    0           2          000
+    0           2          068
     0           3          000
     0           4          000
     0           5          000

diff --git a/pasttrec/pasttrec_baseline.db b/pasttrec/pasttrec_baseline.db
index 24bd22c843119dd6af8f53a2b7afee853a882371..e6c7dce1696d08a5686fb7448735261929aec67b 100644 (file)
--- a/pasttrec/pasttrec_baseline.db
+++ b/pasttrec/pasttrec_baseline.db
@@ -11,26 +11,23 @@
 #  Serial  #   PT   #   C0   #  C1   #  C2   #  C3   #  C4   #  C5   #  C6   #  C7   #
 ######################################################################################
 
-   60013       0       21      16      16      17      19      23      16      21
-   60013       1       18      18      17      16      17      13      14      22
-   60013       2       20      22      21      15      15      18      19      23
-   60013       3       16      20      19      14      21      23      20      23
 
-   70013       0       19      23      21      19      23      20      23      19
-   70013       1       19      16      23      18      23      19      25      16
-   70013       2       14      19      25      19      14      17      21      21
-   70013       3       14      20      15      17      23      19      22      10
+   60033        0       22      16      21      77      18      77      21      77
+   60033        1       20      77      77      18      77      18      20      15
+   60033        2       77      77      16      20      19      77      77      22
+   60033        3       77      77      77      16      20      19      15      77
 
-   60023       0       25      23      28      21      21      26      24      24
-   60023       1       25      17      15      23      25      18      22      21
-   60023       2       16      13      15      13      19      23      24      19
-   60023       3       19      18      19      13      18      21      19      15
+   70033        0       17      17      20      17      77      21      16      15
+   70033        1       19      77      16      15      20      77      16      17
+   70033        2       19      77      17      19      18      28      77      77
+   70033        3       22      25      21      22      20      77      77      21
+
+
+   60133       0       20      16      21      21      14      18      20      20
+   60133       1       09      24      22      11      14      20      19      15
+   60133       2       20      15      10      16      17      12      15      17
+   60133       3       24      27      20      22      18      15      14      29
 
-   70023       0       19      28      17      28      20      28      15      20
-   70023       1       16      17      19      17      15      19      18      18
-   70023       2       20      18      24      16      17      17      17      15
-   70023       3       14      24      19      23      18      19      25      16
- 
    60063        0       19      25      25      19      77      23      21      19
    60063        1       20      24      18      19      27      21      27      27
    60063        2       28      21      26      26      25      20      26      23
@@ -125,15 +122,15 @@
    70153       2       22      18      23      21      23      22      25      21
    70153       3       15      25      24      20      16      21      21      16
    
-   60161       0       15      19      22      21      22      19      22      25
-   60161       1       24      26      19      22      26      21      19      19
-   60161       2       20      22      22      25      20      21      21      23
-   60161       3       21      20      20      24      24      23      20      22
+   60163       0       15      19      22      21      22      19      22      25
+   60163       1       24      26      19      22      26      21      19      19
+   60163       2       20      22      22      25      20      21      21      23
+   60163       3       21      20      20      24      24      23      20      22
 
-   70161       0       22      25      24      22      23      28      21      29
-   70161       1       23      24      21      16      23      24      19      18
-   70161       2       14      22      21      18      20      20      19      25
-   70161       3       24      19      13      22      19      23      23      31
+   70163       0       22      25      24      22      23      28      21      29
+   70163       1       23      24      21      16      23      24      19      18
+   70163       2       14      22      21      18      20      20      19      25
+   70163       3       24      19      13      22      19      23      23      31
 
    
    0910        0       19      19      27      21      17      21      20      22
@@ -240,21 +237,6 @@
    0962  3       23      23      15      23      19      18      24      14
 
    
-   0910  0       19      19      27      21      17      22      19      22
-   0910  1       19      23      23      13      15      09      20      26
-   0910  2       77      11      11      11      11      11      11      11
-   0910  3       21      21      21      21      21      21      21      21
-   
-   0911  0       21      16      16      22      16      21      23      13
-   0911  1       22      20      21      20      28      28      26      14
-   0911  2       23      22      17      20      20      22      22      26
-   0911  3       77      77      77      77      77      77      77      77
-   
-   0912  0       20      22      10      20      02      12      18      17
-   0912  1       11      06      11      04      11      07      06      11
-   0912  2       77      77      77      77      77      77      77      77
-   0912  3       29      21      23      25      23      23      23      25
-
    60013        0       21      16      16      17      18      22      15      21
    60013        1       18      18      17      16      18      13      14      22
    60013        2       17      18      19      15      14      18      19      22
@@ -265,16 +247,6 @@
    60043        2       77      19      29      77      21      77      77      77
    60043        3       15      77      77      15      77      77      27      77
 
-   60063        0       19      25      25      19      27      23      21      19
-   60063        1       20      23      18      19      27      21      27      27
-   60063        2       28      21      26      26      25      20      26      23
-   60063        3       18      24      21      28      12      24      20      26
-
-   60073        0       26      18      17      24      20      22      16      23
-   60073        1       27      24      24      19      24      24      11      24
-   60073        2       22      20      18      26      22      17      21      19
-   60073        3       18      22      23      19      18      26      24      24
-
    70013        0       19      23      21      19      23      20      23      19
    70013        1       19      16      23      18      23      19      24      16
    70013        2       14      19      24      19      13      17      21      21
@@ -285,56 +257,17 @@
    70043        2       18      23      77      20      20      19      25      23
    70043        3       18      17      77      20      14      18      21      16
 
-   70063        0       23      26      26      27      19      22      14      24
-   70063        1       23      27      24      18      23      18      16      24
-   70063        2       20      18      26      18      15      15      18      17
-   70063        3       16      23      16      19      20      19      18      10
-
-   70073        0       21      24      29      16      13      19      19      16
-   70073        1       21      24      17      25      18      30      24      20
-   70073        2       23      21      29      27      29      24      24      24
-   70073        3       18      23      18      16      22      17      17      20
-
-   60013       0       21      16      16      18      19      23      16      21
-   60013       1       18      18      17      16      18      14      14      22
-   60013       2       21      22      21      15      15      19      19      23
-   60013       3       17      20      19      14      21      23      21      23
 
    60023       0       25      23      28      21      21      26      24      24
    60023       1       25      17      15      22      25      18      22      21
    60023       2       16      13      15      13      19      23      24      20
    60023       3       19      19      19      13      18      21      19      15
 
-   60043       0       25      14      18      18      25      18      12      20
-   60043       1       20      20      18      18      25      13      15      28
-   60043       2       14      19      29      19      21      25      19      15
-   60043       3       15      19      11      15      20      17      27      22
-
-   60073       0       26      18      17      24      20      22      16      23
-   60073       1       27      24      24      19      24      24      77      24
-   60073       2       22      20      18      26      22      17      21      19
-   60073       3       18      22      23      19      18      26      24      24
-
-   70013       0       19      23      21      19      23      20      23      19
-   70013       1       19      16      23      18      23      19      24      16
-   70013       2       14      19      24      19      14      17      21      21
-   70013       3       14      20      15      17      23      19      22      10
-
    70023       0       19      28      17      28      20      29      15      20
    70023       1       16      17      19      17      15      19      18      18
    70023       2       20      18      24      16      18      18      17      14
    70023       3       14      24      19      23      18      19      25      16
 
-   70043       0       27      22      23      27      21      21      19      18
-   70043       1       24      22      20      18      25      23      19      24
-   70043       2       18      23      20      20      20      19      25      23
-   70043       3       18      17      23      21      14      18      21      16
-
-   70073       0       21      24      29      16      13      19      19      16
-   70073       1       21      24      17      25      18      30      24      20
-   70073       2       23      21      29      27      29      24      24      24
-   70073       3       18      23      18      16      22      17      17      20
-
    1000        0       20      22      30      25      23      25      23      23
    1000        1       22      18      16      21      22      22      16      17
    1000        2       14      26      18      22      20      31      20      15
@@ -383,3 +316,17 @@
   
    
    
+   1020 0       22      21      21      20      16      23      24      25
+   1020 1       24      23      17      19      18      22      19      24
+   1020 2       19      23      22      19      17      20      18      27
+   1020 3       13      17      20      17      21      18      28      11
+   1021 0       16      24      17      21      14      20      20      23
+   1021 1       23      20      24      17      23      20      19      21
+   1021 2       20      22      23      22      16      26      20      25
+   1021 3       23      17      16      23      28      19      24      18
+   1022 0       23      16      21      17      21      20      19      18
+   1022 1       21      22      22      21      24      15      28      17
+   1022 2       26      19      26      17      25      17      26      13
+   1022 3       20      23      19      23      23      16      14      13
+
+

diff --git a/serials/serials_mdcmbo.db b/serials/serials_mdcmbo.db
index d37358eb09fea6eedde909078d93bd6b6c40ee4c..d0f797ec32efb885fc3b5af064896642212ee67a 100644 (file)
--- a/serials/serials_mdcmbo.db
+++ b/serials/serials_mdcmbo.db
@@ -109,6 +109,12 @@
 0971  0x0000443f00822941  
 0972  0x0000b8e600822941
 
+
+1025  0x0000379700822941
+1020  0x0000622600822941
+1021  0x0000be4300822941
+1022  0x000018f300822941
+
 #0975  
 #0970  
 #0971  

diff --git a/settings_power/settings_voltage.db b/settings_power/settings_voltage.db
index d99df1db2ba0c03795cc207772eecaab625ef9e9..9c8e6a5a2308e7cf30a8f53c537d386bb2c8d2fa 100644 (file)
--- a/settings_power/settings_voltage.db
+++ b/settings_power/settings_voltage.db
@@ -7,19 +7,19 @@
 #  Address   #  Voltage 1  #  Voltage 2
 ########################################
   0x8e00          5              5
-  0x8e01          6              6
-  0x8e02          4              4
+  0x8e01          6              7
+  0x8e02          5              6
   0x8e03          5              5
-  0x8e04          6              7
-  0x8e05          6              6
-  0x8e06          6              6
+  0x8e04          5              5
+  0x8e05          4              4
+  0x8e06          5              7
   0x8e07          6              6
-  0x8e08          6              6
-  0x8e09          6              6
-  0x8e0a          6              6
-  0x8e0b          6              6
-  0x8e0c          6              6
-  0x8e0d          6              6
+  0x8e08          5              5
+  0x8e09          5              5
+  0x8e0a          5              5
+  0x8e0b          4              4
+  0x8e0c          5              5
+  0x8e0d          5              5
   
   
   0x8e10          7              6
@@ -92,22 +92,22 @@
   0x8e5b          2              2
   0x8e5c          2              2
   0x8e5d          2              2
-  0x8e60          6              6
-  0x8e61          6              6
-  0x8e62          6              6
-  0x8e63          6              6
-  0x8e64          6              6
-  0x8e65          6              6
-  0x8e66          6              6
-  0x8e67          6              6
-  0x8e68          6              6
-  0x8e69          6              6
-  0x8e6a          6              6
-  0x8e6b          6              6
-  0x8e6c          6              6
-  0x8e6d          6              6
-  0x8e6e          6              6
-  0x8e6f          6              6
+  0x8e60          2              2
+  0x8e61          2              2
+  0x8e62          2              2
+  0x8e63          2              2
+  0x8e64          2              2
+  0x8e65          2              2
+  0x8e66          2              2
+  0x8e67          2              2
+  0x8e68          2              2
+  0x8e69          2              2
+  0x8e6a          2              2
+  0x8e6b          2              2
+  0x8e6c          2              2
+  0x8e6d          2              2
+  0x8e6e          2              2
+  0x8e6f          2              2
   0x8e70          2              2
   0x8e71          2              2
   0x8e72          2              2