t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes to MQTT interface to make it work properly with current python

Browse Source 
script
This commit is contained in:
Collin Kidder
2020-08-18 22:43:41 -04:00
parent df1ef510da
commit 3fa9f14651
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/mqtt_bus.cpp
+20 -13
View File
@@ -5,6 +5,7 @@
#include <QStringBuilder> #include <QStringBuilder>
#include <QtNetwork> #include <QtNetwork>
#include "utility.h"
#include "mqtt_bus.h" #include "mqtt_bus.h"
MQTT_BUS::MQTT_BUS(QString topicName) : MQTT_BUS::MQTT_BUS(QString topicName) :
@@ -134,22 +135,28 @@ bool MQTT_BUS::piSendFrame(const CANFrame& frame)
if (frame.frameId() & 0x20000000) { if (frame.frameId() & 0x20000000) {
return true; return true;
} }
ID = frame.frameId();
if (frame.hasExtendedFrameFormat()) ID |= 1u << 31;
buffer[0] = (char)0xF1; //start of a command over serial QMQTT::Message msg;
buffer[1] = 0; //command ID for sending a CANBUS frame QByteArray bytes;
buffer[2] = (char)(ID & 0xFF); //four bytes of ID LSB first
buffer[3] = (char)(ID >> 8); msg.setTopic(topicName + "/s/" + QString::number(frame.frameId()));
buffer[4] = (char)(ID >> 16); uint8_t flags = 0;
buffer[5] = (char)(ID >> 24); if (frame.hasExtendedFrameFormat()) flags += 1;
buffer[6] = (char)((frame.bus) & 3); if (frame.frameType() == QCanBusFrame::RemoteRequestFrame) flags += 2;
buffer[7] = (char)frame.payload().length(); if (frame.hasFlexibleDataRateFormat()) flags += 4;
for (c = 0; c < frame.payload().length(); c++) if (frame.frameType() == QCanBusFrame::ErrorFrame) flags += 8;
uint64_t micros = QDateTime::currentMSecsSinceEpoch() * 1000ull;
for (int x = 0; x < 8; x++)
{ {
buffer[8 + c] = frame.payload()[c]; bytes.append(micros & 0xFF);
micros = micros / 256;
} }
buffer[8 + frame.payload().length()] = 0; bytes.append(flags);
bytes.append(frame.payload());
msg.setPayload(bytes);
mqttClient->publish(msg);
return true; return true;
} }