From: Hades User Date: Thu, 11 Jan 2018 12:07:02 +0000 (+0100) Subject: Merge branch 'master' of jspc26:daqtools X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=e0669bcfd54717e3fbf9bc3be416617a344e1081;p=daqtools.git Merge branch 'master' of jspc26:daqtools --- e0669bcfd54717e3fbf9bc3be416617a344e1081 diff --cc users/frankfurt_test/register_configgbe.db index 2132b75,b0e6267..5b8dcd9 --- a/users/frankfurt_test/register_configgbe.db +++ b/users/frankfurt_test/register_configgbe.db @@@ -17,9 -17,10 +17,10 @@@ 0x8200 0 0x8200 1 0 0xffffff 1 0x8820 0 0x8200 1 0 0xffffff 1 0xf3ce 0 0x82ce 1 1 0xffffff 1 - 0xc000 0 0x8000 1 1 0xffffff 1 + 0xc000 0 0xc000 1 1 0xffffff 1 0xc002 0 0xc002 1 0 0xffffff 1 0xc148 0 0xc148 1 0 0xffffff 1 + 0x83cc 0 0x83cc 1 0 0xffffff 1 diff --cc users/frankfurt_test/register_configgbe_ip.db index fa52012,d2756bc..21567bc --- a/users/frankfurt_test/register_configgbe_ip.db +++ b/users/frankfurt_test/register_configgbe_ip.db @@@ -33,8 -33,10 +33,9 @@@ 0x8200 0 0x546C5E8B 0x0008 0xc0a800fe 0xc353 0xc350 0x8820 0 0x546C5E8B 0x0008 0xc0a800fe 0xc354 0xc350 0xf3ce 0 0x546C5E8B 0x0008 0xc0a800fe 0xc354 0xc350 - 0xc000 0 0x546C5E8B 0x0008 0xc0a800fe 0xc351 0xc350 + 0xc000 0 0xf4c85d53 0xbc5f 0xc0a80067 0xc351 0xc350 0xc002 0 0x546C5E8B 0x0008 0xc0a800fe 0xc362 0xc350 0xc148 0 0x546C5E8B 0x0008 0xc0a800fe 50148 0xc350 + 0x83cc 0 0x546C5E8B 0x0008 0xc0a800fe 50030 0xc350 -