SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@574 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2017-12-07 07:34:38 +00:00
parent 2bf2f91a74
commit 2b45d670ac
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src_main/io/pispi.cpp
View File

@@ -38,7 +38,7 @@ bool PISPI::openDevice() {
#ifndef WINDOWS #ifndef WINDOWS
int ret = 0; int ret = 0;
piCoutObj << "open device" << path(); piCoutObj << "open device" << path();
PRIVATE->fd = ::open(path().dataAscii(), O_RDWR); /* PRIVATE->fd = ::open(path().dataAscii(), O_RDWR);
if (PRIVATE->fd < 0) {piCoutObj << "can't open device";return false;} if (PRIVATE->fd < 0) {piCoutObj << "can't open device";return false;}
piCoutObj << "set mode" << spi_mode; piCoutObj << "set mode" << spi_mode;
ret = ioctl(PRIVATE->fd, SPI_IOC_WR_MODE, &spi_mode); ret = ioctl(PRIVATE->fd, SPI_IOC_WR_MODE, &spi_mode);
@@ -52,7 +52,7 @@ bool PISPI::openDevice() {
piCoutObj << "SPI open" << path() << "speed:" << spi_speed/1000 << "KHz" << "mode" << spi_mode << "bits" << spi_bits; piCoutObj << "SPI open" << path() << "speed:" << spi_speed/1000 << "KHz" << "mode" << spi_mode << "bits" << spi_bits;
PRIVATE->spi_ioc_tr.delay_usecs = 0; PRIVATE->spi_ioc_tr.delay_usecs = 0;
PRIVATE->spi_ioc_tr.speed_hz = 0; PRIVATE->spi_ioc_tr.speed_hz = 0;
PRIVATE->spi_ioc_tr.bits_per_word = spi_bits; PRIVATE->spi_ioc_tr.bits_per_word = spi_bits;*/
return true; return true;
#else #else
piCoutObj << "PISPI not implemented on windows"; piCoutObj << "PISPI not implemented on windows";
@@ -90,8 +90,8 @@ int PISPI::writeDevice(const void * data, int max_size) {
memcpy(tx_buf.data(), data, max_size); memcpy(tx_buf.data(), data, max_size);
int ret; int ret;
piCoutObj << "write" << max_size << tx_buf.size(); piCoutObj << "write" << max_size << tx_buf.size();
ret = ioctl(PRIVATE->fd, SPI_IOC_MESSAGE(1), &PRIVATE->spi_ioc_tr); */ret = ioctl(PRIVATE->fd, SPI_IOC_MESSAGE(1), &PRIVATE->spi_ioc_tr);
if (ret < 1) {piCoutObj << "can't send spi message" << ret; return -1;} if (ret < 1) {piCoutObj << "can't send spi message" << ret; return -1;}*/
recv_buf.append(rx_buf); recv_buf.append(rx_buf);
if (recv_buf.size_s() > threadedReadBufferSize()) recv_buf.resize(threadedReadBufferSize()); if (recv_buf.size_s() > threadedReadBufferSize()) recv_buf.resize(threadedReadBufferSize());
return max_size; return max_size;