Merge pull request #45 from prusa3d/et_fixes

Fixed bug in conversion from binary to ascii gcode letting 'G29 G' li…
prusa3d · Jan 22, 2024 · 6f43cb0 · 6f43cb0
2 parents 7aaf717 + 20b79e6
commit 6f43cb0
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/LibBGCode/binarize/meatpack.cpp b/src/LibBGCode/binarize/meatpack.cpp
@@ -384,7 +384,7 @@ void unbinarize(const std::vector<uint8_t>& src, std::string& dst)
                 // G2, G3
                 'I', 'J', 'R',
                 // G29
-                'P', 'W', 'H', 'C', 'A'
+                'G', 'P', 'W', 'H', 'C', 'A'
             };
             return std::find(parameters.begin(), parameters.end(), c) != parameters.end();
         };
@@ -395,12 +395,15 @@ void unbinarize(const std::vector<uint8_t>& src, std::string& dst)
             // GCodeReader::parse_line_internal() is unable to parse a G line where the data are not separated by spaces
             // so we add them where needed
             const size_t curr_unbin_buffer_length = std::distance(unbin_buffer.begin(), it_unbin_end);
-            if (c_unbin[i] == 'G' && (curr_unbin_buffer_length == 0 || *std::prev(it_unbin_end, 1) == '\n'))
+            bool new_line = false;
+            if (c_unbin[i] == 'G' && (curr_unbin_buffer_length == 0 || *std::prev(it_unbin_end, 1) == '\n')) {
                 add_space = true;
+                new_line = true;
+            }
             else if (c_unbin[i] == '\n')
                 add_space = false;
 
-            if (add_space && (curr_unbin_buffer_length == 0 || *std::prev(it_unbin_end, 1) != ' ') &&
+            if (!new_line && add_space && (curr_unbin_buffer_length == 0 || *std::prev(it_unbin_end, 1) != ' ') &&
                 is_gline_parameter(c_unbin[i])) {
                 *it_unbin_end = ' ';
                 ++it_unbin_end;