VMCPlugin.pro

@@ -46,7 +46,7 @@ contains( CONFIG, PTU5_YOCTO ) {
 }
 
 TARGET   = ATBVMCPlugin
-VERSION  = "1.0.0"
+#DESTDIR  = ../plugins
 INTERFACE = VMCInterface
 INTERFACE_DEFINITION = $${PWD}/src/ATBAPP/VMCInterface.h
 
@@ -60,22 +60,18 @@ win32 {
     BUILD_TIME=$$system("date +%H:%M:%S")
 }
 
-GIT_COMMIT=$$system("git log -n 1 --format=oneline | cut -d' ' -f1")
-GIT_DESCRIBE=$$system("git describe")
+GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
 
 EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
 
 CONFIG += c++17
 
+DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
 DEFINES+=ATB_QT_VERSION=\\\"$${QT_VERSION}\\\"
-DEFINES+=PLUGIN_BUILD_DATE=\\\"$$BUILD_DATE\\\"
-DEFINES+=PLUGIN_BUILD_TIME=\\\"$$BUILD_TIME\\\"
-DEFINES+=PLUGIN_EXTENDED_VERSION=\\\"$${EXTENDED_VERSION}\\\"
+DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
+DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
+DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
 
-DEFINES+=INTERFACE=\\\"VMCInterface\\\"
-DEFINES+=INTERFACE_VERSION=\\\"eu.atb.ptu.plugin.VMCInterface/1.0\\\"
-DEFINES+=PLUGIN_NAME=\\\"ATBVMCPlugin\\\"
-DEFINES+=PLUGIN_VERSION=\\\"$${PLUGIN_BUILD_DATE}_$${PLUGIN_BUILD_TIME}\\\"
 
 # Default rules for deployment.
 #qnx: target.path = /tmp/$${TARGET}/bin
@@ -84,6 +80,7 @@ DEFINES+=PLUGIN_VERSION=\\\"$${PLUGIN_BUILD_DATE}_$${PLUGIN_BUILD_TIME}\\\"
 
 # ATBAPP interface
 HEADERS += \
+    include/interfaces.h \
     src/ATBAPP/VMCInterface.h \
     src/ATBAPP/ATBVMCPlugin.h \
     src/ATBAPP/ATBAPPplugin.h \

src/ATBAPP/ATBVMCPlugin.cpp

@@ -36,17 +36,7 @@ QString const &ATBVMCPlugin::getPluginInfo() {
 }
 
 void ATBVMCPlugin::setPluginInfo(QString const &info) {
-
-    Q_UNUSED(info);
-
-    QStringList lst;
-    lst << QString("              Interface: ") + INTERFACE;
-    lst << QString("      Interface Version: ") + INTERFACE_VERSION;
-    lst << QString("            Plugin name: ") + PLUGIN_NAME;
-    lst << QString("         Plugin version: ") + PLUGIN_VERSION;
-    lst << QString("Plugin extended version: ") + PLUGIN_EXTENDED_VERSION;
-
-    m_pluginInfo = lst.join('\n');
+    m_pluginInfo = info;
 }
 
 // ----------------------------------------------------------------------------

src/ATBAPP/ATBVMCPlugin.h

@@ -9,6 +9,7 @@
 #include "src/ATBAPP/VMCInterface.h"
 #include "src/ATBAPP/UnifiedDCVMCInterface.h"
 
+#include "version.h"
 #include "vmc.h"
 
 class ATBVMCPlugin : public VMCInterface {

src/ATBAPP/UnifiedDCVMCInterface.h

@@ -46,7 +46,6 @@ public:
     virtual ~UnifiedDCVMCInterface() = default;
 
     virtual const QString & getPluginInfo() = 0;
-    virtual void setPluginInfo(QString const &info) = 0;
 
     // mandantory ATBAPP plugin methods:
     virtual PLUGIN_STATE getState() = 0;

src/ATBAPP/VMCInterface.h

@@ -27,9 +27,6 @@ public:
     explicit VMCInterface(QObject *parent = nullptr) : QObject(parent) {}
     virtual ~VMCInterface() = default;
 
-    virtual const QString & getPluginInfo() = 0;
-    virtual void setPluginInfo(QString const &info) = 0;
-
     virtual PLUGIN_STATE initPlugin(QObject *eventReceiver, QObject *atbSystem,
                                     QObject *hmiConfig, QSettings const &settings) override {
         return initVMCPlugin(eventReceiver, atbSystem, hmiConfig, settings);

src/ATBAPP/support/VMC/SendBuffer.cpp

@@ -2,6 +2,7 @@
 #include "SendBuffer.h"
 #include "vmc.h"
 #include <QDebug>
+#include "version.h"
 
 SendBuffer::SendBuffer(COM_interface *cinterface, QObject *parent) :
     QObject(parent)

src/ATBAPP/support/VMC/vmc.cpp

@@ -1,4 +1,5 @@
 #include "vmc.h"
+#include "version.h"
 #include "ATBAPP.h"
 
 #include <QObject>

src/ATBAPP/support/VMC/vmc.h

@@ -11,6 +11,7 @@
 #include <QTimer>
 #include <QList>
 #include <QSettings>
+#include "version.h"
 
 
 #define VMC_RECEIVE_TIMEOUT 1000

src/ATBAPP/support/VendingData.cpp

@@ -1,6 +1,7 @@
 #include "VendingData.h"
 #include <QDebug>
 #include "ATBAPP.h"
+#include "version.h"
 
 VendingData::VendingData(QObject *parent) : QObject(parent)
 {