mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-05-14 23:45:36 +02:00
Merge branch 'developer' into dev/xilinx_power_cmd
This commit is contained in:
@@ -36,6 +36,15 @@ class RegisterAddress {
|
||||
constexpr bool operator!=(const RegisterAddress &other) const {
|
||||
return (value_ != other.value_);
|
||||
}
|
||||
constexpr RegisterAddress &operator+=(uint32_t offset) noexcept {
|
||||
value_ += offset;
|
||||
return *this;
|
||||
}
|
||||
constexpr RegisterAddress operator+(uint32_t offset) const noexcept {
|
||||
RegisterAddress tmp(*this);
|
||||
tmp += offset;
|
||||
return tmp;
|
||||
}
|
||||
};
|
||||
|
||||
class BitAddress {
|
||||
@@ -102,4 +111,9 @@ std::ostream &operator<<(std::ostream &os, const RegisterAddress &r);
|
||||
std::ostream &operator<<(std::ostream &os, const BitAddress &r);
|
||||
std::ostream &operator<<(std::ostream &os, const RegisterValue &r);
|
||||
|
||||
constexpr RegisterAddress operator+(uint32_t offset,
|
||||
const RegisterAddress &addr) noexcept {
|
||||
return addr + offset;
|
||||
}
|
||||
|
||||
} // namespace sls
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
/** API versions */
|
||||
#define APILIB "0.0.0 0x250909"
|
||||
#define APIRECEIVER "0.0.0 0x250822"
|
||||
#define APICTB "0.0.0 0x260219"
|
||||
#define APIGOTTHARD2 "0.0.0 0x260218"
|
||||
#define APIMOENCH "0.0.0 0x260218"
|
||||
#define APIEIGER "0.0.0 0x260218"
|
||||
#define APIXILINXCTB "0.0.0 0x260227"
|
||||
#define APIJUNGFRAU "0.0.0 0x260218"
|
||||
#define APIMYTHEN3 "0.0.0 0x260219"
|
||||
#define APICTB "0.0.0 0x260227"
|
||||
#define APIGOTTHARD2 "0.0.0 0x260227"
|
||||
#define APIMOENCH "0.0.0 0x260227"
|
||||
#define APIEIGER "0.0.0 0x260227"
|
||||
#define APIXILINXCTB "0.0.0 0x260305"
|
||||
#define APIJUNGFRAU "0.0.0 0x260227"
|
||||
#define APIMYTHEN3 "0.0.0 0x260227"
|
||||
|
||||
Reference in New Issue
Block a user