Skip to content

Commit

Permalink
corrected const std::string Get_Firmware_Title() in std:string...
Browse files Browse the repository at this point in the history
  • Loading branch information
Christoph Schultz committed Jan 1, 2024
1 parent 4de6e2c commit 1f808b0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
// Firmware title and version used to compare with remote version, to check if an update is needed.
// Title needs to be the same and version needs to be different --> downgrading is possible
#if THINGSBOARD_ENABLE_PROGMEM
constexpr char CURRENT_FIRMWARE_TITLE[] PROGMEM = "TEST";
const std::string CURRENT_FIRMWARE_TITLE PROGMEM = "TEST";
constexpr char CURRENT_FIRMWARE_VERSION[] PROGMEM = "1.0.0";
#else
constexpr char CURRENT_FIRMWARE_TITLE[] = "TEST";
const std::string CURRENT_FIRMWARE_TITLE = "TEST";
constexpr char CURRENT_FIRMWARE_VERSION[] = "1.0.0";
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/OTA_Update_Callback.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ OTA_Update_Callback::OTA_Update_Callback(progressFn progressCb, function endCb,c
void OTA_Update_Callback::Set_Progress_Callback(progressFn progressCb) {
m_progressCb = progressCb;
}
const std::string OTA_Update_Callback::Get_Firmware_Title() const {
std::string OTA_Update_Callback::Get_Firmware_Title() const {
return m_fwTitel;
}

Expand Down
2 changes: 1 addition & 1 deletion src/OTA_Update_Callback.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class OTA_Update_Callback : public Callback<void, const bool&> {
/// @brief Gets the current firmware title, used to decide if an OTA firmware update is already installed and therefore should not be downladed,
/// this is only done if the title of the update and the current firmware title are the same because if they are not then this firmware is meant for another device type
/// @return Current firmware title of the device
const std::string Get_Firmware_Title() const;
std::string Get_Firmware_Title() const;

/// @brief Sets the current firmware title, used to decide if an OTA firmware update is already installed and therefore should not be downladed,
/// this is only done if the title of the update and the current firmware title are the same because if they are not then this firmware is meant for another device type
Expand Down

0 comments on commit 1f808b0

Please sign in to comment.