0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

🔨 Native USB modified env followup (#24669)

Browse source 
Followup to #24619
This commit is contained in:
EvilGremlin 2022-09-02 05:47:37 +03:00 committed by GitHub
parent 8e71f7add4
commit bcb6f6e85e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/test-builds.yml vendored
View file

@ -94,8 +94,8 @@ jobs:
- LERDGEX - LERDGEX
- LERDGEK - LERDGEK
- mks_robin_nano_v1v2 - mks_robin_nano_v1v2
- mks_robin_nano_v1_2_usbmod #- mks_robin_nano_v1v2_usbmod
- mks_robin_nano_v1_3_f4_usbmod #- mks_robin_nano_v1_3_f4_usbmod
- NUCLEO_F767ZI - NUCLEO_F767ZI
- REMRAM_V1 - REMRAM_V1
- BTT_SKR_SE_BX - BTT_SKR_SE_BX

2
Marlin/src/pins/pins.h
View file

@ -512,7 +512,7 @@
#elif MB(MKS_ROBIN_MINI) #elif MB(MKS_ROBIN_MINI)
#include "stm32f1/pins_MKS_ROBIN_MINI.h" // STM32F1 env:mks_robin_mini env:mks_robin_mini_maple #include "stm32f1/pins_MKS_ROBIN_MINI.h" // STM32F1 env:mks_robin_mini env:mks_robin_mini_maple
#elif MB(MKS_ROBIN_NANO) #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) #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 #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) #elif MB(MKS_ROBIN_LITE)

6
buildroot/tests/mks_robin_nano_v1_3_f4_usbmod
View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# #
# Build tests for MKS Robin nano # Build tests for MKS Robin nano v1.3 with native USB modification
# (STM32F4 genericSTM32F407VE) # (STM32F4 genericSTM32F407VE)
# #
@ -8,12 +8,12 @@
set -e 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 use_example_configs Mks/Robin
opt_add USB_MOD opt_add USB_MOD
opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V1_3_F4 SERIAL_PORT -1 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 # cleanup
restore_configs restore_configs

6
buildroot/tests/mks_robin_nano_v1_2_usbmod → buildroot/tests/mks_robin_nano_v1v2_usbmod
View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/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) # (STM32F1 genericSTM32F103VE)
# #
@ -8,12 +8,12 @@
set -e 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 use_example_configs Mks/Robin
opt_add USB_MOD opt_add USB_MOD
opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO SERIAL_PORT -1 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 # cleanup
restore_configs restore_configs

4
ini/stm32f1.ini
View file

@ -238,9 +238,9 @@ build_unflags = ${stm32_variant.build_unflags}
-DUSBCON -DUSBD_USE_CDC -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 extends = mks_robin_nano_v1v2_common
build_flags = ${common_stm32.build_flags} build_flags = ${common_stm32.build_flags}
-DMCU_STM32F103VE -DSS_TIMER=4 -DMCU_STM32F103VE -DSS_TIMER=4