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
1b9fc64d
Commit
1b9fc64d
authored
Sep 28, 2019
by
Maxim
Committed by
Scott Lahteine
Sep 28, 2019
Browse files
Options
Downloads
Patches
Plain Diff
Add M997 support for SKR PRO 1.1 (#15394)
parent
f57ce2b4
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Marlin/src/HAL/HAL_STM32/HAL.cpp
+5
-0
5 additions, 0 deletions
Marlin/src/HAL/HAL_STM32/HAL.cpp
Marlin/src/HAL/HAL_STM32/HAL.h
+3
-0
3 additions, 0 deletions
Marlin/src/HAL/HAL_STM32/HAL.h
with
8 additions
and
0 deletions
Marlin/src/HAL/HAL_STM32/HAL.cpp
+
5
−
0
View file @
1b9fc64d
...
@@ -112,4 +112,9 @@ uint16_t HAL_adc_get_result() {
...
@@ -112,4 +112,9 @@ uint16_t HAL_adc_get_result() {
return
HAL_adc_result
;
return
HAL_adc_result
;
}
}
void
flashFirmware
(
int16_t
value
)
{
UNUSED
(
value
);
NVIC_SystemReset
();
}
#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
#endif // ARDUINO_ARCH_STM32 && !STM32GENERIC
This diff is collapsed.
Click to expand it.
Marlin/src/HAL/HAL_STM32/HAL.h
+
3
−
0
View file @
1b9fc64d
...
@@ -198,3 +198,6 @@ uint16_t HAL_adc_get_result();
...
@@ -198,3 +198,6 @@ uint16_t HAL_adc_get_result();
#define GET_PIN_MAP_PIN(index) index
#define GET_PIN_MAP_PIN(index) index
#define GET_PIN_MAP_INDEX(pin) pin
#define GET_PIN_MAP_INDEX(pin) pin
#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
#define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
#define PLATFORM_M997_SUPPORT
void
flashFirmware
(
int16_t
value
);
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