Add egeniouss receiver.

src/core/CMakeLists.txt

@@ -29,6 +29,7 @@ set(QFIELD_CORE_SRCS
  positioning/gnsspositioninformation.cpp
  positioning/internalgnssreceiver.cpp
  positioning/nmeagnssreceiver.cpp
+ positioning/egenioussreceiver.cpp
  positioning/tcpreceiver.cpp
  positioning/udpreceiver.cpp
  positioning/positioning.cpp
@@ -150,6 +151,7 @@ set(QFIELD_CORE_HDRS
  positioning/positioningdevicemodel.h
  positioning/internalgnssreceiver.h
  positioning/nmeagnssreceiver.h
+ positioning/egenioussreceiver.h
  positioning/tcpreceiver.h
  positioning/udpreceiver.h
  positioning/geofencer.h

src/core/positioning/abstractgnssreceiver.h

@@ -72,6 +72,7 @@ class AbstractGnssReceiver : public QObject
 
  private:
  friend class InternalGnssReceiver;
+ friend class EgenioussReceiver;
  friend class NmeaGnssReceiver;
  friend class BluetoothReceiver;
  friend class TcpReceiver;

src/core/positioning/egenioussreceiver.cpp

@@ -0,0 +1,107 @@
+#include "egenioussreceiver.h"
+
+#include <QHostAddress>
+#include <QJsonDocument>
+#include <QJsonValue>
+
+EgenioussReceiver::EgenioussReceiver( QObject *parent )
+ : AbstractGnssReceiver( parent ), mTcpSocket( new QTcpSocket( this ) )
+{
+ connect( mTcpSocket, &QTcpSocket::readyRead, this, &EgenioussReceiver::onReadyRead );
+ connect( mTcpSocket, &QTcpSocket::errorOccurred, this, &EgenioussReceiver::onErrorOccurred );
+ connect( mTcpSocket, &QTcpSocket::connected, this, &EgenioussReceiver::connected );
+ connect( mTcpSocket, &QTcpSocket::disconnected, this, &EgenioussReceiver::disconnected );
+}
+
+void EgenioussReceiver::handleConnectDevice()
+{
+ mTcpSocket->connectToHost( mAddress, mPort, QTcpSocket::ReadWrite );
+}
+
+void EgenioussReceiver::connected()
+{
+ mSocketState = QAbstractSocket::ConnectedState;
+ emit socketStateChanged( mSocketState );
+}
+
+void EgenioussReceiver::handleDisconnectDevice()
+{
+ mTcpSocket->disconnectFromHost();
+}
+
+void EgenioussReceiver::disconnected()
+{
+ if ( mTcpSocket->state() == QAbstractSocket::ConnectedState )
+ {
+ mSocketState = QAbstractSocket::UnconnectedState;
+ emit socketStateChanged( mSocketState );
+ }
+}
+
+QList<QPair<QString, QVariant>> EgenioussReceiver::details()
+{
+ QList<QPair<QString, QVariant>> detailsList;
+
+ if ( mPayload.isEmpty() )
+ {
+ return detailsList;
+ }
+
+ detailsList.append( qMakePair( "q", mPayload.value( "q" ).toString() ) );
+
+ return detailsList;
+}
+
+void EgenioussReceiver::onReadyRead()
+{
+ QByteArray mReceivedData = mTcpSocket->readAll();
+ if ( mReceivedData.size() < 9 )
+ {
+ return; // Received data is too short to process.
+ }
+ if ( static_cast<uint8_t>( mReceivedData[0] ) != 0xFE )
+ {
+ return; // Invalid start byte
+ }
+ uint32_t payloadLength;
+ QDataStream dataStream( mReceivedData.mid( 4, 4 ) );
+ dataStream.setByteOrder( QDataStream::LittleEndian );
+ dataStream >> payloadLength;
+ if ( mReceivedData.size() < 8 + payloadLength )
+ {
+ return; // Received data is too short to contain the payload.
+ }
+ QJsonDocument jsonDoc = QJsonDocument::fromJson( mReceivedData.mid( 8, payloadLength ) );
+ if ( jsonDoc.isNull() || !jsonDoc.isObject() )
+ {
+ return; // Failed to parse JSON
+ }
+ mPayload = jsonDoc.object();
+ const double latitude = mPayload.value( "lat" ).toDouble() == 0 ? std::numeric_limits<double>::quiet_NaN() : mPayload.value( "lat" ).toDouble();
+ const double longitude = mPayload.value( "lon" ).toDouble() == 0 ? std::numeric_limits<double>::quiet_NaN() : mPayload.value( "lon" ).toDouble();
+ const double elevation = mPayload.value( "alt" ).toDouble() == 0 ? std::numeric_limits<double>::quiet_NaN() : mPayload.value( "alt" ).toDouble();
+ mLastGnssPositionInformation = GnssPositionInformation(
+ latitude,
+ longitude,
+ elevation,
+ std::numeric_limits<double>::quiet_NaN(),
+ std::numeric_limits<double>::quiet_NaN(),
+ QList<QgsSatelliteInfo>(),
+ 0,
+ 0,
+ 0,
+ std::numeric_limits<double>::quiet_NaN(),
+ std::numeric_limits<double>::quiet_NaN(),
+ QDateTime::fromMSecsSinceEpoch( mPayload.value( "utc" ).toDouble() / 1e6, Qt::UTC ),
+ QChar(),
+ 0,
+ 1 );
+
+ emit lastGnssPositionInformationChanged( mLastGnssPositionInformation );
+}
+
+void EgenioussReceiver::onErrorOccurred( QAbstractSocket::SocketError socketError )
+{
+ mLastError = mTcpSocket->errorString();
+ emit lastErrorChanged( mLastError );
+}

src/core/positioning/egenioussreceiver.h

@@ -0,0 +1,34 @@
+#pragma once
+
+#include "abstractgnssreceiver.h"
+
+#include <QJsonObject>
+#include <QTcpSocket>
+
+class EgenioussReceiver : public AbstractGnssReceiver
+{
+ Q_OBJECT
+
+ public:
+ explicit EgenioussReceiver( QObject *parent = nullptr );
+
+ private:
+ void handleConnectDevice() override;
+ void handleDisconnectDevice() override;
+ QList<QPair<QString, QVariant>> details() override;
+
+ private slots:
+ void onReadyRead();
+ void onErrorOccurred( QAbstractSocket::SocketError socketError );
+
+ private:
+ void processReceivedData();
+ void connected();
+ void disconnected();
+
+ private:
+ QTcpSocket *mTcpSocket = nullptr;
+ QJsonObject mPayload;
+ const QHostAddress::SpecialAddress mAddress = QHostAddress::LocalHost;
+ const int mPort = 1235;
+};

src/core/positioning/positioning.cpp

@@ -20,6 +20,7 @@
 #ifdef WITH_SERIALPORT
 #include "serialportreceiver.h"
 #endif
+#include "egenioussreceiver.h"
 #include "internalgnssreceiver.h"
 #include "positioning.h"
 #include "positioningutils.h"
@@ -205,6 +206,10 @@ void Positioning::setupDevice()
  const int port = mDeviceId.mid( portSeparator + 1 ).toInt();
  mReceiver = new UdpReceiver( address, port, this );
  }
+ else if ( mDeviceId.startsWith( QStringLiteral( "egeniouss:" ) ) )
+ {
+ mReceiver = new EgenioussReceiver( this );
+ }
 #ifdef WITH_SERIALPORT
  else if ( mDeviceId.startsWith( QStringLiteral( "serial:" ) ) )
  {

src/core/positioning/positioning.h

@@ -201,7 +201,6 @@ class Positioning : public QObject
  void setLogging( bool logging );
 
  signals:
-
  void activeChanged();
  void deviceIdChanged();
  void deviceChanged();

src/core/positioning/positioningdevicemodel.cpp

@@ -171,6 +171,9 @@ const QString PositioningDeviceModel::deviceId( const Device &device ) const
 
  case SerialPortDevice:
  return QStringLiteral( "serial:%1" ).arg( device.settings.value( QStringLiteral( "address" ) ).toString() );
+
+ case EgenioussDevice:
+ return QStringLiteral( "egeniouss:%1:%2" ).arg( device.settings.value( QStringLiteral( "address" ) ).toString(), QString::number( device.settings.value( QStringLiteral( "port" ) ).toInt() ) );
  }
 
  return QString();

src/core/positioning/positioningdevicemodel.h

@@ -29,6 +29,7 @@ class PositioningDeviceModel : public QAbstractListModel
  BluetoothDevice,
  TcpDevice,
  UdpDevice,
+ EgenioussDevice,
  SerialPortDevice,
  };
  Q_ENUM( Type )

src/qml/EgenioussDeviceChooser.qml

@@ -0,0 +1,65 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import org.qfield
+import Theme
+
+Item {
+ width: parent.width
+
+ property alias deviceAddress: egenioussDeviceAddress.text
+ property alias devicePort: egenioussDevicePort.text
+
+ function generateName() {
+ return deviceAddress + ' (' + devicePort + ')';
+ }
+
+ function setSettings(settings) {
+ deviceAddress = settings['address'];
+ devicePort = settings['port'];
+ }
+
+ function getSettings() {
+ return {
+ "address": deviceAddress.trim(),
+ "port": parseInt(devicePort)
+ };
+ }
+
+ GridLayout {
+ width: parent.width
+ columns: 1
+ columnSpacing: 0
+ rowSpacing: 5
+
+ Label {
+ Layout.fillWidth: true
+ text: qsTr("Address:")
+ font: Theme.defaultFont
+ wrapMode: Text.WordWrap
+ }
+
+ QfTextField {
+ id: egenioussDeviceAddress
+ Layout.fillWidth: true
+ font: Theme.defaultFont
+ text: '127.0.0.1'
+ inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase | Qt.ImhPreferLowercase
+ }
+
+ Label {
+ Layout.fillWidth: true
+ text: qsTr("Port:")
+ font: Theme.defaultFont
+ wrapMode: Text.WordWrap
+ }
+
+ QfTextField {
+ id: egenioussDevicePort
+ Layout.fillWidth: true
+ font: Theme.defaultFont
+ text: '1235'
+ inputMethodHints: Qt.ImhFormattedNumbersOnly
+ }
+ }
+}

src/qml/PositioningDeviceSettings.qml

@@ -95,7 +95,7 @@ Popup {
  id: positioningDeviceName
  Layout.fillWidth: true
  font: Theme.defaultFont
- placeholderText: displayText == '' ? qsTr('Leave empty to auto-fill') : ''
+ placeholderText: displayText === '' ? qsTr('Leave empty to auto-fill') : ''
  }
 
  Label {
@@ -130,6 +130,8 @@ Popup {
  return Theme.getThemeVectorIcon('ic_udp_receiver_black_24dp');
  case PositioningDeviceModel.SerialPortDevice:
  return Theme.getThemeVectorIcon('ic_serial_port_receiver_black_24dp');
+ case PositioningDeviceModel.EgenioussDevice:
+ return Theme.getThemeVectorIcon('ic_serial_port_receiver_black_24dp');
  }
  return '';
  }
@@ -154,6 +156,8 @@ Popup {
  return Theme.getThemeVectorIcon('ic_udp_receiver_black_24dp');
  case PositioningDeviceModel.SerialPortDevice:
  return Theme.getThemeVectorIcon('ic_serial_port_receiver_black_24dp');
+ case PositioningDeviceModel.EgenioussDevice:
+ return Theme.getThemeVectorIcon('ic_serial_port_receiver_black_24dp');
  }
  return '';
  }
@@ -177,6 +181,10 @@ Popup {
  name: qsTr('UDP (NMEA)')
  value: PositioningDeviceModel.UdpDevice
  }
+ ListElement {
+ name: qsTr('Egeniouss')
+ value: PositioningDeviceModel.EgenioussDevice
+ }
  }
 
  Loader {
@@ -193,6 +201,8 @@ Popup {
  return "qrc:/qml/UdpDeviceChooser.qml";
  case PositioningDeviceModel.SerialPortDevice:
  return "qrc:/qml/SerialPortDeviceChooser.qml";
+ case PositioningDeviceModel.EgenioussDevice:
+ return "qrc:/qml/EgenioussDeviceChooser.qml";
  }
  return '';
  }

src/qml/PositioningInformationView.qml

@@ -35,7 +35,7 @@ Rectangle {
  id: grid
 
  readonly property real numberOfColumns: parent.width > 1000 ? 6 : parent.width > 620 ? 3 : 2
- readonly property real numberOfRows: grid.count / numberOfColumns
+ readonly property real numberOfRows: Math.ceil(grid.count / numberOfColumns)
 
  flow: GridView.FlowTopToBottom
  boundsBehavior: Flickable.StopAtBounds
@@ -44,15 +44,15 @@ Rectangle {
  distanceUnits: projectInfo.distanceUnits
  coordinateDisplayCrs: projectInfo.coordinateDisplayCrs
  }
- height: numberOfRows * cellHeight
+ height: grid.numberOfRows * cellHeight
  width: parent.width
  cellHeight: positioningInformationView.cellHeight
  cellWidth: parent.width / numberOfColumns
  clip: true
 
  delegate: Rectangle {
- readonly property real currentColumn: parseInt(index / (grid.count / grid.numberOfColumns))
- readonly property real currentRow: index % (grid.count / grid.numberOfColumns)
+ readonly property real currentColumn: parseInt(index / grid.numberOfRows)
+ readonly property real currentRow: index % grid.numberOfRows
 
  width: grid.cellWidth
  height: grid.cellHeight

src/qml/qml.qrc

@@ -43,6 +43,7 @@
  <file>ScaleBar.qml</file>
  <file>SensorInformationView.qml</file>
  <file>Toast.qml</file>
+ <file>EgenioussDeviceChooser.qml</file>
  <file>TcpDeviceChooser.qml</file>
  <file>UdpDeviceChooser.qml</file>
  <file>VariableEditor.qml</file>