libdfuprog added to Linux build

Desktop_Interface/Labrador.pro

@@ -106,6 +106,12 @@ unix:!android:!macx:LIBS += -Lbuild_linux/libusb -lusb-1.0  ##I suspect the -L h
 unix:!android:!macx:INCLUDEPATH += build_linux/libusb
 unix:!android:!macx:DEPENDPATH += build_linux/libusb
 
+#libdfuprog include
+unix:!android:!macx:LIBS += -L$$PWD/build_linux/libdfuprog/lib -ldfuprog-0.9
+unix:!android:!macx:INCLUDEPATH += $$PWD/build_linux/libdfuprog/include
+unix:!android:!macx:DEPENDPATH += $$PWD/build_linux/libdfuprog/include
+
+
 #############################################################
 ################    MAC OSX BUILD ONLY    ##################
 ###########################################################

Desktop_Interface/Labrador.pro.user

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.1.0, 2017-07-06T21:15:32. -->
+<!-- Written by QtCreator 4.1.0, 2017-07-07T15:25:22. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
-  <value type="QByteArray">{269d77a6-d907-430c-8ea8-15ecdb65537f}</value>
+  <value type="QByteArray">{418854cd-9485-4bb2-af09-20b9a8a51cc7}</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -59,14 +59,14 @@
  <data>
   <variable>ProjectExplorer.Project.Target.0</variable>
   <valuemap type="QVariantMap">
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.7.0 clang 64bit</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.7.0 clang 64bit</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.57.clang_64_kit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.7.0 GCC 64bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.7.0 GCC 64bit</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.57.gcc_64_kit</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">/Users/esposch/Labrador/Desktop_Interface</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/esposch/git/Labrador/Desktop_Interface</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>
@@ -126,7 +126,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">/Users/esposch/Labrador/Desktop_Interface</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/esposch/git/Labrador/Desktop_Interface</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>
@@ -186,7 +186,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/Users/esposch/Labrador/build-Labrador-Desktop_Qt_5_7_0_clang_64bit-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/esposch/git/Labrador/build-Labrador-Desktop_Qt_5_7_0_GCC_64bit-Profile</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>
@@ -304,13 +304,13 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Labrador</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/Users/esposch/Labrador/Desktop_Interface/Labrador.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/esposch/git/Labrador/Desktop_Interface/Labrador.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">Labrador.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/Users/esposch/Labrador/Desktop_Interface/bin/Labrador.app/Contents/MacOS</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/esposch/git/Labrador/Desktop_Interface/bin</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>

Desktop_Interface/build_linux/libdfuprog/include/libdfuprog.h

@@ -0,0 +1,6 @@
+#ifndef LIBDFUPROG_H
+#define LIBDFUPROG_H
+
+int dfuprog_virtual_cmd(char* commandLine);
+
+#endif

Desktop_Interface/qrc_resources.cpp

@@ -7,7 +7,7 @@
 *****************************************************************************/
 
 static const unsigned char qt_resource_data[] = {
-  // /Users/esposch/Labrador/Desktop_Interface/buffer_0.bmp
+  // /home/esposch/git/Labrador/Desktop_Interface/buffer_0.bmp
   0x0,0x0,0x0,0x8d,
   0x0,
   0x0,0x28,0xb6,0x78,0x9c,0xed,0xd0,0xb1,0xd,0xc2,0x30,0x0,0x45,0xc1,0xb0,0x45,
@@ -19,7 +19,7 @@ static const unsigned char qt_resource_data[] = {
   0xab,0x8f,0xd5,0xc7,0xea,0x63,0xf5,0xb1,0xfa,0x58,0x7d,0xac,0x3e,0x56,0x1f,0xab,
   0x8f,0xd5,0xc7,0xea,0x63,0xf5,0xb1,0xfa,0x58,0x7d,0xac,0x3e,0x56,0x1f,0xab,0x8f,
   0xd5,0xc7,0xea,0x63,0x73,0xf6,0xf9,0x2,0xf4,0x4,0x42,0xe7,
-    // /Users/esposch/Labrador/Desktop_Interface/buffer_2.bmp
+    // /home/esposch/git/Labrador/Desktop_Interface/buffer_2.bmp
   0x0,0x0,0x0,0x7b,
   0x0,
   0x0,0x28,0xb6,0x78,0x9c,0xed,0xd0,0x31,0xd,0x80,0x30,0x14,0x45,0xd1,0xe2,0x82,
@@ -30,7 +30,7 @@ static const unsigned char qt_resource_data[] = {
   0x3e,0x99,0xf1,0xe1,0xc3,0x87,0xf,0x9f,0xcc,0xf8,0xf0,0xe1,0xc3,0x87,0x4f,0x66,
   0x7c,0xf8,0xf0,0xe1,0xc3,0x27,0x33,0x3e,0x7c,0xf8,0xf0,0xe1,0x93,0x19,0x1f,0x3e,
   0x7c,0xf8,0xf0,0x19,0x7b,0x1,0x6d,0x5a,0xf,0xce,
-    // /Users/esposch/Labrador/Desktop_Interface/buffer_1.bmp
+    // /home/esposch/git/Labrador/Desktop_Interface/buffer_1.bmp
   0x0,0x0,0x0,0x97,
   0x0,
   0x0,0x28,0xb6,0x78,0x9c,0xed,0xd0,0xb1,0xd,0xc2,0x30,0x10,0x40,0xd1,0xb0,0x5,

Desktop_Interface/unixusbdriver.cpp

@@ -8,7 +8,7 @@ extern "C"
 unixUsbDriver::unixUsbDriver(QWidget *parent) : genericUsbDriver(parent)
 {
     qDebug() << "Testing libdfuprog";
-    dfuprog_virtual_cmd("dfu-programmer atxmega32a4u");
+    dfuprog_virtual_cmd("dfu-programmer atxmega32a4u erase");
 
     qDebug() << "unixUsbDriver created!";
     tv.tv_sec = 0;
@@ -138,7 +138,7 @@ unsigned char unixUsbDriver::usbIsoInit(void){
                     qDebug() << "isoCtx submitted successfully!";
                     qDebug() << "[n, k] = " << n << k;
                     qDebug() << "t = " << t;
-                    qDebug() << "Delay = " << midBufferOffsets[k];
+                    qDebug() << "Delay = " << 0;//midBufferOffsets[k];
                 }
             }
         }