Skip to content

Add Missing FYSETC F6 14 Board #20507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 4 commits into from
Dec 22, 2020
Merged

Add Missing FYSETC F6 14 Board #20507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c89bdd
add missing fysetc f6 14 board
rhapsodyv Dec 19, 2020
b74ea27
typo?
rhapsodyv Dec 20, 2020
d4813b0
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/20507
thinkyhead Dec 20, 2020
38b6883
Single fysetc_f6 environment
thinkyhead Dec 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:

# Extended AVR Environments

- FYSETC_F6_13
- FYSETC_F6
- mega1280
- rambo
- sanguino1284p
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/pins/pins.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@
#elif MB(DAGOMA_F5)
#include "ramps/pins_DAGOMA_F5.h" // ATmega2560 env:mega2560
#elif MB(FYSETC_F6_13)
#include "ramps/pins_FYSETC_F6_13.h" // ATmega2560 env:FYSETC_F6_13
#include "ramps/pins_FYSETC_F6_13.h" // ATmega2560 env:FYSETC_F6
#elif MB(FYSETC_F6_14)
#include "ramps/pins_FYSETC_F6_14.h" // ATmega2560 env:FYSETC_F6_14
#include "ramps/pins_FYSETC_F6_14.h" // ATmega2560 env:FYSETC_F6
#elif MB(DUPLICATOR_I3_PLUS)
#include "ramps/pins_DUPLICATOR_I3_PLUS.h" // ATmega2560 env:mega2560
#elif MB(VORON)
Expand Down
34 changes: 34 additions & 0 deletions buildroot/share/PlatformIO/boards/fysetc_f6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"build": {
"core": "arduino",
"extra_flags": "-DARDUINO_AVR_MEGA2560",
"f_cpu": "16000000L",
"hwids": [
[
"0x27b2",
"0x0002"
]
],
"mcu": "atmega2560",
"variant": "fysetcf6"
},
"debug": {
"simavr_target": "atmega2560",
"avr-stub": {
"speed": 115200
}
},
"frameworks": [
"arduino"
],
"name": "FYSETC F6",
"upload": {
"maximum_ram_size": 8192,
"maximum_size": 258048,
"protocol": "wiring",
"require_upload_port": true,
"speed": 115200
},
"url": "https://www.fysetc.com/",
"vendor": "FYSETC"
}
0 buildroot/tests/FYSETC_F6_13-tests → buildroot/tests/FYSETC_F6-tests
View file
Open in desktop
File renamed without changes.
14 changes: 3 additions & 11 deletions platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,20 +505,12 @@ extends = common_avr8
board = reprap_rambo

#
# FYSETC F6 V1.3
# FYSETC F6 V1.3 / V1.4
#
[env:FYSETC_F6_13]
[env:FYSETC_F6]
platform = atmelavr
extends = common_avr8
board = fysetc_f6_13

#
# FYSETC F6 V1.4
#
[env:FYSETC_F6_14]
platform = atmelavr
extends = common_avr8
board = fysetc_f6_14
board = fysetc_f6

#
# Sanguinololu (ATmega644p)
Expand Down