Removed debug code.

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();
+    }
+  });
 }
 
 

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:" <<err;
-  }
-
-  return 0;
-
-  /*
-  //TransmitResult
-  //qDebug() << " --- BCDriverTinyCan::readRawByte DriverState: " << getDriverState();
-
   if( _driverState <DriverState::Opened )
-    return std::unexpected(QString("readRawValue error: driver not loaded." ) );
+    return std::unexpected(QString("readRawValue error: Treiber nicht geladen." ) );
 
   unsigned char receipient = (unsigned char ) deviceID;
+
   ::TCanMsg msg;
 
   // msg verpacken
   msg.MsgFlags = 0L;
-  msg.Id = receipient;//deviceID;
+  msg.Id = deviceID;
   msg.MsgLen = 2;
   msg.MsgData[0] = 0x00;
   msg.MsgData[1] = registerID;
@@ -311,16 +253,15 @@ retry:
   // msg verschicken
   ::CanTransmit( 0, &msg, 1 );
 
-  int retries = cRetries; // 5?
-  // cTimeOuts (== 20) mal cTIMEOUT_MS (== 10 ms ) Versuche ...
-  int timeOuts = cTimeOuts; // 20 ?
+  int retries = cRetries; // 5
+  int timeOuts = cTimeOuts; // 20
 
   // ... warten bis der Sendepuffer leer ist
   while( timeOuts-- && ::CanTransmitGetCount( 0 ) )
     bc::delay_millis( cTIMEOUT_MS );
 
   if( timeOuts == -1 )
-    return std::unexpected(QString("readRawValue error: could not send value" ));
+    return std::unexpected(QString("readRawValue error: Sendefehler" ));
 
 retry:
 
@@ -331,46 +272,34 @@ retry:
     bc::delay_millis( cTIMEOUT_MS );
 
   if( timeOuts == -1 )    
-    return std::unexpected(QString("getValue error: no response from node" ));
+    return std::unexpected(QString("readRawValue error: (Node)Timeout" ));
 
   // message empfangen
   int err = ::CanReceive( 0, &msg, 1 );
-  ////qDebug() << "HÄÄ ?" << err << "reg: "<< registerID <<"  timeOuts: " << timeOuts;
 
   if( err < 0 )
-    //throw BCException( "getValue error: could not receive value" );
-    qDebug( "getValue error: could not receive value" );
+   return std::unexpected(QString("readRawValue error: Lesefehler" ));
 
-  ////qDebug() << "HÄÄ 2" <<msg.Id;
-  ////qDebug() << "HÄÄ 2" <<msg.MsgLen;
-  ////qDebug() << "HÄÄ 2" <<msg.MsgData[1];
-
-  //if( err > 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 <DriverState::Opened )
     return std::unexpected(QString("readRawValue error: driver not loaded." ) );
 
-  //qDebug() << " --- BCDriverTinyCan writeRawValue: " << value;
-
   ::TCanMsg msg;
   int timeout_count = cTIMEOUT_COUNT;
 
-
   msg.MsgFlags = 0L;
   msg.Id = deviceID;
   msg.MsgLen = 4;
@@ -387,6 +316,6 @@ TransmitResult BCDriverTinyCan::writeRawByte( uint32_t deviceID, uint8_t registe
   if( timeout_count == -1 )
     return std::unexpected(QString("error: could not send value to %1" ).arg( deviceID ) );
 
-  return uint32_t(1); // als 'true'
+  return uint32_t(0); // kein Fehler
 }
 

bcvaluemodel.cpp

@@ -87,8 +87,7 @@ void BCValueModel::updateValue(int row, BCValue::Flags newState, uint32_t rawVal
 
     BCValue::Flags newFlags1 = BCValue::Flag::NoFlag;
     BCValue::Flags newFlags2 = newState;
-    qDebug() << " ---- XXX1: ValueUpdate: Flags: " << newFlags1;
-    qDebug() << " ---- XXX2: ValueUpdate: Flags: " << newFlags2;
+
     // Obacht hier!
     //value.valueFlags = state;
     value.rawValue =  rawValue;

main.cpp

@@ -47,25 +47,7 @@ int main(int argc, char *argv[])
 {
 
   QApplication app(argc, argv);
-   /*
-  app.setStyleSheet(R"(
-            QWidget {
-                background-color: #F3F3F3;
-                font-family: 'Segoe UI Variable', 'Segoe UI', sans-serif;
-            }
-        )");
-  */
-  /*
-  app.setStyleSheet(R"(
-    * {
-        font-family: 'Calibri', 'Carlito', 'Arial', sans-serif;
-        font-size: 12pt;
-      })");
 
-*/
-  //QFont font("segoe UI", 12);  // Name, Größe
-  //QFont font("calibri", 12);  // Name, Größe
-  //app.setFont(font);
 
   BCMainWindow w;
   w.show();