detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-07-14 06:30:49 +02:00
Code Issues Actions Packages Releases Activity

fix bug in SPI read

Browse Source
This commit is contained in:
mazzol_a
2026-05-29 15:57:05 +02:00
parent bb7e2884fe
commit c44c3d8f6d
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorServers/matterhornServer/src/SPICommunication.cpp
+15 -5
View File
@@ -1,4 +1,5 @@
#include "SPICommunication.h"
#include <algorithm>
#include <fcntl.h>
#include <linux/spi/spidev.h>
#include <sys/ioctl.h>
@@ -62,6 +63,15 @@ HardwareSPICommunication::spi_read(const size_t n_bytes, const uint8_t chip_id,
fmt::format("SPI write failed with {}:{}", errno, strerror(errno)));
}
// copy data to output buffer
std::vector<std::byte> output_data(n_bytes);
std::memcpy(output_data.data(), read_data_buffer.data() + 1, n_bytes);
LOG(logDEBUG1) << "Read data: ";
std::for_each(output_data.begin(), output_data.end(), [](std::byte b) {
LOG(logDEBUG1) << fmt::format("{} ", std::to_integer<int>(b));
});
// copy the read out data back to the dummy data buffer to shift it back in
send_cmd.tx_buf = send_cmd.rx_buf;
@@ -76,11 +86,6 @@ HardwareSPICommunication::spi_read(const size_t n_bytes, const uint8_t chip_id,
fmt::format("SPI write failed with {}:{}", errno, strerror(errno)));
}
// copy data to output buffer
std::vector<std::byte> output_data(n_bytes);
std::memcpy(output_data.data(),
reinterpret_cast<std::byte *>(send_cmd.tx_buf) + 1, n_bytes);
return output_data;
}
@@ -98,6 +103,11 @@ void HardwareSPICommunication::spi_write(const uint8_t chip_id,
std::memcpy(write_data.data() + 1, data.data(), n_bytes);
LOG(logDEBUG1) << "Write data: ";
std::for_each(write_data.begin(), write_data.end(), [](std::byte b) {
LOG(logDEBUG1) << fmt::format("{} ", std::to_integer<int>(b));
});
std::vector<std::byte> read_back_buffer(n_bytes +
1); // TODO: do we need this?