Review comments / formatting.

Signed-off-by: Maaike Zijderveld, iolar <git.mail@iolar.nl>

Author: maaikez

include/ocpp/v201/ctrlr_component_variables.hpp

@@ -15,7 +15,7 @@ namespace v201 {
 ///
 struct RequiredComponentVariable : ComponentVariable {
     /// \brief Constructor
-    RequiredComponentVariable() : required_for({OcppProtocolVersion::v201, OcppProtocolVersion::v21}) {};
+    RequiredComponentVariable() : required_for({OcppProtocolVersion::v201, OcppProtocolVersion::v21}){};
 
     ///
     /// \brief RequiredComponentVariable
@@ -27,7 +27,7 @@ struct RequiredComponentVariable : ComponentVariable {
     RequiredComponentVariable(const Component component, const std::optional<Variable> variable,
                               const std::optional<CustomData> custom_data = std::nullopt,
                               const std::set<OcppProtocolVersion>& required_for = {OcppProtocolVersion::v201,
-                                                                                  OcppProtocolVersion::v21}) :
+                                                                                   OcppProtocolVersion::v21}) :
         ComponentVariable(), required_for(required_for) {
         this->component = component;
         this->variable = variable;

lib/ocpp/v201/charge_point.cpp

@@ -806,6 +806,10 @@ void ChargePoint::message_callback(const std::string& message) {
         EVLOG_error << "Exception during handling of message: " << e.what();
         auto call_error = CallError(enhanced_message.uniqueId, "FormationViolation", e.what(), json({}));
         this->message_dispatcher->dispatch_call_error(call_error);
+    } catch (const DeviceModelError& e) {
+        EVLOG_error << "DeviceModelError during handling of message: " << e.what();
+        auto call_error = CallError(enhanced_message.uniqueId, "GenericError", e.what(), json({}));
+        this->message_dispatcher->dispatch_call_error(call_error);
     } catch (json::exception& e) {
         EVLOG_error << "JSON exception during handling of message: " << e.what();
         if (json_message.is_array() and json_message.size() > MESSAGE_ID) {

lib/ocpp/v201/functional_blocks/transaction.cpp

@@ -284,7 +284,8 @@ void TransactionBlock::handle_transaction_event_response(const EnhancedMessage<M
     }
 
     if (tariff_and_cost != nullptr) {
-        this->tariff_and_cost->handle_cost_and_tariff(call_result.msg, original_msg, message.message[CALLRESULT_PAYLOAD]);
+        this->tariff_and_cost->handle_cost_and_tariff(call_result.msg, original_msg,
+                                                      message.message[CALLRESULT_PAYLOAD]);
     }
 
     if (original_msg.eventType == TransactionEventEnum::Ended) {

tests/lib/ocpp/v201/test_device_model.cpp

@@ -23,7 +23,8 @@ class DeviceModelTest : public ::testing::Test {
     }
 };
 
-/// \brief Test if value can be changed. And test if setting a value of 0 is allowed for a value that is allowed to be 0.
+/// \brief Test if value can be changed. And test if setting a value of 0 is allowed for a value that is allowed to be
+/// 0.
 TEST_F(DeviceModelTest, test_set_value_and_allow_zero) {
     // default value is 900
     auto r = dm->get_value<int>(cv, ocpp::v201::AttributeEnum::Actual);