mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-06-21 08:06:40 +02:00
Dev/matterhornserver (#1396)
Build and Deploy on local RHEL9 / build (push) Successful in 2m0s
Build on RHEL9 docker image / build (push) Successful in 3m34s
Build on RHEL8 docker image / build (push) Successful in 4m46s
Build and Deploy on local RHEL8 / build (push) Successful in 5m3s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m43s
Run Simulator Tests on local RHEL8 / build (push) Successful in 18m15s
Build and Deploy on local RHEL9 / build (push) Successful in 2m0s
Build on RHEL9 docker image / build (push) Successful in 3m34s
Build on RHEL8 docker image / build (push) Successful in 4m46s
Build and Deploy on local RHEL8 / build (push) Successful in 5m3s
Run Simulator Tests on local RHEL9 / build (push) Successful in 14m43s
Run Simulator Tests on local RHEL8 / build (push) Successful in 18m15s
* added fetch fmt server library * added first draft of matterhorn * added enum ReturnCode * added cpp TCP Interface to slsDetectorServer * added fmt to workflows * bug: added std::signal for proper handling of ctr+c * added compile option to set log level * WIP * dont use c project settings when building matterhornserver * updated logger * WIP * WIP * linked fmt to slsProjectOptions * solved merge conflict * some refactoring * cleaned up logs * added fmt to workflow * WIP * generated register defs from csv file * oops given in hex * properly added fmt as a dependency * add fmt to conda recipe * some format changes * dont use public headers of fmt * WIP * used CRTP for virtual detector * WIP * added udp functions to matterhornserver * Matterhorn in tostring * warning unused variable from other PR * fixed build * updated cmake * added Server class usable for all detectors * removed stopserver * added some more functions * wrong overload * porper cleanup of matterhorn app * PR Review * refactored directory structure * used pause insetad of sleep --------- Co-authored-by: Dhanya Thattil <dhanya.thattil@psi.ch>
This commit is contained in:
@@ -221,6 +221,8 @@ std::string ToString(const defs::detectorType s) {
|
||||
return std::string("Gotthard2");
|
||||
case defs::XILINX_CHIPTESTBOARD:
|
||||
return std::string("Xilinx_ChipTestBoard");
|
||||
case defs::MATTERHORN:
|
||||
return std::string("Matterhorn");
|
||||
default:
|
||||
return std::string("Unknown");
|
||||
}
|
||||
@@ -756,6 +758,8 @@ template <> defs::detectorType StringTo(const std::string &s) {
|
||||
return defs::GOTTHARD2;
|
||||
if (s == "Xilinx_ChipTestBoard")
|
||||
return defs::XILINX_CHIPTESTBOARD;
|
||||
if (s == "Matterhorn")
|
||||
return defs::MATTERHORN;
|
||||
throw RuntimeError("Unknown detector type " + s);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user