diff --git a/bcdeviceview.cpp b/bcdeviceview.cpp index 59b5e30..929644f 100644 --- a/bcdeviceview.cpp +++ b/bcdeviceview.cpp @@ -50,13 +50,12 @@ BCDeviceView::BCDeviceView(QWidget *parent) // Signal für Änderungen connect(&_valueModel, &BCValueModel::dataChanged, this, [](const QModelIndex& topLeft, const QModelIndex& bottomRight) - { - if (topLeft.column() ==1) { - int row = topLeft.row(); - int value = topLeft.data(Qt::DisplayRole).toInt(); - qDebug() << "äääZeile" << row << "wurde auf" << value << "gesetzt"; - } - }); + { + if (topLeft.column() ==1) { + int row = topLeft.row(); + int value = topLeft.data(Qt::DisplayRole).toInt(); + } + }); } diff --git a/bcdrivertinycan.cpp b/bcdrivertinycan.cpp index 29fc206..f8811e0 100644 --- a/bcdrivertinycan.cpp +++ b/bcdrivertinycan.cpp @@ -151,6 +151,7 @@ BCDriver::DriverStateResult BCDriverTinyCan::loadDriver() return _driverState; }; + qDebug() << " --- DIRVER: " << cMHS_DRIVERNAME // #1. erstmal komplett zurücksetzen resetDriver(); @@ -235,75 +236,16 @@ void BCDriverTinyCan::resetDriver() TransmitResult BCDriverTinyCan::readRawByte( uint32_t deviceID, uint8_t registerID ) const { - //qDebug() << " --- CAN Read Byte: Device: "<< deviceID << " register: " << registerID << " TRY! "; - - struct TCanMsg msg; - int err, retry = 20; - int timeout = 80; - - unsigned char receipient = (unsigned char) deviceID; - unsigned char reg = (unsigned char) registerID; - - msg.MsgFlags = 0L; - msg.Id = receipient; - msg.MsgLen = 2; - msg.MsgData[0] = 0x00; - msg.MsgData[1] = reg; - - CanTransmit(0, &msg, 1); - - while(timeout-- && CanTransmitGetCount(0)) - bc::delay_millis( cTIMEOUT_MS ); - - if (timeout == -1) - //qDebug() << "error: could not send value to node "; - -retry: - - timeout = 80; - while(timeout-- && !CanReceiveGetCount(0)) - bc::delay_millis( cTIMEOUT_MS ); - - if (timeout == -1) - { - //qDebug() << "error: no response from node"; - return 0; - } - - if ((err = CanReceive(0, &msg, 1)) > 0) - { - //qDebug() << " retry: " << retry << " BIB:" << BC::ID::ID_Bib << " msg.Id: " << msg.Id << " msg.MsgLen: " << msg.MsgLen << " msg.MsgData[1]: " << msg.MsgData[1] << " reg: " << reg; - if (--retry && (msg.Id != (uint32_t)BC::ID::ID_Bib|| msg.MsgLen != 4 || msg.MsgData[1] != reg)) - goto retry; - - if (!retry) - { - //qDebug() << "XXX error: no response from node: " << err; - return 0; - } - //qDebug() << " --- CAN Read Byte: Device: "<< deviceID << " register: " << registerID << " BYTE: " << (uint32_t) msg.MsgData[3]; - return (unsigned int) msg.MsgData[3]; - } - else - { - //qDebug() << "Error:" < 0 ) - if( --retries && ( msg.Id != BIB || msg.MsgLen != 4 || msg.MsgData[1] != registerID ) ) + if( --retries && ( msg.Id != (uint32_t)BC::ID::ID_Bib || msg.MsgLen != 4 || msg.MsgData[1] != registerID ) ) goto retry; if( !timeOuts ) - return std::unexpected(QString("CAN response errror: timeout" )); + return std::unexpected(QString("CAN response errror: Timeout" )); - //qDebug() << " --- CAN Read Byte: " << (uint32_t) msg.MsgData[3] << " Device:: "<< deviceID << " register: " << registerID; return (uint32_t) msg.MsgData[3]; -*/ + } -// void BCDriverTinyCan::setValue( unsigned char receipient, unsigned char reg, unsigned char value ) TransmitResult BCDriverTinyCan::writeRawByte( uint32_t deviceID, uint8_t registerID, uint8_t value ) const { if( _driverState