fixed LLA/Observer/TLE to show an error when misconfigured.

Author: RichardB01

FOSSAGSCP/mainwindow.cpp

@@ -15,15 +15,17 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
     assert(ui != nullptr);
 
     // create the interpreter
-    m_interpreter = new DatagramInterpreter(ui);
+    m_interpreter = new DatagramInterpreter(ui, m_messageLogFrame);
 
     // load the system information pane
     m_sytemInfoPane = new systeminformationpane(m_interpreter);
     m_sytemInfoPane->setWindowFlag(Qt::WindowType::WindowStaysOnTopHint);
     m_sytemInfoPane->show();
 
+    m_interpreter->SetSystemInformationPane(m_sytemInfoPane->ui);
+
     // create the processor
-    m_processor = new DatagramProcessor(ui, m_sytemInfoPane->ui);
+    m_processor = new DatagramProcessor(ui, m_sytemInfoPane->ui, m_messageLogFrame);
 
     // initialize the 4 main tabs.
     this->LoadControlPanelSettingsUI();
@@ -40,7 +42,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
     connect(&(this->m_serialPortThread), &SerialPortThread::HandleTimeout, this, &MainWindow::TimeoutReceived, Qt::AutoConnection);
 
     // signal piping from the interpeter to this.
-    connect(m_interpreter, &DatagramInterpreter::ReceivedHandshake, this, &MainWindow::StartDopplerCorrector);
+    connect(m_processor, &DatagramProcessor::StartDopplerCorrector, this, &MainWindow::StartDopplerCorrector);
 
     // data piping from message log frame to serial port thread.
     connect(m_messageLogFrame, &MessageLogFrame::SendDataFromMessageLogFrame, this, &MainWindow::ReceivedMessagefromMessageLog);
@@ -246,7 +248,14 @@ void MainWindow::SendDopplerShiftedFrequency()
     double dopplerShiftedFreq;
     bool dopplerShiftOk = m_dopplerShiftCorrector.GetDopplerShiftNow(currentSatelliteNameStdStr, &dopplerShiftedFreq);
 
-    if (!dopplerShiftOk) return;
+    if (!dopplerShiftOk)
+    {
+        QMessageBox msgBox;
+        msgBox.setText("TLE, LLA or Observer Position are invalid.");
+        msgBox.exec();
+        throw "tle lla or observer are invalid";
+        return;
+    }
 
 
     // current configured frequency.

FOSSAGSCP/messagelogframe.h

@@ -25,6 +25,7 @@ class MessageLogFrame : public QWidget
     bool GetEnableSerialSniffingState();
     void RawWriteToLog(QString msg);
 
+    Ui::MessageLogFrame *ui;
 public slots:
     void WriteDatagram(const IDatagram* datagram); // attached to MessageLog.h
 signals:
@@ -38,7 +39,6 @@ private slots:
 
 
 private:
-    Ui::MessageLogFrame *ui;
     QStringListModel * m_messageLogListModel;
 
     bool m_logTimestamps = false;

FOSSAGSCP/src/DatagramInterpreter.cpp

@@ -1,10 +1,15 @@
 #include "DatagramInterpreter.h"
 
-DatagramInterpreter::DatagramInterpreter(Ui::MainWindow *mainWindowUI)
-    : m_mainWindowUI(mainWindowUI)
+DatagramInterpreter::DatagramInterpreter(Ui::MainWindow *mainWindowUI,  MessageLogFrame* messageLogFrame)
+    : m_mainWindowUI(mainWindowUI), m_messageLog(messageLogFrame)
 {
 }
 
+void DatagramInterpreter::SetSystemInformationPane(Ui::systeminformationpane *systemInfoUI)
+{
+    m_systemInfoUI = systemInfoUI;
+}
+
 IDatagram *DatagramInterpreter::SerialData_To_Datagram(QByteArray datagramData)
 {
     // first byte is the control byte.
@@ -13,11 +18,6 @@ IDatagram *DatagramInterpreter::SerialData_To_Datagram(QByteArray datagramData)
     // second byte is the payload length.
     uint8_t lengthByte = (uint8_t)datagramData[1];
 
-    if (lengthByte < (datagramData.size() - 4))
-    {
-        return nullptr;
-    }
-
     // third and fourth byte is the radiolib status code.
     /// @todo handle status codes.
     int16_t radiolibStatusCode = datagramData[2] | (datagramData[3] << 8);

FOSSAGSCP/src/DatagramInterpreter.h

@@ -17,6 +17,8 @@
 
 #include "ui_mainwindow.h"
 #include "ui_systeminformationpane.h"
+#include "ui_messagelogframe.h"
+#include "messagelogframe.h"
 
 #include <FOSSA-Comms.h>
 #include <QObject>
@@ -58,9 +60,11 @@ class DatagramInterpreter : public QObject
 {
     Q_OBJECT
 public:
-    DatagramInterpreter(Ui::MainWindow* mainWindowUI);
+    DatagramInterpreter(Ui::MainWindow* mainWindowUI, MessageLogFrame* messageLogFrame);
     virtual ~DatagramInterpreter() {}
 
+    void SetSystemInformationPane(Ui::systeminformationpane* systemInfoUI);
+
     IDatagram *SerialData_To_Datagram(QByteArray datagramData);
     IDatagram *Create_Datagram(char operationId, uint8_t functionId, uint8_t optDataLength, char *optData);
 
@@ -128,6 +132,7 @@ class DatagramInterpreter : public QObject
 protected:
     Ui::MainWindow* m_mainWindowUI = nullptr;
     Ui::systeminformationpane* m_systemInfoUI = nullptr;
+    MessageLogFrame* m_messageLog = nullptr;
 };
 
 #endif // Interpreter_H

FOSSAGSCP/src/DatagramProcessor.cpp

@@ -1,7 +1,7 @@
 #include "DatagramProcessor.h"
 
-DatagramProcessor::DatagramProcessor(Ui::MainWindow* mainWindowUI, Ui::systeminformationpane* systemInfoIUI)
-    : m_mainWindowUI(mainWindowUI), m_systemInfoUI(systemInfoIUI)
+DatagramProcessor::DatagramProcessor(Ui::MainWindow *mainWindowUI,  Ui::systeminformationpane* systemInfoUI, MessageLogFrame* messageLogFrame)
+    : m_mainWindowUI(mainWindowUI), m_messageLog(messageLogFrame), m_systemInfoUI(systemInfoUI)
 {
 
 }
@@ -79,8 +79,8 @@ void DatagramProcessor::ProcessFrame(IDatagram *datagram)
 
     // for (int i = 0; i < payloadLength; i++)
      //{
-         qInfo() << functionId;
-         qInfo() << optionalDataLength;
+        // qInfo() << functionId;
+         //qInfo() << optionalDataLength;
      //}
     if (optionalDataLength >= 0)
     {
@@ -107,6 +107,9 @@ void DatagramProcessor::ProcessFrame(IDatagram *datagram)
         }
         else if (functionId == RESP_SYSTEM_INFO)
         {
+            // message the messageframe
+            m_messageLog->RawWriteToLog("[System information frame]");
+
             if (Settings::GetSatVersion() == VERSION_1B)
             {
                 uint8_t batteryVoltage = optionalData[0];

FOSSAGSCP/src/DatagramProcessor.h

@@ -12,6 +12,8 @@
 
 #include "ui_mainwindow.h"
 #include "ui_systeminformationpane.h"
+#include "ui_messagelogframe.h"
+#include "messagelogframe.h"
 
 #include <FOSSA-Comms.h>
 #include <QObject>
@@ -22,7 +24,7 @@ class DatagramProcessor : public QObject
 {
     Q_OBJECT
 public:
-    DatagramProcessor(Ui::MainWindow* mainWindowUI, Ui::systeminformationpane* systemInfoUI);
+    DatagramProcessor(Ui::MainWindow* mainWindowUI, Ui::systeminformationpane* systemInfoUI, MessageLogFrame* messageLogFrame);
 
     void ProcessDatagram(IDatagram* datagram);
 
@@ -36,6 +38,7 @@ class DatagramProcessor : public QObject
 private:
     Ui::MainWindow* m_mainWindowUI;
     Ui::systeminformationpane* m_systemInfoUI;
+    MessageLogFrame* m_messageLog;
 
     void ProcessHandshake(IDatagram *datagram);
     void ProcessGroundStationConfigurationChange(IDatagram *datagram);

FOSSAGSCP/src/InboundDatagram.cpp

@@ -36,16 +36,19 @@ QString InboundDatagram::ToString() const
     hexChar[4] = '\0';
     datagramStr.append(hexChar);
 
-    sprintf(&(hexChar[0]), "%02x, ", (uint8_t)m_radiolibStatusCode);
-    hexChar[4] = '\0';
-    datagramStr.append(hexChar);
+    if (m_lengthByte != 0)
+    {
+        sprintf(&(hexChar[0]), "%02x, ", (uint8_t)m_radiolibStatusCode);
+        hexChar[4] = '\0';
+        datagramStr.append(hexChar);
 
-    sprintf(&(hexChar[0]), "%02x, ", (uint8_t)(m_radiolibStatusCode >> 8));
-    hexChar[4] = '\0';
-    datagramStr.append(hexChar);
+        sprintf(&(hexChar[0]), "%02x, ", (uint8_t)(m_radiolibStatusCode >> 8));
+        hexChar[4] = '\0';
+        datagramStr.append(hexChar);
 
-    QString frameStr = m_frame->ToString();
-    datagramStr.append(frameStr);
+        QString frameStr = m_frame->ToString();
+        datagramStr.append(frameStr);
+    }
 
     return datagramStr;
 }