[cru] Add TTCUP gbt mux option

Author: kostorr

README.md

@@ -151,7 +151,7 @@ The Parameters that affect the configuration of the CRU, their possible values (
 
 `GbtMode (GBT | WB) [GBT]`
 
-`GbtMux (TTC | DDG | SWT) [TTC]`
+`GbtMux (TTC | DDG | SWT | TTCUP) [TTC]`
 
 `LinkLoopbackEnabled (true | false) [false]`
 
@@ -480,18 +480,18 @@ metric format for the CRORC and the CRU is different, as different parameters ar
 
 ###### Metric: `"link"`
 
-| Value name       | Value                                                   | Type   | 
-| ---------------- | ------------------------------------------------------- | ------ | 
-| `"pciAddress"`   | -                                                       | string |
-| `"gbtMode"`      | "GBT/GBT" or "GBT/WB"                                   | string |
-| `"loopback"`     | 0/1 (Enabled/Disabled)                                  | int    |
-| `"gbtMux"`       | "DDG", "SWT", "TTC:CTP", "TTC:PATTERN", or "TTC:MIDTRG" | string |
-| `"datapathMode"` | "PACKET" or "CONTINUOUS"                                | string |
-| `"datapath"`     | 0/1 (Disabled/Enabled)                                  | int    |
-| `"rxFreq"`       | -                                                       | double |
-| `"txFreq"`       | -                                                       | double |
-| `"status"`       | 0/1/2 (DOWN/UP/UP was DOWN)                             | int    |
-| `"opticalPower"` | -                                                       | double |
+| Value name       | Value                                                             | Type   | 
+| ---------------- | ----------------------------------------------------------------- | ------ | 
+| `"pciAddress"`   | -                                                                 | string |
+| `"gbtMode"`      | "GBT/GBT" or "GBT/WB"                                             | string |
+| `"loopback"`     | 0/1 (Enabled/Disabled)                                            | int    |
+| `"gbtMux"`       | "DDG", "SWT", "TTC:CTP", "TTC:PATTERN", "TTC:MIDTRG", or "TTC UP" | string |
+| `"datapathMode"` | "PACKET" or "CONTINUOUS"                                          | string |
+| `"datapath"`     | 0/1 (Disabled/Enabled)                                            | int    |
+| `"rxFreq"`       | -                                                                 | double |
+| `"txFreq"`       | -                                                                 | double |
+| `"status"`       | 0/1/2 (DOWN/UP/UP was DOWN)                                       | int    |
+| `"opticalPower"` | -                                                                 | double |
 
 | Tag key           | Value              |
 | ----------------- | ------------------ |

cru_template.cfg

@@ -66,7 +66,7 @@ userAndCommonLogicEnabled=false
 # [true | false]
 enabled=true
 
-# [TTC | DDG | SWT]
+# [TTC | DDG | SWT | TTCUP]
 gbtMux=TTC
 
 #############################################

include/ReadoutCard/Cru.h

@@ -37,6 +37,7 @@ static constexpr uint32_t DATA_MIDTRG(0x2);
 static constexpr uint32_t GBT_MUX_TTC(0x0);
 static constexpr uint32_t GBT_MUX_DDG(0x1);
 static constexpr uint32_t GBT_MUX_SWT(0x2);
+static constexpr uint32_t GBT_MUX_TTCUP(0x3);
 
 static constexpr uint32_t GBT_MODE_GBT(0x0);
 static constexpr uint32_t GBT_MODE_WB(0x1);

include/ReadoutCard/ParameterTypes/GbtMux.h

@@ -30,6 +30,7 @@ struct GbtMux {
     Ttc = Cru::GBT_MUX_TTC,
     Ddg = Cru::GBT_MUX_DDG,
     Swt = Cru::GBT_MUX_SWT,
+    TtcUp = Cru::GBT_MUX_TTCUP,
     Na = -1,
   };
 

src/CommandLineUtilities/ProgramConfig.cxx

@@ -65,7 +65,7 @@ class ProgramConfig : public Program
                           "GBT MODE [GBT, WB]");
     options.add_options()("gbtmux",
                           po::value<std::string>(&mOptions.gbtMux)->default_value("TTC"),
-                          "GBT MUX [TTC, DDG, SWT]");
+                          "GBT MUX [TTC, DDG, SWT, TTCUP]");
     options.add_options()("links",
                           po::value<std::string>(&mOptions.links)->default_value("0"),
                           "Links to enable");

src/Cru/Gbt.cxx

@@ -40,6 +40,7 @@ void Gbt::setMux(int index, uint32_t mux)
   uint32_t reg = index / 16;
   uint32_t bitOffset = (index % 16) * 2;
   uint32_t address = Cru::Registers::GBT_MUX_SELECT.address + (reg * 4);
+  std::cout << mux << std::endl;
   mPdaBar->modifyRegister(address / 4, bitOffset, 2, mux);
 }
 
@@ -121,6 +122,8 @@ void Gbt::getGbtMuxes()
       link.gbtMux = GbtMux::type::Ddg;
     } else if (txMux == Cru::GBT_MUX_SWT) {
       link.gbtMux = GbtMux::type::Swt;
+    } else if (txMux == Cru::GBT_MUX_TTCUP) {
+      link.gbtMux = GbtMux::type::TtcUp;
     } else {
       link.gbtMux = GbtMux::type::Na;
     }

src/ParameterTypes/GbtMux.cxx

@@ -27,6 +27,7 @@ static const auto converter = Utilities::makeEnumConverter<GbtMux::type>("GbtMux
                                                                                      { GbtMux::Ttc, "TTC" },
                                                                                      { GbtMux::Ddg, "DDG" },
                                                                                      { GbtMux::Swt, "SWT" },
+                                                                                     { GbtMux::TtcUp, "TTC UP" },
                                                                                      { GbtMux::Na, "N/A" },
                                                                                    });