Skip to content

Commit 01d383d

Browse files
rhapsodyvthinkyhead
authored andcommitted
Unify FYSETC F6 1.3 / 1.4 (MarlinFirmware#20507)
Co-authored-by: Scott Lahteine <[email protected]>
1 parent 4b67f30 commit 01d383d

File tree

5 files changed

+40
-14
lines changed

5 files changed

+40
-14
lines changed

.github/workflows/test-builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848

4949
# Extended AVR Environments
5050

51-
- FYSETC_F6_13
51+
- FYSETC_F6
5252
- mega1280
5353
- rambo
5454
- sanguino1284p

Marlin/src/pins/pins.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@
163163
#elif MB(DAGOMA_F5)
164164
#include "ramps/pins_DAGOMA_F5.h" // ATmega2560 env:mega2560
165165
#elif MB(FYSETC_F6_13)
166-
#include "ramps/pins_FYSETC_F6_13.h" // ATmega2560 env:FYSETC_F6_13
166+
#include "ramps/pins_FYSETC_F6_13.h" // ATmega2560 env:FYSETC_F6
167167
#elif MB(FYSETC_F6_14)
168-
#include "ramps/pins_FYSETC_F6_14.h" // ATmega2560 env:FYSETC_F6_14
168+
#include "ramps/pins_FYSETC_F6_14.h" // ATmega2560 env:FYSETC_F6
169169
#elif MB(DUPLICATOR_I3_PLUS)
170170
#include "ramps/pins_DUPLICATOR_I3_PLUS.h" // ATmega2560 env:mega2560
171171
#elif MB(VORON)
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"build": {
3+
"core": "arduino",
4+
"extra_flags": "-DARDUINO_AVR_MEGA2560",
5+
"f_cpu": "16000000L",
6+
"hwids": [
7+
[
8+
"0x27b2",
9+
"0x0002"
10+
]
11+
],
12+
"mcu": "atmega2560",
13+
"variant": "fysetcf6"
14+
},
15+
"debug": {
16+
"simavr_target": "atmega2560",
17+
"avr-stub": {
18+
"speed": 115200
19+
}
20+
},
21+
"frameworks": [
22+
"arduino"
23+
],
24+
"name": "FYSETC F6",
25+
"upload": {
26+
"maximum_ram_size": 8192,
27+
"maximum_size": 258048,
28+
"protocol": "wiring",
29+
"require_upload_port": true,
30+
"speed": 115200
31+
},
32+
"url": "https://www.fysetc.com/",
33+
"vendor": "FYSETC"
34+
}

platformio.ini

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -505,20 +505,12 @@ extends = common_avr8
505505
board = reprap_rambo
506506

507507
#
508-
# FYSETC F6 V1.3
508+
# FYSETC F6 V1.3 / V1.4
509509
#
510-
[env:FYSETC_F6_13]
510+
[env:FYSETC_F6]
511511
platform = atmelavr
512512
extends = common_avr8
513-
board = fysetc_f6_13
514-
515-
#
516-
# FYSETC F6 V1.4
517-
#
518-
[env:FYSETC_F6_14]
519-
platform = atmelavr
520-
extends = common_avr8
521-
board = fysetc_f6_14
513+
board = fysetc_f6
522514

523515
#
524516
# Sanguinololu (ATmega644p)

0 commit comments

Comments
 (0)