bugfixes

Author: matth-x

src/MicroOcpp.cpp

@@ -278,7 +278,7 @@ bool mo_setEnergyMeterInput2(MO_Context *ctx, unsigned int evseId, int32_t (*ene
     mInput.measurand = "Energy.Active.Import.Register";
     mInput.unit = "Wh";
     mInput.user_data = userData;
-    return mo_addMeterValueInput(ctx, EVSE_ID_1, mInput);
+    return mo_addMeterValueInput(ctx, evseId, mInput);
 }
 
 //Input of the power meter reading in W
@@ -297,7 +297,8 @@ bool mo_setPowerMeterInput2(MO_Context *ctx, unsigned int evseId, float (*powerI
     mInput.getFloat2 = powerInput2;
     mInput.measurand = "Power.Active.Import";
     mInput.unit = "W";
-    return mo_addMeterValueInput(ctx, EVSE_ID_1, mInput);
+    mInput.user_data = userData;
+    return mo_addMeterValueInput(ctx, evseId, mInput);
 }
 
 //Smart Charging Output

src/MicroOcpp/Model/Metering/MeteringService.cpp

@@ -661,10 +661,10 @@ std::unique_ptr<Request> v16::MeteringServiceEvse::fetchFrontRequest() {
         return nullptr;
     }
 
-    int32_t dtLastAttempt;
-    if (!clock.delta(clock.getUptime(), meterDataFront->attemptTime, dtLastAttempt)) {
+    int32_t dtLastAttempt = MO_MAX_TIME;
+    if (meterDataFront->attemptTime.isDefined() &&
+            !clock.delta(clock.getUptime(), meterDataFront->attemptTime, dtLastAttempt)) {
         MO_DBG_ERR("internal error");
-        dtLastAttempt = 0;
     }
 
     if (dtLastAttempt < (int)meterDataFront->attemptNr * std::max(0, mService.transactionMessageRetryIntervalInt->getInt())) {

src/MicroOcpp/Model/Transactions/TransactionService16.cpp

@@ -1191,10 +1191,10 @@ std::unique_ptr<Request> TransactionServiceEvse::fetchFrontRequest() {
                 return nullptr;
             }
 
-            int32_t dtLastAttempt;
-            if (!clock.delta(clock.now(), transactionFront->getStartSync().getAttemptTime(), dtLastAttempt)) {
+            int32_t dtLastAttempt = MO_MAX_TIME;
+            if (transactionFront->getStartSync().getAttemptTime().isDefined() &&
+                    !clock.delta(clock.now(), transactionFront->getStartSync().getAttemptTime(), dtLastAttempt)) {
                 MO_DBG_ERR("internal error");
-                dtLastAttempt = 0;
             }
 
             if (dtLastAttempt < (int)transactionFront->getStartSync().getAttemptNr() * std::max(0, cService.transactionMessageRetryIntervalInt->getInt())) {
@@ -1318,10 +1318,10 @@ std::unique_ptr<Request> TransactionServiceEvse::fetchFrontRequest() {
                 }
             }
 
-            int32_t dtLastAttempt;
-            if (!clock.delta(clock.now(), transactionFront->getStopSync().getAttemptTime(), dtLastAttempt)) {
+            int32_t dtLastAttempt = MO_MAX_TIME;
+            if (transactionFront->getStopSync().getAttemptTime().isDefined() &&
+                    !clock.delta(clock.now(), transactionFront->getStopSync().getAttemptTime(), dtLastAttempt)) {
                 MO_DBG_ERR("internal error");
-                dtLastAttempt = 0;
             }
 
             if (dtLastAttempt < (int)transactionFront->getStopSync().getAttemptNr() * std::max(0, cService.transactionMessageRetryIntervalInt->getInt())) {

src/MicroOcpp/Platform.h

@@ -28,7 +28,7 @@ uint32_t (*getDefaultRngCb())();
 
 #ifndef MO_MAX_JSON_CAPACITY
 #if MO_PLATFORM == MO_PLATFORM_UNIX
-#define MO_MAX_JSON_CAPACITY 5120
+#define MO_MAX_JSON_CAPACITY 8192
 #else
 #define MO_MAX_JSON_CAPACITY 4096
 #endif