437: Fix delay in bootnotification

Signed-off-by: Maaike Zijderveld, Alfen <[email protected]>
EVerest · Feb 1, 2024 · b6992cd · b6992cd
1 parent d3971bd
commit b6992cd
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/lib/ocpp/v201/charge_point.cpp b/lib/ocpp/v201/charge_point.cpp
@@ -1870,6 +1870,13 @@ void ChargePoint::handle_boot_notification_response(CallResult<BootNotificationR
     this->registration_status = msg.status;
 
     if (this->registration_status == RegistrationStatusEnum::Accepted) {
+        // B01.FR.06 Only use boot timestamp if TimeSource contains Heartbeat
+        if (this->callbacks.time_sync_callback.has_value() &&
+            this->device_model->get_value<std::string>(ControllerComponentVariables::TimeSource).find("Heartbeat") !=
+                std::string::npos) {
+            this->callbacks.time_sync_callback.value()(msg.currentTime);
+        }
+
         this->remove_network_connection_profiles_below_actual_security_profile();
 
         // get transaction messages from db (if there are any) so they can be sent again.
@@ -1881,12 +1888,6 @@ void ChargePoint::handle_boot_notification_response(CallResult<BootNotificationR
         }
         this->init_certificate_expiration_check_timers();
         this->update_aligned_data_interval();
-        // B01.FR.06 Only use boot timestamp if TimeSource contains Heartbeat
-        if (this->callbacks.time_sync_callback.has_value() &&
-            this->device_model->get_value<std::string>(ControllerComponentVariables::TimeSource).find("Heartbeat") !=
-                std::string::npos) {
-            this->callbacks.time_sync_callback.value()(msg.currentTime);
-        }
         this->component_state_manager->send_status_notification_all_connectors();
 
         if (this->bootreason == BootReasonEnum::RemoteReset) {