zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

General cleanup

Browse source
This commit is contained in:
Scott Lahteine 2020-06-23 18:49:45 -05:00
parent 2a9ad52ab1
commit 1fb2fffdbf
3 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
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) {
* @brief Erases PAGE and PAGE1 and writes VALID_PAGE header to PAGE * @brief Erases PAGE and PAGE1 and writes VALID_PAGE header to PAGE
* @param None * @param None
* @retval Status of the last operation (Flash write or erase) done during * @retval Status of the last operation (Flash write or erase) done during
* EEPROM formating * EEPROM formatting
*/ */
static HAL_StatusTypeDef EE_Format() { static HAL_StatusTypeDef EE_Format() {
FLASH_EraseInitTypeDef pEraseInit; FLASH_EraseInitTypeDef pEraseInit;

2
Marlin/src/gcode/feature/i2c/M260_M261.cpp
View file

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

17
Marlin/src/gcode/gcode.cpp
View file

@ -327,13 +327,8 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
#if ENABLED(G38_PROBE_TARGET) #if ENABLED(G38_PROBE_TARGET)
case 38: // G38.2, G38.3: Probe towards target case 38: // G38.2, G38.3: Probe towards target
if (WITHIN(parser.subcode, 2, if (WITHIN(parser.subcode, 2, TERN(G38_PROBE_AWAY, 5, 3)))
#if ENABLED(G38_PROBE_AWAY) G38(parser.subcode); // G38.4, G38.5: Probe away from target
5
#else
3
#endif
)) G38(parser.subcode); // G38.4, G38.5: Probe away from target
break; break;
#endif #endif
@ -485,14 +480,10 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
case 108: M108(); break; // M108: Cancel Waiting case 108: M108(); break; // M108: Cancel Waiting
case 112: M112(); break; // M112: Full Shutdown case 112: M112(); break; // M112: Full Shutdown
case 410: M410(); break; // M410: Quickstop - Abort all the planned moves. case 410: M410(); break; // M410: Quickstop - Abort all the planned moves.
#if ENABLED(HOST_PROMPT_SUPPORT) TERN_(HOST_PROMPT_SUPPORT, case 876:) // M876: Handle Host prompt responses
case 876: M876(); break; // M876: Handle Host prompt responses
#endif
#else #else
case 108: case 112: case 410: case 108: case 112: case 410:
#if ENABLED(HOST_PROMPT_SUPPORT) TERN_(HOST_PROMPT_SUPPORT, case 876:)
case 876:
#endif
break; break;
#endif #endif