diff --git a/Desktop_Interface/Labrador.pro.user b/Desktop_Interface/Labrador.pro.user index 544c4f86..8d65f7f7 100644 --- a/Desktop_Interface/Labrador.pro.user +++ b/Desktop_Interface/Labrador.pro.user @@ -1,14 +1,14 @@ - + EnvironmentId - {ab2277d1-1bc5-4952-ad8b-26793b4cf07e} + {5435f0c8-6711-4749-aed4-cbb8cc75428f} ProjectExplorer.Project.ActiveTarget - 2 + 0 ProjectExplorer.Project.EditorSettings @@ -59,14 +59,14 @@ ProjectExplorer.Project.Target.0 - Desktop Qt 5.8.0 MSVC2013 32bit - Desktop Qt 5.8.0 MSVC2013 32bit - qt.58.win32_msvc2013_kit + Desktop Qt 5.7.1 MSVC2013 64bit + Desktop Qt 5.7.1 MSVC2013 64bit + qt.57.win64_msvc2013_64_kit 1 0 0 - C:/Users/cesposito/Documents/GitHub/Labrador/build-Labrador-Desktop_Qt_5_8_0_MSVC2013_32bit-Debug + C:/Users/Esposch/Documents/GitHub/Labrador/Desktop Interface true @@ -120,7 +120,7 @@ true - C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface + C:/Users/Esposch/Documents/GitHub/Labrador/Desktop_Interface true @@ -174,7 +174,7 @@ true - C:/Users/cesposito/Documents/GitHub/Labrador/build-Labrador-Desktop_Qt_5_8_0_MSVC2013_32bit-Profile + C:/Users/Esposch/Documents/GitHub/Labrador/build-Labrador-Desktop_Qt_5_7_1_MSVC2013_64bit-Profile true @@ -227,7 +227,61 @@ 0 true - 3 + + + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release2 + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 4 0 @@ -285,14 +339,14 @@ 2 Labrador - - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface/Labrador.pro + Labrador2 + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Esposch/Documents/GitHub/Labrador/Desktop_Interface/Labrador.pro true Labrador.pro false - C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface/bin + 3768 false true @@ -306,14 +360,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.8.0 MSVC2013 64bit - Desktop Qt 5.8.0 MSVC2013 64bit - qt.58.win64_msvc2013_64_kit - 1 + Android for armeabi-v7a (GCC 4.9, Qt 5.7.1) + Android for armeabi-v7a (GCC 4.9, Qt 5.7.1) + {28c522dd-6120-45c1-839d-6a2397bc8cd8} + 0 0 - 0 + -1 - C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface + C:/Users/Esposch/Documents/GitHub/Labrador/Desktop_Interface true @@ -331,12 +385,32 @@ Make Qt4ProjectManager.MakeStep - + + -w + -r + false - 2 + + true + Copy application data + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-25 + + true + Build Android APK + + QmakeProjectManager.AndroidBuildApkStep + 2 + false + false + + 4 Build ProjectExplorer.BuildSteps.Build @@ -347,7 +421,10 @@ Make Qt4ProjectManager.MakeStep - + + -w + -r + true clean @@ -367,7 +444,7 @@ true - C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface + C:/Users/Esposch/Documents/GitHub/Labrador/build-Labrador-Android_for_armeabi_v7a_GCC_4_9_Qt_5_7_1-Release true @@ -385,12 +462,32 @@ Make Qt4ProjectManager.MakeStep - + + -w + -r + false - 2 + + true + Copy application data + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-25 + + true + Build Android APK + + QmakeProjectManager.AndroidBuildApkStep + 2 + true + false + + 4 Build ProjectExplorer.BuildSteps.Build @@ -401,7 +498,10 @@ Make Qt4ProjectManager.MakeStep - + + -w + -r + true clean @@ -421,7 +521,7 @@ true - C:/Users/cesposito/Documents/GitHub/Labrador/build-Labrador-Desktop_Qt_5_8_0_MSVC2013_64bit-Profile + C:/Users/Esposch/Documents/GitHub/Labrador/build-Labrador-Android_for_armeabi_v7a_GCC_4_9_Qt_5_7_1-Profile true @@ -439,12 +539,32 @@ Make Qt4ProjectManager.MakeStep - + + -w + -r + false - 2 + + true + Copy application data + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-25 + + true + Build Android APK + + QmakeProjectManager.AndroidBuildApkStep + 2 + true + false + + 4 Build ProjectExplorer.BuildSteps.Build @@ -455,7 +575,10 @@ Make Qt4ProjectManager.MakeStep - + + -w + -r + true clean @@ -477,90 +600,308 @@ 3 - 0 + + true + Deploy to Android device + + Qt4ProjectManager.AndroidDeployQtStep + false + + 1 Deploy ProjectExplorer.BuildSteps.Deploy 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration + Deploy to Android device + Deploy to Android device + Qt4ProjectManager.AndroidDeployConfiguration2 1 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - Labrador - - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface/Labrador.pro - true - - Labrador.pro - false - - C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface/bin - 3768 - false - true - false - false - true + + 192.168.43.51:5555 - 1 + 0 ProjectExplorer.Project.Target.2 - Desktop Qt 5.7.1 MSVC2013 32bit2 - Desktop Qt 5.7.1 MSVC2013 32bit2 - qt.57.win32_msvc2013_kit + Android for x86 (GCC 4.9, Qt 5.7.1) + Android for x86 (GCC 4.9, Qt 5.7.1) + {6a10cbbb-8ecb-4e21-a392-612946ea50dc} 0 0 + -1 + + C:/Users/Esposch/Documents/GitHub/Labrador/Desktop_Interface + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + true + Copy application data + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-25 + + true + Build Android APK + + QmakeProjectManager.AndroidBuildApkStep + 2 + false + false + + 4 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/Users/Esposch/Documents/GitHub/Labrador/build-Labrador-Android_for_x86_GCC_4_9_Qt_5_7_1-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + true + Copy application data + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-25 + + true + Build Android APK + + QmakeProjectManager.AndroidBuildApkStep + 2 + true + false + + 4 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + C:/Users/Esposch/Documents/GitHub/Labrador/build-Labrador-Android_for_x86_GCC_4_9_Qt_5_7_1-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + true + Copy application data + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-25 + + true + Build Android APK + + QmakeProjectManager.AndroidBuildApkStep + 2 + true + false + + 4 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + + true + Deploy to Android device + + Qt4ProjectManager.AndroidDeployQtStep + false + + 1 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy to Android device + Deploy to Android device + Qt4ProjectManager.AndroidDeployConfiguration2 + + 1 + + emulator-5554 + + 0 + + + + ProjectExplorer.Project.Target.3 + + Desktop Qt 5.7.1 MSVC2013 32bit + Desktop Qt 5.7.1 MSVC2013 32bit + qt.57.win32_msvc2013_kit + 1 + 0 0 - C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface + C:/Users/Esposch/Documents/GitHub/Labrador/Desktop_Interface true @@ -614,7 +955,7 @@ true - C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface + C:/Users/Esposch/Documents/GitHub/Labrador/Desktop_Interface true @@ -668,7 +1009,7 @@ true - C:/Users/cesposito/Documents/GitHub/Labrador/build-Labrador-Desktop_Qt_5_7_1_MSVC2013_32bit2-Profile + C:/Users/Esposch/Documents/GitHub/Labrador/build-Labrador-Desktop_Qt_5_7_1_MSVC2013_32bit-Profile true @@ -780,152 +1121,13 @@ Labrador - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface/Labrador.pro + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Esposch/Documents/GitHub/Labrador/Desktop_Interface/Labrador.pro true Labrador.pro false - C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface/bin - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.3 - - Desktop Qt 5.7.1 MSVC2013 64bit2 - Desktop Qt 5.7.1 MSVC2013 64bit2 - qt.57.win64_msvc2013_64_kit - 0 - 0 - 0 - - C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 1 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - Labrador - - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface/Labrador.pro - true - - Labrador.pro - false - - C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface/bin + C:/Users/Esposch/Documents/GitHub/Labrador/Desktop_Interface/bin 3768 false true diff --git a/Desktop_Interface/Labrador.pro.user.ab2277d b/Desktop_Interface/Labrador.pro.user.ab2277d new file mode 100644 index 00000000..544c4f86 --- /dev/null +++ b/Desktop_Interface/Labrador.pro.user.ab2277d @@ -0,0 +1,951 @@ + + + + + + EnvironmentId + {ab2277d1-1bc5-4952-ad8b-26793b4cf07e} + + + ProjectExplorer.Project.ActiveTarget + 2 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.8.0 MSVC2013 32bit + Desktop Qt 5.8.0 MSVC2013 32bit + qt.58.win32_msvc2013_kit + 1 + 0 + 0 + + C:/Users/cesposito/Documents/GitHub/Labrador/build-Labrador-Desktop_Qt_5_8_0_MSVC2013_32bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + C:/Users/cesposito/Documents/GitHub/Labrador/build-Labrador-Desktop_Qt_5_8_0_MSVC2013_32bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Labrador + + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface/Labrador.pro + true + + Labrador.pro + false + + C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface/bin + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.8.0 MSVC2013 64bit + Desktop Qt 5.8.0 MSVC2013 64bit + qt.58.win64_msvc2013_64_kit + 1 + 0 + 0 + + C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + C:/Users/cesposito/Documents/GitHub/Labrador/build-Labrador-Desktop_Qt_5_8_0_MSVC2013_64bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Labrador + + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface/Labrador.pro + true + + Labrador.pro + false + + C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface/bin + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.2 + + Desktop Qt 5.7.1 MSVC2013 32bit2 + Desktop Qt 5.7.1 MSVC2013 32bit2 + qt.57.win32_msvc2013_kit + 0 + 0 + 0 + + C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + C:/Users/cesposito/Documents/GitHub/Labrador/build-Labrador-Desktop_Qt_5_7_1_MSVC2013_32bit2-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Labrador + + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface/Labrador.pro + true + + Labrador.pro + false + + C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface/bin + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.3 + + Desktop Qt 5.7.1 MSVC2013 64bit2 + Desktop Qt 5.7.1 MSVC2013 64bit2 + qt.57.win64_msvc2013_64_kit + 0 + 0 + 0 + + C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 1 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Labrador + + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface/Labrador.pro + true + + Labrador.pro + false + + C:/Users/cesposito/Documents/GitHub/Labrador/Desktop_Interface/bin + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 4 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + diff --git a/Desktop_Interface/isodriver.cpp b/Desktop_Interface/isodriver.cpp index e40413bb..0aeb7ab2 100644 --- a/Desktop_Interface/isodriver.cpp +++ b/Desktop_Interface/isodriver.cpp @@ -70,6 +70,7 @@ void isoDriver::timerTick(void){ frameActionGeneric(1,0); break; case 1: + internalBuffer375_CH2->channel = 1; frameActionGeneric(1,2); if(serialDecodeEnabled_CH1){ internalBuffer375_CH2->serialDecode(baudRate_CH1); @@ -85,6 +86,7 @@ void isoDriver::timerTick(void){ } break; case 4: + internalBuffer375_CH2->channel = 2; frameActionGeneric(2,2); if(serialDecodeEnabled_CH1){ internalBuffer375_CH1->serialDecode(baudRate_CH1);