Browse Source

🎨 Fix spelling, whitespace

Scott Lahteine 2 years ago
parent
commit
58ce5182c2

+ 1
- 1
Marlin/Configuration.h View File

643
 
643
 
644
 #if ENABLED(PIDTEMP)
644
 #if ENABLED(PIDTEMP)
645
   //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
645
   //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
646
-                                  // Set/get with gcode: M301 E[extruder number, 0-2]
646
+                                  // Set/get with G-code: M301 E[extruder number, 0-2]
647
 
647
 
648
   #if ENABLED(PID_PARAMS_PER_HOTEND)
648
   #if ENABLED(PID_PARAMS_PER_HOTEND)
649
     // Specify up to one value per hotend here, according to your setup.
649
     // Specify up to one value per hotend here, according to your setup.

+ 1
- 1
Marlin/Makefile View File

512
 else ifeq ($(HARDWARE_MOTHERBOARD),1325)
512
 else ifeq ($(HARDWARE_MOTHERBOARD),1325)
513
 # Intamsys 4.0 (Funmat HT)
513
 # Intamsys 4.0 (Funmat HT)
514
 else ifeq ($(HARDWARE_MOTHERBOARD),1326)
514
 else ifeq ($(HARDWARE_MOTHERBOARD),1326)
515
-# Malyan M180 Mainboard Version 2 (no display function, direct gcode only)
515
+# Malyan M180 Mainboard Version 2 (no display function, direct G-code only)
516
 else ifeq ($(HARDWARE_MOTHERBOARD),1327)
516
 else ifeq ($(HARDWARE_MOTHERBOARD),1327)
517
 # Geeetech GT2560 Rev B for A20(M/T/D)
517
 # Geeetech GT2560 Rev B for A20(M/T/D)
518
 else ifeq ($(HARDWARE_MOTHERBOARD),1328)
518
 else ifeq ($(HARDWARE_MOTHERBOARD),1328)

+ 1
- 1
Marlin/src/core/boards.h View File

161
 #define BOARD_PICA_REVB               1324  // PICA Shield (original version)
161
 #define BOARD_PICA_REVB               1324  // PICA Shield (original version)
162
 #define BOARD_PICA                    1325  // PICA Shield (rev C or later)
162
 #define BOARD_PICA                    1325  // PICA Shield (rev C or later)
163
 #define BOARD_INTAMSYS40              1326  // Intamsys 4.0 (Funmat HT)
163
 #define BOARD_INTAMSYS40              1326  // Intamsys 4.0 (Funmat HT)
164
-#define BOARD_MALYAN_M180             1327  // Malyan M180 Mainboard Version 2 (no display function, direct gcode only)
164
+#define BOARD_MALYAN_M180             1327  // Malyan M180 Mainboard Version 2 (no display function, direct G-code only)
165
 #define BOARD_GT2560_V4_A20           1328  // Geeetech GT2560 Rev B for A20(M/T/D)
165
 #define BOARD_GT2560_V4_A20           1328  // Geeetech GT2560 Rev B for A20(M/T/D)
166
 #define BOARD_PROTONEER_CNC_SHIELD_V3 1329  // Mega controller & Protoneer CNC Shield V3.00
166
 #define BOARD_PROTONEER_CNC_SHIELD_V3 1329  // Mega controller & Protoneer CNC Shield V3.00
167
 #define BOARD_WEEDO_62A               1330  // WEEDO 62A board (TINA2, Monoprice Cadet, etc.)
167
 #define BOARD_WEEDO_62A               1330  // WEEDO 62A board (TINA2, Monoprice Cadet, etc.)

+ 1
- 1
Marlin/src/feature/meatpack.cpp View File

26
  * Algorithm & Implementation: Scott Mudge - mail@scottmudge.com
26
  * Algorithm & Implementation: Scott Mudge - mail@scottmudge.com
27
  * Date: Dec. 2020
27
  * Date: Dec. 2020
28
  *
28
  *
29
- * Character Frequencies from ~30 MB of comment-stripped gcode:
29
+ * Character Frequencies from ~30 MB of comment-stripped G-code:
30
  *  '1' -> 4451136    '4' -> 1353273   '\n' -> 1087683    '-' ->   90242
30
  *  '1' -> 4451136    '4' -> 1353273   '\n' -> 1087683    '-' ->   90242
31
  *  '0' -> 4253577    '9' -> 1352147    'G' -> 1075806    'Z' ->   34109
31
  *  '0' -> 4253577    '9' -> 1352147    'G' -> 1075806    'Z' ->   34109
32
  *  ' ' -> 3053297    '3' -> 1262929    'X' ->  975742    'M' ->   11879
32
  *  ' ' -> 3053297    '3' -> 1262929    'X' ->  975742    'M' ->   11879

+ 2
- 2
Marlin/src/feature/meatpack.h View File

29
  * Specifically optimized for 3D printing G-Code, this is a zero-cost data compression method
29
  * Specifically optimized for 3D printing G-Code, this is a zero-cost data compression method
30
  * which packs ~180-190% more data into the same amount of bytes going to the CNC controller.
30
  * which packs ~180-190% more data into the same amount of bytes going to the CNC controller.
31
  * As a majority of G-Code can be represented by a restricted alphabet, I performed histogram
31
  * As a majority of G-Code can be represented by a restricted alphabet, I performed histogram
32
- * analysis on a wide variety of 3D printing gcode samples, and found ~93% of all gcode could
32
+ * analysis on a wide variety of 3D printing G-code samples, and found ~93% of all G-code could
33
  * be represented by the same 15-character alphabet.
33
  * be represented by the same 15-character alphabet.
34
  *
34
  *
35
  * This allowed me to design a system of packing 2 8-bit characters into a single byte, assuming
35
  * This allowed me to design a system of packing 2 8-bit characters into a single byte, assuming
38
  *
38
  *
39
  * Combined with some logic to allow commingling of full-width characters outside of this 15-
39
  * Combined with some logic to allow commingling of full-width characters outside of this 15-
40
  * character alphabet (at the cost of an extra 8-bits per full-width character), and by stripping
40
  * character alphabet (at the cost of an extra 8-bits per full-width character), and by stripping
41
- * out unnecessary comments, the end result is gcode which is roughly half the original size.
41
+ * out unnecessary comments, the end result is G-code which is roughly half the original size.
42
  *
42
  *
43
  * Why did I do this? I noticed micro-stuttering and other data-bottleneck issues while printing
43
  * Why did I do this? I noticed micro-stuttering and other data-bottleneck issues while printing
44
  * objects with high curvature, especially at high speeds. There is also the issue of the limited
44
  * objects with high curvature, especially at high speeds. There is also the issue of the limited

+ 1
- 1
Marlin/src/feature/mmu/mmu2-serial-protocol.md View File

51
 
51
 
52
 - MMU => 'ok\n'
52
 - MMU => 'ok\n'
53
 
53
 
54
-We don't wait for a response here but immediately continue with the next gcode which should
54
+We don't wait for a response here but immediately continue with the next G-code which should
55
 be one or more extruder moves to feed the filament into the hotend.
55
 be one or more extruder moves to feed the filament into the hotend.
56
 
56
 
57
 
57
 

+ 1
- 1
Marlin/src/feature/mmu/mmu2.cpp View File

939
  * Load filament to nozzle of multimaterial printer
939
  * Load filament to nozzle of multimaterial printer
940
  *
940
  *
941
  * This function is used only after T? (user select filament) and M600 (change filament).
941
  * This function is used only after T? (user select filament) and M600 (change filament).
942
- * It is not used after T0 .. T4 command (select filament), in such case, gcode is responsible for loading
942
+ * It is not used after T0 .. T4 command (select filament), in such case, G-code is responsible for loading
943
  * filament to nozzle.
943
  * filament to nozzle.
944
  */
944
  */
945
 void MMU2::load_to_nozzle() {
945
 void MMU2::load_to_nozzle() {

+ 1
- 1
Marlin/src/gcode/gcode.cpp View File

21
  */
21
  */
22
 
22
 
23
 /**
23
 /**
24
- * gcode.cpp - Temporary container for all gcode handlers
24
+ * gcode.cpp - Temporary container for all G-code handlers
25
  *             Most will migrate to classes, by feature.
25
  *             Most will migrate to classes, by feature.
26
  */
26
  */
27
 
27
 

+ 1
- 1
Marlin/src/gcode/gcode.h View File

110
  * M33  - Get the longname version of a path. (Requires LONG_FILENAME_HOST_SUPPORT)
110
  * M33  - Get the longname version of a path. (Requires LONG_FILENAME_HOST_SUPPORT)
111
  * M34  - Set SD Card sorting options. (Requires SDCARD_SORT_ALPHA)
111
  * M34  - Set SD Card sorting options. (Requires SDCARD_SORT_ALPHA)
112
  *
112
  *
113
- * M42  - Change pin status via gcode: M42 P<pin> S<value>. LED pin assumed if P is omitted. (Requires DIRECT_PIN_CONTROL)
113
+ * M42  - Change pin status via G-code: M42 P<pin> S<value>. LED pin assumed if P is omitted. (Requires DIRECT_PIN_CONTROL)
114
  * M43  - Display pin status, watch pins for changes, watch endstops & toggle LED, Z servo probe test, toggle pins (Requires PINS_DEBUGGING)
114
  * M43  - Display pin status, watch pins for changes, watch endstops & toggle LED, Z servo probe test, toggle pins (Requires PINS_DEBUGGING)
115
  * M48  - Measure Z Probe repeatability: M48 P<points> X<pos> Y<pos> V<level> E<engage> L<legs> S<chizoid>. (Requires Z_MIN_PROBE_REPEATABILITY_TEST)
115
  * M48  - Measure Z Probe repeatability: M48 P<points> X<pos> Y<pos> V<level> E<engage> L<legs> S<chizoid>. (Requires Z_MIN_PROBE_REPEATABILITY_TEST)
116
  *
116
  *

+ 1
- 1
Marlin/src/gcode/parser.h View File

45
 /**
45
 /**
46
  * GCode parser
46
  * GCode parser
47
  *
47
  *
48
- *  - Parse a single gcode line for its letter, code, subcode, and parameters
48
+ *  - Parse a single G-code line for its letter, code, subcode, and parameters
49
  *  - FASTER_GCODE_PARSER:
49
  *  - FASTER_GCODE_PARSER:
50
  *    - Flags existing params (1 bit each)
50
  *    - Flags existing params (1 bit each)
51
  *    - Stores value offsets (1 byte each)
51
  *    - Stores value offsets (1 byte each)

+ 1
- 1
Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp View File

708
       // Old TFT A22 X -1F1500      A22 X +1F1500
708
       // Old TFT A22 X -1F1500      A22 X +1F1500
709
       // New TFT A22 X-1.0 F1500    A22 X1.0 F1500
709
       // New TFT A22 X-1.0 F1500    A22 X1.0 F1500
710
 
710
 
711
-      // lets just wrap this in a gcode relative nonprint move and let the controller deal with it
711
+      // Send a G-code-relative non-print move and let the controller deal with it
712
       // G91 G0 <panel command> G90
712
       // G91 G0 <panel command> G90
713
 
713
 
714
       if (!isPrinting()) { // Ignore request if printing
714
       if (!isPrinting()) { // Ignore request if printing

+ 1
- 1
Marlin/src/lcd/extui/dgus/DGUSDisplay.cpp View File

243
 }
243
 }
244
 
244
 
245
 void DGUSDisplay::loop() {
245
 void DGUSDisplay::loop() {
246
-  // protect against recursion… ProcessRx() may indirectly call idle() when injecting gcode commands.
246
+  // Protect against recursion. ProcessRx() may indirectly call idle() when injecting G-code commands.
247
   if (!no_reentrance) {
247
   if (!no_reentrance) {
248
     no_reentrance = true;
248
     no_reentrance = true;
249
     ProcessRx();
249
     ProcessRx();

+ 1
- 1
Marlin/src/lcd/extui/malyan/malyan.cpp View File

24
  * lcd/extui/malyan/malyan.cpp
24
  * lcd/extui/malyan/malyan.cpp
25
  *
25
  *
26
  * LCD implementation for Malyan's LCD, a separate ESP8266 MCU running
26
  * LCD implementation for Malyan's LCD, a separate ESP8266 MCU running
27
- * on Serial1 for the M200 board. This module outputs a pseudo-gcode
27
+ * on Serial1 for the M200 board. This module outputs a pseudo-G-code
28
  * wrapped in curly braces which the LCD implementation translates into
28
  * wrapped in curly braces which the LCD implementation translates into
29
  * actual G-code commands.
29
  * actual G-code commands.
30
  *
30
  *

+ 3
- 3
Marlin/src/lcd/extui/mks_ui/draw_print_file.cpp View File

369
     card.openFileRead(cur_name);
369
     card.openFileRead(cur_name);
370
     card.read(public_buf, 512);
370
     card.read(public_buf, 512);
371
     ps4 = (uint32_t *)strstr((char *)public_buf, ";simage:");
371
     ps4 = (uint32_t *)strstr((char *)public_buf, ";simage:");
372
-    // Ignore the beginning message of gcode file
372
+    // Ignore the beginning message of G-code file
373
     if (ps4) {
373
     if (ps4) {
374
       pre_sread_cnt = (uintptr_t)ps4 - (uintptr_t)((uint32_t *)(&public_buf[0]));
374
       pre_sread_cnt = (uintptr_t)ps4 - (uintptr_t)((uint32_t *)(&public_buf[0]));
375
       card.setIndex(pre_sread_cnt);
375
       card.setIndex(pre_sread_cnt);
490
                 //&& (strIndex2 != 0) && (strIndex1 < strIndex2)
490
                 //&& (strIndex2 != 0) && (strIndex1 < strIndex2)
491
                 ) ? strIndex1 + 1 : tmpFile;
491
                 ) ? strIndex1 + 1 : tmpFile;
492
 
492
 
493
-  if (strIndex2 == 0 || (strIndex1 > strIndex2)) { // not gcode file
493
+  if (strIndex2 == 0 || (strIndex1 > strIndex2)) { // not G-code file
494
     #if _LFN_UNICODE
494
     #if _LFN_UNICODE
495
       if (wcslen(beginIndex) > len)
495
       if (wcslen(beginIndex) > len)
496
         wcsncpy(outStr, beginIndex, len);
496
         wcsncpy(outStr, beginIndex, len);
503
         strcpy(outStr, beginIndex);
503
         strcpy(outStr, beginIndex);
504
     #endif
504
     #endif
505
   }
505
   }
506
-  else { // gcode file
506
+  else { // G-code file
507
     if (strIndex2 - beginIndex > (len - 2)) {
507
     if (strIndex2 - beginIndex > (len - 2)) {
508
       #if _LFN_UNICODE
508
       #if _LFN_UNICODE
509
         wcsncpy(outStr, (const WCHAR *)beginIndex, len - 3);
509
         wcsncpy(outStr, (const WCHAR *)beginIndex, len - 3);

+ 3
- 3
Marlin/src/lcd/extui/mks_ui/draw_ui.cpp View File

159
     gCfgItems.spi_flash_flag = FLASH_INF_VALID_FLAG;
159
     gCfgItems.spi_flash_flag = FLASH_INF_VALID_FLAG;
160
     W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
160
     W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
161
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
161
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
162
-    // init gcode command
162
+    // Init G-code command
163
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[0], AUTO_LEVELING_COMMAND_ADDR, 100);
163
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[0], AUTO_LEVELING_COMMAND_ADDR, 100);
164
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[1], OTHERS_COMMAND_ADDR_1, 100);
164
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[1], OTHERS_COMMAND_ADDR_1, 100);
165
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[2], OTHERS_COMMAND_ADDR_2, 100);
165
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[2], OTHERS_COMMAND_ADDR_2, 100);
238
   uint8_t command_buf[512];
238
   uint8_t command_buf[512];
239
 
239
 
240
   W25QXX.init(SPI_QUARTER_SPEED);
240
   W25QXX.init(SPI_QUARTER_SPEED);
241
-  // read back the gcode command before erase spi flash
241
+  // read back the G-code command before erase spi flash
242
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
242
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
243
   W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
243
   W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
244
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
244
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
249
   uint8_t command_buf[512];
249
   uint8_t command_buf[512];
250
 
250
 
251
   W25QXX.init(SPI_QUARTER_SPEED);
251
   W25QXX.init(SPI_QUARTER_SPEED);
252
-  // read back the gcode command before erase spi flash
252
+  // read back the G-code command before erase spi flash
253
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
253
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
254
   W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
254
   W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
255
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
255
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/pic_manager.h View File

122
 #define VAR_INF_ADDR                    0x000000
122
 #define VAR_INF_ADDR                    0x000000
123
 #define FLASH_INF_VALID_FLAG            0x20201118
123
 #define FLASH_INF_VALID_FLAG            0x20201118
124
 
124
 
125
-// Store some gcode commands, such as auto leveling commands
125
+// Store some G-code commands, such as auto-leveling commands
126
 #define GCODE_COMMAND_ADDR              VAR_INF_ADDR + 3 * 1024
126
 #define GCODE_COMMAND_ADDR              VAR_INF_ADDR + 3 * 1024
127
 #define AUTO_LEVELING_COMMAND_ADDR      GCODE_COMMAND_ADDR
127
 #define AUTO_LEVELING_COMMAND_ADDR      GCODE_COMMAND_ADDR
128
 #define OTHERS_COMMAND_ADDR_1           AUTO_LEVELING_COMMAND_ADDR + 100
128
 #define OTHERS_COMMAND_ADDR_1           AUTO_LEVELING_COMMAND_ADDR + 100

+ 2
- 2
Marlin/src/module/planner.h View File

163
  * A single entry in the planner buffer.
163
  * A single entry in the planner buffer.
164
  * Tracks linear movement over multiple axes.
164
  * Tracks linear movement over multiple axes.
165
  *
165
  *
166
- * The "nominal" values are as-specified by gcode, and
166
+ * The "nominal" values are as-specified by G-code, and
167
  * may never actually be reached due to acceleration limits.
167
  * may never actually be reached due to acceleration limits.
168
  */
168
  */
169
 typedef struct block_t {
169
 typedef struct block_t {
412
 
412
 
413
     /**
413
     /**
414
      * The current position of the tool in absolute steps
414
      * The current position of the tool in absolute steps
415
-     * Recalculated if any axis_steps_per_mm are changed by gcode
415
+     * Recalculated if any axis_steps_per_mm are changed by G-code
416
      */
416
      */
417
     static xyze_long_t position;
417
     static xyze_long_t position;
418
 
418
 

+ 5
- 5
buildroot/share/scripts/g29_auto.py View File

1
 #!/usr/bin/env python
1
 #!/usr/bin/env python
2
 
2
 
3
-# This file is for preprocessing gcode and the new G29 Autobedleveling from Marlin
4
-# It will analyse the first 2 Layer and return the maximum size for this part
5
-# After this it will replace with g29_keyword = ';MarlinG29Script' with the new G29 LRFB
6
-# the new file will be created in the same folder.
3
+# This file is for preprocessing G-code and the new G29 Auto bed leveling from Marlin
4
+# It will analyze the first 2 layers and return the maximum size for this part
5
+# Then it will be replaced with g29_keyword = ';MarlinG29Script' with the new G29 LRFB.
6
+# The new file will be created in the same folder.
7
 
7
 
8
 from __future__ import print_function
8
 from __future__ import print_function
9
 
9
 
10
-# your gcode-file/folder
10
+# Your G-code file/folder
11
 folder = './'
11
 folder = './'
12
 my_file = 'test.gcode'
12
 my_file = 'test.gcode'
13
 
13
 

Loading…
Cancel
Save