Date:2012-06-15 00:13:02 (11 years 9 months ago)
Author:Paul Cercueil
Commit:d6621584e326de9782c1f49e15c074d79310f774
Message:Removed last bits of the "backlight" feature.

Files: src/gmenu2x.cpp (4 diffs)
src/gmenu2x.h (2 diffs)

Change Details

src/gmenu2x.cpp
243243
244244void GMenu2X::init() {
245245    batteryHandle = 0;
246    backlightHandle = 0;
247246    usbHandle = 0;
248247    acHandle = 0;
249248
250249    batteryHandle = fopen("/sys/class/power_supply/battery/capacity", "r");
251250    usbHandle = fopen("/sys/class/power_supply/usb/online", "r");
252251    acHandle = fopen("/sys/class/power_supply/ac/online", "r");
253#if defined(PLATFORM_NANONOTE)
254    backlightHandle = fopen("/sys/class/lcd/ili8960-lcd/contrast", "w+");
255#elif defined(PLATFORM_DINGUX)
256    backlightHandle = fopen("/sys/class/backlight/pwm-backlight/brightness", "w+");
257#endif
258252}
259253
260254void GMenu2X::deinit() {
261255    if (batteryHandle) fclose(batteryHandle);
262    if (backlightHandle) fclose(backlightHandle);
263256    if (usbHandle) fclose(usbHandle);
264257    if (acHandle) fclose(acHandle);
265258}
...... 
652645    }
653646}
654647
655void GMenu2X::setBacklight(int val)
656{
657    if (backlightHandle) {
658        fprintf(backlightHandle, "%d", (val * 255) / 100);
659        fflush(backlightHandle);
660        rewind(backlightHandle);
661    }
662}
663
664int GMenu2X::getBackLight()
665{
666    int val = 255;
667    if (backlightHandle) {
668        fscanf(backlightHandle, "%d", &val);
669        rewind(backlightHandle);
670        val = (val * 100) / 255;
671        if (val < 0) val = 0; else if (val > 100) val = 100;
672    }
673    return val;
674}
675
676648void GMenu2X::main() {
677649    uint linksPerPage = linkColumns*linkRows;
678650    int linkSpacingX = (resX-10 - linkColumns*skinConfInt["linkWidth"])/linkColumns;
...... 
904876
905877void GMenu2X::options() {
906878    int curMenuClock = confInt["menuClock"];
907    int oldBacklight = getBackLight();
908    int newBacklight = oldBacklight;
909879    bool showRootFolder = fileExists(CARD_ROOT);
910880
911881    FileLister fl_tr(getHome() + "/translations");
...... 
926896    sd.addSetting(new MenuSettingInt(this, ts, tr["Clock for GMenu2X"], tr["Set the cpu working frequency when running GMenu2X"], &confInt["menuClock"], cpuFreqMin, cpuFreqSafeMax, cpuFreqMultiple));
927897    sd.addSetting(new MenuSettingInt(this, ts, tr["Maximum overclock"], tr["Set the maximum overclock for launching links"], &confInt["maxClock"], cpuFreqMin, cpuFreqMax, cpuFreqMultiple));
928898    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"]));
929    sd.addSetting(new MenuSettingInt(this, ts, tr["Lcd Backlight"], tr["Set Lcd Backlight value (default: 100)"], &newBacklight, 5, 100));
930899    sd.addSetting(new MenuSettingInt(this, ts, tr["Screen Timeout"], tr["Set screen's backlight timeout in seconds"], &confInt["backlightTimeout"], 0, 120));
931900// sd.addSetting(new MenuSettingMultiString(this, ts, tr["Tv-Out encoding"], tr["Encoding of the tv-out signal"], &confStr["tvoutEncoding"], &encodings));
932901    sd.addSetting(new MenuSettingBool(this, ts, tr["Show root"], tr["Show root folder in the file selection dialogs"], &showRootFolder));
933902
934903    if (sd.exec() && sd.edited()) {
935        if (newBacklight != oldBacklight) setBacklight(newBacklight);
936904        if (curMenuClock != confInt["menuClock"]) setClock(confInt["menuClock"]);
937905
938906        if (confInt["backlightTimeout"] == 0) {
src/gmenu2x.h
8585    @return A number representing battery charge. 0 means fully discharged. 5 means fully charged. 6 represents a gp2x using AC power.
8686    */
8787    unsigned short getBatteryLevel();
88    FILE* batteryHandle, *backlightHandle, *usbHandle, *acHandle;
88    FILE* batteryHandle, *usbHandle, *acHandle;
8989    void browsePath(const std::string &path, std::vector<std::string>* directories, std::vector<std::string>* files);
9090    /*!
9191    Starts the scanning of the nand and sd filesystems, searching for dge and gpu files and creating the links in 2 dedicated sections.
...... 
173173
174174    void setClock(unsigned mhz);
175175
176    void setBacklight(int val);
177    int getBackLight();
178
179176    void setInputSpeed();
180177
181178    void writeConfig();

Archive Download the corresponding diff file



interactive