From 9fa2de3b2edb8716c9a7403e8b6cd7f5b1eb74c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Kub=C3=A1nek?= Date: Thu, 8 Feb 2024 22:14:58 -0300 Subject: [PATCH 1/2] Changed for new cRIO ILCBusList etc --- doc/version-history.rst | 2 +- src/LSST/M1M3/TS/Commands/SAL.cpp | 10 +++++----- src/LSST/M1M3/TS/SALThermalILC.cpp | 17 +++++------------ src/LSST/M1M3/TS/SALThermalILC.h | 5 ----- src/LSST/M1M3/TS/SimulatedFPGA.cpp | 4 ++-- src/m1m3tscli.cpp | 2 +- tests/Makefile | 2 +- 7 files changed, 15 insertions(+), 27 deletions(-) diff --git a/doc/version-history.rst b/doc/version-history.rst index 2d8267b..e4f4491 100644 --- a/doc/version-history.rst +++ b/doc/version-history.rst @@ -7,7 +7,7 @@ Version History v0.2.0 ------ -# Report thermal status strings +* Report thermal status strings * Reports meaning of ILC status bites * Improved makefile diff --git a/src/LSST/M1M3/TS/Commands/SAL.cpp b/src/LSST/M1M3/TS/Commands/SAL.cpp index ef38036..54458cc 100644 --- a/src/LSST/M1M3/TS/Commands/SAL.cpp +++ b/src/LSST/M1M3/TS/Commands/SAL.cpp @@ -69,7 +69,7 @@ void SAL_start::execute() { SPDLOG_INFO("Glycol pump turned on."); } - changeAllILCsMode(ILC::ILCMode::Disabled); + changeAllILCsMode(ILC::Mode::Disabled); TSApplication::ilc()->clear(); TSApplication::instance().callFunctionOnIlcs( @@ -85,7 +85,7 @@ void SAL_start::execute() { } void SAL_enable::execute() { - changeAllILCsMode(ILC::ILCMode::Enabled); + changeAllILCsMode(ILC::Mode::Enabled); IFPGA::get().setFCUPower(true); Events::SummaryState::setState(MTM1M3TS_shared_SummaryStates_EnabledState); @@ -94,7 +94,7 @@ void SAL_enable::execute() { } void SAL_disable::execute() { - changeAllILCsMode(ILC::ILCMode::Disabled); + changeAllILCsMode(ILC::Mode::Disabled); IFPGA::get().setFCUPower(false); IFPGA::get().setCoolantPumpPower(false); @@ -103,8 +103,8 @@ void SAL_disable::execute() { } void SAL_standby::execute() { - changeAllILCsMode(ILC::ILCMode::ClearFaults); - changeAllILCsMode(ILC::ILCMode::Standby); + changeAllILCsMode(ILC::Mode::ClearFaults); + changeAllILCsMode(ILC::Mode::Standby); Events::SummaryState::setState(MTM1M3TS_shared_SummaryStates_StandbyState); ackComplete(); SPDLOG_INFO("Standby"); diff --git a/src/LSST/M1M3/TS/SALThermalILC.cpp b/src/LSST/M1M3/TS/SALThermalILC.cpp index f7100aa..783ac68 100644 --- a/src/LSST/M1M3/TS/SALThermalILC.cpp +++ b/src/LSST/M1M3/TS/SALThermalILC.cpp @@ -30,12 +30,12 @@ #include #include -namespace LSST { -namespace M1M3 { -namespace TS { +using namespace LSST::M1M3::TS; -SALThermalILC::SALThermalILC(std::shared_ptr m1m3tsSAL) : _m1m3tsSAL(m1m3tsSAL) {} +SALThermalILC::SALThermalILC(std::shared_ptr m1m3tsSAL) + : ILC::ILCBusList(1), cRIO::ThermalILC(1), _m1m3tsSAL(m1m3tsSAL) {} +#if 0 void SALThermalILC::handleMissingReply(uint8_t address, uint8_t func) { if (Settings::Thermal::instance().autoDisable) { Events::EnabledILC::instance().communicationProblem(_address2ILCIndex(address)); @@ -43,10 +43,7 @@ void SALThermalILC::handleMissingReply(uint8_t address, uint8_t func) { cRIO::ThermalILC::handleMissingReply(address, func); } } - -void SALThermalILC::preProcess() {} - -void SALThermalILC::postProcess() {} +#endif void SALThermalILC::processServerID(uint8_t address, uint64_t uniqueID, uint8_t ilcAppType, uint8_t networkNodeType, uint8_t ilcSelectedOptions, @@ -78,7 +75,3 @@ void SALThermalILC::processReHeaterGains(uint8_t address, float proportionalGain } uint8_t SALThermalILC::_address2ILCIndex(uint8_t address) { return address - 1; } - -} // namespace TS -} // namespace M1M3 -} // namespace LSST diff --git a/src/LSST/M1M3/TS/SALThermalILC.h b/src/LSST/M1M3/TS/SALThermalILC.h index 7432f93..ee9cbee 100644 --- a/src/LSST/M1M3/TS/SALThermalILC.h +++ b/src/LSST/M1M3/TS/SALThermalILC.h @@ -40,11 +40,6 @@ class SALThermalILC : public cRIO::ThermalILC { SALThermalILC(std::shared_ptr m1m3tsSAL); protected: - void handleMissingReply(uint8_t address, uint8_t func) override; - - void preProcess() override; - void postProcess() override; - void processServerID(uint8_t address, uint64_t uniqueID, uint8_t ilcAppType, uint8_t networkNodeType, uint8_t ilcSelectedOptions, uint8_t networkNodeOptions, uint8_t majorRev, uint8_t minorRev, std::string firmwareName) override; diff --git a/src/LSST/M1M3/TS/SimulatedFPGA.cpp b/src/LSST/M1M3/TS/SimulatedFPGA.cpp index 4b96e07..c4e7097 100644 --- a/src/LSST/M1M3/TS/SimulatedFPGA.cpp +++ b/src/LSST/M1M3/TS/SimulatedFPGA.cpp @@ -32,11 +32,11 @@ using namespace LSST::cRIO; using namespace LSST::M1M3::TS; -SimulatedFPGA::SimulatedFPGA() : IFPGA(), _U16ResponseStatus(IDLE) { +SimulatedFPGA::SimulatedFPGA() : ILC::ILCBusList(1), IFPGA(), ThermalILC(1), _U16ResponseStatus(IDLE) { _broadcastCounter = 0; srandom(time(NULL)); for (int i = 0; i < NUM_TS_ILC; i++) { - _mode[i] = ILC::ILCMode::Standby; + _mode[i] = ILC::Mode::Standby; _heaterPWM[i] = 0; _fanRPM[i] = 0; } diff --git a/src/m1m3tscli.cpp b/src/m1m3tscli.cpp index b1d6cca..11370b2 100644 --- a/src/m1m3tscli.cpp +++ b/src/m1m3tscli.cpp @@ -82,7 +82,7 @@ class M1M3TScli : public FPGACliApp { class PrintThermalILC : public ThermalILC, public PrintILC { public: - PrintThermalILC(uint8_t bus) : ILC(bus), ThermalILC(bus), PrintILC(bus) {} + PrintThermalILC(uint8_t bus) : ILCBusList(bus), ThermalILC(bus), PrintILC(bus) {} protected: void processThermalStatus(uint8_t address, uint8_t status, float differentialTemperature, uint8_t fanRPM, diff --git a/tests/Makefile b/tests/Makefile index 9a5bb3b..fa91c0e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -29,7 +29,7 @@ junit: compile @$(foreach b,$(BINARIES),echo '[JUT] ${b}'; ./${b} -r junit -o ${b}.xml;) clean: - @$(foreach df,$(BINARIES) $(DEPS) $(JUNIT_FILES),echo '[RM ] ${df}'; $(RM) ${df};) + @$(foreach df,$(BINARIES) $(patsubst %,%.cpp.o,$(BINARIES)) $(DEPS) $(JUNIT_FILES),echo '[RM ] ${df}'; $(RM) ${df};) ../src/libM1M3SS.a: FORCE @$(MAKE) -C ../src libM1M3TS.a SIMULATOR=1 From 3ee987198523b37013d6a2f584db6ac7ab3dff52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Kub=C3=A1nek?= Date: Mon, 12 Feb 2024 18:25:27 -0300 Subject: [PATCH 2/2] Fixed JenkinsFile --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a42dc1a..ab185f7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,12 +21,13 @@ properties( node { def SALUSER_HOME = "/home/saluser" def BRANCH = (env.CHANGE_BRANCH != null) ? env.CHANGE_BRANCH : env.BRANCH_NAME - def SAME_CRIO_BRANCH = ["main", "tickets/DM-41336", "tickets/DM-42503"] + def SAME_CRIO_BRANCH = ["main", "tickets/DM-42503"] + def CRIO_BRANCH=(BRANCH in SAME_CRIO_BRANCH) ? BRANCH : "develop" stage('Cloning sources') { dir("ts_cRIOcpp") { - git branch: (BRANCH in SAME_CRIO_BRANCH) ? BRANCH : "develop", url: 'https://github.com/lsst-ts/ts_cRIOcpp' + git branch: CRIO_BRANCH, url: 'https://github.com/lsst-ts/ts_cRIOcpp' } dir("ts_m1m3thermal") { checkout scm @@ -35,7 +36,7 @@ node { stage('Building dev container') { - M1M3sim = docker.build("lsstts/mtm1m3_sim:" + env.BRANCH_NAME.replace("/", "_"), "--target crio-develop --build-arg XML_BRANCH=$BRANCH " + (params.noCache ? "--no-cache " : " ") + "$WORKSPACE/ts_m1m3thermal") + M1M3sim = docker.build("lsstts/mtm1m3_sim:" + env.BRANCH_NAME.replace("/", "_"), "--target crio-develop --build-arg XML_BRANCH=$BRANCH --build-arg cRIO_CPP=$CRIO_BRANCH" + (params.noCache ? " --no-cache " : " ") + "$WORKSPACE/ts_m1m3thermal") } stage("Running tests")