diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2017-07-05 10:45:01 +0200 |
---|---|---|
committer | Yuichi Kusakabe <yuichi.kusakabe@jp.fujitsu.com> | 2017-08-31 14:58:56 +0000 |
commit | c320e8202d3347b1513be57786d4d70b55551351 (patch) | |
tree | 39d01acd55eeb46a2aa14a6e53c2f56bd376af3e | |
parent | 632e86c88bd34725cceec27c1b4b03b07fca0f63 (diff) |
support CAN information(VehicleSpeed and EngineSpeed)eel_4.99.2eel_4.99.1eel/4.99.2eel/4.99.14.99.24.99.1
This patch is support CAN inforamion(VehicleSpeed and EngineSpeed).
CAN data is sent from can binder using websocket.
Change-Id: I26cc6afa5f5f6cea2e6c77e40c324cca5fc00516
Signed-off-by: Yuichi Kusakabe <yuichi.kusakabe@jp.fujitsu.com>
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r-- | app/Dashboard.qml | 65 | ||||
-rw-r--r-- | app/main.cpp | 29 |
2 files changed, 89 insertions, 5 deletions
diff --git a/app/Dashboard.qml b/app/Dashboard.qml index 07bf19f..fd56521 100644 --- a/app/Dashboard.qml +++ b/app/Dashboard.qml @@ -17,29 +17,83 @@ import QtQuick 2.6 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.0 +import QtWebSockets 1.0 ApplicationWindow { id: root + WebSocket { + property string api_str: "api/canivi" + property string verb_str: "subscribe" + property var msgid_enu: { "call":2, "retok":3, "reterr":4, "event":5 } + property string request_str: "" + property string status_str: "" + + id: websocket + url: bindingAddress + + onTextMessageReceived: { + var message_json = JSON.parse (message); + /* + console.log ("Raw response: " + message) + console.log ("JSON response: " + message_json) + */ + + if (message_json[0] == msgid_enu.event) { + if (message_json[1] == "canivi/VehicleSpeed") + speed.text = message_json[2].data.value + else + if (message_json[1] == "canivi/EngineSpeed") + tachometer.value = message_json[2].data.value / 7000 + return + } else + if (message_json[0] != msgid_enu.retok) { + console.log ("Return value is not ok !") + return + } + /* refresh happen */ + } + onStatusChanged: { + if (websocket.status == WebSocket.Error) { + status_str = "Error: " + websocket.errorString + } + else + if (websocket.status == WebSocket.Open) { + status_str = "Socket opened; sending message..." + if (verb_str == "subscribe") { + request_str ='[' + msgid_enu.call + ',"99999","' + api_str +'/'+ verb_str +'",{ \"event\" : \"VehicleSpeed\" } ]'; + websocket.sendTextMessage (request_str) + request_str ='[' + msgid_enu.call + ',"99999","' + api_str +'/'+ verb_str +'",{ \"event\" : \"EngineSpeed\" } ]'; + websocket.sendTextMessage (request_str) + } + } else + if (websocket.status == WebSocket.Closed) { + status_str = "Socket closed" + } + console.log (status_str) + } + active: true + } + Label { id: speed anchors.left: parent.left anchors.top: parent.top anchors.margins: 20 - text: '1' + text: '0' font.pixelSize: 256 } Label { id: unit anchors.left: speed.right anchors.baseline: speed.baseline - text: 'MPH' + text: 'Km/h' font.pixelSize: 64 } Label { anchors.left: unit.left anchors.top: unit.bottom - text: '100,000.5 MI' + text: '100,000.5 km' font.pixelSize: 32 opacity: 0.5 } @@ -99,13 +153,14 @@ ApplicationWindow { source: './images/HMI_Dashboard_Speed_Icon.svg' } ProgressBar { + id: tachometer Layout.fillWidth: true - value: 0.25 + value: 0 Label { anchors.left: parent.left anchors.top: parent.bottom anchors.topMargin: 10 - text: 'SPEED (MPH)' + text: '(RPM)' font.pixelSize: 26 } } diff --git a/app/main.cpp b/app/main.cpp index a86082e..1d73689 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -14,7 +14,10 @@ * limitations under the License. */ +#include <QUrlQuery> +#include <QQmlContext> #include <QtCore/QDebug> +#include <QCommandLineParser> #include <QtGui/QGuiApplication> #include <QtQml/QQmlApplicationEngine> #include <QtQuickControls2/QQuickStyle> @@ -35,10 +38,36 @@ int main(int argc, char *argv[]) #endif QGuiApplication app(argc, argv); + app.setApplicationName(QStringLiteral("Dashboard")); + app.setApplicationVersion(QStringLiteral("3.99.3")); + app.setOrganizationDomain(QStringLiteral("automotivelinux.org")); + app.setOrganizationName(QStringLiteral("AutomotiveGradeLinux")); QQuickStyle::setStyle("AGL"); + QCommandLineParser parser; + parser.addPositionalArgument("port", app.translate("main", "port for binding")); + parser.addPositionalArgument("secret", app.translate("main", "secret for binding")); + parser.addHelpOption(); + parser.addVersionOption(); + parser.process(app); + QStringList positionalArguments = parser.positionalArguments(); + QQmlApplicationEngine engine; + if (positionalArguments.length() == 2) { + int port = positionalArguments.takeFirst().toInt(); + QString secret = positionalArguments.takeFirst(); + QUrl bindingAddress; + bindingAddress.setScheme(QStringLiteral("ws")); + bindingAddress.setHost(QStringLiteral("localhost")); + bindingAddress.setPort(port); + bindingAddress.setPath(QStringLiteral("/api")); + QUrlQuery query; + query.addQueryItem(QStringLiteral("token"), secret); + bindingAddress.setQuery(query); + QQmlContext *context = engine.rootContext(); + context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress); + } engine.load(QUrl(QStringLiteral("qrc:/Dashboard.qml"))); return app.exec(); |