andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

🔨 Native USB modified env followup (#24669) 

Followup to #24619
FB4S_WIFI^2^2
EvilGremlin 2 years ago
committed by Scott Lahteine
parent
e350acb360
commit
033bca1773
4 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Marlin/src/pins/pins.h
  2. 6
      buildroot/tests/mks_robin_nano_v1_3_f4_usbmod
  3. 6
      buildroot/tests/mks_robin_nano_v1v2_usbmod
  4. 4
      ini/stm32f1.ini

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

Write Preview
Loading…
Cancel
Save