From d7a53c875c47912487a58036838c334dbff1924b Mon Sep 17 00:00:00 2001 From: Hugo Jean Ponsin Date: Thu, 30 Apr 2026 08:22:49 +0200 Subject: [PATCH] final cleanup, ready for first code review --- CMakeLists.txt | 16 ---------------- build/submodule/mepicsca/m_epics_ca_test | Bin 9858376 -> 9858376 bytes src/ePowerSwitchFront.cpp | 13 +++++++------ 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 09132ff..c742db4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,9 +40,6 @@ set(LIBS ${LIBS} ${EPICSSYS}/lib/$ENV{EPICS_HOST_ARCH}/libca.so ${EPICSSYS}/lib/$ENV{EPICS_HOST_ARCH}/libCom.so # For alarm.h - $ENV{MIDASSYS}/lib/libmfe.a - $ENV{MIDASSYS}/lib/libmidas.a - $ENV{MIDASSYS}/lib/libmscb.a ) find_package(Midas REQUIRED) @@ -64,15 +61,6 @@ target_include_directories( PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE - $ENV{MIDASSYS}/drivers - $ENV{MIDASSYS}/include - - #$ENV{MIDASSYS}/drivers - #$ENV{MIDASSYS}/include - # This is redundant if MIDASSYS =/ Midas repo, but needed if MIDAS has been - # installed in the repo directory, since the CMake file of MIDAS doesn't - # copy the headers into $ENV{MIDASSYS}/include in the latter case. - $ENV{MIDASSYS}/include/mscb ${EPICSSYS}/include ${EPICSSYS}/include/os/Linux ${EPICSSYS}/include/os/Darwin @@ -92,7 +80,3 @@ install( ePowerSwitchFront RUNTIME DESTINATION bin ) - -# Run the executable during the install process to register it in MIDAS -# include(register_exe) -# register_executable_once("${CMAKE_INSTALL_PREFIX}/bin/ePowerSwitchFront") diff --git a/build/submodule/mepicsca/m_epics_ca_test b/build/submodule/mepicsca/m_epics_ca_test index 3fd2a90ae66a18e04446cdc212ddf3e8f5a0ce06..9ff166ae278d3d9192242cf2fa49c6b2d29dcb8e 100755 GIT binary patch delta 673 zcmWm8H&2uS0D$4hp`wQc5A5X=8}{!&PB;}su`6Ij#ZIv+#SYl;JOvMX98BDei6L=d zCDDO_)kIwUBMv?cPx6lM(4Ud)A^LM8`88jEeH#AKF_;zm{WGtx;Pdx?{olHSNIHm& zA&b$@W-Q|vPYx59I1oglMLn^)rpBPMr7b8f55m%97$(E`$NEgPFejd9PLz~2tWT#h zQF58YWTr5cJf;yNp8}>cgPF`?HglNEJm#~2fQ1yYh{Y^nDa$BgIV)JnDps?GwS>ee zri68rl3?_?jB=7}U?ZETU^82&WGmaKVmmw7$u4%YhrR4$Kh@Mw%K;8@h{GJ=D0Lj; zI47v*B&Rsd8P0N!^EA*%6U|)UBA2+#6|QoP>)fD)R@!LiCbziF9qw|E`*hGr7Y}&I mBOddFZl03j8EKyLf*yK#NrpaN@tQZh8H&kT*1{(wBwwS*5M^mBl_hK0LPORJV@tM-A;#|X3mg|Nxa*#q z`~+?sKf=AIi|3s8@*VyCD>}-z;z(&SQ}eg{)91|B{(s4i#$@#S&w($4K_nMM3K+*& zM;Xrq3MpbDlSYC_tZJyFCEXh|_oah)T@cnM!Y~oWhr9BzilXk?o>W6BUYpD2V-z!) zDNJP=)0sgDrOad&vzfzO=21pD^I5<`0v1uhVwSL!N|sT@a#paCYF1IhYC^`|;;f;L zde*Xz2G)~c0~={%6PszGnJsK(8{26i$qsh1i`}%+Mmu}h%Rctg!2u3(h{GJ=D4le1 zjN_c(B&X=+G-o(V4=K)Zo?b3+kxN|W3Rmgl8fmU`gA6yh#cl3zmwxUsz #include /** @@ -62,11 +61,13 @@ ePowerSwitchEquipment::ePowerSwitchEquipment(std::string equipmentName, : TMFeEquipment(equipmentName.c_str(), equipmentFileName), outletNumberRecord(mEpicsCa( std::string_view(EPOWERSWITCH_SOCKETNUMBER_INFO_PREFIX))) { - fEqConfReadConfigFromOdb = false; - fEqConfPeriodMilliSec = 1000; - fEqConfLogHistory = 1; - fEqConfReadOnlyWhenRunning = false; - fEqConfWriteEventsToOdb = true; + + fEqConfReadConfigFromOdb = false; /// i don't know what this parameter does + fEqConfPeriodMilliSec = 1000; /// refresh rate of midas frontend + fEqConfLogHistory = + 60; /// enable history system, generate one event per minutes + fEqConfReadOnlyWhenRunning = false; /// allow to write values when running + fEqConfWriteEventsToOdb = true; /// i don't know this->numberOfOutlet = 0; }