From afa1419480fbf8b23841f52e211ef274ba471bad Mon Sep 17 00:00:00 2001
From: Chris Esposito <admin@espotek.com>
Date: Sun, 24 Dec 2017 10:52:01 +1100
Subject: [PATCH] New Changes build on Linux/Rpi

---
 .gitignore                                                 | 2 ++
 Desktop_Interface/uartstyledecoder.h                       | 2 +-
 Desktop_Interface/ui_elements/{siPrint.cpp => siprint.cpp} | 0
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename Desktop_Interface/ui_elements/{siPrint.cpp => siprint.cpp} (100%)

diff --git a/.gitignore b/.gitignore
index 670b7fa6..7f3b3df5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,5 @@ Desktop_Interface/debug/Labrador.vc.pdb
 Desktop_Interface/debug/Labrador_resource.res
 Desktop_Interface/debug/qrc_resources.cpp
 !Desktop_Interface/bin/firmware/dfu-programmer.exe
+*.o
+Desktop_Interface/bin/Labrador
diff --git a/Desktop_Interface/uartstyledecoder.h b/Desktop_Interface/uartstyledecoder.h
index 48c21646..49cc872c 100644
--- a/Desktop_Interface/uartstyledecoder.h
+++ b/Desktop_Interface/uartstyledecoder.h
@@ -9,7 +9,7 @@ class uartStyleDecoder : public QObject
 {
     Q_OBJECT
 public:
-    explicit uartStyleDecoder(QObject *parent_in = nullptr);
+    explicit uartStyleDecoder(QObject *parent_in = NULL);
     void serialDecode(double baudRate);
     int serialDistance();
     QTimer *updateTimer;
diff --git a/Desktop_Interface/ui_elements/siPrint.cpp b/Desktop_Interface/ui_elements/siprint.cpp
similarity index 100%
rename from Desktop_Interface/ui_elements/siPrint.cpp
rename to Desktop_Interface/ui_elements/siprint.cpp