Revert "Simplify the waveform reading code (#194)"

This reverts commit 591940b. Revert "Whitespace cleanup (#192)" This reverts commit 1b45b0d.
EspoTek · Nov 16, 2021 · 8cc740c · 8cc740c
1 parent 90bc17a
commit 8cc740c
Show file tree

Hide file tree

Showing 45 changed files with 1,316 additions and 1,207 deletions.
diff --git a/Desktop_Interface/Labrador.pro b/Desktop_Interface/Labrador.pro
@@ -159,37 +159,37 @@ unix:!android:!macx{
             unix:!android:!macx:LIBS += -L$$PWD/build_linux/libdfuprog/lib/x64 -ldfuprog-0.9
             unix:!android:!macx:INCLUDEPATH += $$PWD/build_linux/libdfuprog/include
             unix:!android:!macx:DEPENDPATH += $$PWD/build_linux/libdfuprog/include
-            lib_deploy.files = $$PWD/build_linux/libdfuprog/lib/x64/libdfuprog-0.9.so
+    	    lib_deploy.files = $$PWD/build_linux/libdfuprog/lib/x64/libdfuprog-0.9.so
             lib_deploy.path = /usr/lib
         }
     }
-
+    
     other.files += bin/firmware
     other.files += bin/waveforms
     other.path = /usr/bin/EspoTek-Labrador
-
+    
     target.path = /usr/bin/EspoTek-Labrador
-
+    
     udev.path = /etc/udev/rules.d
     udev.files = rules.d/69-labrador.rules
-
+    
     icon48.files += resources/icon48/espotek-labrador.png
     icon48.path = /usr/share/icons/hicolor/48x48/apps/
 
     icon256.files += resources/icon256/espotek-labrador.png
     icon256.path = /usr/share/icons/hicolor/256x256/apps/
-
+    
     equals(APPIMAGE, 1){
         desktop.files += resources/appimage/espotek-labrador.desktop
     }
     !equals(APPIMAGE, 1){
         desktop.files += resources/espotek-labrador.desktop
     }
     desktop.path = /usr/share/applications
-
+    
     symlink.path = /usr/bin
     symlink.extra = ln -sf ${INSTALL_ROOT}/usr/bin/EspoTek-Labrador/Labrador /usr/bin/labrador
-
+    
     udevextra.path = /etc/udev/rules.d
     !equals(DEB, 1){
         udevextra.extra = udevadm control --reload-rules && udevadm trigger

diff --git a/Desktop_Interface/androidusbdriver.cpp b/Desktop_Interface/androidusbdriver.cpp
@@ -295,3 +295,4 @@ int androidUsbDriver::flashFirmware(void){
     mainActivity.callMethod<void>("closeDevice");
     return 0;
 }
+
diff --git a/Desktop_Interface/bin/firmware/flash.bat b/Desktop_Interface/bin/firmware/flash.bat
@@ -1 +1 @@
-dfu-programmer atxmega32a4u flash labrafirm_0004_02.hex
+dfu-programmer atxmega32a4u flash labrafirm_0004_02.hex