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

small renaming

Browse Source
This commit is contained in:
Erik Frojdh 2019-05-03 16:13:32 +02:00
parent 9231dff626
commit 181ac4f509
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.clang-tidy
View File

@ -18,8 +18,15 @@ Checks: '*,
-google-readability-todo, -google-readability-todo,
-google-readability-braces-around-statements' -google-readability-braces-around-statements'
WarningsAsErrors: '*' HeaderFilterRegex: \.h
HeaderFilterRegex: '.*'
AnalyzeTemporaryDtors: false AnalyzeTemporaryDtors: false
FormatStyle: none FormatStyle: none
CheckOptions:
- { key: readability-identifier-naming.NamespaceCase, value: lower_case }
- { key: readability-identifier-naming.FunctionCase, value: lower_case }
- { key: readability-identifier-naming.ClassCase, value: CamelCase }
- { key: readability-identifier-naming.MethodCase, value: CamelCase }
- { key: readability-identifier-naming.StructCase, value: CamelCase }
- { key: readability-identifier-naming.VariableCase, value: lower_case }
- { key: readability-identifier-naming.GlobalConstantCase, value: UPPER_CASE }
... ...

4
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -1478,10 +1478,10 @@ int slsDetector::configureMAC() {
ret = client.sendCommandThenRead(fnum, args, sizeof(args), retvals, ret = client.sendCommandThenRead(fnum, args, sizeof(args), retvals,
sizeof(retvals)); sizeof(retvals));
//TODO!(Erik) Send as int already from detector
uint64_t detector_mac = 0; uint64_t detector_mac = 0;
uint32_t detector_ip = 0; uint32_t detector_ip = 0;
sscanf(retvals[0], "%lx", sscanf(retvals[0], "%lx", &detector_mac);
&detector_mac); // TODO! (Erik) send mac and ip as int
sscanf(retvals[1], "%x", &detector_ip); sscanf(retvals[1], "%x", &detector_ip);
detector_ip = __builtin_bswap32(detector_ip); detector_ip = __builtin_bswap32(detector_ip);