funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2025-12-12 17:58:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

declare battery files in settings

Browse Source 
Signed-off-by: Vincent-FK <vincent.buso@funkey-project.com>
This commit is contained in:
Vincent-FK 2020-02-22 12:31:00 +01:00
parent 86f7d7e5b2
commit 785449ec2a
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
RetroFE/Source/Graphics/Component/Battery.cpp
View File

@ -2,6 +2,7 @@
#include "../ViewInfo.h" #include "../ViewInfo.h"
#include "../../SDL.h" #include "../../SDL.h"
#include "../../Utility/Log.h" #include "../../Utility/Log.h"
#include "../../Database/Configuration.h"
#include <SDL/SDL_image.h> #include <SDL/SDL_image.h>
@ -75,14 +76,10 @@ static uint32_t noBatIcon [NOBAT_ICON_HEIGHT][NOBAT_ICON_WIDTH] = {
{0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}; {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
/* TODO: this should be in config */ /*Default value, reset with config*/
static std::string fileUsbConnected = "/sys/class/power_supply/axp20x-usb/present"; std::string Battery::fileUsbConnected_ = "/sys/class/power_supply/axp20x-usb/present";
static std::string fileBatConnected = "/sys/class/power_supply/axp20x-battery/present"; std::string Battery::fileBatConnected_ = "/sys/class/power_supply/axp20x-battery/present";
static std::string fileBatCapacity = "/sys/class/power_supply/axp20x-battery/capacity"; std::string Battery::fileBatCapacity_ = "/sys/class/power_supply/axp20x-battery/capacity";
/*static std::string fileUsbConnected = "/home/vincent/Workspace/axp20x-usb_present";
static std::string fileBatConnected = "/home/vincent/Workspace/axp20x-battery_present";
static std::string fileBatCapacity = "/home/vincent/Workspace/axp20x-battery_capacity";*/
int Battery::percentage_ = 0; int Battery::percentage_ = 0;
int Battery::prevPercentage_ = 0; int Battery::prevPercentage_ = 0;
@ -94,8 +91,9 @@ float Battery::currentWaitTime_ = 0.0f;
bool Battery::mustRender_ = false; bool Battery::mustRender_ = false;
Battery::Battery(Page &p, float scaleX, float scaleY, float reloadPeriod, SDL_Color fontColor) Battery::Battery(Page &p, Configuration &config, float reloadPeriod, SDL_Color fontColor, float scaleX, float scaleY)
: Component(p) : Component(p)
, config_(config)
, texture_(NULL) , texture_(NULL)
, texture_prescaled_(NULL) , texture_prescaled_(NULL)
, reloadPeriod_(reloadPeriod) , reloadPeriod_(reloadPeriod)
@ -104,6 +102,16 @@ Battery::Battery(Page &p, float scaleX, float scaleY, float reloadPeriod, SDL_Co
, fontColor_(0xff000000 | ((uint32_t)fontColor.b) << 16 | ((uint32_t)fontColor.g) << 8 | ((uint32_t)fontColor.r)) , fontColor_(0xff000000 | ((uint32_t)fontColor.b) << 16 | ((uint32_t)fontColor.g) << 8 | ((uint32_t)fontColor.r))
{ {
allocateGraphicsMemory(); allocateGraphicsMemory();
if( config_.propertyExists( "fileUsbConnected" ) ){
config_.getProperty( "fileUsbConnected", fileUsbConnected_ );
}
if( config_.propertyExists( "fileBatConnected" ) ){
config_.getProperty( "fileBatConnected", fileBatConnected_ );
}
if( config_.propertyExists( "fileBatCapacity" ) ){
config_.getProperty( "fileBatCapacity", fileBatCapacity_ );
}
} }
Battery::~Battery() Battery::~Battery()
@ -295,7 +303,7 @@ int Battery::readFileValue(std::string file){
bool Battery::isBatConnected(){ bool Battery::isBatConnected(){
int res = readFileValue(fileBatConnected); int res = readFileValue(fileBatConnected_);
//printf("%s: %d \n", __func__, res); //printf("%s: %d \n", __func__, res);
return (res==1)?true:false; return (res==1)?true:false;
@ -303,7 +311,7 @@ bool Battery::isBatConnected(){
bool Battery::isUsbConnected(){ bool Battery::isUsbConnected(){
int res = readFileValue(fileUsbConnected); int res = readFileValue(fileUsbConnected_);
//printf("%s: %d \n", __func__, res); //printf("%s: %d \n", __func__, res);
return (res==1)?true:false; return (res==1)?true:false;
@ -311,7 +319,7 @@ bool Battery::isUsbConnected(){
int Battery::getBatPercent(){ int Battery::getBatPercent(){
int res = readFileValue(fileBatCapacity); int res = readFileValue(fileBatCapacity_);
//printf("%s: %d \n", __func__, res); //printf("%s: %d \n", __func__, res);
return res; return res;

7
RetroFE/Source/Graphics/Component/Battery.h
View File

@ -7,7 +7,7 @@
class Battery : public Component class Battery : public Component
{ {
public: public:
Battery(Page &p, float scaleX, float scaleY, float reloadPeriod, SDL_Color fontColor); Battery(Page &p, Configuration &config, float reloadPeriod, SDL_Color fontColor, float scaleX, float scaleY);
virtual ~Battery(); virtual ~Battery();
void freeGraphicsMemory(); void freeGraphicsMemory();
void allocateGraphicsMemory(); void allocateGraphicsMemory();
@ -24,6 +24,7 @@ protected:
void drawNoBattery(); void drawNoBattery();
int readFileValue(std::string file); int readFileValue(std::string file);
Configuration &config_;
SDL_Surface *texture_; SDL_Surface *texture_;
SDL_Surface *texture_prescaled_; SDL_Surface *texture_prescaled_;
uint32_t fontColor_; uint32_t fontColor_;
@ -31,6 +32,10 @@ protected:
float scaleY_; float scaleY_;
float reloadPeriod_; float reloadPeriod_;
static std::string fileUsbConnected_;
static std::string fileBatConnected_;
static std::string fileBatCapacity_;
static float currentWaitTime_; static float currentWaitTime_;
static bool mustRender_; static bool mustRender_;
static int percentage_; static int percentage_;

2
RetroFE/Source/Graphics/PageBuilder.cpp
View File

@ -418,7 +418,7 @@ bool PageBuilder::buildComponents(xml_node<> *layout, Page *page)
fontColor.r = intColor & 0xFF; fontColor.r = intColor & 0xFF;
} }
Battery *c = new Battery(*page, scaleX_, scaleY_, reloadPeriod, fontColor); Battery *c = new Battery(*page, config_, reloadPeriod, fontColor, scaleX_, scaleY_);
buildViewInfo(componentXml, c->baseViewInfo); buildViewInfo(componentXml, c->baseViewInfo);
loadTweens(c, componentXml); loadTweens(c, componentXml);
page->addComponent(c); page->addComponent(c);