Add ECOND and ECONT I2C

CMakeLists.txt

@@ -100,6 +100,39 @@ add_custom_command(
 )
 add_custom_target(lpgbt_regmap DEPENDS include/register_maps/lpgbt.h)
 
+add_custom_command(
+  OUTPUT "include/register_maps/econd.h"
+  COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/include/register_maps
+  COMMAND python3
+  ${PROJECT_SOURCE_DIR}/register_maps/econ-to-header.py
+  ${PROJECT_SOURCE_DIR}/register_maps/ECOND_I2C_params_regmap.yaml
+  ${CMAKE_CURRENT_BINARY_DIR}/include/register_maps/econd.h
+  DEPENDS
+  ${PROJECT_SOURCE_DIR}/register_maps/econ-to-header.py
+  ${PROJECT_SOURCE_DIR}/register_maps/ECOND_I2C_params_regmap.yaml
+  COMMENT "Generating C++ ECOND register LUT from register_maps/ECOND_I2C_params_regmap.yaml"
+  VERBATIM
+)
+add_custom_target(econd DEPENDS include/register_maps/econd.h)
+
+add_custom_command(
+  OUTPUT "include/register_maps/econt.h"
+  COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/include/register_maps
+  COMMAND python3
+  ${PROJECT_SOURCE_DIR}/register_maps/econ-to-header.py
+  ${PROJECT_SOURCE_DIR}/register_maps/ECONT_I2C_params_regmap.yaml
+  ${CMAKE_CURRENT_BINARY_DIR}/include/register_maps/econt.h
+  DEPENDS
+  ${PROJECT_SOURCE_DIR}/register_maps/econ-to-header.py
+  ${PROJECT_SOURCE_DIR}/register_maps/ECONT_I2C_params_regmap.yaml
+  COMMENT "Generating C++ ECONT register LUT from register_maps/ECONT_I2C_params_regmap.yaml"
+  VERBATIM
+)
+add_custom_target(econt DEPENDS include/register_maps/econt.h)
+
+#list(APPEND generate_headers econd)
+#list(APPEND generate_headers econt)
+
 add_custom_command(
   OUTPUT include/register_maps/register_maps.h
   COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/include/register_maps
@@ -144,9 +177,10 @@ target_link_libraries(packing PUBLIC utility)
 #
 #  src/pflib/FastControl.cxx
 
-add_library(pflib SHARED 
+add_library(pflib SHARED
   src/pflib/I2C_Linux.cxx
   src/pflib/ROC.cxx
+  src/pflib/ECON.cxx
   src/pflib/Compile.cxx
   src/pflib/Logging.cxx
   src/pflib/Hcal.cxx
@@ -160,13 +194,18 @@ add_library(pflib SHARED
   src/pflib/lpgbt/lpGBT_ConfigTransport_I2C.cxx
   src/pflib/lpgbt/lpGBT_Registers.cxx
   src/pflib/lpgbt/lpGBT_Utility.cxx
+  src/pflib/lpgbt/lpGBT_standard_configs.cxx
+  src/pflib/lpgbt/I2C.cxx
+  src/pflib/lpgbt/GPIO.cxx
   src/pflib/TargetFiberless.cxx
   src/pflib/GPIO_HcalHGCROCZCU.cxx
   src/pflib/FastControlCMS_MMap.cxx
   src/pflib/ECOND_Formatter.cxx
   src/pflib/zcu/UIO.cxx
   src/pflib/zcu/Elinks_zcu.cxx
   src/pflib/zcu/lpGBT_ICEC_ZCU_Simple.cxx
+  src/pflib/zcu/zcu_optolink.cxx
+  src/pflib/zcu/HcalBackplaneZCU.cxx
   src/pflib/Bias.cxx
   src/pflib/algorithm/level_pedestals.cxx
   src/pflib/algorithm/toa_vref_scan.cxx
@@ -180,7 +219,7 @@ target_include_directories(pflib PUBLIC
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
   "$<INSTALL_INTERFACE:include>")
 target_link_libraries(pflib PUBLIC yaml-cpp::yaml-cpp packing Boost::log version utility)
-add_dependencies(pflib register_maps_header direct_access lpgbt_regmap)
+add_dependencies(pflib register_maps_header direct_access lpgbt_regmap econd)
 
 add_library(menu SHARED
   src/pflib/menu/Menu.cc
@@ -216,7 +255,6 @@ target_link_libraries(pftool PRIVATE pflib menu)
 
 add_executable(pflpgbt app/lpgbt/main.cxx 
   app/lpgbt/lpgbt_mezz_tester.cc
-  app/lpgbt/zcu_optolink.cc
 )
 target_link_libraries(pflpgbt PRIVATE pflib menu)
 

app/lpgbt/lpgbt_mezz_tester.cc

@@ -159,39 +159,3 @@ std::vector<uint32_t> LPGBT_Mezz_Tester::capture(int ilink, bool is_rx) {
 }
 
 
-void LPGBT_Mezz_Tester::capture_ec(int mode, std::vector<uint8_t>& tx, std::vector<uint8_t>& rx) {
-  static constexpr int REG_SPY_CTL = 67;
-  static constexpr int REG_READ    = 69;
-
-  uint32_t val=opto_.read(REG_SPY_CTL);
-  val=val&0x1FF;
-  val=val|((mode&0x3)<<10)|(1<<9); 
-  opto_.write(REG_SPY_CTL,val);
-
-  // now wait for it...
-  bool done=false;
-  do {
-    usleep(100);
-    done=(opto_.read(REG_READ)&0x400)!=0;
-    if (mode==0) done=true;
-  } while (!done);
-  val=val&0x1FF;
-  val=val|((mode&0x3)<<10); // disable the spy 
-  opto_.write(REG_SPY_CTL,val);
-
-  tx.clear();
-  rx.clear();
-
-  val=val&0x1FF;
-  val=val|((mode&0x3)<<10); 
-  for (int i=0; i<256; i++) {
-    val=val&0xFFF;
-    val=val|(i<<12);
-    opto_.write(REG_SPY_CTL,val);
-    usleep(1);
-    uint32_t k=opto_.read(REG_READ);
-    tx.push_back((k>>(2+11))&0x3);
-    rx.push_back((k>>11)&0x3);
-  }
-
-}

app/lpgbt/lpgbt_mezz_tester.h

@@ -22,7 +22,6 @@ class LPGBT_Mezz_Tester {
   std::vector<uint32_t> ber_tx();
 
   std::vector<uint32_t> capture(int ilink, bool is_rx = false);
-  void capture_ec(int mode, std::vector<uint8_t>& tx, std::vector<uint8_t>& rx);
 
  private:
   pflib::UIO& opto_;