formatting

This commit is contained in:
2020-08-11 17:09:36 +02:00
parent 690947ec3a
commit 0c7759d7e4
12 changed files with 54 additions and 51 deletions

1
slsSupportLib/include/ClientSocket.h Executable file → Normal file
View File

@ -16,6 +16,7 @@ class ClientSocket : public DataSocket {
void *retval, size_t retval_size);
std::string readErrorMessage();
private:
void readReply(int &ret, void *retval, size_t retval_size);
struct sockaddr_in serverAddr {};

View File

@ -1,11 +1,11 @@
#pragma once
#include <vector>
#include <bitset>
#include <vector>
namespace sls {
template <typename T> std::vector<int> getSetBits(T val) {
constexpr size_t bitsPerByte = 8;
constexpr size_t numBits = sizeof(T)*bitsPerByte;
constexpr size_t numBits = sizeof(T) * bitsPerByte;
std::bitset<numBits> bs(val);
std::vector<int> set_bits;
set_bits.reserve(bs.count());

View File

@ -135,8 +135,9 @@ class slsDetectorDefs {
} sls_detector_header;
#ifdef __cplusplus
//For sending and receiving data
static_assert(sizeof(detectorType) == sizeof(int), "enum and int differ in size");
// For sending and receiving data
static_assert(sizeof(detectorType) == sizeof(int),
"enum and int differ in size");
#define MAX_NUM_PACKETS 512
using sls_bitset = std::bitset<MAX_NUM_PACKETS>;
using bitset_storage = uint8_t[MAX_NUM_PACKETS / 8];

View File

@ -1,12 +1,12 @@
/** API versions */
#define GITBRANCH "developer"
#define APILIB 0x200810
#define APIRECEIVER 0x200810
#define APIGUI 0x200804
#define APICTB 0x200810
#define APIGOTTHARD 0x200810
#define GITBRANCH "developer"
#define APILIB 0x200810
#define APIRECEIVER 0x200810
#define APIGUI 0x200804
#define APICTB 0x200810
#define APIGOTTHARD 0x200810
#define APIGOTTHARD2 0x200810
#define APIJUNGFRAU 0x200810
#define APIMYTHEN3 0x200810
#define APIMOENCH 0x200810
#define APIEIGER 0x200810
#define APIJUNGFRAU 0x200810
#define APIMYTHEN3 0x200810
#define APIMOENCH 0x200810
#define APIEIGER 0x200810