Merge pull request #1 from thinkyhead/bf2_gremlin_pr_mods_24619

Cleanup for MarlinFirmware#24619
EvilGremlin · Aug 22, 2022 · 1fa72f6 · 1fa72f6
2 parents a6dbbbc + c53f962
commit 1fa72f6
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 35 deletions.
diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
@@ -94,7 +94,7 @@ jobs:
         - LERDGEX
         - LERDGEK
         - mks_robin_nano_v1v2
-        - mks_robin_nano_v1v2_usbmod
+        - mks_robin_nano_v1_2_usbmod
         - mks_robin_nano_v1_3_f4_usbmod
         - NUCLEO_F767ZI
         - REMRAM_V1

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
@@ -512,7 +512,7 @@
 #elif MB(MKS_ROBIN_MINI)
   #include "stm32f1/pins_MKS_ROBIN_MINI.h"      // STM32F1                                env:mks_robin_mini env:mks_robin_mini_maple
 #elif MB(MKS_ROBIN_NANO)
-  #include "stm32f1/pins_MKS_ROBIN_NANO.h"      // STM32F1                                env:mks_robin_nano_v1v2 env:mks_robin_nano_v1v2_maple env:mks_robin_nano_v1v2_usbmod
+  #include "stm32f1/pins_MKS_ROBIN_NANO.h"      // STM32F1                                env:mks_robin_nano_v1v2 env:mks_robin_nano_v1v2_maple env:mks_robin_nano_v1_2_usbmod
 #elif MB(MKS_ROBIN_NANO_V2)
   #include "stm32f1/pins_MKS_ROBIN_NANO_V2.h"   // STM32F1                                env:mks_robin_nano_v1v2 env:mks_robin_nano3_v1v2_maple
 #elif MB(MKS_ROBIN_LITE)

diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_common.h
@@ -61,11 +61,11 @@
 #define X_STOP_PIN                          PA15
 #define Z_MAX_PIN                           PC4
 #ifndef USB_MOD
-  #define Y_STOP_PIN                          PA12
-  #define Z_MIN_PIN                           PA11
+  #define Y_STOP_PIN                        PA12
+  #define Z_MIN_PIN                         PA11
 #else
-  #define Y_STOP_PIN                          PB10
-  #define Z_MIN_PIN                           PB11
+  #define Y_STOP_PIN                        PB10
+  #define Z_MIN_PIN                         PB11
 #endif
 
 //

diff --git a/buildroot/share/PlatformIO/scripts/offset_and_rename.py b/buildroot/share/PlatformIO/scripts/offset_and_rename.py
@@ -53,8 +53,13 @@ def encrypt(source, target, env):
     #
     if 'rename' in board_keys:
 
+        # If FIRMWARE_BIN is defined by config, override all
+        mf = env["MARLIN_FEATURES"]
+        if "FIRMWARE_BIN" in mf: new_name = mf["FIRMWARE_BIN"]
+        else: new_name = board.get("build.rename")
+
         def rename_target(source, target, env):
             from pathlib import Path
-            Path(target[0].path).replace(Path(target[0].dir.path, board.get("build.rename")))
+            Path(target[0].path).replace(Path(target[0].dir.path, new_name))
 
         marlin.add_post_action(rename_target)
diff --git a/ini/stm32f1-maple.ini b/ini/stm32f1-maple.ini
@@ -203,7 +203,7 @@ board_build.ldscript = mks_robin_mini.ld
 build_flags          = ${STM32F1_maple.build_flags} -DMCU_STM32F103VE
 
 #
-# MKS Robin Nano v1.x and V2 (STM32F103VET6)
+# MKS Robin Nano v1.x and v2 (STM32F103VET6)
 #
 [env:mks_robin_nano_v1v2_maple]
 extends              = STM32F1_maple

diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini
@@ -240,7 +240,7 @@ build_unflags               = ${stm32_variant.build_unflags}
 #
 # MKS/ZNP Robin Nano v1.2 with native USB modification
 #
-[env:mks_robin_nano_v1v2_usbmod]
+[env:mks_robin_nano_v1_2_usbmod]
 extends                     = mks_robin_nano_v1v2_common
 build_flags                 = ${common_stm32.build_flags}
                               -DMCU_STM32F103VE -DSS_TIMER=4

diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
@@ -587,42 +587,37 @@ upload_protocol             = jlink
 #  - ZNP Robin Nano   V1.3 (STM32F407VET6, 2 TMC2208, 2 A4988, 1x Polulu plug)
 #
 [env:mks_robin_nano_v1_3_f4]
-extends                     = mks_robin_nano_v1_3_f4_common
-build_flags                 = ${stm32_variant.build_flags}
-                              -DMCU_STM32F407VE -DSS_TIMER=4 -DENABLE_HWSERIAL3
-                              -DSTM32_FLASH_SIZE=512
-                              -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
-                              -DHAL_SD_MODULE_ENABLED
-                              -DHAL_SRAM_MODULE_ENABLED
-build_unflags               = ${stm32_variant.build_unflags}
-                              -DUSBCON -DUSBD_USE_CDC
-
+extends       = mks_robin_nano_v1_3_f4_common
+build_flags   = ${stm32_variant.build_flags}
+                -DMCU_STM32F407VE -DENABLE_HWSERIAL3 -DSTM32_FLASH_SIZE=512
+                -DTIMER_SERVO=TIM2 -DTIMER_TONE=TIM3 -DSS_TIMER=4
+                -DHAL_SD_MODULE_ENABLED -DHAL_SRAM_MODULE_ENABLED
+build_unflags = ${stm32_variant.build_unflags}
+                -DUSBCON -DUSBD_USE_CDC
 
 #
 #  MKS/ZNP Robin Nano V1.3 with native USB mod
 #
 [env:mks_robin_nano_v1_3_f4_usbmod]
-extends                     = mks_robin_nano_v1_3_f4_common
-build_flags                 = ${stm32_variant.build_flags}
-                              -DMCU_STM32F407VE -DSS_TIMER=4
-                              -DSTM32_FLASH_SIZE=512
-                              -DTIMER_TONE=TIM3 -DTIMER_SERVO=TIM2
-                              -DHAL_SD_MODULE_ENABLED
-                              -DHAL_SRAM_MODULE_ENABLED
+extends       = mks_robin_nano_v1_3_f4_common
+build_flags   = ${stm32_variant.build_flags}
+                -DMCU_STM32F407VE -DSTM32_FLASH_SIZE=512
+                -DTIMER_SERVO=TIM2 -DTIMER_TONE=TIM3 -DSS_TIMER=4
+                -DHAL_SD_MODULE_ENABLED -DHAL_SRAM_MODULE_ENABLED
 
 #
 # Artillery Ruby
 #
 [env:Artillery_Ruby]
-extends           = common_stm32
-board             = marlin_Artillery_Ruby
-build_flags       = ${common_stm32.build_flags}
-                    -DSTM32F401xC -DTARGET_STM32F4 -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32
-                    -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
-                    -DUSB_PRODUCT=\"Artillery_3D_Printer\"
-                    -DFLASH_DATA_SECTOR=1U -DFLASH_BASE_ADDRESS=0x08004000
-extra_scripts     = ${common_stm32.extra_scripts}
-                    pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+extends       = common_stm32
+board         = marlin_Artillery_Ruby
+build_flags   = ${common_stm32.build_flags}
+                -DSTM32F401xC -DTARGET_STM32F4 -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32
+                -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
+                -DUSB_PRODUCT=\"Artillery_3D_Printer\"
+                -DFLASH_DATA_SECTOR=1U -DFLASH_BASE_ADDRESS=0x08004000
+extra_scripts = ${common_stm32.extra_scripts}
+                pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 
 #
 # Ender-3 S1 STM32F401RC_creality