removing bugs

Author: thunderbug1

Spherebot_UI/Spherebot_UI.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.4.2, 2016-02-27T11:04:57. -->
+<!-- Written by QtCreator 3.4.2, 2016-02-27T16:13:07. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -61,7 +61,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.5.0 MinGW 32bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.5.0 MinGW 32bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.55.win32_mingw492_kit</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">

Spherebot_UI/mainwindow.cpp

@@ -66,6 +66,7 @@ void MainWindow::entry_connected()
     ui->portBox->setEnabled(false);
     ui->resetButton->setEnabled(false);
     ui->connectButton->setText("Disconnect");
+    ui->sendButton->setEnabled(false);
     if(!ui->fileTextEdit->toPlainText().isEmpty()) ui->sendFileButton->setEnabled(true);
     statusBar()->showMessage(tr("Successfully connected to bot!"),4000);
 }
@@ -157,11 +158,13 @@ void MainWindow::entry_idle()
     qDebug()<< "entry_idle"<< endl;
     ui->fileSendProgressBar->setValue(0);
     ui->sendFileButton->setText("Send File");
+    ui->saveFileButton->setText("Save File");
     ui->loadFileButton->setText("Load File");
 
     ui->controllBox->setEnabled(true);
     ui->restartButton->setEnabled(false);
     ui->loadFileButton->setEnabled(true);
+    ui->saveFileButton->setEnabled(false);
     ui->fileSendProgressBar->setEnabled(false);
 
     bot->send("M 18");      //disable motors
@@ -183,14 +186,22 @@ void MainWindow::entry_ask_for_restart()
     qDebug()<< "entry_ask_for_restart"<< endl;
     statusBar()->showMessage(tr("File successfully sent"));
     SetBotToHomePosition();
-    if(restartLayerMsgBox->exec() == QMessageBox::Ok)   //workaround cause the signals don´t fire
-        emit restartLayerMsgBox->accept();
+    int result = restartLayerMsgBox->exec();
+    if(result == QMessageBox::Ok)
+    {
+        emit restart_print();
+        qDebug()<< "emit restart_print"<< endl;
+    }
     else
-        emit restartLayerMsgBox->reject();
+    {
+        emit abort_print();
+        qDebug()<< "emit abort_print"<< endl;
+    }
 }
 
 void MainWindow::entry_ask_for_next_layer()
 {
+    qDebug()<<"entry_ask_for_next_layer"<< endl;
     qDebug()<< "entry_ask_for_next_layer"<< endl;
     if(layerNames.size() > 1) layerIndex++;
 
@@ -201,12 +212,23 @@ void MainWindow::entry_ask_for_next_layer()
     {
         nextLayerMsgBox->setText("Please change the tool for layer: " + layerNames[layerIndex]);
         SetBotToHomePosition();
-        nextLayerMsgBox->exec();
+        int result = nextLayerMsgBox->exec();
+        if(result == QMessageBox::Ok)
+        {
+            emit print_next_layer();
+            qDebug()<< "emit print_next_layer"<< endl;
+        }
+        else
+        {
+            emit abort_print();
+            qDebug()<< "emit abort_print"<< endl;
+        }
     }
 }
 
 void MainWindow::entry_load_file_dialog()
 {
+    qDebug()<<"entry_load_file_dialog"<< endl;
     QString fileName;
     if(!curDir.absolutePath().isEmpty())
     {
@@ -264,11 +286,20 @@ void MainWindow::initSateMachine()
     //
     start_sending->addTransition(start_sending,SIGNAL(entered()),sending);
 
-    ask_for_restart->addTransition(restartLayerMsgBox,SIGNAL(accepted()),restart);
-    ask_for_restart->addTransition(restartLayerMsgBox,SIGNAL(rejected()),idle);
-    connect(ask_for_restart,SIGNAL(exited()),this,SLOT(hey()));
+    idle->addTransition(restartLayerMsgBox,SIGNAL(accepted()),restart);
+    idle->addTransition(restartLayerMsgBox,SIGNAL(rejected()),idle);
+
+    idle->addTransition(this,SIGNAL(restart_print()),restart);
+    ask_for_restart->addTransition(this,SIGNAL(restart_print()),restart);
+    ask_for_restart->addTransition(this,SIGNAL(abort_restart_print()),abort);
+    idle->addTransition(this,SIGNAL(abort_restart_print()),abort);
 
-    ask_for_next_layer->addTransition(nextLayerMsgBox,SIGNAL(accepted()),sending);
+    idle->addTransition(this,SIGNAL(print_next_layer()),sending);
+    ask_for_next_layer->addTransition(this,SIGNAL(print_next_layer()),sending);
+    idle->addTransition(this,SIGNAL(abort_print()),abort);
+    ask_for_next_layer->addTransition(this,SIGNAL(abort_print()),abort);
+    //idle->addTransition(nextLayerMsgBox,SIGNAL(accepted()),sending);
+    //idle->addTransition(nextLayerMsgBox,SIGNAL(rejected()),abort);
 
     load_file_dialog->addTransition(load_file_dialog,SIGNAL(entered()),idle);
 
@@ -308,14 +339,17 @@ void MainWindow::initUI()
     nextLayerMsgBox = new QMessageBox(QMessageBox::Information,
                                       "Next Layer",
                                       "The Layer has been finished!\nplease insert the tool for the layer: " + QString::number(layerIndex),
-                                      QMessageBox::Ok|QMessageBox::No);
-    nextLayerMsgBox->setButtonText(QMessageBox::Ok,"OK");
-    nextLayerMsgBox->setButtonText(QMessageBox::No,"Abort");
+                                      QMessageBox::Ok|QMessageBox::Abort);
+
+    //nextLayerMsgBox->addButton("OK",QMessageBox::AcceptRole);
+    //nextLayerMsgBox->addButton("Abort",QMessageBox::RejectRole);
 
     restartLayerMsgBox = new QMessageBox(QMessageBox::Information,
                                          "Restart?",
                                          "Do you want to restart the print?",
-                                         QMessageBox::Ok|QMessageBox::No);
+                                         QMessageBox::Ok|QMessageBox::Abort);
+    //restartLayerMsgBox->addButton("OK",QMessageBox::RejectRole);   //for some reason rejectrole and acceptrole need to be switched
+    //restartLayerMsgBox->addButton("Abort",QMessageBox::AcceptRole);
 
     connect(ui->undoButton,SIGNAL(clicked()),ui->fileTextEdit,SLOT(undo()));
     connect(ui->redoButton,SIGNAL(clicked()),ui->fileTextEdit,SLOT(redo()));
@@ -599,7 +633,7 @@ void MainWindow::on_sendString_editingFinished()
     }
 }
 
-void MainWindow::on_sendButton_clicked()
+void MainWindow::on_sendButton_released()
 {
     on_sendString_editingFinished();
     ui->sendString->setText("");

Spherebot_UI/mainwindow.h

@@ -52,10 +52,10 @@ public slots:
 
 //    void loadFileDialog();
 private slots:
-    void hey(){qDebug()<<"hey"<<endl;}
+   // void hey(){qDebug()<<"hey"<<endl;}
 
     void resetPortList();
-    void on_sendButton_clicked();
+    void on_sendButton_released();
     void on_resetButton_clicked();
     void on_sendString_editingFinished();
     void on_servoSlider_sliderMoved(int position);
@@ -96,6 +96,12 @@ private slots:
     void successfully_connected();
     void not_successfully_connected();
 
+    void print_next_layer();
+    void abort_print();
+
+    void restart_print();
+    void abort_restart_print();
+
 private:
 
     void setCurrentFile(const QString &fileName);

Spherebot_UI/mainwindow.ui

@@ -58,7 +58,7 @@
       <rect>
        <x>8</x>
        <y>0</y>
-       <width>541</width>
+       <width>609</width>
        <height>191</height>
       </rect>
      </property>
@@ -422,13 +422,13 @@
       </item>
      </layout>
     </widget>
-    <widget class="QWidget" name="">
+    <widget class="QWidget" name="layoutWidget">
      <property name="geometry">
       <rect>
        <x>0</x>
        <y>200</y>
        <width>539</width>
-       <height>31</height>
+       <height>48</height>
       </rect>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_3">
@@ -453,8 +453,8 @@
      <rect>
       <x>20</x>
       <y>20</y>
-      <width>271</width>
-      <height>30</height>
+      <width>461</width>
+      <height>48</height>
      </rect>
     </property>
     <layout class="QHBoxLayout" name="horizontalLayout">
@@ -474,7 +474,7 @@
      <item>
       <widget class="QPushButton" name="resetButton">
        <property name="text">
-        <string>Reset</string>
+        <string>Reset portlist</string>
        </property>
       </widget>
      </item>
@@ -558,7 +558,7 @@
      <rect>
       <x>570</x>
       <y>10</y>
-      <width>461</width>
+      <width>642</width>
       <height>491</height>
      </rect>
     </property>

Spherebot_UI/rxthread.cpp

@@ -13,11 +13,17 @@ void rxThread::receiveData()
 {
     if(bot->port->canReadLine())
     {
-        line = bot->port->readLine(1024);
-        //qDebug()<<"receiving raw: " << line << endl;/////////////////////////////
-        while(line.endsWith('\n')) line.chop(1);
-        qDebug()<<"receiving: " << line << endl;/////////////////////////////
-        emit lineReceived(line);
+        while(bot->port->canReadLine())
+        {
+            line = bot->port->readLine(1024);
+            //qDebug()<<"receiving raw: " << line << endl;/////////////////////////////
+            while(line.endsWith('\n')) line.chop(1);
+            if( line != "")
+            {
+                qDebug()<<"receiving: " << line << endl;/////////////////////////////
+                emit lineReceived(line);
+            }
+        }
     }
 }
 

Spherebot_UI/spherebot.cpp

@@ -54,7 +54,7 @@ bool spherebot::disconnectWithBot()
     if(port->isOpen())
         port->close();
     bot_connected = false;
-    timeout_timer->stop();
+    this->resetState();
     return 1;
 }
 
@@ -99,7 +99,8 @@ void spherebot::processAnswer(QString answer)
     }
     else
     {
-        //qDebug() << "answer did not contain rs or ok" << endl;
+        qDebug() << "answer did not contain rs or ok or Spherebot" << endl;
+        qDebug() << "answer was:" << answer << endl;
     }
 }
 
@@ -122,19 +123,21 @@ bool spherebot::send(QString cmd)
 {
     if(port->isOpen())
     {
-        while( lastLine.endsWith('\n')) lastLine.chop(1);
+        while( lastLine.endsWith('\n') || lastLine.endsWith('\r')) lastLine.chop(1);
 
         cmd.append(" ");
         cmd.append(generateChecksumString(cmd));
-        cmd.append("\n");
+        cmd.append('\n');
 
         if(bot_connected)
         {
             if(lastLineTransmitted)
             {
                 qDebug()<<"Sending: " + cmd;
-                port->write((const char*)cmd.toUtf8(),cmd.length());
-
+                int er = port->write((const char*)cmd.toUtf8(),cmd.length());
+                if (er == -1)
+                    qDebug() << "an error occured while writing to the port!!" << endl;
+                //qDebug() << "flush result: " << port->flush();
                 lastLine = cmd;
                 lastLineTransmitted = false;
                 timeout_timer->start();
@@ -168,7 +171,7 @@ void spherebot::resendLine()
     else if( bot_connected)
     {
         port->write((const char*)lastLine.toUtf8(),lastLine.length());
-        while( lastLine.endsWith('\n')) lastLine.chop(1);
+        //while( lastLine.endsWith('\n')) lastLine.chop(1);
         qDebug()<<"Resending: " << lastLine << endl;
     }
 }
@@ -203,6 +206,11 @@ void spherebot::resetState()
     lineCounter = 0;
     ignoreFirstM01 = true;
     sendingFile = false;
+    toSendBuffer.clear();
+    lastLine = "";
+    lineCounter = 0;
+    retry_timer->stop();
+    timeout_timer->stop();
 }
 
 QString removeComments(QString intext)