Fix: use a virtual can device vcan0

Change-Id: I6724edb37152c8cc7f1d7a550e59ae0a8b3aeb17
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

4 files changed, 29 insertions, 58 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c449422..5649f1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,31 +58,48 @@ link_libraries(${EXTRAS_LIBRARIES})
 ###########################################################################
 # the binding for afb
 
-message(STATUS "Creation of ${PROJECT_NAME} for AFB-DAEMON")
-
-###############################################################
-add_library(${PROJECT_NAME} MODULE ${PROJECT_NAME}-bindings.c
-                                   ./qml)
-#                                   ./qml/${PROJECT_NAME}-app.qml)
+message(STATUS "Creation of ${PROJECT_NAME} binding for AFB-DAEMON")
+###########################################################################
+add_library(${PROJECT_NAME}-binding MODULE ${PROJECT_NAME}-binding.c)
 
-set_target_properties(${PROJECT_NAME} PROPERTIES
+set_target_properties(${PROJECT_NAME}-binding PROPERTIES
 	PREFIX ""
 	LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map"
 )
 
+###########################################################################
+# QT UI building
+
+message(STATUS "Creation of ${PROJECT_NAME} QT UI for AFB-DAEMON")
+###############################################################
+add_custom_command(
+	OUTPUT ${PROJECT_NAME}
+	DEPENDS ${PROJECT_NAME}-binding
+	COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/app/* .
+	COMMAND qmake
+	COMMAND make
+)
+
+add_custom_target(app ALL DEPENDS ${PROJECT_NAME})
+
+###########################################################################
+# WGT packaging
+
+message(STATUS "Creation of ${PROJECT_NAME}.wgt package for AppFW")
+###############################################################
 configure_file(config.xml.in config.xml)
 
 add_custom_command(
 	OUTPUT ${PROJECT_NAME}.wgt
-	DEPENDS ${PROJECT_NAME}
+	DEPENDS ${PROJECT_NAME}-binding
 	COMMAND rm -rf package
 	COMMAND mkdir -p package/${PROJECT_LIBDIR} package/htdocs
 	COMMAND cp config.xml package/
 	COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_ICON} package/icon.png
-	COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/qml/ package/
-	COMMAND cp ${PROJECT_NAME}.so package/${PROJECT_LIBDIR}
+#	COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/app/ package/
+	COMMAND cp ${PROJECT_NAME} package
+	COMMAND cp ${PROJECT_NAME}-binding.so package/${PROJECT_LIBDIR}
 	COMMAND wgtpkg-pack -f -o ${PROJECT_NAME}.wgt package 
-     	COMMAND rm -rf package
 )
 add_custom_target(widget ALL DEPENDS ${PROJECT_NAME}.wgt)
 
diff --git a/app/hvac-demo-ui.cpp b/app/hvac-demo-ui.cpp
deleted file mode 100644
index c00c43b..0000000
--- a/app/hvac-demo-ui.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2016 The Qt Company Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QtCore/QDebug>
-#include <QtGui/QGuiApplication>
-#include <QtQml/QQmlApplicationEngine>
-#include <QtQuickControls2/QQuickStyle>
-
-#ifdef HAVE_LIBHOMESCREEN
-#include <libhomescreen.hpp>
-#endif
-
-int main(int argc, char *argv[])
-{
-#ifdef HAVE_LIBHOMESCREEN
-    LibHomeScreen libHomeScreen;
-
-    if (!libHomeScreen.renderAppToAreaAllowed(0, 1)) {
-        qWarning() << "renderAppToAreaAllowed is denied";
-        return -1;
-    }
-#endif
-
-    QGuiApplication app(argc, argv);
-
-    QQuickStyle::setStyle("AGL");
-
-    QQmlApplicationEngine engine;
-    engine.load(QUrl(QStringLiteral("qrc:/hvac-demo.qml")));
-
-    return app.exec();
-}
-
diff --git a/app/HVAC.pro b/app/hvac-demo.pro
index 7213f37..7213f37 100644
--- a/app/HVAC.pro
+++ b/app/hvac-demo.pro
diff --git a/hvac-demo-binding.c b/hvac-demo-binding.c
index a341d05..fe20880 100644
--- a/hvac-demo-binding.c
+++ b/hvac-demo-binding.c
@@ -30,7 +30,7 @@
 #include <afb/afb-binding.h>
 #include <afb/afb-service-itf.h>
 
-#define CAN_DEV "can0"
+#define CAN_DEV "vcan0"
 
 #define SIMULATE_HVAC