Skip to content

feat(event-handler): Add const parameter url to updateFirmwareRequested #256

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat(event-handler): Add const parameter url to updateFirmwareRequested #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions examples/ocpp16/common/DefaultChargePointEventsHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,10 @@ std::string DefaultChargePointEventsHandler::getDiagnostics(const ocpp::types::O
return diag_file;
}

/** @copydoc std::string IChargePointEventsHandler::updateFirmwareRequested() */
std::string DefaultChargePointEventsHandler::updateFirmwareRequested()
/** @copydoc std::string IChargePointEventsHandler::updateFirmwareRequested(const std::string&) */
std::string DefaultChargePointEventsHandler::updateFirmwareRequested(const std::string& url)
{
cout << "Firmware update requested" << endl;
cout << "Firmware update requested from: " << url << endl;
return "/tmp/firmware.tar.gz";
}

Expand Down
4 changes: 2 additions & 2 deletions examples/ocpp16/common/DefaultChargePointEventsHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ class DefaultChargePointEventsHandler : public ocpp::chargepoint::IChargePointEv
std::string getDiagnostics(const ocpp::types::Optional<ocpp::types::DateTime>& start_time,
const ocpp::types::Optional<ocpp::types::DateTime>& stop_time) override;

/** @copydoc std::string IChargePointEventsHandler::updateFirmwareRequested() */
std::string updateFirmwareRequested() override;
/** @copydoc std::string IChargePointEventsHandler::updateFirmwareRequested(const std::string&) */
std::string updateFirmwareRequested(const std::string& url) override;

/** @copydoc void IChargePointEventsHandler::installFirmware() */
void installFirmware(const std::string& firmware_file) override;
Expand Down
3 changes: 2 additions & 1 deletion src/ocpp16/chargepoint/interface/IChargePointEventsHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,10 @@ class IChargePointEventsHandler

/**
* @brief Called on an update firmware request
* @param url URL from where to download the file
* @return Path where to download the firmware
*/
virtual std::string updateFirmwareRequested() = 0;
virtual std::string updateFirmwareRequested(const std::string& url) = 0;

/**
* @brief Called when a firmware is ready to be installed
Expand Down
4 changes: 2 additions & 2 deletions src/ocpp16/chargepoint/maintenance/MaintenanceManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ void MaintenanceManager::processUpdateFirmware(std::string
}

// Notify start of download
std::string local_firmware_file = m_events_handler.updateFirmwareRequested();
std::string local_firmware_file = m_events_handler.updateFirmwareRequested(location);
m_firmware_status = FirmwareStatus::Downloading;
sendFirmwareStatusNotification();

Expand Down Expand Up @@ -857,7 +857,7 @@ void MaintenanceManager::processSignedUpdateFirmware(std::string
}

// Notify start of download
std::string local_firmware_file = m_events_handler.updateFirmwareRequested();
std::string local_firmware_file = m_events_handler.updateFirmwareRequested(location);
m_signed_firmware_status = FirmwareStatusEnumType::Downloading;
sendSignedFirmwareStatusNotification();

Expand Down
3 changes: 2 additions & 1 deletion tests/deploy/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,9 +717,10 @@ class ChargePointEventsHandler : public IChargePointEventsHandler

/**
* @brief Called on an update firmware request
* @param url URL from where to download the file
* @return Path where to download the firmware
*/
std::string updateFirmwareRequested() override { return ""; }
std::string updateFirmwareRequested(const std::string& url) override { return ""; }

/**
* @brief Called when a firmware is ready to be installed
Expand Down
6 changes: 3 additions & 3 deletions tests/stubs/ChargePointEventsHandlerStub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,10 @@ std::string ChargePointEventsHandlerStub::getDiagnostics(const ocpp::types::Opti
return m_diag_file;
}

/** @copydoc std::string IChargePointEventsHandler::updateFirmwareRequested() */
std::string ChargePointEventsHandlerStub::updateFirmwareRequested()
/** @copydoc std::string IChargePointEventsHandler::updateFirmwareRequested(const std::string&) */
std::string ChargePointEventsHandlerStub::updateFirmwareRequested(const std::string& url)
{
m_calls["updateFirmwareRequested"] = {{}};
m_calls["updateFirmwareRequested"] = {{"url", url}};
return m_diag_file;
}

Expand Down
4 changes: 2 additions & 2 deletions tests/stubs/ChargePointEventsHandlerStub.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ class ChargePointEventsHandlerStub : public ocpp::chargepoint::IChargePointEvent
std::string getDiagnostics(const ocpp::types::Optional<ocpp::types::DateTime>& start_time,
const ocpp::types::Optional<ocpp::types::DateTime>& stop_time) override;

/** @copydoc std::string IChargePointEventsHandler::updateFirmwareRequested() */
std::string updateFirmwareRequested() override;
/** @copydoc std::string IChargePointEventsHandler::updateFirmwareRequested(const std::string&) */
std::string updateFirmwareRequested(const std::string& url) override;

/** @copydoc void IChargePointEventsHandler::installFirmware() */
void installFirmware(const std::string& firmware_file) override;
Expand Down