Added DLT log level

alexmucde · Jul 9, 2021 · 17d47a9 · 17d47a9
1 parent 67a1ad5
commit 17d47a9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/dltminiserver.cpp b/dltminiserver.cpp
@@ -255,7 +255,7 @@ void DLTMiniServer::disconnected()
     status("listening");
 }
 
-void DLTMiniServer::sendValue(QString appId,QString ctxId, QString text)
+void DLTMiniServer::sendValue(QString appId,QString ctxId, QString text,int logLevel)
 {
     if(tcpSocket==0 || !tcpSocket->isOpen())
     {
@@ -271,7 +271,7 @@ void DLTMiniServer::sendValue(QString appId,QString ctxId, QString text)
     data += (char)4+10+4+2+text.length(); // length low byte
 
     // Extended Header (10 Byte)
-    data += (char)0x41; // MSIN: Verbose,NW_TRACE, CAN 0x25
+    data += (char)0x01|(char)logLevel<<4; // MSIN: Verbose,DLT_TYPE_LOG
     data += (char)0x01; // NOAR
     data += appId[0].toLatin1(); // APID
     data += appId[1].toLatin1(); // APID
@@ -298,7 +298,7 @@ void DLTMiniServer::sendValue(QString appId,QString ctxId, QString text)
     tcpSocket->write(data);
 }
 
-void DLTMiniServer::sendValue2(QString appId,QString ctxId, QString text1,QString text2)
+void DLTMiniServer::sendValue2(QString appId,QString ctxId, QString text1,QString text2,int logLevel)
 {
     if(tcpSocket==0 || !tcpSocket->isOpen())
     {
@@ -314,7 +314,7 @@ void DLTMiniServer::sendValue2(QString appId,QString ctxId, QString text1,QStrin
     data += (char)4+10+4+2+text1.length()+4+2+text2.length(); // length low byte
 
     // Extended Header (10 Byte)
-    data += (char)0x41; // MSIN: Verbose,NW_TRACE, CAN 0x25
+    data += (char)0x01|(char)logLevel<<4; // MSIN: Verbose,DLT_TYPE_LOG
     data += (char)0x02; // NOAR
     data += appId[0].toLatin1(); // APID
     data += appId[1].toLatin1(); // APID
@@ -355,7 +355,7 @@ void DLTMiniServer::sendValue2(QString appId,QString ctxId, QString text1,QStrin
 
 }
 
-void DLTMiniServer::sendValue3(QString appId,QString ctxId, QString text1,QString text2,QString text3)
+void DLTMiniServer::sendValue3(QString appId,QString ctxId, QString text1,QString text2,QString text3,int logLevel)
 {
     if(tcpSocket==0 || !tcpSocket->isOpen())
     {
@@ -371,7 +371,7 @@ void DLTMiniServer::sendValue3(QString appId,QString ctxId, QString text1,QStrin
     data += (char)4+10+4+2+text1.length()+4+2+text2.length()+4+2+text3.length(); // length low byte
 
     // Extended Header (10 Byte)
-    data += (char)0x41; // MSIN: Verbose,NW_TRACE, CAN 0x25
+    data += (char)0x01|(char)logLevel<<4; // MSIN: Verbose,DLT_TYPE_LOG
     data += (char)0x03; // NOAR
     data += appId[0].toLatin1(); // APID
     data += appId[1].toLatin1(); // APID

diff --git a/dltminiserver.h b/dltminiserver.h
@@ -21,6 +21,13 @@
 #include <QTcpServer>
 #include <QTcpSocket>
 
+#define DLT_LOG_FATAL 0x1
+#define DLT_LOG_ERROR 0x2
+#define DLT_LOG_WARN 0x3
+#define DLT_LOG_INFO 0x4
+#define DLT_LOG_DEBUG 0x5
+#define DLT_LOG_VERBOSE 0x6
+
 class DLTMiniServer : public QObject
 {
     Q_OBJECT
@@ -31,12 +38,12 @@ class DLTMiniServer : public QObject
     void start();
     void stop();
 
-    void sendValue(QString text) { sendValue(applicationId,contextId,text); }
-    void sendValue2(QString text1,QString text2) { sendValue2(applicationId,contextId,text1,text2); }
-    void sendValue3(QString text1,QString text2,QString text3) { sendValue3(applicationId,contextId,text1,text2,text3); }
-    void sendValue(QString appId,QString ctxId, QString text);
-    void sendValue2(QString appId,QString ctxId, QString text1,QString text2);
-    void sendValue3(QString appId,QString ctxId, QString text1,QString text2,QString text3);
+    void sendValue(QString text,int logLevel = DLT_LOG_INFO) { sendValue(applicationId,contextId,text,logLevel); }
+    void sendValue2(QString text1,QString text2,int logLevel = DLT_LOG_INFO) { sendValue2(applicationId,contextId,text1,text2,logLevel); }
+    void sendValue3(QString text1,QString text2,QString text3,int logLevel = DLT_LOG_INFO) { sendValue3(applicationId,contextId,text1,text2,text3,logLevel); }
+    void sendValue(QString appId,QString ctxId, QString text,int logLevel = DLT_LOG_INFO);
+    void sendValue2(QString appId,QString ctxId, QString text1,QString text2,int logLevel = DLT_LOG_INFO);
+    void sendValue3(QString appId,QString ctxId, QString text1,QString text2,QString text3,int logLevel = DLT_LOG_INFO);
 
     unsigned short getPort() { return port; }
     void setPort(unsigned short port) { this->port = port; }