Index: denali.pro =================================================================== diff -u -rdf74454a7a75eb63ac577739c1fd0f179e479f44 -rd639f647678727bb5d6196eb09ea9f33df8f3297 --- denali.pro (.../denali.pro) (revision df74454a7a75eb63ac577739c1fd0f179e479f44) +++ denali.pro (.../denali.pro) (revision d639f647678727bb5d6196eb09ea9f33df8f3297) @@ -107,14 +107,14 @@ \ # CANBus sources/canbus/CanInterface.h \ sources/canbus/FrameInterface.h \ + \ # Bluetooth + sources/bluetooth/BLEScanner.h \ \ # Denali Message sources/canbus/MessageGlobals.h \ sources/canbus/MessageAcknowModel.h \ sources/canbus/MessageBuilder.h \ sources/canbus/MessageInterpreter.h \ sources/canbus/MessageDispatcher.h \ - \ # Bluetooth - sources/bluetooth/BLEScanner.h \ \ # Gui sources/gui/GuiGlobals.h \ sources/gui/GuiView.h \ @@ -235,13 +235,13 @@ \ # CANBus sources/canbus/CanInterface.cpp \ sources/canbus/FrameInterface.cpp \ + \ # Bluetooth + sources/bluetooth/BLEScanner.cpp \ \ # Denali Message sources/canbus/MessageAcknowModel.cpp \ sources/canbus/MessageBuilder.cpp \ sources/canbus/MessageDispatcher.cpp \ sources/canbus/MessageInterpreter.cpp \ - \ # Bluetooth - sources/bluetooth/BLEScanner.cpp \ \ # Gui sources/gui/GuiGlobals.cpp \ sources/gui/GuiView.cpp \ Index: denali.pro.user =================================================================== diff -u -r3d0a160e4e8c0348c688ed5efe4d86dc66121e6b -rd639f647678727bb5d6196eb09ea9f33df8f3297 --- denali.pro.user (.../denali.pro.user) (revision 3d0a160e4e8c0348c688ed5efe4d86dc66121e6b) +++ denali.pro.user (.../denali.pro.user) (revision d639f647678727bb5d6196eb09ea9f33df8f3297) @@ -1,6 +1,6 @@ - + EnvironmentId Index: scripts/run.sh =================================================================== diff -u -r8ec5969db5d688c89ff99a4911112da53e0a9408 -rd639f647678727bb5d6196eb09ea9f33df8f3297 --- scripts/run.sh (.../run.sh) (revision 8ec5969db5d688c89ff99a4911112da53e0a9408) +++ scripts/run.sh (.../run.sh) (revision d639f647678727bb5d6196eb09ea9f33df8f3297) @@ -72,6 +72,7 @@ # setup bluetooth mkdir -p "$SDCARD_MNT/treatment" +# Wait for drivers to initialize. TODO: Investigate what is needed to reduce/remove this sleep 5 killall connmand /usr/share/silex-uart/silex-uart.sh start Index: sources/gui/qml/components/ScreenItem.qml =================================================================== diff -u -r0470ff6f209ff0c5089f8f0849b6da04f60f8f41 -rd639f647678727bb5d6196eb09ea9f33df8f3297 --- sources/gui/qml/components/ScreenItem.qml (.../ScreenItem.qml) (revision 0470ff6f209ff0c5089f8f0849b6da04f60f8f41) +++ sources/gui/qml/components/ScreenItem.qml (.../ScreenItem.qml) (revision d639f647678727bb5d6196eb09ea9f33df8f3297) @@ -30,10 +30,6 @@ width : Variables.applicationWidth height : Variables.applicationHeight - BackButton { id : _backButton - onClicked: pop() - } - Rectangle { id: _backgroundRect anchors.fill: parent color: Colors.backgroundMain Index: sources/gui/qml/components/SettingsItem.qml =================================================================== diff -u -r0470ff6f209ff0c5089f8f0849b6da04f60f8f41 -rd639f647678727bb5d6196eb09ea9f33df8f3297 --- sources/gui/qml/components/SettingsItem.qml (.../SettingsItem.qml) (revision 0470ff6f209ff0c5089f8f0849b6da04f60f8f41) +++ sources/gui/qml/components/SettingsItem.qml (.../SettingsItem.qml) (revision d639f647678727bb5d6196eb09ea9f33df8f3297) @@ -46,30 +46,17 @@ } - // chevron - Line { - color: "#4290ec" - height: 18 - width: 3 - anchors.right: parent.right - anchors.bottom: parent.verticalCenter - anchors.rightMargin: 20 - anchors.bottomMargin: -3 - rotation: 135 - } + Image { id: _arrow + anchors { + right : parent.right + verticalCenter: parent.verticalCenter + } - Line { - color: "#4290ec" - height: 18 - width: 3 - anchors.right: parent.right - anchors.rightMargin: 20 - anchors.top: parent.verticalCenter - anchors.topMargin: -3 - rotation: 45 + width : Variables.settingsArrowWidth + height: Variables.settingsArrowHeight + source: "qrc:/images/iArrow" } - Line { width: parent.width color: "#475f75" Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rdf74454a7a75eb63ac577739c1fd0f179e479f44 -rd639f647678727bb5d6196eb09ea9f33df8f3297 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision df74454a7a75eb63ac577739c1fd0f179e479f44) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision d639f647678727bb5d6196eb09ea9f33df8f3297) @@ -113,6 +113,9 @@ readonly property int notificationBarIconHeight : 30 readonly property int notificationBarIconWidth : 30 + readonly property int settingsArrowHeight : 30 + readonly property int settingsArrowWidth : 24 + readonly property int settingsBLEListViewWidth : 360 readonly property int settingsBLEItemRightMargin : 20 readonly property int settingsBLEButtonWidth : 300