Skip to content

Develop dadashi #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Develop dadashi #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86cd451
Update OcppConfig.cpp
mahdidadashi65 Jul 3, 2023
accd195
Update DefaultChargePointEventsHandler.cpp
mahdidadashi65 Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 6 additions & 14 deletions examples/common/DefaultChargePointEventsHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,24 +168,16 @@ bool DefaultChargePointEventsHandler::remoteStartTransactionRequested(unsigned i
{
bool ret = false;
cout << "Remote start transaction : " << connector_id << " - " << id_tag << endl;
if (connector_id != 0)

if(connector_id > m_config.ocppConfig().numberOfConnectors() || connector_id == 0)
{
m_remote_start_pending[connector_id - 1u] = true;
m_remote_start_id_tag[connector_id - 1u] = id_tag;
ret = true;
ret=false;
}
else
{
for (size_t i = 1; i <= m_config.ocppConfig().numberOfConnectors(); i++)
{
if (m_chargepoint->getConnectorStatus(i) < ChargePointStatus::Charging)
{
m_remote_start_pending[i - 1u] = true;
m_remote_start_id_tag[i - 1u] = id_tag;
ret = true;
break;
}
}
m_remote_start_pending[connector_id - 1u] = true;
m_remote_start_id_tag[connector_id - 1u] = id_tag;
ret=true;
}
return ret;
}
Expand Down
22 changes: 10 additions & 12 deletions examples/common/config/OcppConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,18 +197,16 @@ ocpp::types::ConfigurationStatus OcppConfig::setConfiguration(const std::string&
{
if ((it->second & PARAM_WRITE) != 0)
{
std::size_t key_is_interval = key.find("Interval");
if (key_is_interval != std::string::npos)
{
std::size_t value_is_negative = key.find("-");
if (value_is_negative)
{
ret = ConfigurationStatus::Rejected;
}
}
if (key.find("Interval") != std::string::npos)
{
if (value.find("-") != std::string::npos)
{
ret = ConfigurationStatus::Rejected;
}
}

if (ret != ConfigurationStatus::Rejected)
{
if (ret != ConfigurationStatus::Rejected)
{
if ((it->second & PARAM_OCPP) != 0)
{
m_config.set(OCPP_PARAMS, key, value);
Expand All @@ -225,7 +223,7 @@ ocpp::types::ConfigurationStatus OcppConfig::setConfiguration(const std::string&
{
ret = ConfigurationStatus::Accepted;
}
}
}
}
else
{
Expand Down