Merge for BLE online updates and Mobile app

.gitignore

@@ -4,3 +4,4 @@ ui_*
 Makefile
 BLDC_Tool.app
 BLDC_Tool
+*.pro.user*

BLDC_Tool.pro

@@ -1,44 +1,53 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2012-11-18T21:19:27
-#
-#-------------------------------------------------
 
-QT       += core gui
-QT       += printsupport
-QT       += serialport
-QT       += network
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-TARGET = BLDC_Tool
-TEMPLATE = app
-
-
-SOURCES += main.cpp\
-        mainwindow.cpp \
-    qcustomplot.cpp \
-    digitalfiltering.cpp \
-    packetinterface.cpp \
-    utility.cpp \
-    serialization.cpp \
-    mrichtextedit.cpp \
-    mtextedit.cpp \
-    rtdatawidget.cpp
-
-HEADERS  += mainwindow.h \
-    qcustomplot.h \
+#DEFINES += QML # for test
+CONFIG += c++11
+
+QT += core gui bluetooth serialport network
+
+android | ios : DEFINES += QML
+ios{
+    QT -= serialport
+    DEFINES += NO_SERIAL_PORT
+
+    include(ios_proj/quickios.pri)
+}
+android{
+    QT -= serialport
+    DEFINES += NO_SERIAL_PORT
+}
+
+contains(DEFINES,QML){
+    include(QML.pri)
+} else {
+    include(Widgets.pri)
+}
+
+HEADERS += \
+    datatypes.h \
+    mcvalues.h \
+    bleinterface.h \
+    bldcinterface.h \
+    lib-qt-qml-tricks/src/qqmlhelpers.h \
     digitalfiltering.h \
     packetinterface.h \
     utility.h \
     serialization.h \
-    mrichtextedit.h \
-    mtextedit.h \
-    rtdatawidget.h \
-    datatypes.h
+    mcconfiguration.h \
+    appconfiguration.h \
+    downloader.h \
+    detectres.h
 
-FORMS    += mainwindow.ui \
-    mrichtextedit.ui
-
-RESOURCES += \
-    resources.qrc
+SOURCES += \
+    main.cpp \
+    packetinterface.cpp \
+    bldcinterface.cpp \
+    mcvalues.cpp \
+    bleinterface.cpp \
+    lib-qt-qml-tricks/src/qqmlhelpers.cpp \
+    digitalfiltering.cpp \
+    utility.cpp \
+    serialization.cpp \
+    mcconfiguration.cpp \
+    appconfiguration.cpp \
+    downloader.cpp \
+    detectres.cpp

Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Created by Qt/QMake</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleExecutable</key>
+	<string>BLDCApp</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.athenasoft.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>NOTE</key>
+	<string>This file was generated by Qt/QMake.</string>
+</dict>
+</plist>

QML.pri

@@ -0,0 +1,13 @@
+TEMPLATE = app
+
+QT      += qml quick
+
+
+RESOURCES += qml.qrc
+RCC_DIR += qml
+
+# Additional import path used to resolve QML modules in Qt Creator's code model
+QML_IMPORT_PATH =
+
+# Default rules for deployment.
+include(deployment.pri)

Widgets.pri

@@ -0,0 +1,33 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2012-11-18T21:19:27
+#
+#-------------------------------------------------
+
+QT += printsupport
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = BLDC_Tool
+TEMPLATE = app
+
+
+SOURCES += \
+    mainwindow.cpp \
+    qcustomplot.cpp \
+    mrichtextedit.cpp \
+    mtextedit.cpp \
+    rtdatawidget.cpp
+
+HEADERS  += \
+    mainwindow.h \
+    qcustomplot.h \
+    mrichtextedit.h \
+    mtextedit.h \
+    rtdatawidget.h \
+
+FORMS    += mainwindow.ui \
+    mrichtextedit.ui
+
+RESOURCES += \
+    resources.qrc

appconfiguration.cpp

@@ -0,0 +1,76 @@
+#include "appconfiguration.h"
+
+AppConfiguration::AppConfiguration(QObject *parent) : QObject(parent)
+{
+    memset(&m_data, 0, sizeof(app_configuration));
+}
+
+AppConfiguration::AppConfiguration(app_configuration &data)
+{
+    m_data = data;
+}
+
+void AppConfiguration::setData(app_configuration &src)
+{
+    // set all properties one by one to notify iff changed
+    set_controller_id 				(src.controller_id 			);
+    set_timeout_msec 				(src.timeout_msec 			);
+    set_timeout_brake_current 		(src.timeout_brake_current 	);
+    set_send_can_status 			(src.send_can_status 		);
+    set_send_can_status_rate_hz		(src.send_can_status_rate_hz);
+    set_app_to_use					(src.app_to_use );
+    set_ppm_ctrl_type 				(src.app_ppm_conf.ctrl_type 		);
+    set_ppm_pid_max_erpm 			(src.app_ppm_conf.pid_max_erpm 	);
+    set_ppm_hyst 					(src.app_ppm_conf.hyst 			);
+    set_ppm_pulse_start 			(src.app_ppm_conf.pulse_start 	);
+    set_ppm_pulse_end 				(src.app_ppm_conf.pulse_end 		);
+    set_ppm_median_filter 			(src.app_ppm_conf.median_filter 	);
+    set_ppm_safe_start 				(src.app_ppm_conf.safe_start 	);
+    set_ppm_rpm_lim_start 			(src.app_ppm_conf.rpm_lim_start 	);
+    set_ppm_rpm_lim_end 			(src.app_ppm_conf.rpm_lim_end 	);
+    set_ppm_multi_esc 				(src.app_ppm_conf.multi_esc 		);
+    set_ppm_tc 						(src.app_ppm_conf.tc 			);
+    set_ppm_tc_max_diff 			(src.app_ppm_conf.tc_max_diff 	);
+    set_adc_ctrl_type 				(src.app_adc_conf.ctrl_type 			);
+    set_adc_hyst 					(src.app_adc_conf.hyst 				);
+    set_adc_voltage_start 			(src.app_adc_conf.voltage_start 		);
+    set_adc_voltage_end 			(src.app_adc_conf.voltage_end 		);
+    set_adc_use_filter 				(src.app_adc_conf.use_filter 		);
+    set_adc_safe_start 				(src.app_adc_conf.safe_start 		);
+    set_adc_cc_button_inverted		(src.app_adc_conf.cc_button_inverted	);
+    set_adc_rev_button_inverted		(src.app_adc_conf.rev_button_inverted);
+    set_adc_voltage_inverted 		(src.app_adc_conf.voltage_inverted 	);
+    set_adc_rpm_lim_start 			(src.app_adc_conf.rpm_lim_start 		);
+    set_adc_rpm_lim_end 			(src.app_adc_conf.rpm_lim_end 		);
+    set_adc_multi_esc 				(src.app_adc_conf.multi_esc 			);
+    set_adc_tc 						(src.app_adc_conf.tc 				);
+    set_adc_tc_max_diff 			(src.app_adc_conf.tc_max_diff 		);
+    set_adc_update_rate_hz 			(src.app_adc_conf.update_rate_hz 	);
+    set_app_uart_baudrate			(src.app_uart_baudrate);
+    set_chuk_ctrl_type 				(src.app_chuk_conf.ctrl_type 			);
+    set_chuk_hyst 					(src.app_chuk_conf.hyst 					);
+    set_chuk_rpm_lim_start 			(src.app_chuk_conf.rpm_lim_start 		);
+    set_chuk_rpm_lim_end 			(src.app_chuk_conf.rpm_lim_end 			);
+    set_chuk_ramp_time_pos 			(src.app_chuk_conf.ramp_time_pos 		);
+    set_chuk_ramp_time_neg			(src.app_chuk_conf.ramp_time_neg			);
+    set_chuk_stick_erpm_per_s_in_cc	(src.app_chuk_conf.stick_erpm_per_s_in_cc);
+    set_chuk_multi_esc				(src.app_chuk_conf.multi_esc				);
+    set_chuk_tc						(src.app_chuk_conf.tc					);
+    set_chuk_tc_max_diff			(src.app_chuk_conf.tc_max_diff			);
+    set_nrf_speed					(src.app_nrf_conf.speed		);
+    set_nrf_power					(src.app_nrf_conf.power		);
+    set_nrf_crc_type				(src.app_nrf_conf.crc_type	);
+    set_nrf_retry_delay				(src.app_nrf_conf.retry_delay);
+    set_nrf_retries					(src.app_nrf_conf.retries	);
+    set_nrf_channel					(src.app_nrf_conf.channel	);
+    set_nrf_address0				(src.app_nrf_conf.address[0]	);
+    set_nrf_address1				(src.app_nrf_conf.address[1]	);
+    set_nrf_address2				(src.app_nrf_conf.address[2]	);
+    set_nrf_send_crc_ack			(src.app_nrf_conf.send_crc_ack);
+}
+
+const app_configuration &AppConfiguration::data()
+{
+    return m_data;
+}
+