Skip to content

Commit 4744997

Browse files
committed
📝 GCode => G-Code
1 parent 5bd39ba commit 4744997

File tree

11 files changed

+21
-21
lines changed

11 files changed

+21
-21
lines changed

Marlin/src/HAL/STM32F1/MarlinSerial.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static __always_inline void my_usart_irq(ring_buffer *rb, ring_buffer *wb, usart
7575
}
7676

7777
// Not every MarlinSerial port should handle emergency parsing.
78-
// It would not make sense to parse GCode from TMC responses, for example.
78+
// It would not make sense to parse G-Code from TMC responses, for example.
7979
constexpr bool serial_handles_emergency(int port) {
8080
return (false
8181
#ifdef SERIAL_PORT

Marlin/src/gcode/calibrate/G28.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ void GcodeSuite::G28() {
536536
/**
537537
* Preserve DXC mode across a G28 for IDEX printers in DXC_DUPLICATION_MODE.
538538
* This is important because it lets a user use the LCD Panel to set an IDEX Duplication mode, and
539-
* then print a standard GCode file that contains a single print that does a G28 and has no other
539+
* then print a standard G-Code file that contains a single print that does a G28 and has no other
540540
* IDEX specific commands in it.
541541
*/
542542
#if ENABLED(DUAL_X_CARRIAGE)

Marlin/src/gcode/control/M42.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void protected_pin_err() {
4444
}
4545

4646
/**
47-
* M42: Change pin status via GCode
47+
* M42: Change pin status via G-Code
4848
*
4949
* P<pin> Pin number (LED if omitted)
5050
* For LPC1768 specify pin P1_02 as M42 P102,

Marlin/src/gcode/feature/mixing/M163-M165.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void GcodeSuite::M164() {
7676
* I[factor] Mix factor for extruder stepper 6
7777
*/
7878
void GcodeSuite::M165() {
79-
// Get mixing parameters from the GCode
79+
// Get mixing parameters from the G-Code
8080
// The total "must" be 1.0 (but it will be normalized)
8181
// If no mix factors are given, the old mix is preserved
8282
const char mixing_codes[] = { LIST_N(MIXING_STEPPERS, 'A', 'B', 'C', 'D', 'H', 'I') };

Marlin/src/gcode/gcode.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ int8_t GcodeSuite::get_target_e_stepper_from_command(const int8_t dval/*=-1*/) {
153153
}
154154

155155
/**
156-
* Set XYZ...E destination and feedrate from the current GCode command
156+
* Set XYZ...E destination and feedrate from the current G-Code command
157157
*
158158
* - Set destination from included axis codes
159159
* - Set to current for missing axis codes
@@ -459,7 +459,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
459459
#endif
460460

461461
#if ENABLED(DEBUG_GCODE_PARSER)
462-
case 800: parser.debug(); break; // G800: GCode Parser Test for G
462+
case 800: parser.debug(); break; // G800: G-Code Parser Test for G
463463
#endif
464464

465465
default: parser.unknown_command_warning(); break;
@@ -1035,7 +1035,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
10351035
#endif
10361036

10371037
#if ENABLED(DEBUG_GCODE_PARSER)
1038-
case 800: parser.debug(); break; // M800: GCode Parser Test for M
1038+
case 800: parser.debug(); break; // M800: G-Code Parser Test for M
10391039
#endif
10401040

10411041
#if ENABLED(GCODE_REPEAT_MARKERS)

Marlin/src/gcode/gcode.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ class GcodeSuite {
462462
*/
463463
enum MarlinBusyState : char {
464464
NOT_BUSY, // Not in a handler
465-
IN_HANDLER, // Processing a GCode
465+
IN_HANDLER, // Processing a G-Code
466466
IN_PROCESS, // Known to be blocking command input (as in G29)
467467
PAUSED_FOR_USER, // Blocking pending any input
468468
PAUSED_FOR_INPUT // Blocking pending text input (concept)

Marlin/src/gcode/parser.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222

2323
/**
24-
* parser.cpp - Parser for a GCode line, providing a parameter interface.
24+
* parser.cpp - Parser for a G-Code line, providing a parameter interface.
2525
*/
2626

2727
#include "parser.h"
@@ -66,7 +66,7 @@ uint16_t GCodeParser::codenum;
6666
char *GCodeParser::command_args; // start of parameters
6767
#endif
6868

69-
// Create a global instance of the GCode parser singleton
69+
// Create a global instance of the G-Code parser singleton
7070
GCodeParser parser;
7171

7272
/**
@@ -108,7 +108,7 @@ void GCodeParser::reset() {
108108

109109
/**
110110
* Populate the command line state (command_letter, codenum, subcode, and string_arg)
111-
* by parsing a single line of GCode. 58 bytes of SRAM are used to speed up seen/value.
111+
* by parsing a single line of G-Code. 58 bytes of SRAM are used to speed up seen/value.
112112
*/
113113
void GCodeParser::parse(char *p) {
114114

@@ -317,7 +317,7 @@ void GCodeParser::parse(char *p) {
317317
#endif
318318

319319
#if ENABLED(FASTER_GCODE_PARSER)
320-
// Arguments MUST be uppercase for fast GCode parsing
320+
// Arguments MUST be uppercase for fast G-Code parsing
321321
#define PARAM_OK(P) WITHIN((P), 'A', 'Z')
322322
#else
323323
#define PARAM_OK(P) true

Marlin/src/gcode/parser.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#pragma once
2323

2424
/**
25-
* parser.h - Parser for a GCode line, providing a parameter interface.
26-
* Codes like M149 control the way the GCode parser behaves,
25+
* parser.h - Parser for a G-Code line, providing a parameter interface.
26+
* Codes like M149 control the way the G-Code parser behaves,
2727
* so settings for these codes are located in this class.
2828
*/
2929

@@ -43,7 +43,7 @@
4343
#endif
4444

4545
/**
46-
* GCode parser
46+
* G-Code parser
4747
*
4848
* - Parse a single G-code line for its letter, code, subcode, and parameters
4949
* - FASTER_GCODE_PARSER:
@@ -68,7 +68,7 @@ class GCodeParser {
6868

6969
public:
7070

71-
// Global states for GCode-level units features
71+
// Global states for G-Code-level units features
7272

7373
static bool volumetric_enabled;
7474

@@ -233,7 +233,7 @@ class GCodeParser {
233233
FORCE_INLINE static char* unescape_string(char* &src) { return src; }
234234
#endif
235235

236-
// Populate all fields by parsing a single line of GCode
236+
// Populate all fields by parsing a single line of G-Code
237237
// This uses 54 bytes of SRAM to speed up seen/value
238238
static void parse(char * p);
239239

Marlin/src/gcode/queue.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class GCodeQueue {
3535
*/
3636
struct SerialState {
3737
/**
38-
* GCode line number handling. Hosts may include line numbers when sending
38+
* G-Code line number handling. Hosts may include line numbers when sending
3939
* commands to Marlin, and lines will be checked for sequentiality.
4040
* M110 N<int> sets the current line number.
4141
*/
@@ -48,7 +48,7 @@ class GCodeQueue {
4848
static SerialState serial_state[NUM_SERIAL]; //!< Serial states for each serial port
4949

5050
/**
51-
* GCode Command Queue
51+
* G-Code Command Queue
5252
* A simple (circular) ring buffer of BUFSIZE command strings.
5353
*
5454
* Commands are copied into this buffer by the command injectors

Marlin/src/lcd/e3v2/jyersui/dwin.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4201,7 +4201,7 @@ void JyersDWIN::popupHandler(const PopupID popupid, const bool option/*=false*/)
42014201
case Popup_PIDWait: drawPopup(F("PID Autotune"), F("in process"), F("Please wait until done."), Proc_Wait, ICON_BLTouch); break;
42024202
case Popup_MPCWait: drawPopup(F("MPC Autotune"), F("in process"), F("Please wait until done."), Proc_Wait, ICON_BLTouch); break;
42034203
case Popup_Resuming: drawPopup(F("Resuming Print"), F("Please wait until done."), F(""), Proc_Wait, ICON_BLTouch); break;
4204-
case Popup_Custom: drawPopup(F("Running Custom GCode"), F("Please wait until done."), F(""), Proc_Wait, ICON_BLTouch); break;
4204+
case Popup_Custom: drawPopup(F("Running Custom G-Code"), F("Please wait until done."), F(""), Proc_Wait, ICON_BLTouch); break;
42054205
default: break;
42064206
}
42074207
}

docs/Queue.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Here's a basic flowchart of Marlin command processing:
1919
| Host | | SerialState RingBuffer | | |
2020
| | Marlin | NUM_SERIAL BUF_SIZE | | Marlin |
2121
+--+---+ R/TX_BUFFER_SIZE | +---+ +------------------+ | | |
22-
| +------------+ | | | | | | | GCode |
22+
| +------------+ | | | | | | | G-Code |
2323
| | | | | | | MAX_CMD_SIZE +-+-----> processor |
2424
| | Platform | | | | On EOL | +--------------+ | r_pos | |
2525
+-------------> serial's +-----------> +--------> | G-code | | | +-----------+

0 commit comments

Comments
 (0)