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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
723d4d6f
Commit
723d4d6f
authored
4 years ago
by
Scott Lahteine
Browse files
Options
Downloads
Patches
Plain Diff
Fix Archim 2 build for PIO
parent
65f6a373
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Marlin/Makefile
+1
-1
1 addition, 1 deletion
Marlin/Makefile
Marlin/src/pins/pins.h
+1
-1
1 addition, 1 deletion
Marlin/src/pins/pins.h
platformio.ini
+19
-0
19 additions, 0 deletions
platformio.ini
with
21 additions
and
2 deletions
Marlin/Makefile
+
1
−
1
View file @
723d4d6f
...
...
@@ -686,7 +686,7 @@ ifeq ($(HARDWARE_VARIANT), Teensy)
else
ifeq
($(HARDWARE_VARIANT), archim)
CDEFS
+=
-DARDUINO_SAM_ARCHIM
-DARDUINO_ARCH_SAM
-D__SAM3X8E__
-DUSB_VID
=
0x27b1
-DUSB_PID
=
0x0001
-DUSBCON
'-DUSB_MANUFACTURER="UltiMachine"'
'-DUSB_PRODUCT="Archim"'
LIB_CXXSRC
+=
variant.cpp IPAddress.cpp Reset.cpp RingBuffer.cpp Stream.cpp UARTClass.cpp USARTClass.cpp abi.cpp new.cpp watchdog.cpp CDC.cpp PluggableUSB.cpp
USBCore.cpp
LIB_CXXSRC
+=
variant.cpp IPAddress.cpp Reset.cpp RingBuffer.cpp Stream.cpp UARTClass.cpp USARTClass.cpp abi.cpp new.cpp watchdog.cpp CDC.cpp PluggableUSB.cpp USBCore.cpp
LIB_SRC
+=
cortex_handlers.c iar_calls_sam3.c syscalls_sam3.c dtostrf.c itoa.c
ifeq
($(U8GLIB), 1)
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/pins/pins.h
+
1
−
1
View file @
723d4d6f
...
...
@@ -454,7 +454,7 @@
#elif MB(ARCHIM1)
#include
"sam/pins_ARCHIM1.h"
// SAM3X8E env:DUE env:DUE_debug
#elif MB(ARCHIM2)
#include
"sam/pins_ARCHIM2.h"
// SAM3X8E env:DUE env:DUE_debug
#include
"sam/pins_ARCHIM2.h"
// SAM3X8E env:DUE
_archim
env:DUE_
archim_
debug
#elif MB(ALLIGATOR)
#include
"sam/pins_ALLIGATOR_R2.h"
// SAM3X8E env:DUE env:DUE_debug
#elif MB(ADSK)
...
...
This diff is collapsed.
Click to expand it.
platformio.ini
+
19
−
0
View file @
723d4d6f
...
...
@@ -206,6 +206,25 @@ build_flags = ${common.build_flags}
-funwind-tables
-mpoke-function-name
#
# Archim SAM
#
[env:DUE_archim]
platform
=
atmelsam
board
=
due
src_filter
=
${common.default_src_filter} +<src/HAL/DUE>
build_flags
=
${common.build_flags}
-DARDUINO_SAM_ARCHIM
-DARDUINO_ARCH_SAM
-D__SAM3X8E__
-DUSBCON
[env:DUE_archim_debug]
# Used when WATCHDOG_RESET_MANUAL is enabled
platform
=
atmelsam
board
=
due
src_filter
=
${common.default_src_filter} +<src/HAL/DUE>
build_flags
=
${common.build_flags}
-DARDUINO_SAM_ARCHIM
-DARDUINO_ARCH_SAM
-D__SAM3X8E__
-DUSBCON
-funwind-tables
-mpoke-function-name
#
# NXP LPC176x ARM Cortex-M3
#
...
...
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