Skip to content
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

Special handling for value 0 for certain variables #466

Merged
merged 2 commits into from
Feb 14, 2024
Merged

Special handling for value 0 for certain variables #466

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fe59cb
Allow value of 0 for AlignedDataInterval, SampledDataTxUpdatedInterva…
Pietfried Feb 13, 2024
5351323
clang format
Pietfried Feb 13, 2024
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
16 changes: 14 additions & 2 deletions lib/ocpp/v201/device_model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ namespace ocpp {

namespace v201 {

/// \brief For AlignedDataInterval, SampledDataTxUpdatedInterval and SampledDataTxEndedInterval, zero is allowed
static bool allow_zero(const Component& component, const Variable& variable) {
ComponentVariable component_variable = {component, std::nullopt, variable};
return component_variable == ControllerComponentVariables::AlignedDataInterval or
component_variable == ControllerComponentVariables::SampledDataTxUpdatedInterval or
component_variable == ControllerComponentVariables::SampledDataTxEndedInterval;
}

bool DeviceModel::component_criteria_match(const Component& component,
const std::vector<ComponentCriterionEnum>& component_criteria) {
if (component_criteria.empty()) {
Expand Down Expand Up @@ -46,7 +54,7 @@ bool DeviceModel::component_variables_match(const std::vector<ComponentVariable>
(component.instance == v.component.instance) and (variable == v.variable)); // B08.FR.23
}) != component_variables.end();
}
bool validate_value(const VariableCharacteristics& characteristics, const std::string& value) {
bool validate_value(const VariableCharacteristics& characteristics, const std::string& value, bool allow_zero) {
switch (characteristics.dataType) {
case DataEnum::string:
if (characteristics.minLimit.has_value() and value.size() < characteristics.minLimit.value()) {
Expand All @@ -61,6 +69,10 @@ bool validate_value(const VariableCharacteristics& characteristics, const std::s
return false;
}
float f = std::stof(value);

if (allow_zero and f == 0) {
return true;
}
if (characteristics.minLimit.has_value() and f < characteristics.minLimit.value()) {
return false;
}
Expand Down Expand Up @@ -165,7 +177,7 @@ SetVariableStatusEnum DeviceModel::set_value_internal(const Component& component

const auto characteristics = variable_map[variable].characteristics;
try {
if (!validate_value(characteristics, value)) {
if (!validate_value(characteristics, value, allow_zero(component, variable))) {
return SetVariableStatusEnum::Rejected;
}
} catch (const std::exception& e) {
Expand Down
Loading