[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:chargemon.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/kimmoli/chargemon.git</param>
<param name="branch">master</param>
- <param name="revision">cfd728b1c4626370d5feaa48a8f931aa754d7b59</param>
+ <param name="revision">fcdf90cf82716e68cae1f87bcff5a7bf2bf15ce5</param>
<param name="token"/>
<param name="debian"/>
<param name="dumb"/>
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.0.tar.bz2/LICENSE
^
|
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2014-2015 Kimmo Lindholm
+Copyright (c) 2014-2017 Kimmo Lindholm
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.0.tar.bz2/chargemon.pro
^
|
@@ -1,7 +1,7 @@
#
# QtCreator project for harbour-chargemon, Charge Monitor
#
-# (C) 2014-2015 Kimmo Lindholm, LICENSE MIT
+# (C) 2014-2017 Kimmo Lindholm, LICENSE MIT
#
TARGET = harbour-chargemon
@@ -13,6 +13,8 @@
message($${DEFINES})
+SAILFISHAPP_ICONS += 86x86 108x108 128x128 256x256
+
SOURCES += src/chargemon.cpp \
src/cmon.cpp
@@ -23,7 +25,10 @@
qml/pages/Chargemon.qml \
rpm/chargemon.spec \
harbour-chargemon.desktop \
- harbour-chargemon.png \
+ icons/108x108/harbour-chargemon.png \
+ icons/128x128/harbour-chargemon.png \
+ icons/256x256/harbour-chargemon.png \
+ icons/86x86/harbour-chargemon.png \
qml/pages/AboutPage.qml \
qml/cover/charger.png \
qml/cover/oneaction.qml \
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.0.tar.bz2/icons/86x86/harbour-chargemon.png
^
|
(renamed from harbour-chargemon.png)
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.0.tar.bz2/qml/chargemon.qml
^
|
@@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2015 Kimmo Lindholm
+ * Charge monitor (C) 2014-2017 Kimmo Lindholm
* LICENSE MIT
*/
import QtQuick 2.0
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.0.tar.bz2/qml/cover/CoverPage.qml
^
|
@@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2015 Kimmo Lindholm
+ * Charge monitor (C) 2014-2017 Kimmo Lindholm
* LICENSE MIT
*/
import QtQuick 2.0
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.0.tar.bz2/qml/cover/oneaction.qml
^
|
@@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2015 Kimmo Lindholm
+ * Charge monitor (C) 2014-2017 Kimmo Lindholm
* LICENSE MIT
*/
import QtQuick 2.0
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.0.tar.bz2/qml/cover/twoactions.qml
^
|
@@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2015 Kimmo Lindholm
+ * Charge monitor (C) 2014-2017 Kimmo Lindholm
* LICENSE MIT
*/
import QtQuick 2.0
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.0.tar.bz2/qml/pages/AboutPage.qml
^
|
@@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2015 Kimmo Lindholm
+ * Charge monitor (C) 2014-2017 Kimmo Lindholm
* LICENSE MIT
*/
import QtQuick 2.0
@@ -45,15 +45,15 @@
{
visible: imagelocation.length > 0
anchors.horizontalCenter: parent.horizontalCenter
- height: 120
- width: 120
+ height: Theme.iconSizeLauncher
+ width: Theme.iconSizeLauncher
color: "transparent"
Image
{
visible: imagelocation.length > 0
source: imagelocation
- anchors.centerIn: parent
+ anchors.fill: parent
}
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.0.tar.bz2/qml/pages/Chargemon.qml
^
|
@@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2015 Kimmo Lindholm
+ * Charge monitor (C) 2014-2017 Kimmo Lindholm
* LICENSE MIT
*/
import QtQuick 2.0
@@ -23,7 +23,7 @@
text: "About"
onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml"),
{ "version": cmon.version,
- "year": "2014",
+ "year": "2014-2017",
"name": "Charge monitor",
"imagelocation": "/usr/share/icons/hicolor/86x86/apps/harbour-chargemon.png"} )
}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.0.tar.bz2/qml/pages/InfoPage.qml
^
|
@@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2015 Kimmo Lindholm
+ * Charge monitor (C) 2014-2017 Kimmo Lindholm
* LICENSE MIT
*/
import QtQuick 2.0
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.0.tar.bz2/qml/pages/Messagebox.qml
^
|
@@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2015 Kimmo Lindholm
+ * Charge monitor (C) 2014-2017 Kimmo Lindholm
* LICENSE MIT
*/
import QtQuick 2.0
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.0.tar.bz2/src/chargemon.cpp
^
|
@@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2015 Kimmo Lindholm
+ * Charge monitor (C) 2014-2017 Kimmo Lindholm
* LICENSE MIT
*/
#ifdef QT_QML_DEBUG
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.0.tar.bz2/src/cmon.cpp
^
|
@@ -1,10 +1,11 @@
/*
- * Charge monitor (C) 2014-2015 Kimmo Lindholm
+ * Charge monitor (C) 2014-2017 Kimmo Lindholm
* LICENSE MIT
*/
#include <QCoreApplication>
#include <QRegExp>
#include <QFile>
+#include <QDir>
#include <QTextStream>
#include <QStringList>
#include <QStandardPaths>
@@ -123,22 +124,22 @@
generalValues.clear();
generalValues << "";
generalValues << "/sys/devices/msm_dwc3/power_supply/usb/voltage_now";
- generalValues << "/sys/devices/qpnp-charger-f6169000/power_supply/battery/current_now";
- generalValues << "/sys/devices/qpnp-charger-f6169000/power_supply/battery/voltage_now";
- generalValues << "/sys/devices/qpnp-charger-f6169000/power_supply/battery/capacity";
- generalValues << "/sys/devices/qpnp-charger-f6169000/power_supply/battery/temp";
+ generalValues << "/sys/devices/qpnp-charger-*/power_supply/battery/current_now";
+ generalValues << "/sys/devices/qpnp-charger-*/power_supply/battery/voltage_now";
+ generalValues << "/sys/devices/qpnp-charger-*/power_supply/battery/capacity";
+ generalValues << "/sys/devices/qpnp-charger-*/power_supply/battery/temp";
infoPageValues.clear();
- infoPageValues << "/sys/devices/qpnp-charger-f6169000/power_supply/battery/status";
- infoPageValues << "/sys/devices/qpnp-charger-f6169000/power_supply/battery/charge_type";
- infoPageValues << "/sys/devices/qpnp-charger-f6169000/power_supply/battery/health";
- infoPageValues << "/sys/devices/qpnp-charger-f6169000/power_supply/battery/technology";
- infoPageValues << "/sys/devices/qpnp-charger-f6169000/power_supply/qpnp-dc/type";
- infoPageValues << "/sys/devices/qpnp-charger-f6169000/power_supply/qpnp-dc/current_max";
+ infoPageValues << "/sys/devices/qpnp-charger-*/power_supply/battery/status";
+ infoPageValues << "/sys/devices/qpnp-charger-*/power_supply/battery/charge_type";
+ infoPageValues << "/sys/devices/qpnp-charger-*/power_supply/battery/health";
+ infoPageValues << "/sys/devices/qpnp-charger-*/power_supply/battery/technology";
+ infoPageValues << "/sys/devices/qpnp-charger-*/power_supply/qpnp-dc/type";
+ infoPageValues << "/sys/devices/qpnp-charger-*/power_supply/qpnp-dc/current_max";
infoPageRawValues.clear();
- infoPageRawValues << "/sys/devices/qpnp-charger-f6169000/power_supply/battery/charge_full";
- infoPageRawValues << "/sys/devices/qpnp-charger-f6169000/power_supply/battery/charge_full_design";
+ infoPageRawValues << "/sys/devices/qpnp-charger-*/power_supply/battery/charge_full";
+ infoPageRawValues << "/sys/devices/qpnp-charger-*/power_supply/battery/charge_full_design";
res = true;
}
@@ -146,23 +147,23 @@
{
generalValues.clear();
generalValues << "";
- generalValues << "/sys/devices/qpnp-charger-f6274800/power_supply/battery/subsystem/usb/voltage_now";
- generalValues << "/sys/devices/qpnp-charger-f6274800/power_supply/battery/current_now";
- generalValues << "/sys/devices/qpnp-charger-f6274800/power_supply/battery/voltage_now";
- generalValues << "/sys/devices/qpnp-charger-f6274800/power_supply/battery/capacity";
- generalValues << "/sys/devices/qpnp-charger-f6274800/power_supply/battery/temp";
+ generalValues << "/sys/devices/qpnp-charger-*/power_supply/battery/subsystem/usb/voltage_now";
+ generalValues << "/sys/devices/qpnp-charger-*/power_supply/battery/current_now";
+ generalValues << "/sys/devices/qpnp-charger-*/power_supply/battery/voltage_now";
+ generalValues << "/sys/devices/qpnp-charger-*/power_supply/battery/capacity";
+ generalValues << "/sys/devices/qpnp-charger-*/power_supply/battery/temp";
infoPageValues.clear();
- infoPageValues << "/sys/devices/qpnp-charger-f6274800/power_supply/battery/status";
- infoPageValues << "/sys/devices/qpnp-charger-f6274800/power_supply/battery/charge_type";
- infoPageValues << "/sys/devices/qpnp-charger-f6274800/power_supply/battery/health";
- infoPageValues << "/sys/devices/qpnp-charger-f6274800/power_supply/battery/technology";
- infoPageValues << "/sys/devices/qpnp-charger-f6274800/power_supply/qpnp-dc/type";
- infoPageValues << "/sys/devices/qpnp-charger-f6274800/power_supply/qpnp-dc/current_max";
+ infoPageValues << "/sys/devices/qpnp-charger-*/power_supply/battery/status";
+ infoPageValues << "/sys/devices/qpnp-charger-*/power_supply/battery/charge_type";
+ infoPageValues << "/sys/devices/qpnp-charger-*/power_supply/battery/health";
+ infoPageValues << "/sys/devices/qpnp-charger-*/power_supply/battery/technology";
+ infoPageValues << "/sys/devices/qpnp-charger-*/power_supply/qpnp-dc/type";
+ infoPageValues << "/sys/devices/qpnp-charger-*/power_supply/qpnp-dc/current_max";
infoPageRawValues.clear();
- infoPageRawValues << "/sys/devices/qpnp-charger-f6274800/power_supply/battery/charge_full";
- infoPageRawValues << "/sys/devices/qpnp-charger-f6274800/power_supply/battery/charge_full_design";
+ infoPageRawValues << "/sys/devices/qpnp-charger-*/power_supply/battery/charge_full";
+ infoPageRawValues << "/sys/devices/qpnp-charger-*/power_supply/battery/charge_full_design";
res = true;
}
@@ -172,25 +173,30 @@
{
generalValues.clear();
generalValues << "";
- generalValues << "/sys/devices/soc.0/qpnp-vadc-f4bc9a00/usb_in";
- generalValues << "/sys/devices/soc.0/qpnp-linear-charger-f4bca200/power_supply/battery/current_now";
- generalValues << "/sys/devices/soc.0/qpnp-linear-charger-f4bca200/power_supply/battery/voltage_now";
- generalValues << "/sys/devices/soc.0/qpnp-linear-charger-f4bca200/power_supply/battery/capacity";
- generalValues << "/sys/devices/soc.0/qpnp-linear-charger-f4bca200/power_supply/battery/temp";
+ generalValues << "/sys/devices/soc.0/qpnp-vadc-*/usb_in";
+ generalValues << "/sys/devices/soc.0/qpnp-linear-charger-*/power_supply/battery/current_now";
+ generalValues << "/sys/devices/soc.0/qpnp-linear-charger-*/power_supply/battery/voltage_now";
+ generalValues << "/sys/devices/soc.0/qpnp-linear-charger-*/power_supply/battery/capacity";
+ generalValues << "/sys/devices/soc.0/qpnp-linear-charger-*/power_supply/battery/temp";
infoPageValues.clear();
- infoPageValues << "/sys/devices/soc.0/qpnp-linear-charger-f4bca200/power_supply/battery/status";
- infoPageValues << "/sys/devices/soc.0/qpnp-linear-charger-f4bca200/power_supply/battery/charge_type";
+ infoPageValues << "/sys/devices/soc.0/qpnp-linear-charger-*/power_supply/battery/status";
+ infoPageValues << "/sys/devices/soc.0/qpnp-linear-charger-*/power_supply/battery/charge_type";
infoPageValues << "/sys/devices/soc.0/qpnp-linear-charger-f4bca200/power_supply/battery/health";
- infoPageValues << "/sys/devices/soc.0/qpnp-vm-bms-f4bca600/power_supply/bms/battery_type";
- infoPageValues << "/sys/devices/soc.0/78d9000.usb/power_supply/usb/type";
- infoPageValues << "/sys/devices/soc.0/78d9000.usb/power_supply/usb/current_max";
+ infoPageValues << "/sys/devices/soc.0/qpnp-vm-bms-*/power_supply/bms/battery_type";
+ infoPageValues << "/sys/devices/soc.0/*.usb/power_supply/usb/type";
+ infoPageValues << "/sys/devices/soc.0/*.usb/power_supply/usb/current_max";
infoPageRawValues.clear();
/* charge_full, charge_full_design not available on Jolla C */
res = true;
}
+
+ glob(&generalValues);
+ glob(&infoPageValues);
+ glob(&infoPageRawValues);
+
return res;
}
@@ -386,3 +392,36 @@
m_coverStatus = args.at(0).toInt();
emit coverStatusChanged();
}
+
+void Cmon::glob(QStringList *files)
+{
+ /* If the file paths contains wildcards, try to resolve them */
+ int i,j;
+
+ for (i=0; i < files->size(); i++)
+ {
+ if (files->at(i).contains("*"))
+ {
+ QStringList s = files->at(i).split("/");
+
+ for (j=0; j<s.size(); j++)
+ {
+ if (s.at(j).contains("*"))
+ {
+ QStringList filters;
+ filters << s.at(j);
+
+ QDir dir(s.mid(0,j).join("/"));
+
+ QStringList dirs = dir.entryList(filters, QDir::Dirs);
+
+ if (dirs.size() > 0)
+ {
+ s.replace(j, dirs.at(0));
+ files->replace(i, s.join("/"));
+ }
+ }
+ }
+ }
+ }
+}
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.0.tar.bz2/src/cmon.h
^
|
@@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2015 Kimmo Lindholm
+ * Charge monitor (C) 2014-2017 Kimmo Lindholm
* LICENSE MIT
*/
#ifndef CMON_H
@@ -67,6 +67,7 @@
void thisDeviceIsNotSupported();
private:
+ void glob(QStringList *files);
QString readOneLineFromFile(QString name);
float m_dcinvoltage;
float m_usbinvoltage;
|