qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-12-24 20:14:35 +02:00
Code

Removed last bits of the "backlight" feature.

Browse Source
This commit is contained in:
Paul Cercueil 2012-06-15 00:13:02 +02:00
parent 21fee6ccd1
commit d6621584e3
2 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/gmenu2x.cpp
View File

@ -243,23 +243,16 @@ void GMenu2X::initCPULimits() {
void GMenu2X::init() {
batteryHandle = 0;
backlightHandle = 0;
usbHandle = 0;
acHandle = 0;
batteryHandle = fopen("/sys/class/power_supply/battery/capacity", "r");
usbHandle = fopen("/sys/class/power_supply/usb/online", "r");
acHandle = fopen("/sys/class/power_supply/ac/online", "r");
#if defined(PLATFORM_NANONOTE)
backlightHandle = fopen("/sys/class/lcd/ili8960-lcd/contrast", "w+");
#elif defined(PLATFORM_DINGUX)
backlightHandle = fopen("/sys/class/backlight/pwm-backlight/brightness", "w+");
#endif
}
void GMenu2X::deinit() {
if (batteryHandle) fclose(batteryHandle);
if (backlightHandle) fclose(backlightHandle);
if (usbHandle) fclose(usbHandle);
if (acHandle) fclose(acHandle);
}
@ -652,27 +645,6 @@ void GMenu2X::writeTmp(int selelem, const string &selectordir) {
}
}
void GMenu2X::setBacklight(int val)
{
if (backlightHandle) {
fprintf(backlightHandle, "%d", (val * 255) / 100);
fflush(backlightHandle);
rewind(backlightHandle);
}
}
int GMenu2X::getBackLight()
{
int val = 255;
if (backlightHandle) {
fscanf(backlightHandle, "%d", &val);
rewind(backlightHandle);
val = (val * 100) / 255;
if (val < 0) val = 0; else if (val > 100) val = 100;
}
return val;
}
void GMenu2X::main() {
uint linksPerPage = linkColumns*linkRows;
int linkSpacingX = (resX-10 - linkColumns*skinConfInt["linkWidth"])/linkColumns;
@ -904,8 +876,6 @@ void GMenu2X::explorer() {
void GMenu2X::options() {
int curMenuClock = confInt["menuClock"];
int oldBacklight = getBackLight();
int newBacklight = oldBacklight;
bool showRootFolder = fileExists(CARD_ROOT);
FileLister fl_tr(getHome() + "/translations");
@ -926,13 +896,11 @@ void GMenu2X::options() {
sd.addSetting(new MenuSettingInt(this, ts, tr["Clock for GMenu2X"], tr["Set the cpu working frequency when running GMenu2X"], &confInt["menuClock"], cpuFreqMin, cpuFreqSafeMax, cpuFreqMultiple));
sd.addSetting(new MenuSettingInt(this, ts, tr["Maximum overclock"], tr["Set the maximum overclock for launching links"], &confInt["maxClock"], cpuFreqMin, cpuFreqMax, cpuFreqMultiple));
sd.addSetting(new MenuSettingBool(this, ts, tr["Output logs"], tr["Logs the output of the links. Use the Log Viewer to read them."], &confInt["outputLogs"]));
sd.addSetting(new MenuSettingInt(this, ts, tr["Lcd Backlight"], tr["Set Lcd Backlight value (default: 100)"], &newBacklight, 5, 100));
sd.addSetting(new MenuSettingInt(this, ts, tr["Screen Timeout"], tr["Set screen's backlight timeout in seconds"], &confInt["backlightTimeout"], 0, 120));
// sd.addSetting(new MenuSettingMultiString(this, ts, tr["Tv-Out encoding"], tr["Encoding of the tv-out signal"], &confStr["tvoutEncoding"], &encodings));
sd.addSetting(new MenuSettingBool(this, ts, tr["Show root"], tr["Show root folder in the file selection dialogs"], &showRootFolder));
if (sd.exec() && sd.edited()) {
if (newBacklight != oldBacklight) setBacklight(newBacklight);
if (curMenuClock != confInt["menuClock"]) setClock(confInt["menuClock"]);
if (confInt["backlightTimeout"] == 0) {

5
src/gmenu2x.h
View File

@ -85,7 +85,7 @@ private:
@return A number representing battery charge. 0 means fully discharged. 5 means fully charged. 6 represents a gp2x using AC power.
*/
unsigned short getBatteryLevel();
FILE* batteryHandle, *backlightHandle, *usbHandle, *acHandle;
FILE* batteryHandle, *usbHandle, *acHandle;
void browsePath(const std::string &path, std::vector<std::string>* directories, std::vector<std::string>* files);
/*!
Starts the scanning of the nand and sd filesystems, searching for dge and gpu files and creating the links in 2 dedicated sections.
@ -173,9 +173,6 @@ public:
void setClock(unsigned mhz);
void setBacklight(int val);
int getBackLight();
void setInputSpeed();
void writeConfig();