ported the state machine to a QStateMachine

and enhanced the communication and removed txthread
thunderbug1 · Apr 4, 2015 · a48a704 · a48a704
1 parent f3d518b
commit a48a704
Show file tree

Hide file tree

Showing 40 changed files with 614 additions and 16,039 deletions.
diff --git a/Spherebot_UI/Makefile b/Spherebot_UI/Makefile
diff --git a/Spherebot_UI/Makefile.Debug b/Spherebot_UI/Makefile.Debug
diff --git a/Spherebot_UI/Makefile.Release b/Spherebot_UI/Makefile.Release
diff --git a/Spherebot_UI/Spherebot_UI.pro b/Spherebot_UI/Spherebot_UI.pro
@@ -21,12 +21,10 @@ TEMPLATE = app
 SOURCES += main.cpp\
         mainwindow.cpp \
     spherebot.cpp \
-    txthread.cpp \
     rxthread.cpp
 
 HEADERS  += mainwindow.h \
     spherebot.h \
-    txthread.h \
     rxthread.h
 
 FORMS    += mainwindow.ui

diff --git a/Spherebot_UI/Spherebot_UI.pro.user b/Spherebot_UI/Spherebot_UI.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.0.1, 2015-04-03T23:09:37. -->
+<!-- Written by QtCreator 3.0.1, 2015-04-04T17:44:54. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -54,11 +54,11 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.2.1 MinGW 32bit static</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.2.1 MinGW 32bit static</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.521.win32_mingw48.essentials_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">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">G:/A_PROJECTS/Spherebot-Host-GUI V2.0/build-Spherebot_UI-Desktop_Qt_5_2_1_MinGW_32bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:/User-Daten/Documents/GitHub/Spherebot-Host-GUI/Spherebot_UI</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -111,7 +111,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:/User-Daten/Documents/GitHub/Spherebot-Host-GUI/build</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">F:/User-Daten/Documents/GitHub/Spherebot-Host-GUI/Spherebot_UI</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>

diff --git a/Spherebot_UI/Spherebot_UI.pro.user.16 b/Spherebot_UI/Spherebot_UI.pro.user.16
diff --git a/Spherebot_UI/Spherebot_UI.pro.user.21cd503.15 b/Spherebot_UI/Spherebot_UI.pro.user.21cd503.15
diff --git a/Spherebot_UI/Spherebot_UI.pro.user.3.0-pre1 b/Spherebot_UI/Spherebot_UI.pro.user.3.0-pre1
diff --git a/Spherebot_UI/Spherebot_UI.pro.user.3.2-pre1 b/Spherebot_UI/Spherebot_UI.pro.user.3.2-pre1
diff --git a/Spherebot_UI/Spherebot_UI.pro.user.45c759c.2.7pre1 b/Spherebot_UI/Spherebot_UI.pro.user.45c759c.2.7pre1
diff --git a/Spherebot_UI/Spherebot_UI.pro.user.4d13b5f.3.0-pre1 b/Spherebot_UI/Spherebot_UI.pro.user.4d13b5f.3.0-pre1
diff --git a/Spherebot_UI/Spherebot_UI.pro.user.ea18535 b/Spherebot_UI/Spherebot_UI.pro.user.ea18535