Skip to content

Commit

Permalink
Unify FYSETC F6 1.3 / 1.4 (MarlinFirmware#20507)
Browse files Browse the repository at this point in the history
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
  • Loading branch information
2 people authored and dpreed committed Feb 5, 2021
1 parent 4b67f30 commit 01d383d
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-builds.yml
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
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
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"
}
File renamed without changes.
14 changes: 3 additions & 11 deletions platformio.ini
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

0 comments on commit 01d383d

Please sign in to comment.