revisions

examples/meshtastic/cpp/connection/ble/ble_me.h

@@ -13,8 +13,6 @@ class Connection;
 class BLE_ME : public BLE {
   Q_OBJECT
 
-  /*** <INTERFACE> ****************************************/
-
 public:
 #ifdef Q_OS_ANDROID
   BLE_ME(QtAndroidService*, Connection*);
@@ -27,13 +25,6 @@ public Q_SLOTS:
   void read();
   void write(const QByteArray&);
 
-Q_SIGNALS:
-  void setReady(bool, const QString&, const QStringList&);
-  void receivedFromRadio(const QByteArray&, const QString&);
-  void receivingDone();
-
-  /*** </INTERFACE> ***************************************/
-
 public:
   static const UID uuid_service;
   static const UID uuid_fromRadio;

examples/meshtastic/cpp/connection/connection.cpp

@@ -119,6 +119,8 @@ void Connection::setBackgroundMode(bool background) {
   if (!backgroundMode) {
     sendSavedBytes();
   }
+#else
+  Q_UNUSED(background)
 #endif
 }
 

examples/meshtastic/cpp/connection/usb/usb_me.cpp

@@ -2,7 +2,6 @@
 #include "../connection.h"
 #include <QSerialPortInfo>
 #include <QTimer>
-#include <QGuiApplication>
 #include <QtDebug>
 
 USB_ME::USB_ME(Connection* _con) : con(_con) {

examples/meshtastic/cpp/connection/usb/usb_me.h

@@ -8,8 +8,6 @@ class Connection;
 class USB_ME : public QSerialPort {
   Q_OBJECT
 
-  /*** <INTERFACE> ****************************************/
-
 public:
   USB_ME(Connection*);
 
@@ -19,13 +17,6 @@ public Q_SLOTS:
   void read2();
   void write2(const QByteArray&);
 
-Q_SIGNALS:
-  void setReady(const QString&);
-  void receivedFromRadio(const QByteArray&);
-  void receivingDone();
-
-  /*** </INTERFACE> ***************************************/
-
 public:
   bool ready = false;
   Connection* con = nullptr;

examples/meshtastic/lisp/main.lisp

@@ -39,9 +39,8 @@
 (defun view-index-changed (index) ; see QML
   (when (and (= 1 index)
              (not (app:setting :latest-receiver)))
+    (toast (tr "please select a receiver first"))
     (q> |currentIndex| ui:*main-view* 0)) ; 'Group'
-  (q> |visible| ui:*location* (= 0 index))
-  (q> |visible| ui:*find*     (= 1 index))
   (q> |interactive| ui:*main-view* (/= 1 index)) ; swipe single message, not view
   (values))
 

examples/meshtastic/qml/main.qml

@@ -131,7 +131,7 @@ Item {
     width: headerHeight
     height: width
     anchors.right: parent.right
-    visible: false
+    visible: (view.pageIndex === 0)
 
     MouseArea {
       anchors.fill: parent
@@ -145,6 +145,7 @@ Item {
     width: headerHeight
     height: width
     anchors.right: parent.right
+    visible: (view.pageIndex === 1)
 
     MouseArea {
       anchors.fill: parent