Merge branch 'develop' into mueller/release-warning-fixes

2022-04-13 12:04:08 +02:00
parent 52885919d0 435f8164a1
commit 42b7b4a7c4
23 changed files with 624 additions and 1686 deletions
--- a/linux/ObjectFactory.cpp
+++ b/linux/ObjectFactory.cpp
@ -280,7 +280,7 @@ void ObjectFactory::createRtdComponents(std::string spiDev, GpioIF* gpioComIF,
  TcsBoardHelper helper(rtdIds);
  TcsBoardAssembly* tcsBoardAss =
      new TcsBoardAssembly(objects::TCS_BOARD_ASS, objects::NO_OBJECT, pwrSwitcher,
-                           pcduSwitches::Switches::PDU1_CH0_TCS_BOARD_3V3, helper);
+                           pcdu::Switches::PDU1_CH0_TCS_BOARD_3V3, helper);
  static_cast<void>(tcsBoardAss);
 #endif  // OBSW_ADD_RTD_DEVICES == 1
 }