Moved QuadControl to top-level directory

.gitignore

@@ -1,6 +1,7 @@
 *~
 *.bak
 *.tmp
+build-*
 .project
 .cproject
 .settings

Bootloader/Makefile

@@ -16,20 +16,20 @@ TARGET = $(OBJDIR)/f00b00t
 
 # Define all C source files (dependencies are generated automatically)
 #
+INCDIRS += .
 INCDIRS += Bootloader
+
 SOURCES += Bootloader/small_printf.c
 SOURCES += Bootloader/main.c
 SOURCES += Bootloader/board.c
 SOURCES += Bootloader/uart.c
 SOURCES += Bootloader/msg_packet.c
 SOURCES += Bootloader/version.c
 
-SHARED_DIR = Shared
-INCDIRS += $(SHARED_DIR)
-SOURCES += $(SHARED_DIR)/cobsr.c
-SOURCES += $(SHARED_DIR)/errors.c
-SOURCES += $(SHARED_DIR)/crc16_sm.c
-SOURCES += $(SHARED_DIR)/crc32_sm.c
+SOURCES += Shared/cobsr.c
+SOURCES += Shared/errors.c
+SOURCES += Shared/crc16_sm.c
+SOURCES += Shared/crc32_sm.c
 
 # Standard peripheral library
 #
@@ -160,7 +160,7 @@ MKDIR    = mkdir
 DOXYGEN  = doxygen
 SUBWCREV = SubWCRev
 STLINK   = Tools/st-link/ST-LINK_CLI.exe
-POSTLD   = Tools/add_version_info/add_version_info.py -q
+POSTLD   = Tools/add_version_info.py # -q
 
 # Compiler flags to generate dependency files
 #

Bootloader/main.c

@@ -1,13 +1,13 @@
 #include "board.h"
 #include "uart.h"
-#include "crc32_sm.h"
 #include "msg_packet.h"
 #include "stm32f4xx.h"
 #include "version.h"
 #include "small_printf.h"
 
-#include "msg_structs.h"
-#include "errors.h"
+#include "Shared/crc32_sm.h"
+#include "Shared/msg_structs.h"
+#include "Shared/errors.h"
 
 #include <string.h>
 #include <stdio.h>

Bootloader/msg_packet.c

@@ -1,9 +1,10 @@
 #include "msg_packet.h"
-#include "crc16_sm.h"
 #include "uart.h"
 #include "board.h"
-#include "cobsr.h"
-#include "errors.h"
+
+#include "Shared/crc16_sm.h"
+#include "Shared/cobsr.h"
+#include "Shared/errors.h"
 
 #define PACKET_TIMEOUT  1000     // [ms]
 

Bootloader/msg_packet.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <unistd.h>
-#include "msg_structs.h"
+#include "Shared/msg_structs.h"
 
 int msg_recv(struct msg_header *msg);
 int msg_send(struct msg_header *msg);

Makefile

@@ -16,6 +16,7 @@ TARGET = $(OBJDIR)/drquad
 
 # Define all C source files (dependencies are generated automatically)
 #
+INCDIRS += .
 INCDIRS += Source
 
 SOURCES += Source/main.c
@@ -61,12 +62,10 @@ SOURCES += Source/filter.c
 SOURCES += Source/watchdog.c
 SOURCES += Source/version.c
 
-SHARED_DIR = Shared
-INCDIRS += $(SHARED_DIR)
-SOURCES += $(SHARED_DIR)/cobsr.c
-SOURCES += $(SHARED_DIR)/errors.c
-SOURCES += $(SHARED_DIR)/crc16.c
-SOURCES += $(SHARED_DIR)/crc32.c
+SOURCES += Shared/cobsr.c
+SOURCES += Shared/errors.c
+SOURCES += Shared/crc16.c
+SOURCES += Shared/crc32.c
 
 # FatFS
 #
@@ -255,7 +254,7 @@ NM       = $(TOOLCHAIN)nm
 MKDIR    = mkdir
 DOXYGEN  = doxygen
 STLINK   = Tools/st-link/ST-LINK_CLI.exe
-POSTLD   = Tools/add_version_info/add_version_info.py # -q
+POSTLD   = Tools/add_version_info.py # -q
 
 # Compiler flags to generate dependency files
 #

Tools/quadcontrol/AnsiParser.cpp → QuadControl/AnsiParser.cpp

@@ -19,6 +19,7 @@
  */
 
 #include "AnsiParser.h"
+
 #include <QStringList>
 
 

Tools/quadcontrol/BootProtocol.cpp → QuadControl/BootProtocol.cpp

@@ -16,9 +16,6 @@
  */
 
 #include "BootProtocol.h"
-#include "IntelHexFile.h"
-#include "MainWindow.h"
-
 #include "Shared/msg_structs.h"
 #include "Shared/errors.h"
 #include "Shared/crc32.h"
@@ -27,6 +24,8 @@
 #include <QApplication>
 #include <QThread>
 #include <QTime>
+#include "IntelHexFile.h"
+#include "MainWindow.h"
 
 
 BootProtocol::BootProtocol(Connection &connection, QWidget *parent)

Tools/quadcontrol/Connection.cpp → QuadControl/Connection.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "Connection.h"
-
 #include <QDebug>
 #include <QByteArray>
 #include <QTcpSocket>

Tools/quadcontrol/DockWindows/AddConnectionDialog.cpp → QuadControl/DockWindows/AddConnectionDialog.cpp

@@ -1,4 +1,5 @@
 #include "AddConnectionDialog.h"
+
 #include "ui_AddConnectionDialog.h"
 
 AddConnectionDialog::AddConnectionDialog(QWidget *parent) :

Tools/quadcontrol/DockWindows/ConnectionWindow.cpp → QuadControl/DockWindows/ConnectionWindow.cpp

@@ -16,17 +16,17 @@
  */
 
 #include "ConnectionWindow.h"
-#include "ui_ConnectionWindow.h"
-#include "AddConnectionDialog.h"
-#include "TryAction.h"
 
+#include "ui_ConnectionWindow.h"
 #include <QSerialPort>
 #include <QMessageBox>
 #include <QDebug>
 #include <QSettings>
 
+#include "../PuTTYLauncher.h"
+#include "../TryAction.h"
+#include "AddConnectionDialog.h"
 #include "MainWindow.h"
-#include "PuTTYLauncher.h"
 
 
 ConnectionWindow::ConnectionWindow(QWidget *parent)

Tools/quadcontrol/DockWindows/ConnectionWindow.h → QuadControl/DockWindows/ConnectionWindow.h

@@ -1,14 +1,13 @@
 #ifndef CONNECTIONWINDOW_H
 #define CONNECTIONWINDOW_H
 
-#include "WiFlyListener.h"
-#include "InterleavedFuture.h"
-
 #include <QMainWindow>
 #include <QTreeWidgetItem>
 #include <QSerialPortInfo>
 #include <QTimer>
 #include <QMap>
+#include "../InterleavedFuture.h"
+#include "../WiFlyListener.h"
 
 namespace Ui {
 class ConnectionWindow;

Tools/quadcontrol/DockWindows/ConsoleWindow.cpp → QuadControl/DockWindows/ConsoleWindow.cpp

@@ -16,6 +16,7 @@
  */
 
 #include "ConsoleWindow.h"
+
 #include "ui_ConsoleWindow.h"
 
 #include <QSerialPort>
@@ -28,8 +29,8 @@
 #include <QMessageBox>
 #include <QScrollBar>
 
-#include "MainWindow.h"
-#include "TryAction.h"
+#include "../MainWindow.h"
+#include "../TryAction.h"
 
 static const QBrush ansiPalette[] = {
     QBrush(QColor("#222")), QBrush(QColor("#C00")),

Tools/quadcontrol/DockWindows/ConsoleWindow.h → QuadControl/DockWindows/ConsoleWindow.h

@@ -1,13 +1,13 @@
 #ifndef CONSOLEWINDOW_H
 #define CONSOLEWINDOW_H
 
-#include "AnsiParser.h"
 #include "Shared/msg_structs.h"
 
 #include <QTimer>
 #include <QTextCursor>
 #include <QTextCharFormat>
 #include <QMainWindow>
+#include "../AnsiParser.h"
 
 namespace Ui {
 class ConsoleWindow;

Tools/quadcontrol/DockWindows/GLWindow.cpp → QuadControl/DockWindows/GLWindow.cpp

@@ -16,13 +16,14 @@
  */
 
 #include "GLWindow.h"
+
 #include "ui_GLWindow.h"
 
 #include <QSerialPort>
 #include <QSerialPortInfo>
 #include <QAction>
 
-#include "MainWindow.h"
+#include "../MainWindow.h"
 
 GLWindow::GLWindow(QWidget *parent)
     : QMainWindow(parent)

Tools/quadcontrol/DockWindows/MyGLWidget.cpp → QuadControl/DockWindows/MyGLWidget.cpp

@@ -16,10 +16,11 @@
  */
 
 #include "MyGLWidget.h"
+
 #include <QGLFormat>
 
+#include "../glut_teapot.h"
 #include "../GLTools.h"
-#include "glut_teapot.h"
 
 MyGLWidget::MyGLWidget(QWidget *parent)
     : QGLWidget(parent)

Tools/quadcontrol/DockWindows/PlotWindow.cpp → QuadControl/DockWindows/PlotWindow.cpp

@@ -16,11 +16,12 @@
  */
 
 #include "PlotWindow.h"
+
 #include "ui_PlotWindow.h"
-#include "MainWindow.h"
 #include "qcustomplot.h"
 
 #include <math.h>
+#include "../MainWindow.h"
 
 
 PlotWindow::PlotWindow(QWidget *parent)

Tools/quadcontrol/DockWindows/UpdateWindow.cpp → QuadControl/DockWindows/UpdateWindow.cpp

@@ -16,9 +16,8 @@
  */
 
 #include "UpdateWindow.h"
-#include "ui_UpdateWindow.h"
-#include "TryAction.h"
 
+#include "ui_UpdateWindow.h"
 #include <QSettings>
 #include <QFileSystemModel>
 #include <QCompleter>
@@ -30,8 +29,9 @@
 #include <QByteArray>
 #include <QTime>
 
+#include "../IntelHexFile.h"
+#include "../TryAction.h"
 #include "MainWindow.h"
-#include "IntelHexFile.h"
 
 UpdateWindow::UpdateWindow(QWidget *parent)
     : QMainWindow(parent)

Tools/quadcontrol/DockWindows/UpdateWindow.h → QuadControl/DockWindows/UpdateWindow.h

@@ -5,7 +5,8 @@
 #include <QDragEnterEvent>
 #include <QDropEvent>
 #include <QProgressDialog>
-#include "BootProtocol.h"
+
+#include "../BootProtocol.h"
 
 namespace Ui {
 class UpdateWindow;

Tools/quadcontrol/IntelHexFile.cpp → QuadControl/IntelHexFile.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "IntelHexFile.h"
+
 #include <QFile>
 
 

Tools/quadcontrol/MainWindow.cpp → QuadControl/MainWindow.cpp

@@ -16,22 +16,21 @@
  */
 
 #include "MainWindow.h"
-#include "ui_MainWindow.h"
-
-#include "DockWindows/ConnectionWindow.h"
-#include "DockWindows/UpdateWindow.h"
-#include "DockWindows/ConsoleWindow.h"
-#include "DockWindows/GLWindow.h"
-#include "DockWindows/PlotWindow.h"
 
-#include "Connection.h"
+#include "ui_MainWindow.h"
 
 #include <QAction>
 #include <QDockWidget>
 #include <QSettings>
 #include <QCloseEvent>
 #include <QMessageBox>
 #include <QDebug>
+#include "Connection.h"
+#include "DockWindows/ConnectionWindow.h"
+#include "DockWindows/ConsoleWindow.h"
+#include "DockWindows/GLWindow.h"
+#include "DockWindows/PlotWindow.h"
+#include "DockWindows/UpdateWindow.h"
 
 
 MainWindow *mainWindow;

Tools/quadcontrol/MainWindow.h → QuadControl/MainWindow.h

@@ -1,12 +1,11 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include "Connection.h"
-
 #include <QMainWindow>
 #include <QLabel>
 #include <QTimer>
 #include <QTime>
+#include "Connection.h"
 
 
 namespace Ui {

Tools/quadcontrol/PuTTYLauncher.cpp → QuadControl/PuTTYLauncher.cpp

@@ -18,6 +18,7 @@
  */
 
 #include "PuTTYLauncher.h"
+
 #include <QDebug>
 #include <QSettings>
 #include <QSerialPortInfo>