@@ -110,6 +110,15 @@ void NeoBattery::updateSysStatus() int capacity = getCapacity(); + // JM: Occasionally we get a glitch and capacity returns 0, which + // is an unlikely value, so we ignore it, otherwise we get a + // critical battery dialog + if(capacity == 0){ + qLog(PowerManagement) << __PRETTY_FUNCTION__ << "ignoring 0 capacity"; + return; + } + + //JM: now is charging returns the correct result, we just need to do this battery->setCharging(charging); battery->setCharge(capacity); devices/neo/server/neobattery.cpp @@ -79,7 +79,6 @@ bool NeoSuspend::suspend() bool NeoSuspend::wake() { - qLog(PowerManagement)<< __PRETTY_FUNCTION__; #ifdef Q_WS_QWS QWSServer::instance()->refresh(); #endif devices/neo/server/neosuspend.cpp @@ -38,7 +38,8 @@ static struct { { QObject::tr("Default Qt Extended"), 0, 0, 0 }, { QObject::tr("Wheel browser"), 0, 0, "Wheel" }, { QObject::tr("E1 example"), "E1", 0, 0 }, - { QObject::tr("E2 example"), "E2", 0, 0 } + { QObject::tr("E2 example"), "E2", 0, 0 }, + { QObject::tr("E3 example"), "E3", 0, 0 } }; ServerWidgetSettings::ServerWidgetSettings( QWidget* parent, Qt::WFlags fl ) src/settings/serverwidgets/serverwidgets.cpp 8e378ed921955f891961a25ddc6b7a12d3d57c98 Jim Morris morris@wolfman.com http://github.com/wolfmanjm/qtmoko/commit/1f82d64dddf16037a495925e9173e5647ce353e8 1f82d64dddf16037a495925e9173e5647ce353e8 2009-09-29T16:41:39-07:00 2009-09-29T16:41:39-07:00 Added E3 to server widgets demo Remove the debug statement in wake Fix neobattery to ignore a getCapacity return of 0 65fe458c0845c248d37b8214f72342b35f505a92 Jim Morris morris@wolfman.com