From 772436be3eef8df7b2f2a34d2ca54498371d072a Mon Sep 17 00:00:00 2001
From: nictronik99 <62067513+nictronik99@users.noreply.github.com>
Date: Sun, 5 Jul 2020 17:47:27 +0200
Subject: [PATCH] Add files via upload

fix #44 error described here: https://github.com/MarlinFirmware/Marlin/pull/18516
---
 platformio.ini | 76 +++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 56 insertions(+), 20 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 326b146711..563e9a0db9 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -244,6 +244,44 @@ lib_deps          = Servo
   TMCStepper@>=0.6.1,<1.0.0
   Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/release.zip
   SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
+  
+  
+#################################
+#                               #
+#      STM32 Architecture       #
+#                               #
+#################################
+#
+# HAL/STM32 Base Environment values
+#
+[common_stm32]
+platform      = ststm32@<6.2.0
+platform_packages = framework-arduinoststm32@>=4.10700,<4.10800
+lib_deps      = ${common.lib_deps}
+lib_ignore    = SoftwareSerial
+build_flags   = ${common.build_flags}
+  -IMarlin/src/HAL/STM32 -std=gnu++14
+  -DUSBCON -DUSBD_USE_CDC
+  -DUSBD_VID=0x0483
+  -DTIM_IRQ_PRIO=13
+build_unflags = -std=gnu++11
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32>
+#
+# HAL/STM32F1 Common Environment values
+#
+[common_stm32f1]
+platform      = ${common_stm32.platform}
+build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
+  ${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL
+build_unflags = -std=gnu++11
+src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_ignore    =
+  Adafruit NeoPixel
+  SPI
+lib_deps      = ${common.lib_deps}
+  SoftwareSerialM
+
+
 
 #
 # STM32F103RC
@@ -480,21 +518,26 @@ src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore    = Adafruit NeoPixel, SPI
 
 #
-# MKS Robin Nano (STM32F103VET6)
+# MKS Robin Nano (STM32F103VET6) - Emulated Graphical 128x64 (DOGM) UI
 #
-[env:mks_robin_nano35]
-platform      = ststm32
+[env:mks_robin_nano]
+platform      = ${common_stm32f1.platform}
+extends       = common_stm32f1
 board         = genericSTM32F103VE
 platform_packages = tool-stm32duino
-build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
-  ${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
-build_unflags = -std=gnu++11
+extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_nano.py
+build_flags   = ${common_stm32f1.build_flags}
+  -DMCU_STM32F103VE -DSS_TIMER=4
+
+#
+# MKS Robin Nano (STM32F103VET6) - MKS UI (LVGL)
+#
+[env:mks_robin_nano35]
+platform      = ${common_stm32f1.platform}
+extends       = env:mks_robin_nano
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_nano35.py
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
-lib_deps      = ${common.lib_deps}
-  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+lib_deps      = ${common_stm32f1.lib_deps}
   MKS-LittlevGL=https://github.com/makerbase-mks/MKS-LittlevGL/archive/master.zip
-lib_ignore    = Adafruit NeoPixel, SPI
 debug_tool = jlink
 upload_protocol = jlink
 
@@ -502,18 +545,11 @@ upload_protocol = jlink
 # MKS Robin Nano v2.0 (STM32F103VET6)
 #
 [env:mks_robin_nano35_v2]
-platform      = ststm32
-board         = genericSTM32F103VE
-platform_packages = tool-stm32duino
-build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
-  ${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
-build_unflags = -std=gnu++11
+platform      = ${common_stm32f1.platform}
+extends       = env:mks_robin_nano
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_nano35_v2.py
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
-lib_deps      = ${common.lib_deps}
-  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+lib_deps      = ${common_stm32f1.lib_deps}
   MKS-LittlevGL=https://github.com/makerbase-mks/MKS-LittlevGL/archive/master.zip
-lib_ignore    = Adafruit NeoPixel, SPI
 debug_tool = jlink
 upload_protocol = jlink