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
089d12df
Commit
089d12df
authored
Jun 18, 2019
by
Bob Kuhn
Committed by
Scott Lahteine
Jun 18, 2019
Browse files
Options
Downloads
Patches
Plain Diff
Fix duplicate board IDs (#14310)
parent
5307f429
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Marlin/Makefile
+1
-1
1 addition, 1 deletion
Marlin/Makefile
Marlin/src/core/boards.h
+2
-2
2 additions, 2 deletions
Marlin/src/core/boards.h
buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
+4
-4
4 additions, 4 deletions
...are/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
with
7 additions
and
7 deletions
Marlin/Makefile
+
1
−
1
View file @
089d12df
...
...
@@ -273,7 +273,7 @@ else ifeq ($(HARDWARE_MOTHERBOARD),304)
# Einsy Retro
else
ifeq
($(HARDWARE_MOTHERBOARD),305)
# Elefu Ra Board (v3)
else
ifeq
($(HARDWARE_MOTHERBOARD),2
1
)
else
ifeq
($(HARDWARE_MOTHERBOARD),2
3
)
# Leapfrog
else
ifeq
($(HARDWARE_MOTHERBOARD),999)
# Mega controller
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/core/boards.h
+
2
−
2
View file @
089d12df
...
...
@@ -112,7 +112,7 @@
#define BOARD_MINIRAMBO_10A 303 // Mini-Rambo 1.0a
#define BOARD_EINSY_RAMBO 304 // Einsy Rambo
#define BOARD_EINSY_RETRO 305 // Einsy Retro
#define BOARD_ELEFU_3 2
1
// Elefu Ra Board (v3)
#define BOARD_ELEFU_3 2
3
// Elefu Ra Board (v3)
#define BOARD_LEAPFROG 999 // Leapfrog
#define BOARD_MEGACONTROLLER 310 // Mega controller
#define BOARD_SCOOVO_X9H 321 // abee Scoovo X9H
...
...
@@ -247,7 +247,7 @@
#define BOARD_MORPHEUS 1806 // STM32F103C8/STM32F103CB Libmaple based stm32f1 controller
#define BOARD_MKS_ROBIN 1808 // MKS Robin / STM32F103ZET6
#define BOARD_BIGTREE_SKR_MINI_V1_1 1814 // STM32F103RC
#define BOARD_JGAURORA_A5S_A1 18
1
0 // JGAurora A5S A1 / STM32F103ZET6
#define BOARD_JGAURORA_A5S_A1 18
2
0 // JGAurora A5S A1 / STM32F103ZET6
//
// STM32 ARM Cortex-M4F
...
...
This diff is collapsed.
Click to expand it.
buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
+
4
−
4
View file @
089d12df
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