detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 04:47:14 +02:00
Code Issues Actions Packages Releases Activity

merge resolved

Browse Source
This commit is contained in:
maliakal_d
2020-01-20 11:36:35 +01:00
parent 95030bc55f 3c891495db
commit 6e47f0b7f7
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsSupportLib/include/network_utils.h
View File

@ -40,8 +40,8 @@ class MacAddr {
public:
constexpr MacAddr() noexcept = default;
explicit constexpr MacAddr(uint64_t mac) noexcept : addr_{mac} {}
MacAddr(std::string mac);
MacAddr(const char *address);
explicit MacAddr(std::string mac);
explicit MacAddr(const char *address);
std::string str() const;
std::string hex() const;
constexpr bool operator==(const MacAddr &other) const noexcept {

2
slsSupportLib/include/versionAPI.h
View File

@ -8,5 +8,5 @@
#define APIJUNGFRAU 0x191127
#define APICTB 0x191210
#define APIEIGER 0x200110
#define APIMYTHEN3 0x200115
#define APIMYTHEN3 0x200120
#define APIGOTTHARD2 0x200116