Skip to content
Merged

sycn #149

Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,19 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [1.0.20](https://github.com/rdkcentral/devicesettings/compare/1.0.19...1.0.20)

- RDKEMW-7967: Adding retry logic for dsFPInit [`#144`](https://github.com/rdkcentral/devicesettings/pull/144)
- RDKEMW-6149: Implementation of IARM libds event notification APIs [`#121`](https://github.com/rdkcentral/devicesettings/pull/121)
- Merge tag '1.0.19' into develop [`07e4869`](https://github.com/rdkcentral/devicesettings/commit/07e486905ceda01173cd74ab46de5e40b0391577)

#### [1.0.19](https://github.com/rdkcentral/devicesettings/compare/1.0.18...1.0.19)

> 2 September 2025

- RDKEMW-7503: Volume level failed to persist post reboot (#119) [`#131`](https://github.com/rdkcentral/devicesettings/pull/131)
- RDKEMW-6595: Fix coverity issue in devicesettings [`#87`](https://github.com/rdkcentral/devicesettings/pull/87)
- 1.0.19 release change log updates [`4d4e4bf`](https://github.com/rdkcentral/devicesettings/commit/4d4e4bf96c7fcd4c1f3ea8307e06040bd0d4a3d1)
- Merge tag '1.0.18' into develop [`11fc3d8`](https://github.com/rdkcentral/devicesettings/commit/11fc3d8b43bb6120192c05087befdfa9e5d67059)

#### [1.0.18](https://github.com/rdkcentral/devicesettings/compare/1.0.17...1.0.18)
Expand Down Expand Up @@ -60,10 +69,16 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- 1.0.13 release change log updates [`46313cd`](https://github.com/rdkcentral/devicesettings/commit/46313cdef42716cfec368f6dd8a71508dd9773ba)
- RDKEMW-4128 Coverity Integration [`d6306c5`](https://github.com/rdkcentral/devicesettings/commit/d6306c5712f7212794cd29994dd1dda5091bf81d)

#### [1.0.12](https://github.com/rdkcentral/devicesettings/compare/1.0.12-hotfix.2...1.0.12)
#### [1.0.12](https://github.com/rdkcentral/devicesettings/compare/1.0.12-hotfix.3...1.0.12)

> 11 June 2025

#### [1.0.12-hotfix.3](https://github.com/rdkcentral/devicesettings/compare/1.0.12-hotfix.2...1.0.12-hotfix.3)

> 11 September 2025

- RDKEMW-7967: Adding retry logic for dsFPInit [`#144`](https://github.com/rdkcentral/devicesettings/pull/144)

#### [1.0.12-hotfix.2](https://github.com/rdkcentral/devicesettings/compare/1.0.12-hotfix.1...1.0.12-hotfix.2)

> 27 August 2025
Expand Down
26 changes: 23 additions & 3 deletions ds/frontPanelConfig.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:

Check failure on line 3 in ds/frontPanelConfig.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected

Source code with 'Apache-2.0' license found in local file 'ds/frontPanelConfig.cpp' (Match: rdk/components/generic/devicesettings/rdk/components/generic/devicesettings/2010, 392 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/devicesettings/+archive/RDK-DEV-2010.tar.gz, file: ds/frontPanelConfig.cpp)

Check failure on line 3 in ds/frontPanelConfig.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected

Source code with 'Apache-2.0' license found in local file 'ds/frontPanelConfig.cpp' (Match: rdk/components/generic/devicesettings/rdk/components/generic/devicesettings/2010, 392 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/devicesettings/+archive/RDK-DEV-2010.tar.gz, file: ds/frontPanelConfig.cpp)
*
* Copyright 2016 RDK Management
*
Expand Down Expand Up @@ -34,6 +34,7 @@


#include <iostream>
#include <unistd.h>
#include "dsError.h"
#include "dsUtl.h"
#include "frontPanelConfig.hpp"
Expand All @@ -54,8 +55,7 @@
*/
FrontPanelConfig::FrontPanelConfig()
{
dsFPInit();
load();
m_isFPInitialized = false;
}


Expand All @@ -68,6 +68,7 @@
FrontPanelConfig::~FrontPanelConfig()
{
//dsFPTerm();
m_isFPInitialized = false;
}


Expand All @@ -82,10 +83,29 @@
FrontPanelConfig & FrontPanelConfig::getInstance()
{
static FrontPanelConfig _singleton;
if (!_singleton.m_isFPInitialized)
{
dsError_t errorCode = dsERR_NONE;
unsigned int retryCount = 1;
do
{
errorCode = dsFPInit();
if (dsERR_NONE == errorCode)
{
_singleton.load();
_singleton.m_isFPInitialized = true;
INT_INFO("dsFPInit success\n");
}
else{
INT_ERROR("dsFPInit failed with error[%d]. Retrying... (%d/20)\n", errorCode, retryCount);
usleep(50000); // Sleep for 50ms before retrying
}
}
while ((!_singleton.m_isFPInitialized) && (retryCount++ < 20));
}
return _singleton;
}


/**
* @fn FrontPanelConfig::getIndicator(const string &name)
* @brief This API gets the FrontPanelndicator instance corresponding to the name parameter returned by the get supported frontpanel indicator device.
Expand Down
1 change: 1 addition & 0 deletions ds/include/frontPanelConfig.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class FrontPanelConfig {
std::vector<FrontPanelIndicator> _indicators; //!< Container to hold all the FrontPanelIndicator instances.
std::vector<FrontPanelTextDisplay> _textDisplays; //!< Container to hold all the FrontPanelTextDisplay instances.
std::vector<FrontPanelIndicator::Color> _colors; //!< Container to hold all the Color instances.
bool m_isFPInitialized;

FrontPanelConfig();
virtual ~FrontPanelConfig();
Expand Down
Loading