ETM-Schurig
/
powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix report 1xx parsing

master
Simon Stürz 2021-09-28 22:23:27 +02:00
parent 74f3174a7f
commit 71433ba2fa
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keba/integrationpluginkeba.cpp
View File

@ -483,7 +483,7 @@ void IntegrationPluginKeba::onReport1XXReceived(int reportNumber, const KeContac
qCDebug(dcKeba()) << " - Curr HW" << report.currHW;
qCDebug(dcKeba()) << " - Energy start" << report.startEnergy;
qCDebug(dcKeba()) << " - Energy present" << report.presentEnergy;
qCDebug(dcKeba()) << " - Start time" << report.startTime;
qCDebug(dcKeba()) << " - Start time" << report.startTime << QDateTime::fromMSecsSinceEpoch(report.startTime * 1000).toString();
qCDebug(dcKeba()) << " - End time" << report.endTime;
qCDebug(dcKeba()) << " - Stop reason" << report.stopReason;
qCDebug(dcKeba()) << " - RFID Tag" << report.rfidTag;

33
keba/integrationpluginkeba.json
View File

@ -92,7 +92,8 @@
"displayNameAction": "Set charging enabled",
"type": "bool",
"writable": true,
"defaultValue": false
"defaultValue": false,
"suggestLogging": true
},
{
"id": "e5631593-f486-47cb-9951-b7597d0b769b",
@ -133,7 +134,8 @@
"displayNameEvent": "Current changed",
"type": "double",
"unit": "Ampere",
"defaultValue": 0.00
"defaultValue": 0.00,
"suggestLogging": true
},
{
"id": "593656f0-babf-4308-8767-68f34e10fb15",
@ -146,7 +148,8 @@
"defaultValue": 6.0,
"minValue": 6.0,
"maxValue": 32.0,
"writable": true
"writable": true,
"suggestLogging": true
},
{
"id": "da0cfb97-0b27-4d8f-bdf7-45b1ca727038",
@ -159,7 +162,8 @@
"defaultValue": 6.0,
"minValue": 6.0,
"maxValue": 32.0,
"writable": true
"writable": true,
"suggestLogging": true
},
{
"id": "3c7b83a0-0e42-47bf-9788-dde6aab5ceea",
@ -170,7 +174,8 @@
"unit": "Percentage",
"defaultValue": 100,
"minValue": 0,
"maxValue": 100
"maxValue": 100,
"suggestLogging": true
},
{
"id": "08bb9872-8d63-49b0-a8ce-7a449341f13b",
@ -215,7 +220,8 @@
"displayNameEvent": "Current phase 1 changed",
"type": "double",
"unit": "Ampere",
"defaultValue": 0.00
"defaultValue": 0.00,
"suggestLogging": true
},
{
"id": "cdc7e10a-0d0a-4e93-ad2c-d34ffca45c97",
@ -224,7 +230,8 @@
"displayNameEvent": "Current phase 2 changed",
"type": "double",
"unit": "Ampere",
"defaultValue": 0.00
"defaultValue": 0.00,
"suggestLogging": true
},
{
"id": "da838dc8-85f0-4e55-b4b5-cb93a43b373d",
@ -233,7 +240,8 @@
"displayNameEvent": "Current phase 3 changed",
"type": "double",
"unit": "Ampere",
"defaultValue": 0.00
"defaultValue": 0.00,
"suggestLogging": true
},
{
"id": "7af9e93b-099d-4d9d-a480-9c0f66aecd8b",
@ -242,7 +250,8 @@
"displayNameEvent": "Power consumtion changed",
"type": "double",
"unit": "Watt",
"defaultValue": 0.00
"defaultValue": 0.00,
"suggestLogging": true
},
{
"id": "889c3c9a-96b4-4408-bd9a-d79e36ed9296",
@ -277,7 +286,8 @@
"displayNameEvent": "Session energy changed",
"type": "double",
"unit": "KiloWattHour",
"defaultValue": 0
"defaultValue": 0,
"suggestLogging": true
},
{
"id": "41e179b3-29a2-43ec-b537-023a527081e8",
@ -286,7 +296,8 @@
"displayNameEvent": "Total energy consumption changed",
"type": "double",
"unit": "KiloWattHour",
"defaultValue": 0
"defaultValue": 0,
"suggestLogging": true
},
{
"id": "96b2d176-6460-4109-8824-3af4679c6573",

8
keba/kecontact.cpp
View File

@ -540,11 +540,11 @@ void KeContact::onReceivedDatagram(const QHostAddress &address, const QByteArray
qCDebug(dcKeba()) << "Report" << id << "received";
report.sessionId = data.value("Session ID").toInt();
report.currHW = data.value("Curr HW").toInt();
report.startTime = data.value("E Start ").toInt()/10000.00;
report.presentEnergy = data.value("E Pres ").toInt()/10000.00;
report.startEnergy = data.value("E start").toInt() / 10000.00;
report.presentEnergy = data.value("E pres").toInt() / 10000.00;
report.startTime = data.value("started[s]").toInt();
report.endTime = data.value("ended[s] ").toInt();
report.stopReason = data.value("reason ").toInt();
report.endTime = data.value("ended[s]").toInt();
report.stopReason = data.value("reason").toInt();
report.rfidTag = data.value("RFID tag").toByteArray();
report.rfidClass = data.value("RFID class").toByteArray();
report.serialNumber = data.value("Serial").toString();