From bcb6f6e85e1ec2ccd4e4cfa119109637f4381675 Mon Sep 17 00:00:00 2001 From: EvilGremlin <22657714+EvilGremlin@users.noreply.github.com> Date: Fri, 2 Sep 2022 05:47:37 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20Native=20USB=20modified=20env=20?= =?UTF-8?q?followup=20(#24669)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Followup to #24619 --- .github/workflows/test-builds.yml | 4 ++-- Marlin/src/pins/pins.h | 2 +- buildroot/tests/mks_robin_nano_v1_3_f4_usbmod | 6 +++--- ...ks_robin_nano_v1_2_usbmod => mks_robin_nano_v1v2_usbmod} | 6 +++--- ini/stm32f1.ini | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) rename buildroot/tests/{mks_robin_nano_v1_2_usbmod => mks_robin_nano_v1v2_usbmod} (51%) diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml index 2fe7a28bc2..5a18a2e8bf 100644 --- a/.github/workflows/test-builds.yml +++ b/.github/workflows/test-builds.yml @@ -94,8 +94,8 @@ jobs: - LERDGEX - LERDGEK - mks_robin_nano_v1v2 - - mks_robin_nano_v1_2_usbmod - - mks_robin_nano_v1_3_f4_usbmod + #- mks_robin_nano_v1v2_usbmod + #- mks_robin_nano_v1_3_f4_usbmod - NUCLEO_F767ZI - REMRAM_V1 - BTT_SKR_SE_BX diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 1bd58487e7..14d16c5415 100644 --- 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_v1_2_usbmod + #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 #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/buildroot/tests/mks_robin_nano_v1_3_f4_usbmod b/buildroot/tests/mks_robin_nano_v1_3_f4_usbmod index 5213eb84f7..01a47525d1 100755 --- a/buildroot/tests/mks_robin_nano_v1_3_f4_usbmod +++ b/buildroot/tests/mks_robin_nano_v1_3_f4_usbmod @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Build tests for MKS Robin nano +# Build tests for MKS Robin nano v1.3 with native USB modification # (STM32F4 genericSTM32F407VE) # @@ -8,12 +8,12 @@ set -e # -# MKS/ZNP Robin nano v1.3 Emulated DOGM FSMC and native USB mod +# MKS/ZNP Robin nano v1.3 with Emulated DOGM FSMC and native USB mod # use_example_configs Mks/Robin opt_add USB_MOD opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V1_3_F4 SERIAL_PORT -1 -exec_test $1 $2 "MKS/ZNP Robin nano v1.3 Emulated DOGM FSMC and native USB mod" "$3" +exec_test $1 $2 "MKS/ZNP Robin nano v1.3 with Emulated DOGM FSMC (native USB mod)" "$3" # cleanup restore_configs diff --git a/buildroot/tests/mks_robin_nano_v1_2_usbmod b/buildroot/tests/mks_robin_nano_v1v2_usbmod similarity index 51% rename from buildroot/tests/mks_robin_nano_v1_2_usbmod rename to buildroot/tests/mks_robin_nano_v1v2_usbmod index a3ec1d4075..31f04c9a94 100755 --- a/buildroot/tests/mks_robin_nano_v1_2_usbmod +++ b/buildroot/tests/mks_robin_nano_v1v2_usbmod @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Build tests for MKS Robin nano +# Build tests for MKS Robin nano V1.2 and V2 with native USB modification # (STM32F1 genericSTM32F103VE) # @@ -8,12 +8,12 @@ set -e # -# MKS/ZNP Robin nano v1.2 Emulated DOGM FSMC and native USB mod +# MKS/ZNP Robin nano v1.2 with Emulated DOGM FSMC # use_example_configs Mks/Robin opt_add USB_MOD opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO SERIAL_PORT -1 -exec_test $1 $2 "MKS/ZNP Robin nano v1.2 Emulated DOGM FSMC and native USB mod" "$3" +exec_test $1 $2 "MKS/ZNP Robin nano v1.2 with Emulated DOGM FSMC (native USB mod)" "$3" # cleanup restore_configs diff --git a/ini/stm32f1.ini b/ini/stm32f1.ini index f06eef4594..49dac9e476 100644 --- a/ini/stm32f1.ini +++ b/ini/stm32f1.ini @@ -238,9 +238,9 @@ build_unflags = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC # -# MKS/ZNP Robin Nano v1.2 with native USB modification +# MKS/ZNP Robin Nano V1.2 and V2 with native USB modification # -[env:mks_robin_nano_v1_2_usbmod] +[env:mks_robin_nano_v1v2_usbmod] extends = mks_robin_nano_v1v2_common build_flags = ${common_stm32.build_flags} -DMCU_STM32F103VE -DSS_TIMER=4