Merge branch 'master' into immediatealertservice-part2

jmlich · Oct 14, 2024 · 061d00d · 061d00d
2 parents a17f57d + b3fe7cc
commit 061d00d
Show file tree

Hide file tree

Showing 17 changed files with 219 additions and 146 deletions.
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
@@ -44,7 +44,7 @@ jobs:
         flatpak build-bundle ${{ github.workspace }}/repo ${{ github.workspace }}/uk.co.piggz.amazfish.flatpak uk.co.piggz.amazfish
 
     - name: Upload Flatpak
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: uk.co.piggz.amazfish.flatpak
+        pattern: uk.co.piggz.amazfish.flatpak
         path: uk.co.piggz.amazfish.flatpak
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ These are devices I have, have tested, and will try not to break any functionali
  * Amazfit GTS
  * Amazfit GTR2
  * Pinetime InfiniTime
- * Bangle.js
+ * Bangle.js - [Android integration](https://gadgetbridge.org/gadgets/wearables/banglejs/) app should be installed
 
 ### Silver
 
@@ -151,3 +151,9 @@ Credits to:
 
     The Gadgetbridge devs, which gave me a lot of hints and inspiration from their device code.
     https://codeberg.org/Freeyourgadget/Gadgetbridge
+
+## Automatic Reconnecting
+
+Depending on device and operating system if there are problems with pairing or reconnecting you may need to take one action.
+Open the bluetooth settings on your phone and head for known devices. There enter the settings for the watch and enable "reconnect automatically" for it.
+This should fix pairing and reconnecting issues.
diff --git a/daemon/daemon.pro b/daemon/daemon.pro
@@ -82,7 +82,7 @@ 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.path = $$PREFIX/share/harbour-amazfishd/
 chirp.files = chirp.raw
 
 #Install appropriate files for each system
@@ -265,7 +265,16 @@ HEADERS += \
     src/activitycoordinate.h
 
 TRANSLATIONS += \
-    translations/harbour-amazfishd-cs.ts
+    translations/harbour-amazfishd-cs.ts \
+    translations/harbour-amazfishd-de.ts \
+    translations/harbour-amazfishd-es.ts \
+    translations/harbour-amazfishd-fr.ts \
+    translations/harbour-amazfishd-nl.ts \
+    translations/harbour-amazfishd-pl.ts \
+    translations/harbour-amazfishd-ru.ts \
+    translations/harbour-amazfishd-sv.ts \
+    translations/harbour-amazfishd-zh_Hans.ts
+
 
 flavor_uuitk {
     DEFINES += TRANSLATION_FOLDER=\\\"/opt/click.ubuntu.com/uk.co.piggz.amazfish/current/translations\\\"

diff --git a/daemon/src/deviceinterface.cpp b/daemon/src/deviceinterface.cpp
@@ -696,9 +696,9 @@ void DeviceInterface::findDevice()
 
 
 #ifdef MER_EDITION_SAILFISH
-    QFile file("/usr/share/harbour-amazfish/chirp.raw");
+    QFile file("/usr/share/harbour-amazfishd/chirp.raw");
 #else // elif defined(UUITK_EDITION)
-    QFile file("/opt/click.ubuntu.com/uk.co.piggz.amazfish/current/share/harbour-amazfish/chirp.raw");
+    QFile file("/opt/click.ubuntu.com/uk.co.piggz.amazfish/current/share/harbour-amazfishd/chirp.raw");
 #endif
 
     if(!file.open(QIODevice::ReadOnly))

diff --git a/daemon/src/devices/banglejsdevice.cpp b/daemon/src/devices/banglejsdevice.cpp
@@ -233,10 +233,10 @@ void BangleJSDevice::sendWeather(CurrentWeather *weather)
         QJsonObject o;
         o.insert("t", "weather");
         o.insert("temp", weather->temperature());
-	o.insert("hum", weather->humidity());
+        o.insert("hum", weather->humidity());
         o.insert("txt", weather->description());
-	o.insert("wind", weather->windSpeed());
-	o.insert("wdir", weather->windDeg());
+        o.insert("wind", weather->windSpeed());
+        o.insert("wdir", weather->windDeg());
         o.insert("loc", weather->city()->name());
 
         uart->txJson(o);
@@ -291,7 +291,7 @@ void BangleJSDevice::refreshInformation()
 
 QString BangleJSDevice::information(Info i) const
 {
-    qDebug() << Q_FUNC_INFO;
+    qDebug() << Q_FUNC_INFO << i;
 
     if (i == INFO_BATTERY) {
         return QString::number(m_infoBatteryLevel);
@@ -332,21 +332,51 @@ void BangleJSDevice::handleRxJson(const QJsonObject &json)
         m_infoBatteryLevel = json.value("bat").toInt();
         emit informationChanged(INFO_BATTERY, QString::number(m_infoBatteryLevel));
     } else if (t == "findPhone") {
+        bool running = json.value("n").toBool();
+        qDebug() << "findPhone" << running;
+        if (running) {
+            emit deviceEvent(AbstractDevice::EVENT_FIND_PHONE);
+        } else {
+            emit deviceEvent(AbstractDevice::EVENT_CANCEL_FIND_PHONE);
 
+        }
 
     } else if (t == "music") {
+        QString music_action = json.value("n").toString();
+
+        if (music_action == "play") {
+            emit deviceEvent(AbstractDevice::EVENT_MUSIC_PLAY);
+        } else if (music_action == "pause") {
+            emit deviceEvent(AbstractDevice::EVENT_MUSIC_PAUSE);
+        } else if (music_action == "next") {
+            emit deviceEvent(AbstractDevice::EVENT_MUSIC_NEXT);
+        } else if (music_action == "previous") {
+            emit deviceEvent(AbstractDevice::EVENT_MUSIC_PREV);
+        } else if (music_action == "volumeup") {
+            emit deviceEvent(AbstractDevice::EVENT_MUSIC_VOLUP);
+        } else if (music_action == "volumedown") {
+            emit deviceEvent(AbstractDevice::EVENT_MUSIC_VOLDOWN);
+        }
 
+//            emit deviceEvent(AbstractDevice::EVENT_APP_MUSIC);
 
-    } else if (t == "call") {
-
-
-    } else if (t == "notify") {
+//    } else if (t == "call") {
+//    } else if (t == "notify") {
+    } else if (t == "act") {
 
+        long ts = json.value("ts").toInt(); // timestamp
+        int hrm = json.value("hrm").toInt(); // heart rate,
+        int stp = json.value("stp").toInt(); // steps
+        int mov = json.value("mov").toInt(); // movement intensity
+        int rt = json.value("rt").toInt();
 
-    } else if (t == "act") {
+        qDebug() << "parsed type = act " << ts << hrm << stp << mov << rt;
 
+        emit informationChanged(INFO_HEARTRATE, QString("%1").arg(hrm));
+        emit informationChanged(INFO_STEPS, QString("%1").arg(stp));
 
     } else {
+        qDebug() << "Gadgetbridge type " << t;
 
     }
 #if 0

diff --git a/daemon/src/services/uartservice.cpp b/daemon/src/services/uartservice.cpp
@@ -56,7 +56,7 @@ void UARTService::handleRx(const QString &json)
 
     if (json.contains( "Uncaught ReferenceError: \"gb\" is not defined")) {
         emit message("Gadgetbridge plugin not installed on Bangle.js");
-    } else if (json.at(0)=='{') {
+    } else if ((json.length() > 0) && (json.at(0)=='{')) {
         // JSON - we hope!
         QJsonObject obj = ObjectFromString(json);
         emit jsonRx(obj);

diff --git a/daemon/translations/harbour-amazfishd-de.ts b/daemon/translations/harbour-amazfishd-de.ts
@@ -5,143 +5,143 @@
     <name>AbstractDevice</name>
     <message>
         <source>Device does not support settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Gerät unterstützt keine Einstellungen</translation>
     </message>
 </context>
 <context>
     <name>AsteroidOSDevice</name>
     <message>
         <source>Stored %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>Gespeichert %1...</translation>
     </message>
 </context>
 <context>
     <name>BipDevice</name>
     <message>
         <source>Navigation Started</source>
-        <translation type="unfinished"></translation>
+        <translation>Navigation gestartet</translation>
     </message>
     <message>
         <source>Navigation Stopped</source>
-        <translation type="unfinished"></translation>
+        <translation>Navigation gestoppt</translation>
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"></translation>
+        <translation>Fortschritt</translation>
     </message>
 </context>
 <context>
     <name>BipFirmwareService</name>
     <message>
         <source>An operation is currently running, please try later</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein Vorgang wird derzeit ausgeführt, bitte versuchen Sie es später</translation>
     </message>
     <message>
         <source>Sending %1...</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 wird gesendet...</translation>
     </message>
     <message>
         <source>No file selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Datei ausgewählt</translation>
     </message>
 </context>
 <context>
     <name>DeviceInterface</name>
     <message>
         <source>Device is not valid, it may not be supported</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Gerät ist ungültig und wird möglicherweise nicht unterstützt</translation>
     </message>
     <message>
         <source>Amazfish</source>
-        <translation type="unfinished"></translation>
+        <translation>Amazfish</translation>
     </message>
     <message>
         <source>Connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbunden</translation>
     </message>
     <message>
         <source>Phone and watch are connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Telefon und Uhr sind verbunden</translation>
     </message>
     <message>
         <source>Low Battery</source>
-        <translation type="unfinished"></translation>
+        <translation>Schwache Batterie</translation>
     </message>
     <message>
         <source>Battery level now </source>
-        <translation type="unfinished"></translation>
+        <translation>Akkustand jetzt </translation>
     </message>
 </context>
 <context>
     <name>DfuService</name>
     <message>
         <source>An operation is currently running, please try later</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein Vorgang wird derzeit ausgeführt, bitte versuchen Sie es später</translation>
     </message>
     <message>
         <source>No file selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine Datei ausgewählt</translation>
     </message>
 </context>
 <context>
     <name>HuamiDevice</name>
     <message>
         <source>Navigation Started</source>
-        <translation type="unfinished"></translation>
+        <translation>Navigation gestartet</translation>
     </message>
     <message>
         <source>Navigation Stopped</source>
-        <translation type="unfinished"></translation>
+        <translation>Navigation gestoppt</translation>
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"></translation>
+        <translation>Fortschritt</translation>
     </message>
 </context>
 <context>
     <name>MiBandService</name>
     <message>
         <source>Firmware is too old to set display items, V0.1.1.14 is required</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Firmware ist zu alt, um Anzeigeelemente zu setzen, V0.1.1.14 wird benötigt</translation>
     </message>
     <message>
         <source>An operation is currently running, please try later</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein Vorgang wird derzeit ausgeführt, bitte versuchen Sie es später</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>About to transfer data from </source>
-        <translation type="unfinished"></translation>
+        <translation>Über das Übertragen von Daten aus </translation>
     </message>
     <message>
         <source>Finished transferring activity data</source>
-        <translation type="unfinished"></translation>
+        <translation>Übergabe der Vorgangsdaten abgeschlossen</translation>
     </message>
     <message>
         <source>No data to transfer</source>
-        <translation type="unfinished"></translation>
+        <translation>Es müssen keine Daten übertragen werden</translation>
     </message>
     <message>
         <source>Update operation failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler beim Aktualisierungsvorgang</translation>
     </message>
     <message>
         <source>Update operation failed, unexpected metadata</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler beim Updatevorgang, unerwartete Metadaten</translation>
     </message>
     <message>
         <source>Update operation complete</source>
-        <translation type="unfinished"></translation>
+        <translation>Updatevorgang abgeschlossen</translation>
     </message>
     <message>
         <source>Update operation failed, filetype not supported</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler beim Update-Vorgang, Dateityp wird nicht unterstützt</translation>
     </message>
     <message>
         <source>File does not seem to be supported</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei scheint nicht unterstützt zu werden</translation>
     </message>
 </context>
 </TS>
diff --git a/documentation/build-instructions.md b/documentation/build-instructions.md
@@ -9,6 +9,7 @@ build target which are not available by default.
 
 To get into the build machine (if started by Sailfish IDE)
 `ssh -l mersdk localhost -p 2222 -i ~/SailfishOS/vmshare/ssh/private_keys/engine/mersdk`
+or `sfdk engine exec` with docker based builder
 
 Use the `sb2-config` command to make your ARM target the default
 

diff --git a/qble b/qble
diff --git a/rpm/harbour-amazfish.spec b/rpm/harbour-amazfish.spec
@@ -122,6 +122,6 @@ desktop-file-install --delete-original       \
 %{_datadir}/icons/hicolor/scalable/apps/%{name}-ui.svg
 %{_userunitdir}/harbour-amazfish.service
 %{_datadir}/mapplauncherd/privileges.d/harbour-amazfishd.privileges
-%{_datadir}/harbour-amazfish/chirp.raw
+%{_datadir}/harbour-amazfishd/chirp.raw
 # >> files
 # << files
diff --git a/ui/qml/pages/FirstPage.qml b/ui/qml/pages/FirstPage.qml
@@ -94,9 +94,8 @@ PagePL {
                 anchors.rightMargin: 2
                 height: parent.height - 4
             }
-
-
         }
+
         RowLayout {
             height: styler.themeItemSizeSmall
             width: parent.width
@@ -149,7 +148,6 @@ PagePL {
             }
         }
 
-
         SectionHeaderPL {
             text: qsTr("Steps")
             visible: supportsFeature(Amazfish.FEATURE_STEPS)
@@ -158,6 +156,8 @@ PagePL {
         // steps
         IconPL {
             id: imgSteps
+            anchors.left: parent.left
+            anchors.leftMargin: styler.themePaddingLarge
             iconName: styler.iconSteps
             height: styler.themeIconSizeMedium
             width: height
@@ -208,6 +208,10 @@ PagePL {
 
         //Heartrate
         RowLayout {
+            anchors.left: parent.left
+            anchors.leftMargin: styler.themePaddingLarge
+            anchors.right: parent.right
+            anchors.rightMargin: styler.themePaddingLarge
             spacing: styler.themePaddingLarge
             width: parent.width
             visible: supportsFeature(Amazfish.FEATURE_HRM)
@@ -270,8 +274,6 @@ PagePL {
                 }
             }
         }
-
-
     }
 
     onPageStatusActive: {