mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-07-16 23:26:03 +02:00
mazzol_aandGitHub
7db947e4d2
Build on RHEL9 docker image / build (push) Successful in 4m15s
Build on RHEL8 docker image / build (push) Successful in 5m21s
Build and Deploy on local RHEL9 / build (push) Successful in 2m12s
Build and Deploy on local RHEL8 / build (push) Successful in 5m12s
Run Simulator Tests on local RHEL9 / build (push) Successful in 18m55s
Run Simulator Tests on local RHEL8 / build (push) Successful in 22m19s
* added fetch fmt server library * added first draft of matterhorn * added cpp TCP Interface to slsDetectorServer * 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 * WIP * generated register defs from csv file * oops given in hex * properly added fmt as a dependency * some format changes * WIP * used CRTP for virtual detector * WIP * added udp functions to matterhornserver * fixed build * 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 * added shared memory for aqcuisition status * implemented bus read and write * added Matterhorn data class * modified memory model * added SPI communication * moved memory for Bus communication to BucCommunication class * WIP added HelperFunction for mask conversion * completed HelperFunctions * added tests for MatterHorn Helper Functions * removed shared memory in destructor * fixed SPI communication * moved SharedMemory to slsSupportLib * added toolchain file for cross compilation * fix constructor for HarwareSPICommunication is public * update receiver parameters function * updated mac address * uploaded matterhorn server binary tracked as lfs * small fixes from tests on board * automatically update matterhorn api version when cross compiling binaries * fix bug in SPI read * copy to server_directory/bin when cross compiling * fixed cmake list * update generate_registerdefs.py * fixed copy of server binary * always return error message * add error log when opening dev/mem * code review * fixed eiger, mythen tests for dynamic range * second Review * member function getDerived for better readability * split code into implementation class and actual class doing tcp communication * added slsWarnings and c++17 compiler option * added git lfs to workflow * fix gitea workflows * bug: add extra clock register * implement initial checks * bug: client excpetcs 4 bytes * refactoring directory structure and rename to .hpp * check if detector already set up * missed .h to .hpp * Code Review 3 * use temmplate value for stopserver * use internal CMAKE_CROSSCOMPILING variable * moved boolean stop server flag to DetectorImpl - moving template parameter up * missed a file * replace baseclass:: with this * add Matterhorn server in github workflow * whatever workflow bug- lets see * fixed receiving trim bits changed to int64_t
66 lines
2.0 KiB
C++
66 lines
2.0 KiB
C++
#include "sls/sls_detector_defs.h"
|
|
#include <array>
|
|
#include <cstdint>
|
|
#include <getopt.h>
|
|
#include <string>
|
|
|
|
namespace sls {
|
|
|
|
struct DetectorServerOptions {
|
|
// TODO: careful changed for other detectors
|
|
uint16_t port{DEFAULT_TCP_CNTRL_PORTNO};
|
|
/// @brief ignore firmware version compatibility
|
|
bool ignoreFirmwareCompatibility{false};
|
|
/// @brief safe startup - skip initial detector setup and checks
|
|
bool safeStartup{false};
|
|
bool versionRequested{false};
|
|
bool helpRequested{false};
|
|
};
|
|
|
|
template <typename Server>
|
|
struct SpecificDetectorServerOptions : DetectorServerOptions {};
|
|
|
|
// template specialization
|
|
// template <>
|
|
// struct SpecificDetectorServerOptions<BaseMatterhornServer> {};
|
|
|
|
// TODO should be a general server specific class or even shared with
|
|
// CommandLIneOptions in Receiver
|
|
class CommandLineOptions {
|
|
|
|
public:
|
|
CommandLineOptions() = default;
|
|
|
|
~CommandLineOptions() = default;
|
|
|
|
DetectorServerOptions parse(int argc, char *argv[]);
|
|
|
|
std::string printOptions() const;
|
|
|
|
private:
|
|
std::string getHelpMessage(const std::string &executable) const;
|
|
|
|
uint16_t parsePort(const char *optarg) const;
|
|
|
|
void parse_deprecated(const int &opt, char *argv[]);
|
|
|
|
DetectorServerOptions detectorserveroptions{};
|
|
|
|
static constexpr std::array<option, 8> options{
|
|
{{"help", no_argument, nullptr, 'h'},
|
|
{"version", no_argument, nullptr, 'v'},
|
|
{"port", required_argument, nullptr, 'p'},
|
|
{"ignore_fw_compatibility", no_argument, nullptr,
|
|
'f'}, // ignore firmware compatibility check
|
|
{"safe_startup", no_argument, nullptr, 's'}, // safe startup
|
|
// deprecated options for backward compatibility
|
|
{"devel", no_argument, nullptr, 'd'}, // safe_startup mode
|
|
{"update", no_argument, nullptr, 'u'}, // firmware compatibility check
|
|
|
|
{nullptr, 0, nullptr, 0}}};
|
|
|
|
inline static const char optstring[] = "hvp:fs"
|
|
"du"; // second part is deprecated
|
|
};
|
|
|
|
} // namespace sls
|