From: c.wendisch Date: Wed, 20 Sep 2023 14:14:25 +0000 (+0200) Subject: 4 new long MBOs added X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=fd9310514a0b1f419cf852c17e71d02df3f82513;p=hades_mdc_settings.git 4 new long MBOs added --- fd9310514a0b1f419cf852c17e71d02df3f82513 diff --cc pasttrec/pasttrec_baseline.db index 5e8f6b9,e6c7dce..1a2a310 --- a/pasttrec/pasttrec_baseline.db +++ b/pasttrec/pasttrec_baseline.db @@@ -381,53 -314,19 +314,71 @@@ 0972 2 23 20 27 24 20 19 19 19 0972 3 18 14 28 24 14 17 21 23 + 0530 0 15 11 16 20 18 13 14 17 + 0530 1 14 19 20 17 15 16 21 13 + 0530 2 26 15 19 14 18 24 17 15 + 0530 3 19 23 23 20 23 21 20 21 + + 0531 0 24 24 19 30 23 25 22 22 + 0531 1 18 16 23 24 18 22 22 28 + 0531 2 16 18 18 18 17 25 17 17 + 0531 3 20 22 21 21 21 19 22 21 ++<<<<<<< HEAD + 1041 0 25 16 24 18 19 21 21 28 + 1041 1 18 17 25 19 27 15 23 20 + 1041 2 17 18 15 18 14 19 26 23 + 1041 3 19 22 22 19 21 18 15 20 + + 1042 0 23 17 21 22 22 19 24 29 + 1042 1 28 21 16 24 24 16 12 19 + 1042 2 21 21 22 19 20 24 18 19 + 1042 3 24 22 21 77 23 19 18 18 + + + 1050 0 29 21 23 26 21 24 23 20 + 1050 1 24 18 20 27 22 19 24 20 + 1050 2 19 19 12 20 20 18 20 23 + 1050 3 19 22 19 20 18 19 21 22 + + 1051 0 25 16 18 20 18 23 16 18 + 1051 1 17 17 26 29 28 25 19 16 + 1051 2 25 22 26 18 24 26 22 20 + 1051 3 28 20 22 16 28 18 21 20 + + 1052 0 17 17 27 20 26 20 16 22 + 1052 1 25 18 20 23 30 27 24 24 + 1052 2 27 21 18 21 20 16 24 21 + 1052 3 20 20 21 18 26 18 16 19 + + 1070 0 16 23 21 29 22 24 20 22 + 1070 1 25 20 31 21 25 24 26 24 + 1070 2 15 16 21 20 18 20 15 26 + 1070 3 23 21 25 26 22 27 16 29 + + 1071 0 25 18 22 25 24 24 23 21 + 1071 1 22 20 25 24 19 26 24 25 + 1071 2 18 25 22 22 26 25 22 26 + 1071 3 18 26 18 16 17 22 15 22 + + 1072 0 19 18 19 21 13 16 24 16 + 1072 1 20 18 18 23 23 18 26 13 + 1072 2 22 15 29 25 23 20 14 30 + 1072 3 20 17 23 17 22 15 22 16 ++======= + + 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 + + ++>>>>>>> be06249b7960cfe98af298729baa0b8cd3f5491b diff --cc serials/serials_mdcmbo.db index acb0d53,d0f797e..cecaaaf --- a/serials/serials_mdcmbo.db +++ b/serials/serials_mdcmbo.db @@@ -109,6 -109,17 +109,20 @@@ 0971 0x0000443f00822941 0972 0x0000b8e600822941 ++<<<<<<< HEAD ++======= + + 1025 0x0000379700822941 + 1020 0x0000622600822941 + 1021 0x0000be4300822941 + 1022 0x000018f300822941 + + #0975 + #0970 + #0971 + #0972 + ++>>>>>>> be06249b7960cfe98af298729baa0b8cd3f5491b 1005 0x00003cdc00822941 1000 0x000080b900822941 1001 0x0000464900822941 diff --cc settings_power/settings_voltage.db index 79ba80a,9c8e6a5..7ca6485 --- a/settings_power/settings_voltage.db +++ b/settings_power/settings_voltage.db @@@ -6,20 -6,20 +6,37 @@@ # Address # Voltage 1 # Voltage 2 ######################################## ++<<<<<<< HEAD + 0x8e00 4 5 + 0x8e01 7 7 + 0x8e02 3 4 + 0x8e03 2 4 + 0x8e04 5 7 + 0x8e05 5 5 + 0x8e06 6 7 + 0x8e07 7 7 + 0x8e08 5 6 + 0x8e09 5 5 + 0x8e0a 5 6 + 0x8e0b 3 2 + 0x8e0c 7 7 + 0x8e0d 3 3 ++======= + 0x8e00 5 5 + 0x8e01 6 7 + 0x8e02 5 6 + 0x8e03 5 5 + 0x8e04 5 5 + 0x8e05 4 4 + 0x8e06 5 7 + 0x8e07 6 6 + 0x8e08 5 5 + 0x8e09 5 5 + 0x8e0a 5 5 + 0x8e0b 4 4 + 0x8e0c 5 5 + 0x8e0d 5 5 ++>>>>>>> be06249b7960cfe98af298729baa0b8cd3f5491b 0x8e10 7 6