From f3910a87a39f765d8a21a76efed71460f942d8a4 Mon Sep 17 00:00:00 2001 From: Jerzy Jamroz Date: Mon, 30 Sep 2024 12:28:20 +0200 Subject: [PATCH 1/2] feat: Update of printreg with the IO-s. --- evgMrmApp/src/evgInit.cpp | 79 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/evgMrmApp/src/evgInit.cpp b/evgMrmApp/src/evgInit.cpp index a318565b..f9b63890 100644 --- a/evgMrmApp/src/evgInit.cpp +++ b/evgMrmApp/src/evgInit.cpp @@ -682,6 +682,7 @@ struct printreg { REGINFO("SeqControl(0)", SeqControl(0), 32), REGINFO("SeqControl(1)", SeqControl(1), 32), REGINFO("FracSynthWord", FracSynthWord, 32), + REGINFO("TrigEventCtrl(0)", TrigEventCtrl(0), 32), REGINFO("TrigEventCtrl(1)", TrigEventCtrl(1), 32), REGINFO("TrigEventCtrl(2)", TrigEventCtrl(2), 32), @@ -690,6 +691,7 @@ struct printreg { REGINFO("TrigEventCtrl(5)", TrigEventCtrl(5), 32), REGINFO("TrigEventCtrl(6)", TrigEventCtrl(6), 32), REGINFO("TrigEventCtrl(7)", TrigEventCtrl(7), 32), + REGINFO("MuxControl(0)", MuxControl(0), 32), REGINFO("MuxPrescaler(0)", MuxPrescaler(0), 32), REGINFO("MuxControl(1)", MuxControl(1), 32), @@ -706,21 +708,98 @@ struct printreg { REGINFO("MuxPrescaler(6)", MuxPrescaler(6), 32), REGINFO("MuxControl(7)", MuxControl(7), 32), REGINFO("MuxPrescaler(7)", MuxPrescaler(7), 32), + REGINFO("FrontOutMap(0)", FrontOutMap(0), 16), + REGINFO("FrontOutMap(1)", FrontOutMap(1), 16), + REGINFO("FrontOutMap(2)", FrontOutMap(2), 16), + REGINFO("FrontOutMap(3)", FrontOutMap(3), 16), + + REGINFO("UnivOutMap(0)", UnivOutMap(0), 16), + REGINFO("UnivOutMap(1)", UnivOutMap(1), 16), + REGINFO("UnivOutMap(2)", UnivOutMap(2), 16), + REGINFO("UnivOutMap(3)", UnivOutMap(3), 16), + REGINFO("UnivOutMap(4)", UnivOutMap(4), 16), + REGINFO("UnivOutMap(5)", UnivOutMap(5), 16), + REGINFO("UnivOutMap(6)", UnivOutMap(6), 16), + REGINFO("UnivOutMap(7)", UnivOutMap(7), 16), + REGINFO("UnivOutMap(8)", UnivOutMap(8), 16), + REGINFO("UnivOutMap(9)", UnivOutMap(9), 16), + + REGINFO("RearOutMap(0)", RearOutMap(0), 16), + REGINFO("RearOutMap(1)", RearOutMap(1), 16), + REGINFO("RearOutMap(2)", RearOutMap(2), 16), + REGINFO("RearOutMap(3)", RearOutMap(3), 16), + REGINFO("RearOutMap(4)", RearOutMap(4), 16), + REGINFO("RearOutMap(5)", RearOutMap(5), 16), + REGINFO("RearOutMap(6)", RearOutMap(6), 16), + REGINFO("RearOutMap(7)", RearOutMap(7), 16), + REGINFO("RearOutMap(8)", RearOutMap(8), 16), + REGINFO("RearOutMap(9)", RearOutMap(9), 16), + REGINFO("RearOutMap(10)", RearOutMap(10), 16), + REGINFO("RearOutMap(11)", RearOutMap(11), 16), + REGINFO("RearOutMap(12)", RearOutMap(12), 16), + REGINFO("RearOutMap(13)", RearOutMap(13), 16), + REGINFO("RearOutMap(14)", RearOutMap(14), 16), + REGINFO("RearOutMap(15)", RearOutMap(15), 16), + + REGINFO("BackOutMap(0)", BackOutMap(0), 16), + REGINFO("BackOutMap(1)", BackOutMap(1), 16), + REGINFO("BackOutMap(2)", BackOutMap(2), 16), + REGINFO("BackOutMap(3)", BackOutMap(3), 16), + REGINFO("BackOutMap(4)", BackOutMap(4), 16), + REGINFO("BackOutMap(5)", BackOutMap(5), 16), + REGINFO("BackOutMap(6)", BackOutMap(6), 16), + REGINFO("BackOutMap(7)", BackOutMap(7), 16), + REGINFO("FrontInMap(0)", FrontInMap(0), 32), REGINFO("FrontInMap(1)", FrontInMap(1), 32), + REGINFO("FrontInMap(2)", FrontInMap(2), 32), + REGINFO("FrontInMap(3)", FrontInMap(3), 32), + REGINFO("UnivInMap(0)", UnivInMap(0), 32), REGINFO("UnivInMap(1)", UnivInMap(1), 32), + REGINFO("UnivInMap(2)", UnivInMap(2), 32), + REGINFO("UnivInMap(3)", UnivInMap(3), 32), + REGINFO("UnivInMap(4)", UnivInMap(4), 32), + REGINFO("UnivInMap(5)", UnivInMap(5), 32), + REGINFO("UnivInMap(6)", UnivInMap(6), 32), + REGINFO("UnivInMap(7)", UnivInMap(7), 32), + REGINFO("UnivInMap(8)", UnivInMap(8), 32), + REGINFO("UnivInMap(9)", UnivInMap(9), 32), + + REGINFO("RearInMap(0)", RearInMap(0), 32), + REGINFO("RearInMap(1)", RearInMap(1), 32), + REGINFO("RearInMap(2)", RearInMap(2), 32), + REGINFO("RearInMap(3)", RearInMap(3), 32), + REGINFO("RearInMap(4)", RearInMap(4), 32), + REGINFO("RearInMap(5)", RearInMap(5), 32), + REGINFO("RearInMap(6)", RearInMap(6), 32), + REGINFO("RearInMap(7)", RearInMap(7), 32), + REGINFO("RearInMap(8)", RearInMap(8), 32), + REGINFO("RearInMap(9)", RearInMap(9), 32), + REGINFO("RearInMap(10)", RearInMap(10), 32), + REGINFO("RearInMap(11)", RearInMap(11), 32), REGINFO("RearInMap(12)", RearInMap(12), 32), REGINFO("RearInMap(13)", RearInMap(13), 32), REGINFO("RearInMap(14)", RearInMap(14), 32), REGINFO("RearInMap(15)", RearInMap(15), 32), + + REGINFO("BackInMap(0)", BackInMap(0), 32), + REGINFO("BackInMap(1)", BackInMap(1), 32), + REGINFO("BackInMap(2)", BackInMap(2), 32), + REGINFO("BackInMap(3)", BackInMap(3), 32), + REGINFO("BackInMap(4)", BackInMap(4), 32), + REGINFO("BackInMap(5)", BackInMap(5), 32), + REGINFO("BackInMap(6)", BackInMap(6), 32), + REGINFO("BackInMap(7)", BackInMap(7), 32), + REGINFO("DataBuffer(0)", DataBuffer(0), 8), REGINFO("DataBuffer(1)", DataBuffer(1), 8), REGINFO("DataBuffer(2)", DataBuffer(2), 8), REGINFO("DataBuffer(3)", DataBuffer(3), 8), REGINFO("DataBuffer(4)", DataBuffer(4), 8), REGINFO("DataBuffer(5)", DataBuffer(5), 8), + REGINFO("SeqRamTS(0,0)", SeqRamTS(0,0), 32), REGINFO("SeqRamTS(0,1)", SeqRamTS(0,1), 32), REGINFO("SeqRamTS(0,2)", SeqRamTS(0,2), 32), From 40619315113a3711b86fa70f4bb7cbc14dad472d Mon Sep 17 00:00:00 2001 From: Jerzy Jamroz Date: Mon, 30 Sep 2024 13:15:28 +0200 Subject: [PATCH 2/2] feat: Update of printreg with generic regs. --- evgMrmApp/src/evgInit.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/evgMrmApp/src/evgInit.cpp b/evgMrmApp/src/evgInit.cpp index f9b63890..c41a7dca 100644 --- a/evgMrmApp/src/evgInit.cpp +++ b/evgMrmApp/src/evgInit.cpp @@ -678,10 +678,18 @@ struct printreg { REGINFO("DataBufferControl",DataBufferControl,32), REGINFO("DBusSrc", DBusSrc, 32), REGINFO("FPGAVersion", FPGAVersion, 32), + + REGINFO("TSControl", TSControl, 32), + REGINFO("TSValue", TSValue, 32), + REGINFO("ClockControl", ClockControl, 32), + REGINFO("ClockStatus", ClockStatus, 16), + REGINFO("SeqControl(0)", SeqControl(0), 32), REGINFO("SeqControl(1)", SeqControl(1), 32), + REGINFO("FracSynthWord", FracSynthWord, 32), + REGINFO("RxInitPS", RxInitPS, 32), REGINFO("TrigEventCtrl(0)", TrigEventCtrl(0), 32), REGINFO("TrigEventCtrl(1)", TrigEventCtrl(1), 32),