final cleanup, ready for first code review
This commit is contained in:
@@ -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")
|
||||
|
||||
Binary file not shown.
@@ -2,7 +2,6 @@
|
||||
#include "../include/ePowerSwitchConfig.h"
|
||||
#include "m_epics_ca.h"
|
||||
#include "tmfe.h"
|
||||
#include <format>
|
||||
#include <sstream>
|
||||
|
||||
/**
|
||||
@@ -62,11 +61,13 @@ ePowerSwitchEquipment::ePowerSwitchEquipment(std::string equipmentName,
|
||||
: TMFeEquipment(equipmentName.c_str(), equipmentFileName),
|
||||
outletNumberRecord(mEpicsCa<int>(
|
||||
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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user