Skip to content

Commit 867be98

Browse files
c-jimenezc-jimenez
authored
Merge pull request #114 from mahdidadashi65/develop_dadashi
some problems solved for pass test cases
2 parents 5273718 + efd5272 commit 867be98

File tree

5 files changed

+66
-35
lines changed

5 files changed

+66
-35
lines changed

‎src/chargepoint/authent/AuthentLocalList.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ bool AuthentLocalList::handleMessage(const ocpp::messages::SendLocalListReq& req
124124
// Check local list activation
125125
if (m_ocpp_config.localAuthListEnabled())
126126
{
127-
if (request.listVersion > 0)
127+
if (request.listVersion >= 0)
128128
{
129129
// Check update list size
130130
if (request.localAuthorizationList.size() <= m_ocpp_config.sendLocalListMaxLength())

‎src/chargepoint/maintenance/MaintenanceManager.cpp‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -586,9 +586,9 @@ void MaintenanceManager::processGetDiagnostics(std::string
586586
if (!success)
587587
{
588588
// Next retry
589-
nb_retries--;
590-
if (nb_retries != 0)
589+
if (nb_retries > 0)
591590
{
591+
nb_retries--;
592592
LOG_WARNING << "GetDiagnostics : upload failed (" << nb_retries << " retrie(s) left - next retry in "
593593
<< retry_interval_s.count() << "s)";
594594
std::this_thread::sleep_for(retry_interval_s);
@@ -635,10 +635,12 @@ void MaintenanceManager::processUpdateFirmware(std::string
635635
ocpp::types::Optional<unsigned int> retry_interval,
636636
ocpp::types::DateTime retrieve_date)
637637
{
638+
639+
LOG_INFO << "UpdateFirmware : Waiting until retrieve date:"<<retrieve_date.timestamp()<<" DateTime::now():"<<DateTime::now();
640+
638641
// Check retrieve date
639642
if (retrieve_date > DateTime::now())
640643
{
641-
LOG_INFO << "UpdateFirmware : Waiting until retrieve date";
642644
std::this_thread::sleep_until(std::chrono::system_clock::from_time_t(retrieve_date.timestamp()));
643645
}
644646

@@ -667,9 +669,10 @@ void MaintenanceManager::processUpdateFirmware(std::string
667669
if (!success)
668670
{
669671
// Next retry
670-
nb_retries--;
671-
if (nb_retries != 0)
672+
673+
if (nb_retries > 0)
672674
{
675+
nb_retries--;
673676
LOG_WARNING << "FirmwareUpdate : download failed (" << nb_retries << " retrie(s) left - next retry in "
674677
<< retry_interval_s.count() << "s)";
675678
std::this_thread::sleep_for(retry_interval_s);
@@ -766,10 +769,10 @@ void MaintenanceManager::processGetLog(ocpp::types::LogEnumType type,
766769
success = m_events_handler.uploadFile(local_log_file, url);
767770
if (!success)
768771
{
769-
// Next retry
770-
nb_retries--;
771-
if (nb_retries != 0)
772+
// Next retry
773+
if (nb_retries > 0)
772774
{
775+
nb_retries--;
773776
LOG_WARNING << "GetLog : upload failed (" << nb_retries << " retrie(s) left - next retry in " << retry_interval_s.count()
774777
<< "s)";
775778
std::this_thread::sleep_for(retry_interval_s);
@@ -854,10 +857,10 @@ void MaintenanceManager::processSignedUpdateFirmware(std::string
854857
success = m_events_handler.downloadFile(location, local_firmware_file);
855858
if (!success)
856859
{
857-
// Next retry
858-
nb_retries--;
859-
if (nb_retries != 0)
860+
// Next retry
861+
if (nb_retries > 0)
860862
{
863+
nb_retries--;
861864
LOG_WARNING << "SignedUpdateFirmware : download failed (" << nb_retries << " retrie(s) left - next retry in "
862865
<< retry_interval_s.count() << "s)";
863866
std::this_thread::sleep_for(retry_interval_s);

‎src/chargepoint/metervalues/MeterValuesManager.cpp‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,23 @@ void MeterValuesManager::getTxStopMeterValues(unsigned int connector_id, std::ve
188188
bool MeterValuesManager::onTriggerMessage(ocpp::types::MessageTrigger message, const ocpp::types::Optional<unsigned int>& connector_id)
189189
{
190190
bool ret = false;
191-
if (connector_id.isSet() && (message == MessageTrigger::MeterValues))
191+
192+
if (message == MessageTrigger::MeterValues)
192193
{
193-
processTriggered(connector_id);
194-
ret = true;
194+
if (connector_id.isSet())
195+
{
196+
processTriggered(connector_id);
197+
ret = true;
198+
}
199+
else
200+
{
201+
for (const Connector* connector : m_connectors.getConnectors())
202+
{
203+
unsigned int id = connector->id;
204+
processTriggered(id);
205+
}
206+
ret = true;
207+
}
195208
}
196209
return ret;
197210
}
@@ -201,12 +214,25 @@ bool MeterValuesManager::onTriggerMessage(ocpp::types::MessageTriggerEnumType
201214
const ocpp::types::Optional<unsigned int>& connector_id)
202215
{
203216
bool ret = false;
204-
if (connector_id.isSet() && (message == MessageTriggerEnumType::MeterValues))
217+
if (message == MessageTriggerEnumType::MeterValues)
205218
{
206-
processTriggered(connector_id);
207-
ret = true;
219+
if (connector_id.isSet())
220+
{
221+
processTriggered(connector_id);
222+
ret = true;
223+
}
224+
else
225+
{
226+
for (const Connector* connector : m_connectors.getConnectors())
227+
{
228+
unsigned int id = connector->id;
229+
processTriggered(id);
230+
}
231+
ret = true;
232+
}
208233
}
209234
return ret;
235+
210236
}
211237

212238
/** @copydoc void IConfigChangedListener::configurationValueChanged(const std::string&) */

‎src/chargepoint/trigger/TriggerMessageManager.cpp‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,14 @@ bool TriggerMessageManager::handleMessage(const ocpp::messages::TriggerMessageRe
8585
}
8686
else
8787
{
88-
// Check connector id
89-
if (!request.connectorId.isSet() || m_connectors.isValid(request.connectorId))
88+
// Check invalid connector id
89+
if (request.connectorId.isSet() && !m_connectors.isValid(request.connectorId))
90+
{
91+
error_code = ocpp::rpc::IRpc::RPC_ERROR_PROPERTY_CONSTRAINT_VIOLATION;
92+
error_message = "Invalid connector id";
93+
response.status = TriggerMessageStatus::Rejected;
94+
}
95+
else
9096
{
9197
// Call handler
9298
if (it->second->onTriggerMessage(request.requestedMessage, request.connectorId))
@@ -100,11 +106,6 @@ bool TriggerMessageManager::handleMessage(const ocpp::messages::TriggerMessageRe
100106
LOG_WARNING << "Trigger message rejected : " << trigger_message;
101107
}
102108
}
103-
else
104-
{
105-
error_code = ocpp::rpc::IRpc::RPC_ERROR_PROPERTY_CONSTRAINT_VIOLATION;
106-
error_message = "Invalid connector id";
107-
}
108109
}
109110

110111
return ret;
@@ -136,26 +137,27 @@ bool TriggerMessageManager::handleMessage(const ocpp::messages::ExtendedTriggerM
136137
}
137138
else
138139
{
139-
// Check connector id
140-
if (!request.connectorId.isSet() || m_connectors.isValid(request.connectorId))
140+
// Check invalid connector id
141+
if (request.connectorId.isSet() && !m_connectors.isValid(request.connectorId))
142+
{
143+
error_code = ocpp::rpc::IRpc::RPC_ERROR_PROPERTY_CONSTRAINT_VIOLATION;
144+
error_message = "Invalid connector id";
145+
response.status = TriggerMessageStatusEnumType::Rejected;
146+
}
147+
else
141148
{
142149
// Call handler
143150
if (it->second->onTriggerMessage(request.requestedMessage, request.connectorId))
144151
{
145152
response.status = TriggerMessageStatusEnumType::Accepted;
146-
LOG_INFO << "Extended trigger message accepted : " << trigger_message;
153+
LOG_INFO << "Trigger message accepted : " << trigger_message;
147154
}
148155
else
149156
{
150157
response.status = TriggerMessageStatusEnumType::Rejected;
151-
LOG_WARNING << "Extended trigger message rejected : " << trigger_message;
158+
LOG_WARNING << "Trigger message rejected : " << trigger_message;
152159
}
153160
}
154-
else
155-
{
156-
error_code = ocpp::rpc::IRpc::RPC_ERROR_PROPERTY_CONSTRAINT_VIOLATION;
157-
error_message = "Invalid connector id";
158-
}
159161
}
160162

161163
return ret;

‎tests/stubs/ChargePointEventsHandlerStub.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ bool ChargePointEventsHandlerStub::getLocalLimitationsSchedule(unsigned int
170170
/** @copydoc bool IChargePointEventsHandler::resetRequested(ocpp::types::ResetType) */
171171
bool ChargePointEventsHandlerStub::resetRequested(ocpp::types::ResetType reset_type)
172172
{
173-
m_calls["transactionDeAuthorized"] = {{"reset_type", ResetTypeHelper.toString(reset_type)}};
173+
m_calls["resetRequested"] = {{"reset_type", ResetTypeHelper.toString(reset_type)}};
174174
return callResult("resetRequested");
175175
}
176176

0 commit comments

Comments
 (0)