Parse / log modal state

Author: etet100

src/gpilot/core/communicator/communicator_processing_response.cpp

@@ -458,35 +458,37 @@ void Communicator::processGCodeParserState(CommandAttributes commandAttributes,
     }
 
     // Process GCore parser state
-    if (commandAttributes.tableIndex == TABLE_INDEX_UTIL2) {
-        // @TODO what is this ; for? is it '; ok'?
-        m_lastParserState = response.left(response.indexOf("; "));
-
-        auto modal = ModalStateParser::parse(m_lastParserState);
+    // if (commandAttributes.tableIndex == TABLE_INDEX_UTIL2) {
+        auto modal = ModalStateParser::parse(response);
         if (modal) {
             m_deviceContext.setModalState(*modal);
-        }
+            emit log(modal->toString());
 
-        // Update status in visualizer window
-        emit parserStateReceived(m_lastParserState);
+            // Update status in visualizer window
+            emit parserStateReceived(modal->raw);
 
-        // Store parser status
-        if ((m_senderState == SenderState::Transferring) || (m_senderState == SenderState::Stopping)) {
-            storeParserState();
-        }
+            // Store parser status
+            if ((m_senderState == SenderState::Transferring) || (m_senderState == SenderState::Stopping)) {
+                storeParserState();
+            }
 
-        // Spindle speed
-        // @TODO what is the difference between this and processFeedSpindleSpeed??
-        static QRegularExpression rx(".*S([\\d\\.]+)");
+            if (modal->spindleSpeed != -1) {
+                emit spindleSpeedReceived(modal->spindleSpeed);
+            }
+
+            // Spindle speed
+            // @TODO what is the difference between this and processFeedSpindleSpeed??
+            // static QRegularExpression rx(".*S([\\d\\.]+)");
 
-        match = rx.match(response);
-        if (match.hasMatch()) {
-            double spindleSpeed = match.captured(1).toDouble();
-            emit spindleSpeedReceived(spindleSpeed);
+            // match = rx.match(response);
+            // if (match.hasMatch()) {
+            //     double spindleSpeed = match.captured(1).toDouble();
+            //     emit spindleSpeedReceived(spindleSpeed);
+            // }
         }
 
         m_updateParserState = true;
-    }
+    // }
 }
 
 // processCommandResponse was moved to CommandBuffer::processResponse()

src/gpilot/core/machine/modalstateparser.cpp

@@ -6,14 +6,15 @@
 
 std::optional<ModalState> ModalStateParser::parse(const QString &line)
 {
-    if (!line.startsWith('[') || !line.endsWith(']')) {
+    if (!line.startsWith("[GC:") || !line.endsWith(']')) {
         return std::nullopt;
     }
 
-    const QString inner = line.mid(1, line.length() - 2);
+    const QString inner = line.mid(4, line.length() - 5);
     const QStringList tokens = inner.split(' ', Qt::SkipEmptyParts);
 
     ModalState state;
+    state.raw = inner;
 
     for (const QString &token : tokens) {
         if (token.startsWith('G')) {
@@ -55,3 +56,21 @@ std::optional<ModalState> ModalStateParser::parse(const QString &line)
 
     return state;
 }
+
+QString ModalState::toString() const
+{
+    QString sep = "————————————";
+    QString result;
+    result += sep + "\n";
+    result += QString("Coord: %1\n").arg(coordinateSystem);
+    result += QString("Plane: %1\n").arg(workPlane);
+    result += QString("Units: %1\n").arg(units == "G20" ? "inches" : units == "G21" ? "mm" : units);
+    result += QString("Motion: %1\n").arg(motionMode == "G90" ? "absolute" : motionMode == "G91" ? "relative" : motionMode);
+    result += QString("Feed mode: %1\n").arg(feedMode);
+    result += QString("Feed: %1\n").arg(feedRate);
+    result += QString("Spindle: %1\n").arg(spindleMode == "M3" ? "CW" : spindleMode == "M4" ? "CCW" : spindleMode == "M5" ? "off" : spindleMode);
+    result += QString("Speed: %1\n").arg(spindleSpeed);
+    result += sep;
+
+    return result;
+}

src/gpilot/core/machine/modalstateparser.h

@@ -21,8 +21,12 @@ struct ModalState {
     // Spindle mode (M3 = CW, M4 = CCW, M5 = off)
     QString spindleMode;
 
-    int feedRate = 0;
-    int spindleSpeed = 0;
+    int feedRate = -1;
+    int spindleSpeed = -1;
+
+    QString raw;
+
+    QString toString() const;
 };
 
 // Parses a modal state line like [G54 G17 G21 G90 G94 M5 M9 T0 F0 S0].

src/gpilot/ui/forms/frmmain.cpp

@@ -1878,7 +1878,7 @@ void FrmMain::onPinStateReceived(PinState state)
 
 void FrmMain::onFeedSpindleSpeedReceived(int feedRate, int spindleSpeed)
 {
-    ui->visualizer->setSpeedState((QString(tr("F/S: %1 / %2")).arg(feedRate, spindleSpeed)));
+    ui->visualizer->setSpeedState(feedRate, spindleSpeed);
 }
 
 void FrmMain::onSpindleSpeedReceived(int spindleSpeed)

src/gpilot/ui/forms/partials/main/partmainvisualizer.cpp

@@ -579,9 +579,9 @@ void PartMainVisualizer::setPinState(QString state)
     ui->visualizer->setPinState(state);
 }
 
-void PartMainVisualizer::setSpeedState(QString state)
+void PartMainVisualizer::setSpeedState(int feedRate, int spindleSpeed)
 {
-    ui->visualizer->setSpeedState(state);
+    ui->visualizer->setSpeedState(QString("F/S: %1 / %2").arg(feedRate).arg(spindleSpeed));
 }
 
 bool PartMainVisualizer::isIgnoreZ() const

src/gpilot/ui/forms/partials/main/partmainvisualizer.h

@@ -53,7 +53,7 @@ class PartMainVisualizer : public QWidget
 
         void setParserState(QString state);
         void setPinState(QString state);
-        void setSpeedState(QString state);
+        void setSpeedState(int feedRate, int spindleSpeed);
 
         void close();