summaryrefslogtreecommitdiff
authorzecke <zecke>2005-11-28 20:47:57 (UTC)
committer zecke <zecke>2005-11-28 20:47:57 (UTC)
commit252a5a6c477ee0b394b34dce5f77265006ae2010 (patch) (side-by-side diff)
tree40e77d6f37873555c0cda0622e888e447f26c198
parent6ed0ea6196d210847c041dfd1229b4f2db71b152 (diff)
downloadopie-252a5a6c477ee0b394b34dce5f77265006ae2010.zip
opie-252a5a6c477ee0b394b34dce5f77265006ae2010.tar.gz
opie-252a5a6c477ee0b394b34dce5f77265006ae2010.tar.bz2
Opie Battery Applet for h19??:
Patch by Pawel Kolodziejski (thank you once again) to make this applet work with the specific iPAQ model. It uses a 2.6kernel and there is no iPAQ specific prof file anymore, I think this device is not even capable of having a sleeve.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/batteryapplet/batterystatus.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index 34043f4..08ddc85 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -1,78 +1,79 @@
#include "batterystatus.h"
/* OPIE */
#include <opie2/odevice.h>
#include <qpe/power.h>
/* QT */
#include <qpushbutton.h>
#include <qdrawutil.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qmessagebox.h>
using namespace Opie::Core;
BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent, WFlags f )
: QFrame( parent, 0, f), ps(p), bat2(false) {
UpdateBatteryStatus();
}
BatteryStatus::~BatteryStatus() {}
void BatteryStatus::UpdateBatteryStatus() {
jackPercent = 0;
if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
- getProcApmStatusIpaq();
+ if ( ODevice::inst ( ) -> model() != Model_iPAQ_H191x )
+ getProcApmStatusIpaq();
}
percent = ps->batteryPercentRemaining();
}
/*
* Make use of the advanced apm interface of the ipaq
*/
bool BatteryStatus::getProcApmStatusIpaq() {
bat2 = false;
QFile procApmIpaq("/proc/hal/battery");
if (procApmIpaq.open(IO_ReadOnly) ) {
QStringList list;
// since it is /proc we _must_ use QTextStream
QTextStream stream ( &procApmIpaq);
QString streamIn;
streamIn = stream.read();
list = QStringList::split("\n", streamIn);
sec2 = sec1 = "";
for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) {
// not nice, need a rewrite later
if( (*line).startsWith(" Percentage") ) {
if (bat2 == true) {
perc2 = (*line).mid(((*line).find('(')) +1,(*line).find(')')-(*line).find('(')-2);
} else {
perc1 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2);
}
} else if( (*line).startsWith(" Life") ) {
if (bat2 == true) {
sec2 = (*line).mid(((*line).find(':')+2), 5 );
} else {
sec1 = (*line).mid(((*line).find(':')+2), 5 );
}
} else if( (*line).startsWith("Battery #1") ) {
bat2 = true;
} else if( (*line).startsWith(" Status") ) {
if (bat2 == true) {
jackStatus = (*line).mid((*line).find('(')+1, (*line).find(')')-(*line).find('(')-1);
} else {
ipaqStatus = (*line).mid((*line).find('(')+1, (*line).find(')')-(*line).find('(')-1);
}
} else if( (*line).startsWith(" Chemistry") ) {
if (bat2 == true) {
jackChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1);