Browse Source

General cleanup

Scott Lahteine 4 years ago
parent
commit
1fb2fffdbf

+ 1
- 1
Marlin/src/HAL/STM32_F4_F7/eeprom_emul.cpp View File

@@ -336,7 +336,7 @@ uint16_t EE_WriteVariable(uint16_t VirtAddress, uint16_t Data) {
336 336
  * @brief  Erases PAGE and PAGE1 and writes VALID_PAGE header to PAGE
337 337
  * @param  None
338 338
  * @retval Status of the last operation (Flash write or erase) done during
339
- *         EEPROM formating
339
+ *         EEPROM formatting
340 340
  */
341 341
 static HAL_StatusTypeDef EE_Format() {
342 342
   FLASH_EraseInitTypeDef pEraseInit;

+ 1
- 1
Marlin/src/gcode/feature/i2c/M260_M261.cpp View File

@@ -31,7 +31,7 @@
31 31
 /**
32 32
  * M260: Send data to a I2C slave device
33 33
  *
34
- * This is a PoC, the formating and arguments for the GCODE will
34
+ * This is a PoC, the formatting and arguments for the GCODE will
35 35
  * change to be more compatible, the current proposal is:
36 36
  *
37 37
  *  M260 A<slave device address base 10> ; Sets the I2C slave address the data will be sent to

+ 4
- 13
Marlin/src/gcode/gcode.cpp View File

@@ -327,13 +327,8 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
327 327
 
328 328
       #if ENABLED(G38_PROBE_TARGET)
329 329
         case 38:                                                  // G38.2, G38.3: Probe towards target
330
-          if (WITHIN(parser.subcode, 2,
331
-            #if ENABLED(G38_PROBE_AWAY)
332
-              5
333
-            #else
334
-              3
335
-            #endif
336
-          )) G38(parser.subcode);                                 // G38.4, G38.5: Probe away from target
330
+          if (WITHIN(parser.subcode, 2, TERN(G38_PROBE_AWAY, 5, 3)))
331
+            G38(parser.subcode);                                  // G38.4, G38.5: Probe away from target
337 332
           break;
338 333
       #endif
339 334
 
@@ -485,14 +480,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
485 480
         case 108: M108(); break;                                  // M108: Cancel Waiting
486 481
         case 112: M112(); break;                                  // M112: Full Shutdown
487 482
         case 410: M410(); break;                                  // M410: Quickstop - Abort all the planned moves.
488
-        #if ENABLED(HOST_PROMPT_SUPPORT)
489
-          case 876: M876(); break;                                // M876: Handle Host prompt responses
490
-        #endif
483
+        TERN_(HOST_PROMPT_SUPPORT, case 876:)                     // M876: Handle Host prompt responses
491 484
       #else
492 485
         case 108: case 112: case 410:
493
-        #if ENABLED(HOST_PROMPT_SUPPORT)
494
-          case 876:
495
-        #endif
486
+        TERN_(HOST_PROMPT_SUPPORT, case 876:)
496 487
         break;
497 488
       #endif
498 489
 

Loading…
Cancel
Save