Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
1fb2fffd
Commit
1fb2fffd
authored
Jun 23, 2020
by
Scott Lahteine
Browse files
Options
Downloads
Patches
Plain Diff
General cleanup
parent
2a9ad52a
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Marlin/src/HAL/STM32_F4_F7/eeprom_emul.cpp
+1
-1
1 addition, 1 deletion
Marlin/src/HAL/STM32_F4_F7/eeprom_emul.cpp
Marlin/src/gcode/feature/i2c/M260_M261.cpp
+1
-1
1 addition, 1 deletion
Marlin/src/gcode/feature/i2c/M260_M261.cpp
Marlin/src/gcode/gcode.cpp
+4
-13
4 additions, 13 deletions
Marlin/src/gcode/gcode.cpp
with
6 additions
and
15 deletions
Marlin/src/HAL/STM32_F4_F7/eeprom_emul.cpp
+
1
−
1
View file @
1fb2fffd
...
@@ -336,7 +336,7 @@ uint16_t EE_WriteVariable(uint16_t VirtAddress, uint16_t Data) {
...
@@ -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 format
t
ing
*/
*/
static
HAL_StatusTypeDef
EE_Format
()
{
static
HAL_StatusTypeDef
EE_Format
()
{
FLASH_EraseInitTypeDef
pEraseInit
;
FLASH_EraseInitTypeDef
pEraseInit
;
...
...
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/gcode/feature/i2c/M260_M261.cpp
+
1
−
1
View file @
1fb2fffd
...
@@ -31,7 +31,7 @@
...
@@ -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 format
t
ing 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
...
...
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/gcode/gcode.cpp
+
4
−
13
View file @
1fb2fffd
...
@@ -327,13 +327,8 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) {
...
@@ -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*/) {
...
@@ -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
...
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment