Changement du timestamp pour ms since EPOCH.
V1.04 déployée sur site
This commit is contained in:
@@ -6,17 +6,6 @@ CCANDataLogger::CCANDataLogger():
|
||||
{
|
||||
mMQTTCLient = 0;
|
||||
mCANMsgList.clear();
|
||||
|
||||
CCANMessage toto;
|
||||
toto.mCANMsgID = 234;
|
||||
CCANSignal test;
|
||||
test.mSignalName = "TOTORO";
|
||||
toto.mSignalsList.append(test);
|
||||
|
||||
CCANMessage Bleh;
|
||||
Bleh = toto;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -142,8 +131,17 @@ CMQTTMessage CCANDataLogger::GetMQTTMessage(CCANMessage *Msg, bool Format )
|
||||
|
||||
|
||||
#ifdef MQTT_TIMESTAMP_IN_PAYLOAD
|
||||
QString TimeStamp = QDateTime::currentDateTime().toString(Qt::ISODate);
|
||||
MsgPayload.append(QString("\"timestamp\":\"%1\",").arg(TimeStamp));
|
||||
|
||||
//Millisecs to EPOCH timestamp format
|
||||
qint64 TimeStamp = QDateTime::currentDateTime().toMSecsSinceEpoch();
|
||||
MsgPayload.append(QString("\"timestamp\":%1,").arg(TimeStamp));
|
||||
|
||||
//ISO date timestamp format
|
||||
// QDateTime datetime(QDateTime::currentDateTime());
|
||||
//// datetime.setOffsetFromUtc(datetime.offsetFromUtc()); //this makes no sense but it's to circumvent a bug in QT
|
||||
// QString TimeStamp = datetime.toString(Qt::ISODate);
|
||||
// MsgPayload.append(QString("\"timestamp\":\"%1\",").arg(TimeStamp));
|
||||
|
||||
if(Format == true)
|
||||
{
|
||||
MsgPayload.append("\n");
|
||||
|
||||
@@ -22,7 +22,7 @@ CMainWindow::CMainWindow(QWidget *parent) :
|
||||
ui(new Ui::CMainWindow)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
QMainWindow::statusBar()->showMessage("V1.03");
|
||||
QMainWindow::statusBar()->showMessage("V1.04");
|
||||
|
||||
mGeneralStatusPage = new CGeneralStatusPage(this);
|
||||
mMainWindowWidget = new QTabWidget(this);
|
||||
|
||||
Reference in New Issue
Block a user