update settings and installation files

diff --git a/installation/mbo_positions.db b/installation/mbo_positions.db
index 206c9f8683cdce1df3389fe84e34d34aa9239af1..18e6d5230b55011165c3ec6ebcb20e6f9f3f914e 100644 (file)
--- a/installation/mbo_positions.db
+++ b/installation/mbo_positions.db
@@ -32,12 +32,12 @@
 
 0        2        0        0        397
 0        2        1        1        854  ##868
-0        2        2        1        860
+0        2        2        1        953  ##860
 0        2        3        0        396
 0        2        4        0        473  ## 402
 0        2        5        0        404
 0        2        6        1        851
-0        2        7        1        870
+0        2        7        1        954 ## 870
 0        2        8        0        399
 0        2        9        0        406
 0        2        10       1        845
@@ -67,7 +67,7 @@
 0        4        4        0        362
 0        4        5        0        342
 0        4        6        1        827
-0        4        7        1        818
+0        4        7        1        958  # no trigger? 24.1.25. 818
 0        4        8        0        360
 0        4        9        0        357
 0        4        10       1        840
@@ -85,7 +85,7 @@
 0        5        7        1        832
 0        5        8        0        356
 0        5        9        0        302
-0        5        10       1        847
+0        5        10       1        809  ##847
 0        5        11       0        311
 0        5        12       1        844  ## 819
 0        5        13       0        508  ## 310
@@ -93,7 +93,7 @@
 ##########################################
 
 1        0        0        0        432
-1        0        1        0        452
+1        0        1        0        578   ##452
 1        0        2        0        439
 1        0        3        0        448
 1        0        4        0        436
@@ -120,7 +120,7 @@
 1        1        8        0        464
 1        1        9        0        453
 1        1        10       0        323
-1        1        11       0        460
+1        1        11       0        582 ## 460
 1        1        12       0        408
 1        1        13       0        303
 1        1        14       1        875

diff --git a/installation/temperature_sensors.db b/installation/temperature_sensors.db
index a5a4932a70fa51de50f0019403813ddd577f3bc8..462f3a379437f1e99be2d04c2786d3bc20c264b8 100644 (file)
--- a/installation/temperature_sensors.db
+++ b/installation/temperature_sensors.db
@@ -2,8 +2,8 @@
 #####################################################################################################################################
     0           0        A3000001f1408528      1F000001f14F7D28      B7000001f110A428      78000001F149E028      A2000001F1194E28
     0           1        22000001f1438f28      54000001f130e628      f7000001f12eea28      81000001f1496e28      72000001F10CD428      
-    0           2        96000001f1132328      a6000001f14adc28      55000001f141EE28      AD000001F12B0228      0D000001F10B8428
-    0           3        df000001f1508528      1f000001f1449e28      d7000001f130d428      2d000001f1299428      94000001F1CF2628
+    0           2        96000001f1132328      a6000001f14adc28      28000001F158ba28      AD000001F12B0228      0D000001F10B8428
+    0           3        df000001f1508528      1f000001f1449e28      d7000001f130d428      2d000001f1299428      94000001F126cf28
     0           4        3b000001f159ad28      21000001f110ad28      1c0000028f6efa28      e4000001f12a8028      D4000001F12B2828
     0           5        3f000001f10c6928      1e000001f12efc28      10000001f1432d28      53000001f122ed28      66000001F140D028
 
@@ -17,7 +17,7 @@
     2           0        0                     0                     0                     0
     2           1        0                     0                     0                     0
     2           2        0                     0                     0                     0
-    2           3        0                     0                     0                     0
+    2           3        0                     0                     55000001f141EE28      0
     2           4        0                     0                     0                     0
     2           5        0                     0                     0                     0
 

diff --git a/settings_power/settings_voltage.db b/settings_power/settings_voltage.db
index 9a58478dce889b297010d59379398b225b8fdc75..ea76ad1720ce3c13733cd654664e8dacc887b62a 100644 (file)
--- a/settings_power/settings_voltage.db
+++ b/settings_power/settings_voltage.db
@@ -6,25 +6,25 @@
 
 #  Address   #  Voltage 1  #  Voltage 2
 ########################################
-  0x8e00          5              5
-  0x8e01          3              4
-  0x8e02          3              3
-  0x8e03          5              5
+  0x8e00          4              4
+  0x8e01          3              3
+  0x8e02          2              3
+  0x8e03          4              5
   0x8e04          4              5
-  0x8e05          3              4
-  0x8e06          4              4
-  0x8e07          3              4
-  0x8e08          6              6
+  0x8e05          3              3
+  0x8e06          3              3
+  0x8e07          3              3
+  0x8e08          5              6
   0x8e09          5              6
-  0x8e0a          4              5
-  0x8e0b          4              5
-  0x8e0c          5              5
-  0x8e0d          5              4
+  0x8e0a          4              4
+  0x8e0b          3              5
+  0x8e0c          3              4
+  0x8e0d          3              3
   0x8e10          1              2
   0x8e11          2              2
-  0x8e12          5              5
-  0x8e13          5              5
-  0x8e14          3              4
+  0x8e12          4              4
+  0x8e13          3              4
+  0x8e14          3              5
   0x8e15          4              5
   0x8e16          2              3
   0x8e17          2              3
@@ -34,100 +34,100 @@
   0x8e1b          2              3
   0x8e1c          3              3
   0x8e1d          2              3
-  0x8e20          4              4
-  0x8e21          3              3
-  0x8e22          3              3
-  0x8e23          4              4
+  0x8e20          3              3
+  0x8e21          2              3
+  0x8e22          2              3
+  0x8e23          3              3
   0x8e24          3              4
-  0x8e25          3              3
-  0x8e26          3              4
-  0x8e27          3              3
-  0x8e28          3              3
-  0x8e29          3              3
-  0x8e2a          4              4
-  0x8e2b          3              3
-  0x8e2c          4              4
+  0x8e25          2              3
+  0x8e26          3              3
+  0x8e27          2              3
+  0x8e28          2              3
+  0x8e29          2              3
+  0x8e2a          3              3
+  0x8e2b          2              3
+  0x8e2c          3              4
   0x8e2d          3              3
-  0x8e30          4              5
-  0x8e31          3              7
-  0x8e32          3              1
-  0x8e33          6              5
+  0x8e30          3              4
+  0x8e31          3              3
+  0x8e32          2              2
+  0x8e33          4              4
   0x8e34          4              5
-  0x8e35          2              3
-  0x8e36          3              3
+  0x8e35          2              2
+  0x8e36          2              3
   0x8e37          2              3
-  0x8e38          5              5
+  0x8e38          4              5
   0x8e39          4              5
-  0x8e3a          4              5
-  0x8e3b          3              3
-  0x8e3c          4              4
-  0x8e3d          3              3
-  0x8e40          0              0
-  0x8e41          0              1
-  0x8e42          0              0
-  0x8e43          3              4
-  0x8e44          3              4
-  0x8e45          1              3
-  0x8e46          0              0
-  0x8e47          0              0
-  0x8e48          3              4
-  0x8e49          1              4
-  0x8e4a          0              0
-  0x8e4b          0              0
-  0x8e4c          0              0
-  0x8e4d          0              1
-  0x8e50          5              5
-  0x8e51          4              4
-  0x8e52          4              4
-  0x8e53          5              6
-  0x8e54          4              5
-  0x8e55          3              4
-  0x8e56          5              4
-  0x8e57          4              4
+  0x8e3a          4              4
+  0x8e3b          2              3
+  0x8e3c          3              4
+  0x8e3d          2              3
+  0x8e40          2              2
+  0x8e41          2              3
+  0x8e42          3              3
+  0x8e43          4              5
+  0x8e44          4              5
+  0x8e45          3              5
+  0x8e46          2              3
+  0x8e47          2              2
+  0x8e48          4              7
+  0x8e49          4              5
+  0x8e4a          2              3
+  0x8e4b          3              4
+  0x8e4c          2              3
+  0x8e4d          2              3
+  0x8e50          4              4
+  0x8e51          3              3
+  0x8e52          3              4
+  0x8e53          4              4
+  0x8e54          4              4
+  0x8e55          2              3
+  0x8e56          3              4
+  0x8e57          3              4
   0x8e58          5              6
-  0x8e59          6              6
-  0x8e5a          4              6
-  0x8e5b          4              5
-  0x8e5c          4              5
-  0x8e5d          4              4
+  0x8e59          5              5
+  0x8e5a          3              4
+  0x8e5b          3              4
+  0x8e5c          3              4
+  0x8e5d          3              3
   0x8e60          1              2
   0x8e61          2              2
   0x8e62          2              2
   0x8e63          2              2
   0x8e64          1              2
   0x8e65          2              3
-  0x8e66          3              2
-  0x8e67          1              2
+  0x8e66          2              2
+  0x8e67          2              2
   0x8e68          2              2
   0x8e69          2              2
   0x8e6a          1              2
-  0x8e6b          2              3
+  0x8e6b          2              4
   0x8e6c          1              1
   0x8e6d          2              3
   0x8e6e          1              1
-  0x8e6f          3              3
+  0x8e6f          3              4
   0x8e70          1              2
-  0x8e71          2              2
-  0x8e72          2              2
+  0x8e71          2              3
+  0x8e72          2              3
   0x8e73          2              2
   0x8e74          1              2
-  0x8e75          3              3
-  0x8e76          2              2
+  0x8e75          4              4
+  0x8e76          2              3
   0x8e77          2              2
   0x8e78          2              2
-  0x8e79          2              2
+  0x8e79          2              3
   0x8e7a          1              2
   0x8e7b          2              3
   0x8e7c          1              2
   0x8e7d          2              3
   0x8e7e          1              2
-  0x8e7f          3              3
+  0x8e7f          4              3
   0x8e80          1              2
   0x8e81          2              2
   0x8e82          2              3
   0x8e83          2              2
   0x8e84          2              2
-  0x8e85          3              3
+  0x8e85          3              4
   0x8e86          2              2
   0x8e87          2              2
   0x8e88          2              2
@@ -136,7 +136,7 @@
   0x8e8b          3              4
   0x8e8c          1              2
   0x8e8d          1              2
-  0x8e8e          2              2
+  0x8e8e          2              3
   0x8e8f          2              2
   0x8e90          1              2
   0x8e91          2              2
@@ -175,15 +175,15 @@
   0x8eb2          2              2
   0x8eb3          2              2
   0x8eb4          2              2
-  0x8eb5          3              3
+  0x8eb5          3              4
   0x8eb6          2              2
-  0x8eb7          2              3
+  0x8eb7          2              2
   0x8eb8          2              2
   0x8eb9          2              2
   0x8eba          2              2
   0x8ebb          3              3
   0x8ebc          2              3
-  0x8ebd          2              3
+  0x8ebd          3              3
   0x8ebe          1              2
   0x8ebf          3              3
   0x8f00          7              7

diff --git a/settings_tdc/common_50_settingsselect.trbcmd b/settings_tdc/common_50_settingsselect.trbcmd
index ab5ee0d92dca14ab08a3b93d9d39ab870f1ce00a..6069f2d4e4fae4854c2a3db5a4185d02fbf825e5 100644 (file)
--- a/settings_tdc/common_50_settingsselect.trbcmd
+++ b/settings_tdc/common_50_settingsselect.trbcmd
@@ -1,7 +1,12 @@
 #Select memory location 40,50,60,70 for the four Pasttrec chips, activate autoload of 12 values
 0xa002 0x4c504c40
 0xa003 0x4c704c60
-#min event size 2
-0x7114 0x00020000
-#SEU on
-0xd500 0x00000001
+
+0x7114 0x00020000 #min event size 2
+0xd500 0x00000001 #SEU on
+
+
+0x7111 100        #max event size 100
+
+
+0xc001 0x06148301 #spike rejection 3, window -2000..+100