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@572 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2017-12-07 07:21:02 +00:00
parent b7691222b6
commit 6b92ce74d2
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
main.cpp
View File

@@ -13,6 +13,7 @@ int main(int argc, char *argv[]) {
} }
PIString path = cli.argumentValue("dev"); PIString path = cli.argumentValue("dev");
PISPI spi(path, 1000000); PISPI spi(path, 1000000);
spi.setDebug(true);
if (cli.hasArgument("speed")) spi.setSpeed(cli.argumentValue("speed").toInt()); if (cli.hasArgument("speed")) spi.setSpeed(cli.argumentValue("speed").toInt());
piCout << "open" << spi.open(); piCout << "open" << spi.open();
piCout << "write" << spi.write(PIByteArray::fromHex("0000000000000000000000000000000000000000000000000000000000000000")); piCout << "write" << spi.write(PIByteArray::fromHex("0000000000000000000000000000000000000000000000000000000000000000"));

8
src_main/io/pispi.cpp
View File

@@ -37,17 +37,21 @@ void PISPI::setSpeed(uint speed_hz) {
bool PISPI::openDevice() { bool PISPI::openDevice() {
#ifndef WINDOWS #ifndef WINDOWS
int ret = 0; int ret = 0;
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;
ret = ioctl(PRIVATE->fd, SPI_IOC_WR_MODE, &spi_mode); ret = ioctl(PRIVATE->fd, SPI_IOC_WR_MODE, &spi_mode);
if (ret == -1) {piCoutObj << "can't set spi write mode";return false;} if (ret == -1) {piCoutObj << "can't set spi write mode";return false;}
piCoutObj << "set bits" << spi_bits;
ret = ioctl(PRIVATE->fd, SPI_IOC_WR_BITS_PER_WORD, &spi_bits); ret = ioctl(PRIVATE->fd, SPI_IOC_WR_BITS_PER_WORD, &spi_bits);
if (ret == -1) {piCoutObj << "can't set bits per word";return false;} if (ret == -1) {piCoutObj << "can't set bits per word";return false;}
piCoutObj << "set speed" << spi_speed;
ret = ioctl(PRIVATE->fd, SPI_IOC_WR_MAX_SPEED_HZ, &spi_speed); ret = ioctl(PRIVATE->fd, SPI_IOC_WR_MAX_SPEED_HZ, &spi_speed);
if (ret == -1) {piCoutObj << "can't set max write speed hz";return false;} if (ret == -1) {piCoutObj << "can't set max write speed hz";return false;}
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 = spi_speed; 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
@@ -85,9 +89,11 @@ 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();
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() > threadedReadBufferSize()) recv_buf.resize(threadedReadBufferSize());
return max_size; return max_size;
} }
#endif #endif