|
[-]
[+]
|
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">fb2fd854d62b73314723abbc11680f97e14b93a2</param>
+ <param name="revision">2764b97094d83e057014019f5e94c49c1ee9bf17</param>
<param name="token"/>
<param name="debian"/>
<param name="dumb"/>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.4.tar.bz2/LICENSE
^
|
| @@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2014-2017 Kimmo Lindholm
+Copyright (c) 2014-2019 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
@@ -18,4 +18,4 @@
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+SOFTWARE.
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.4.tar.bz2/chargemon.pro
^
|
| @@ -1,7 +1,7 @@
#
# QtCreator project for harbour-chargemon, Charge Monitor
#
-# (C) 2014-2017 Kimmo Lindholm, LICENSE MIT
+# (C) 2014-2019 Kimmo Lindholm, LICENSE MIT
#
TARGET = harbour-chargemon
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.4.tar.bz2/qml/chargemon.qml
^
|
| @@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2017 Kimmo Lindholm
+ * Charge monitor (C) 2014-2019 Kimmo Lindholm
* LICENSE MIT
*/
import QtQuick 2.0
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.4.tar.bz2/qml/cover/CoverPage.qml
^
|
| @@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2017 Kimmo Lindholm
+ * Charge monitor (C) 2014-2019 Kimmo Lindholm
* LICENSE MIT
*/
import QtQuick 2.0
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.4.tar.bz2/qml/cover/oneaction.qml
^
|
| @@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2017 Kimmo Lindholm
+ * Charge monitor (C) 2014-2019 Kimmo Lindholm
* LICENSE MIT
*/
import QtQuick 2.0
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.4.tar.bz2/qml/cover/twoactions.qml
^
|
| @@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2017 Kimmo Lindholm
+ * Charge monitor (C) 2014-2019 Kimmo Lindholm
* LICENSE MIT
*/
import QtQuick 2.0
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.4.tar.bz2/qml/pages/AboutPage.qml
^
|
| @@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2017 Kimmo Lindholm
+ * Charge monitor (C) 2014-2019 Kimmo Lindholm
* LICENSE MIT
*/
import QtQuick 2.0
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.4.tar.bz2/qml/pages/Chargemon.qml
^
|
| @@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2017 Kimmo Lindholm
+ * Charge monitor (C) 2014-2019 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-2017",
+ "year": "2014-2019",
"name": "Charge monitor",
"imagelocation": "/usr/share/icons/hicolor/86x86/apps/harbour-chargemon.png"} )
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.4.tar.bz2/qml/pages/InfoPage.qml
^
|
| @@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2017 Kimmo Lindholm
+ * Charge monitor (C) 2014-2019 Kimmo Lindholm
* LICENSE MIT
*/
import QtQuick 2.0
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.4.tar.bz2/qml/pages/Messagebox.qml
^
|
| @@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2017 Kimmo Lindholm
+ * Charge monitor (C) 2014-2019 Kimmo Lindholm
* LICENSE MIT
*/
import QtQuick 2.0
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.4.tar.bz2/src/chargemon.cpp
^
|
| @@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2017 Kimmo Lindholm
+ * Charge monitor (C) 2014-2019 Kimmo Lindholm
* LICENSE MIT
*/
#ifdef QT_QML_DEBUG
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.4.tar.bz2/src/cmon.cpp
^
|
| @@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2017 Kimmo Lindholm
+ * Charge monitor (C) 2014-2019 Kimmo Lindholm
* LICENSE MIT
*/
#include <QCoreApplication>
@@ -95,7 +95,7 @@
printf("device name is %s\n", qPrintable(deviceName));
- if (outArgs.at(0).toString() == "JP-1301") /* The one and only original Jolla phone */
+ if (deviceName == "JP-1301") /* The one and only original Jolla phone */
{
generalValues.clear();
generalValues << "/sys/devices/platform/msm_ssbi.0/pm8038-core/pm8xxx-adc/dcin";
@@ -119,7 +119,7 @@
res = true;
}
- else if (outArgs.at(0).toString() == "JT-1501") /* The one and only original Jolla tablet */
+ else if (deviceName == "JT-1501") /* The one and only original Jolla tablet */
{
generalValues.clear();
generalValues << "";
@@ -143,7 +143,7 @@
res = true;
}
- else if (outArgs.at(0).toString() == "onyx") /* OneplusX */
+ else if (deviceName == "onyx") /* OneplusX */
{
generalValues.clear();
generalValues << "";
@@ -167,7 +167,7 @@
res = true;
}
- else if (outArgs.at(0).toString() == "fp2-sibon")
+ else if (deviceName == "fp2-sibon")
{
generalValues.clear();
generalValues << "";
@@ -191,9 +191,9 @@
res = true;
}
- else if ((outArgs.at(0).toString() == "JP-1601") || /* Jolla C */
- (outArgs.at(0).toString() == "Aqua Fish") || /* Aquafish */
- (outArgs.at(0).toString() == "L500D")) /* This is also Aquafish */
+ else if ((deviceName == "JP-1601") || /* Jolla C */
+ (deviceName == "Aqua Fish") || /* Aquafish */
+ (deviceName == "L500D")) /* This is also Aquafish */
{
generalValues.clear();
generalValues << "";
@@ -216,9 +216,9 @@
res = true;
}
- else if (outArgs.at(0).toString() == "f5121" || /* Sony Xperia X */
- outArgs.at(0).toString() == "f5122" || /* Sony Xperia X dual SIM */
- outArgs.at(0).toString() == "f5321") /* Sony Xperia X Compact */
+ else if (deviceName == "f5121" || /* Sony Xperia X */
+ deviceName == "f5122" || /* Sony Xperia X dual SIM */
+ deviceName == "f5321") /* Sony Xperia X Compact */
{
generalValues.clear();
generalValues << "";
@@ -242,7 +242,7 @@
res = true;
}
- else if (outArgs.at(0).toString() == "geminipda") /* Planet computers Gemini PDA */
+ else if (deviceName == "geminipda") /* Planet computers Gemini PDA */
{
generalValues.clear();
generalValues << "";
@@ -265,7 +265,7 @@
res = true;
}
- else if (outArgs.at(0).toString() == "vince" ) /* Xiaomi Redmi Note 5 / 5 Plus */
+ else if (deviceName == "vince" ) /* Xiaomi Redmi Note 5 / 5 Plus */
{
generalValues.clear();
generalValues << "";
@@ -289,6 +289,40 @@
res = true;
}
+ else if (deviceName == "h3113" || /* Sony Xperia XA2 Europe */
+ deviceName == "h3123" || /* Sony Xperia XA2 US/Canada Version */
+ deviceName == "h3133" || /* Sony Xperia XA2 International */
+ deviceName == "h4113" || /* Sony Xperia XA2 dual SIM Europe */
+ deviceName == "h4133" || /* Sony Xperia XA2 dual SIM International */
+ deviceName == "h3413" || /* Sony Xperia XA2 Plus */
+ deviceName == "h4413" || /* Sony Xperia XA2 Plus dual */
+ deviceName == "h3213" || /* Sony Xperia XA2 Ultra Europe */
+ deviceName == "h3223" || /* Sony Xperia XA2 Ultra US/Canada/Latin Version */
+ deviceName == "h4213" || /* Sony Xperia XA2 Ultra dual SIM Europe */
+ deviceName == "h4233" /* Sony Xperia XA2 Ultra dual SIM International */)
+ {
+ generalValues.clear();
+ generalValues << "";
+ generalValues << "/sys/devices/soc/*.qcom,spmi/spmi-0/spmi*/*qcom,qpnp-smb2/power_supply/usb/voltage_now";
+ generalValues << "/sys/devices/soc/*.qcom,spmi/spmi-0/spmi*/*qcom,qpnp-smb2/power_supply/battery/current_now";
+ generalValues << "/sys/devices/soc/*.qcom,spmi/spmi-0/spmi*/*qcom,qpnp-smb2/power_supply/battery/voltage_now";
+ generalValues << "/sys/devices/soc/*.qcom,spmi/spmi-0/spmi*/*qcom,qpnp-smb2/power_supply/battery/capacity";
+ generalValues << "/sys/devices/soc/*.qcom,spmi/spmi-0/spmi*/*qcom,qpnp-smb2/power_supply/battery/temp";
+
+ infoPageValues.clear();
+ infoPageValues << "/sys/devices/soc/*.qcom,spmi/spmi-0/spmi*/*qcom,qpnp-smb2/power_supply/battery/status";
+ infoPageValues << "/sys/devices/soc/*.qcom,spmi/spmi-0/spmi*/*qcom,qpnp-smb2/power_supply/battery/charge_type";
+ infoPageValues << "/sys/devices/soc/*.qcom,spmi/spmi-0/spmi*/*qcom,qpnp-smb2/power_supply/battery/health";
+ infoPageValues << "/sys/devices/soc/*.qcom,spmi/spmi-0/spmi*/*qcom,qpnp-smb2/power_supply/battery/technology";
+ infoPageValues << "/sys/devices/soc/*.qcom,spmi/spmi-0/spmi*/*qcom,qpnp-smb2/power_supply/usb/real_type";
+ infoPageValues << "/sys/devices/soc/*.qcom,spmi/spmi-0/spmi*/*qcom,qpnp-smb2/power_supply/usb/current_max";
+
+ infoPageRawValues.clear();
+ infoPageRawValues << "/sys/devices/soc/*.qcom,spmi/spmi-0/spmi*/*qpnp,fg/power_supply/bms/charge_full";
+ infoPageRawValues << "/sys/devices/soc/*.qcom,spmi/spmi-0/spmi*/*qpnp,fg/power_supply/bms/charge_full_design";
+
+ res = true;
+ }
glob(&generalValues);
glob(&infoPageValues);
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-chargemon-0.5.4.tar.bz2/src/cmon.h
^
|
| @@ -1,5 +1,5 @@
/*
- * Charge monitor (C) 2014-2017 Kimmo Lindholm
+ * Charge monitor (C) 2014-2019 Kimmo Lindholm
* LICENSE MIT
*/
#ifndef CMON_H
|
