Call $G during handshake, process $$, $G, $# in communicator

Author: etet100

src/gpilot/core/communicator/communicator.cpp

@@ -69,12 +69,17 @@ Communicator::Communicator(
         const QString& data,
         const QStringList& lines
     ) -> bool {
-        // Store current coordinate system
+        // Store device configuration and state from query responses
+        if (command == "$$" && status.ok) {
+            processDeviceConfiguration(lines);
+        }
+
         if (command == "$G" && status.ok) {
-            auto modal = ModalStateParser::parse(lines[0]);
-            if (modal) {
-                qDebug() << "[Communicator] Detected coordinate system: " << modal->coordinateSystem;
-            }
+            processGCodeParserState(attrs, lines[0]);
+        }
+
+        if (command == "$#" && status.ok) {
+            processOffsetsVars(lines);
         }
 
         if (attrs.source == CommandSource::Communicator) {

src/gpilot/core/state_behavior/handshakebehavior.cpp

@@ -65,30 +65,39 @@ AbstractStateBehavior::Result HandshakeBehavior::onCommandResponse(
 
     // Retry on EEPROM-not-ready error before main handling.
     if (!cmdStatus.ok && cmdStatus.errorCode == GRBL_ERROR_EEPROM_READ_FAIL) {
-        if (command == "$$" || command == "$#") {
+        if (command == "$$" || command == "$G" || command == "$#") {
             qDebug() << "[Behavior][Handshake] EEPROM not ready for" << command << "— requeuing.";
 
             return Result::ReturnCommandToQueue;
         }
     }
 
+    // Responses for all commands are handled in Communicator callback, do not handle it here.
+
     if (command == "$$") {
-        if (cmdStatus.ok) {
-            m_communicator->processDeviceConfiguration(fullResponse);
-        } else {
+        if (!cmdStatus.ok) {
             qDebug() << "[Behavior][Handshake] Failed to receive device settings (error" << cmdStatus.errorCode << "). Continuing.";
         }
 
+        m_communicator->sendCommand(CommandSource::System, "$G", TABLE_INDEX_UTIL1);
+        m_stage = QueryingGcodeState;
+
+        return Result::Ok;
+    }
+
+    if (command == "$G") {
+        if (!cmdStatus.ok) {
+            qDebug() << "[Behavior][Handshake] Failed to receive gcode parser state (error" << cmdStatus.errorCode << "). Continuing.";
+        }
+
         m_communicator->sendCommand(CommandSource::System, "$#", TABLE_INDEX_UTIL1);
         m_stage = QueryingOffsets;
 
         return Result::Ok;
     }
 
     if (command == "$#") {
-        if (cmdStatus.ok) {
-            m_communicator->processOffsetsVars(fullResponse);
-        } else {
+        if (!cmdStatus.ok) {
             qDebug() << "[Behavior][Handshake] Failed to receive coordinate offsets (error" << cmdStatus.errorCode << "). Continuing.";
         }
 

src/gpilot/core/state_behavior/handshakebehavior.h

@@ -10,7 +10,7 @@
 //   1. Queries current machine state (?).
 //   2. If the machine is actively running an external process (Run/Jog/Check),
 //      transitions immediately to ExternalProcessBehavior.
-//   3. Otherwise queries device settings ($$) and coordinate offsets ($#).
+//   3. Otherwise queries device settings ($$), gcode state ($G), and coordinate offsets ($#).
 //   4. Transitions to the appropriate behavior based on the initial machine state.
 class HandshakeBehavior : public AbstractStateBehavior
 {
@@ -33,6 +33,7 @@ class HandshakeBehavior : public AbstractStateBehavior
     enum Stage {
         QueryingState,
         QueryingSettings,
+        QueryingGcodeState,
         QueryingOffsets,
         Completed
     };

src/gpilot/core/state_behavior/idlebehavior.cpp

@@ -35,25 +35,6 @@ AbstractStateBehavior::Result IdleBehavior::onCommandResponse(QString command, C
 
     qDebug() << "[Behavior][Idle] Command Response:" << command << response;
 
-    if (command == "$G") {
-        m_communicator->processGCodeParserState(commandAttributes, response);
-
-        return Result::Ok;
-    }
-
-    if (command == "$$") {
-        if (!cmdStatus.ok) {
-            qDebug() << "[Behavior][Idle] Error receiving device configuration.";
-
-            return Result::Ok;
-        }
-
-        qDebug() << "[Behavior][Idle] Processing device configuration.";
-        m_communicator->processDeviceConfiguration(fullResponse);
-
-        return Result::Ok;
-    }
-
     return Result::Unhandled;
 }