alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-04 10:51:12 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

interfaces: Removed isConfigured() from IModuleStaus

Browse Source 
Signed-off-by: Henry Bruce <henry.bruce@intel.com>
Signed-off-by: Abhishek Malik <abhishek.malik@intel.com>
This commit is contained in:
Henry Bruce
2016-01-21 16:25:49 -08:00
committed by Abhishek Malik
parent f268437cd5
commit 9bc3d2ded0
23 changed files with 132 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/hlg150h/hlg150h.cxx
View File

@ -19,7 +19,7 @@ HLG150H::HLG150H(int pinRelay, int pinPWM)
UPM_THROW("pwm init failed");
status = pwmBrightness->enable(true);
status = pwmBrightness->period_us(PWM_PERIOD);
if (!isConfigured())
if (status != mraa::SUCCESS)
UPM_THROW("pwm config failed.");
dutyPercent = getBrightness();
isPoweredShadow = dutyPercent > 10;
@ -30,12 +30,6 @@ HLG150H::~HLG150H()
delete pwmBrightness;
}
bool HLG150H::isConfigured()
{
return status == mraa::SUCCESS;
}
void HLG150H::setPowerOn()
{
isPoweredShadow = true;
@ -68,14 +62,11 @@ void HLG150H::setBrightness(int dutyPercent)
{
if (dutyPercent < 10)
dutyPercent = 10;
if (isConfigured())
{
int dutyUs = (PWM_PERIOD * dutyPercent) / 100;
dutyUs = PWM_PERIOD - dutyUs;
status = pwmBrightness->pulsewidth_us(dutyUs);
// std::cout << "Brightness = " << dutyPercent << "%, duty = " << dutyUs << "us" << std::endl;
}
else
int dutyUs = (PWM_PERIOD * dutyPercent) / 100;
dutyUs = PWM_PERIOD - dutyUs;
status = pwmBrightness->pulsewidth_us(dutyUs);
// std::cout << "Brightness = " << dutyPercent << "%, duty = " << dutyUs << "us" << std::endl;
if (status != mraa::SUCCESS)
UPM_THROW("setBrightness failed");
}
@ -83,14 +74,9 @@ void HLG150H::setBrightness(int dutyPercent)
int HLG150H::getBrightness()
{
if (isConfigured())
{
float duty = pwmBrightness->read();
int dutyPercent = static_cast<int>(100.0 * (1.0 - duty) + 0.5);
return dutyPercent;
}
else
UPM_THROW("getBrightness failed");
float duty = pwmBrightness->read();
int dutyPercent = static_cast<int>(100.0 * (1.0 - duty) + 0.5);
return dutyPercent;
}

3
src/hlg150h/hlg150h.h
View File

@ -58,8 +58,7 @@ public:
~HLG150H();
protected:
bool isConfigured();
const char* getModuleName() { return "hlg150h"; }
const char* getModuleName() { return "hlg150h"; }
void setPowerOn();
void setPowerOff();
bool isPowered();