Merge branch 'master' into hrm-enable

.github/workflows/sailfishos.yml

@@ -0,0 +1,38 @@
+name: SailfishOS Build
+
+on: [push, pull_request]
+
+env:
+  OS_VERSION: 4.5.0.16
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Build App
+    strategy:
+      matrix:
+        arch: ['armv7hl', 'aarch64', 'i486']
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+    - name: Prepare
+      run: docker pull coderus/sailfishos-platform-sdk:$OS_VERSION && mkdir output
+
+    - name: Build ${{ matrix.arch }}
+      run: docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$OS_VERSION /bin/bash -c "
+            mkdir -p build ;
+            cd build ;
+            cp -r /share/* . ;
+            sb2 -t SailfishOS-$OS_VERSION-${{ matrix.arch }} -R zypper --non-interactive ar --no-gpgcheck http://repo.merproject.org/obs/home:/piggz:/kf5/sailfish_latest_${{ matrix.arch }}/ piggz ;
+            sb2 -t SailfishOS-$OS_VERSION-${{ matrix.arch }} -R zypper --non-interactive refresh ;
+            sb2 -t SailfishOS-$OS_VERSION-${{ matrix.arch }} -R zypper --non-interactive in -y mpris-qt5-devel libkf5archive-devel kcoreaddons-devel kdb-devel libKDb3-3 mkcal-qt5-devel libicu-devel pulseaudio-devel;
+            mb2 -t SailfishOS-$OS_VERSION-${{ matrix.arch }} build ;
+            sudo cp -r RPMS/*.rpm /share/output"
+
+    - name: Upload RPM (${{ matrix.arch }})
+      uses: actions/upload-artifact@v3
+      with:
+        name: rpm-${{ matrix.arch }}
+        path: output

click/manifest.json.in

@@ -9,7 +9,7 @@
             "desktop":  "harbour-amazfish-ui.desktop"
         }
     },
-    "version": "2.1.3",
+    "version": "2.2.2",
     "maintainer": "Adam Pigg <adam@piggz.co.uk>",
     "framework" : "ubuntu-sdk-20.04"
 }

clickable.yaml

@@ -22,6 +22,7 @@ dependencies_target:
 - libkf5archive-dev
 - libkf5coreaddons-dev
 - libdbus-1-dev
+- libtelepathy-qt5-dev
 
 libraries:
   qtmpris:

daemon/daemon.pro

@@ -16,7 +16,7 @@ LIBS += -Lqble/qble -L$$OUT_PWD/../lib -lamazfish -lz
 PKGCONFIG += dbus-1
 PKGCONFIG += icu-uc icu-io icu-i18n # transliteration
 QT +=  positioning KDb3 network dbus KArchive
-CONFIG += c++17
+CONFIG += c++17 c++1z
 
 equals(FLAVOR, "silica") {
     CONFIG += flavor_silica
@@ -33,10 +33,16 @@ equals(FLAVOR, "silica") {
 flavor_silica {
     message(SailfishOS daemon build)
     DEFINES += MER_EDITION_SAILFISH
-    LIBS += -lkeepalive
+    LIBS += -lkeepalive -lpulse-simple
     CONFIG += sailfishapp
     CONFIG += link_pkgconfig
-    PKGCONFIG += mlite5
+    PKGCONFIG += mlite5 libpulse
+    WATCHFISH_FEATURES += music \
+                      voicecall \
+                      notificationmonitor \
+                      calendar
+} else:flavor_uuitk {
+    DEFINES += UUITK_EDITION
     WATCHFISH_FEATURES += music \
                       voicecall \
                       notificationmonitor \
@@ -74,6 +80,9 @@ systemd_services.path = $$PREFIX/lib/systemd/user/
 systemd_services.files = $$OUT_PWD/harbour-amazfish.service
 systemd_services.CONFIG += no_check_exist
 
+chirp.path = $$PREFIX/share/harbour-amazfish/
+chirp.files = chirp.raw
+
 #Install appropriate files for each system
 flavor_silica {
     systemd_services.commands =  cp $$PWD/harbour-amazfish-sailfish.service.in $$OUT_PWD/harbour-amazfish.service
@@ -88,18 +97,21 @@ flavor_silica {
 }
 
 INSTALLS += target \
-            systemd_services
+            systemd_services \
+            chirp
 
 include(libwatchfish/libwatchfish.pri)
 include(../qble/qble.pri)
 
 SOURCES += \
+    src/devices/asteroidosdevice.cpp \
     src/devices/banglejsdevice.cpp \
     src/devices/bipdevice.cpp \
     src/devices/bipsdevice.cpp \
     src/devices/gtr2device.cpp \
     src/devices/gtr2firmwareinfo.cpp \
     src/devices/gtrdevice.cpp \
+    src/devices/gtrfirmwareinfo.cpp \
     src/devices/gts2device.cpp \
     src/devices/gts2firmwareinfo.cpp \
     src/devices/huamidevice.cpp \
@@ -120,23 +132,31 @@ SOURCES += \
     src/operations/huamiupdatefirmwareoperation2020.cpp \
     src/qaesencryption.cpp \
     src/services/adafruitblefsservice.cpp \
+    src/services/asteroidtimeservice.cpp \
+    src/services/asteroidweatherservice.cpp \
+    src/services/asteroidnotificationservice.cpp \
+    src/services/asteroidmediaservice.cpp \
+    src/services/asteroidscreenshotservice.cpp \
     src/services/currenttimeservice.cpp \
     src/services/dfuservice.cpp \
     src/services/infinitimemotionservice.cpp \
     src/services/infinitimenavservice.cpp \
     src/services/infinitimeweatherservice.cpp \
+    src/services/pinetimesimpleweatherservice.cpp \
     src/services/pinetimemusicservice.cpp \
     src/services/uartservice.cpp \
     src/typeconversion.cpp \
     src/bipbatteryinfo.cpp \
     src/devicefactory.cpp \
+    src/realtimeactivitysample.cpp \
     src/services/mibandservice.cpp \
     src/services/miband2service.cpp \
     src/services/alertnotificationservice.cpp \
     src/services/hrmservice.cpp \
     src/services/deviceinfoservice.cpp \
     src/services/bipfirmwareservice.cpp \
     src/services/batteryservice.cpp \
+    src/services/immediatealertservice.cpp \
     src/operations/abstractoperation.cpp \
     src/operations/activityfetchoperation.cpp \
     src/operations/logfetchoperation.cpp \
@@ -158,6 +178,7 @@ SOURCES += \
     src/huamiweathercondition.cpp
 
 DISTFILES += \
+    chirp.raw \
     harbour-amazfish-sailfish.service.in \
     harbour-amazfish.service.in \
     harbour-amazfishd.privileges
@@ -166,12 +187,14 @@ SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172
 
 HEADERS += \
     src/codec.h \
+    src/devices/asteroidosdevice.h \
     src/devices/banglejsdevice.h \
     src/devices/bipdevice.h \
     src/devices/bipsdevice.h \
     src/devices/gtr2device.h \
     src/devices/gtr2firmwareinfo.h \
     src/devices/gtrdevice.h \
+    src/devices/gtrfirmwareinfo.h \
     src/devices/gts2device.h \
     src/devices/gts2firmwareinfo.h \
     src/devices/huamidevice.h \
@@ -192,13 +215,20 @@ HEADERS += \
     src/operations/huamiupdatefirmwareoperation2020.h \
     src/qaesencryption.h \
     src/services/adafruitblefsservice.h \
+    src/services/asteroidtimeservice.h \
+    src/services/asteroidweatherservice.h \
+    src/services/asteroidnotificationservice.h \
+    src/services/asteroidmediaservice.h \
+    src/services/asteroidscreenshotservice.h \
     src/services/currenttimeservice.h \
     src/services/dfuservice.h \
     src/services/infinitimemotionservice.h \
     src/services/infinitimenavservice.h \
     src/services/infinitimeweatherservice.h \
+    src/services/pinetimesimpleweatherservice.h \
     src/services/pinetimemusicservice.h \
     src/services/uartservice.h \
+    src/services/immediatealertservice.h \
     src/typeconversion.h \
     src/bipbatteryinfo.h \
     src/deviceinterface.h \
@@ -208,6 +238,7 @@ HEADERS += \
     src/activitysummary.h \ 
     src/activitysample.h \
     src/devicefactory.h \
+    src/realtimeactivitysample.h \
     src/services/mibandservice.h \
     src/services/miband2service.h \
     src/services/alertnotificationservice.h \

daemon/src/activitysummary.cpp

@@ -172,18 +172,18 @@ bool ActivitySummary::saveToDatabase(KDbConnection *conn)
     values << baseAltitude();
     values << m_gpxTrack;
 
-    qDebug() << "Saving Sport:" << name()  << startTime() << startTime().toString(Qt::ISODate);
+    qDebug() << Q_FUNC_INFO << "Saving Sport:" << name()  << startTime() << startTime().toString(Qt::ISODate);
 
     QSharedPointer<KDbSqlResult> result = conn->insertRecord(&fields, values);
 
     if (result->lastResult().isError()) {
-        qDebug() << "error inserting record";
+        qDebug() << Q_FUNC_INFO << "Error inserting record";
         return false;
     }
 
     long lastId = result->lastInsertRecordId();
     setId(lastId);
-    qDebug() << "Record Id is" << id();
+    qDebug() << Q_FUNC_INFO << "Record Id is" << id();
 
     //Save meta data
     foreach(const auto &m, m_metaData) {
@@ -204,7 +204,7 @@ bool ActivitySummary::saveToDatabase(KDbConnection *conn)
         result = conn->insertRecord(&metaFields, metaValues);
 
         if (result->lastResult().isError()) {
-            qDebug() << "error inserting meta record";
+            qDebug() << Q_FUNC_INFO << "Error inserting meta record";
             return false;
         }
     }

daemon/src/bipactivitydetailparser.cpp

@@ -15,7 +15,8 @@ BipActivityDetailParser::BipActivityDetailParser(const ActivitySummary &summary)
     m_baseAltitude = summary.baseAltitude();
     m_baseDate = summary.startTime();
 
-    qDebug() << "Base data::" << m_baseLongitude << m_baseLatitude << m_baseAltitude << m_baseDate;
+    qDebug() << Q_FUNC_INFO;
+    qDebug() << "Base data:" << m_baseLongitude << m_baseLatitude << m_baseAltitude << m_baseDate;
     qDebug() << summary.startTime() << m_summary.startTime();
     qDebug() << convertHuamiValueToDecimalDegrees(m_baseLongitude) << convertHuamiValueToDecimalDegrees(m_baseLatitude);
 
@@ -89,7 +90,7 @@ void BipActivityDetailParser::parse(const QByteArray &bytes)
             i += consumeSpeed6(bytes, i);
             break;
         default:
-            qDebug() << "unknown packet type" << type;
+            qDebug() << Q_FUNC_INFO << "unknown packet type" << type;
             i+=6;
         }
 
@@ -198,7 +199,7 @@ void BipActivityDetailParser::add(const ActivityCoordinate &ap)
         }
         m_lastActivityPoint = ap;
     } else {
-        qDebug() << "skipping point!";
+        qDebug() << Q_FUNC_INFO << "skipping point!";
     }
 }
 

daemon/src/dbushrm.cpp

@@ -3,50 +3,46 @@
 
 DBusHRM::DBusHRM(QObject *parent) : QObject(parent)
 {
-    qDebug() << "Creating DBUS HRM";
+    qDebug() << Q_FUNC_INFO;
 
     if (!QDBusConnection::sessionBus().registerService("org.sailfishos.heartrate")) {
-        qDebug() << QDBusConnection::sessionBus().lastError().message();
+        qDebug() << Q_FUNC_INFO << "Unable to register service:" << QDBusConnection::sessionBus().lastError().message();
     } else {
         QDBusConnection::sessionBus().registerObject("/", this, QDBusConnection::ExportAllSlots);
     }
 }
 
 void DBusHRM::setHRMService(HRMService *hrm)
 {
-    qDebug() << "Assigning HRM";
-
+    qDebug() << Q_FUNC_INFO;
     m_hrm = hrm;
 }
 
-void DBusHRM::setMiBandService(MiBandService *mi)
+void DBusHRM::setDevice(AbstractDevice *dev)
 {
-    qDebug() << "Assigning MI";
-
-    m_mi = mi;
+    qDebug() << Q_FUNC_INFO;
+    m_device = dev;
 }
 
 void DBusHRM::start()
 {
-    qDebug() << "Starting DBUS HRM" << m_hrm;
-
+    qDebug() << Q_FUNC_INFO;
     if (m_hrm) {
         return m_hrm->enableRealtimeHRMeasurement(true);
     }
 }
 
 void DBusHRM::stop()
 {
-    qDebug() << "Stopping DBUS HRM" << m_hrm;
-
+    qDebug() << Q_FUNC_INFO;
     if (m_hrm) {
         return m_hrm->enableRealtimeHRMeasurement(false);
     }
 }
 
 int DBusHRM::heartRate()
 {
-    qDebug() << "Getting heartrate" << m_hrm->heartRate();
+    qDebug() << Q_FUNC_INFO << m_hrm->heartRate();
 
     if (m_hrm) {
         m_hrm->keepRealtimeHRMMeasurementAlive();
@@ -57,8 +53,8 @@ int DBusHRM::heartRate()
 
 int DBusHRM::batteryLevel()
 {
-    if (m_mi) {
-        return m_mi->batteryInfo();
+    if (m_device) {
+        return m_device->information(AbstractDevice::INFO_BATTERY).toInt();
     }
     return 0;
 }

daemon/src/dbushrm.h

@@ -3,7 +3,7 @@
 
 #include <QObject>
 #include "services/hrmservice.h"
-#include "services/mibandservice.h"
+#include "abstractdevice.h"
 
 class DBusHRM : public QObject
 {
@@ -12,7 +12,7 @@ class DBusHRM : public QObject
 public:
     explicit DBusHRM(QObject *parent = nullptr);
     void setHRMService(HRMService *hrm);
-    void setMiBandService(MiBandService *mi);
+    void setDevice(AbstractDevice *dev);
 
 public Q_SLOTS:
     void start();
@@ -22,7 +22,7 @@ public Q_SLOTS:
 
 private:
     HRMService *m_hrm = nullptr;
-    MiBandService *m_mi = nullptr;
+    AbstractDevice *m_device = nullptr;
 };
 
 #endif // DBUSHRM_H