File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 3434 with :
3535 repository : matth-x/MicroOcppSimulator
3636 path : MicroOcppSimulator
37- ref : 643743d4bb7ca267e710114bb8a8c0396196384f
37+ ref : 741733550b801d29261f81c3b7fb74bfc0b6faec
3838 submodules : ' recursive'
3939 - name : Clean MicroOcpp submodule
4040 run : |
Original file line number Diff line number Diff line change @@ -242,14 +242,15 @@ TransactionEventData::ChargingState TransactionServiceEvse::getChargingState() {
242242 auto res = TransactionEventData::ChargingState::Idle;
243243 if (connectorPluggedInput && !connectorPluggedInput (evseId, connectorPluggedInputUserData)) {
244244 res = TransactionEventData::ChargingState::Idle;
245- } else if (!transaction || !transaction->isAuthorizationActive || !transaction->isAuthorized ) {
245+ } else if (!transaction || !transaction->isAuthorizationActive || !transaction->isAuthorized ||
246+ (evseReadyInput && !evseReadyInput (evseId, evseReadyInputUserData))) {
246247 res = TransactionEventData::ChargingState::EVConnected;
247- } else if (evseReadyInput && !evseReadyInput (evseId, evseReadyInputUserData)) {
248- res = TransactionEventData::ChargingState::SuspendedEVSE;
249248 } else if (evReadyInput && !evReadyInput (evseId, evReadyInputUserData)) {
250249 res = TransactionEventData::ChargingState::SuspendedEV;
251250 } else if (ocppPermitsCharge ()) {
252251 res = TransactionEventData::ChargingState::Charging;
252+ } else {
253+ res = TransactionEventData::ChargingState::SuspendedEVSE;
253254 }
254255 return res;
255256}
Original file line number Diff line number Diff line change @@ -245,7 +245,7 @@ bool VariableContainerOwning::commit() {
245245
246246 JsonArray variablesJson = doc.createNestedArray (" variables" );
247247
248- for (size_t i = 0 ; i < variableCapacity ; i++) {
248+ for (size_t i = 0 ; i < variables. size () ; i++) {
249249 auto & variable = *variables[i];
250250
251251 if (!variable.isPersistent ()) {
You can’t perform that action at this time.
0 commit comments