From 9c89bdd1399d04b5f3c26160d3d98941a7d5427d Mon Sep 17 00:00:00 2001
From: Victor Mateus Oliveira <rhapsodyv@gmail.com>
Date: Sat, 19 Dec 2020 15:00:25 -0300
Subject: [PATCH 1/3] add missing fysetc f6 14 board

---
 .../share/PlatformIO/boards/fysetc_f6_14.json | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 buildroot/share/PlatformIO/boards/fysetc_f6_14.json

diff --git a/buildroot/share/PlatformIO/boards/fysetc_f6_14.json b/buildroot/share/PlatformIO/boards/fysetc_f6_14.json
new file mode 100644
index 000000000000..750bc8906533
--- /dev/null
+++ b/buildroot/share/PlatformIO/boards/fysetc_f6_14.json
@@ -0,0 +1,28 @@
+{
+  "build": {
+    "core": "arduino",
+    "extra_flags": "-DARDUINO_AVR_MEGA2560",
+    "f_cpu": "16000000L",
+    "hwids": [
+      [
+        "0x27b2",
+        "0x0002"
+      ]
+    ],
+    "mcu": "atmega2560",
+    "variant": "fysetcf6"
+  },
+  "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"
+}

From b74ea2760255b4457027de99bfd5d4653779597c Mon Sep 17 00:00:00 2001
From: Victor Mateus Oliveira <rhapsodyv@gmail.com>
Date: Sat, 19 Dec 2020 21:37:45 -0300
Subject: [PATCH 2/3] typo?

---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 11918bc35af0..cf7ee171ce96 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -486,7 +486,7 @@ build_flags         = ${common.build_flags} -fno-tree-scev-cprop -fno-split-wide
 [env:MightyBoard1280]
 platform = atmelavr
 extends  = mega_extended_optimized
-board    = megamega1280
+board    = megaatmega1280
 
 #
 # MightyBoard ATmega2560

From 38b6883c25eae8a4d74f6418f24637aade7fbb4d Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 20 Dec 2020 00:54:07 -0600
Subject: [PATCH 3/3] Single fysetc_f6 environment

---
 .github/workflows/test-builds.yml                  |  2 +-
 Marlin/src/pins/pins.h                             |  4 ++--
 .../boards/{fysetc_f6_14.json => fysetc_f6.json}   |  6 ++++++
 .../tests/{FYSETC_F6_13-tests => FYSETC_F6-tests}  |  0
 platformio.ini                                     | 14 +++-----------
 5 files changed, 12 insertions(+), 14 deletions(-)
 rename buildroot/share/PlatformIO/boards/{fysetc_f6_14.json => fysetc_f6.json} (83%)
 rename buildroot/tests/{FYSETC_F6_13-tests => FYSETC_F6-tests} (100%)

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 53ffbe0c08b1..7549e3defcbb 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -48,7 +48,7 @@ jobs:
 
         # Extended AVR Environments
 
-        - FYSETC_F6_13
+        - FYSETC_F6
         - mega1280
         - rambo
         - sanguino1284p
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 9d1dab10f60c..c261c6f25d9d 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -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)
diff --git a/buildroot/share/PlatformIO/boards/fysetc_f6_14.json b/buildroot/share/PlatformIO/boards/fysetc_f6.json
similarity index 83%
rename from buildroot/share/PlatformIO/boards/fysetc_f6_14.json
rename to buildroot/share/PlatformIO/boards/fysetc_f6.json
index 750bc8906533..2772f73a6539 100644
--- a/buildroot/share/PlatformIO/boards/fysetc_f6_14.json
+++ b/buildroot/share/PlatformIO/boards/fysetc_f6.json
@@ -12,6 +12,12 @@
     "mcu": "atmega2560",
     "variant": "fysetcf6"
   },
+  "debug": {
+    "simavr_target": "atmega2560",
+    "avr-stub": {
+      "speed": 115200
+    }
+  },
   "frameworks": [
     "arduino"
   ],
diff --git a/buildroot/tests/FYSETC_F6_13-tests b/buildroot/tests/FYSETC_F6-tests
similarity index 100%
rename from buildroot/tests/FYSETC_F6_13-tests
rename to buildroot/tests/FYSETC_F6-tests
diff --git a/platformio.ini b/platformio.ini
index e7f22e3f09e7..547ab8107173 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -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)