Browse Source

🔨 Native USB modified env followup (#24669)

Followup to #24619
EvilGremlin 2 years ago
parent
commit
bcb6f6e85e
No account linked to committer's email address

+ 2
- 2
.github/workflows/test-builds.yml View File

94
         - LERDGEX
94
         - LERDGEX
95
         - LERDGEK
95
         - LERDGEK
96
         - mks_robin_nano_v1v2
96
         - mks_robin_nano_v1v2
97
-        - mks_robin_nano_v1_2_usbmod
98
-        - mks_robin_nano_v1_3_f4_usbmod
97
+        #- mks_robin_nano_v1v2_usbmod
98
+        #- mks_robin_nano_v1_3_f4_usbmod
99
         - NUCLEO_F767ZI
99
         - NUCLEO_F767ZI
100
         - REMRAM_V1
100
         - REMRAM_V1
101
         - BTT_SKR_SE_BX
101
         - BTT_SKR_SE_BX

+ 1
- 1
Marlin/src/pins/pins.h View File

512
 #elif MB(MKS_ROBIN_MINI)
512
 #elif MB(MKS_ROBIN_MINI)
513
   #include "stm32f1/pins_MKS_ROBIN_MINI.h"      // STM32F1                                env:mks_robin_mini env:mks_robin_mini_maple
513
   #include "stm32f1/pins_MKS_ROBIN_MINI.h"      // STM32F1                                env:mks_robin_mini env:mks_robin_mini_maple
514
 #elif MB(MKS_ROBIN_NANO)
514
 #elif MB(MKS_ROBIN_NANO)
515
-  #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
515
+  #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
516
 #elif MB(MKS_ROBIN_NANO_V2)
516
 #elif MB(MKS_ROBIN_NANO_V2)
517
   #include "stm32f1/pins_MKS_ROBIN_NANO_V2.h"   // STM32F1                                env:mks_robin_nano_v1v2 env:mks_robin_nano3_v1v2_maple
517
   #include "stm32f1/pins_MKS_ROBIN_NANO_V2.h"   // STM32F1                                env:mks_robin_nano_v1v2 env:mks_robin_nano3_v1v2_maple
518
 #elif MB(MKS_ROBIN_LITE)
518
 #elif MB(MKS_ROBIN_LITE)

+ 3
- 3
buildroot/tests/mks_robin_nano_v1_3_f4_usbmod View File

1
 #!/usr/bin/env bash
1
 #!/usr/bin/env bash
2
 #
2
 #
3
-# Build tests for MKS Robin nano
3
+# Build tests for MKS Robin nano v1.3 with native USB modification
4
 # (STM32F4 genericSTM32F407VE)
4
 # (STM32F4 genericSTM32F407VE)
5
 #
5
 #
6
 
6
 
8
 set -e
8
 set -e
9
 
9
 
10
 #
10
 #
11
-# MKS/ZNP Robin nano v1.3 Emulated DOGM FSMC and native USB mod
11
+# MKS/ZNP Robin nano v1.3 with Emulated DOGM FSMC and native USB mod
12
 #
12
 #
13
 use_example_configs Mks/Robin
13
 use_example_configs Mks/Robin
14
 opt_add USB_MOD
14
 opt_add USB_MOD
15
 opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V1_3_F4 SERIAL_PORT -1
15
 opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V1_3_F4 SERIAL_PORT -1
16
-exec_test $1 $2 "MKS/ZNP Robin nano v1.3 Emulated DOGM FSMC and native USB mod" "$3"
16
+exec_test $1 $2 "MKS/ZNP Robin nano v1.3 with Emulated DOGM FSMC (native USB mod)" "$3"
17
 
17
 
18
 # cleanup
18
 # cleanup
19
 restore_configs
19
 restore_configs

buildroot/tests/mks_robin_nano_v1_2_usbmod → buildroot/tests/mks_robin_nano_v1v2_usbmod View File

1
 #!/usr/bin/env bash
1
 #!/usr/bin/env bash
2
 #
2
 #
3
-# Build tests for MKS Robin nano
3
+# Build tests for MKS Robin nano V1.2 and V2 with native USB modification
4
 # (STM32F1 genericSTM32F103VE)
4
 # (STM32F1 genericSTM32F103VE)
5
 #
5
 #
6
 
6
 
8
 set -e
8
 set -e
9
 
9
 
10
 #
10
 #
11
-# MKS/ZNP Robin nano v1.2 Emulated DOGM FSMC and native USB mod
11
+# MKS/ZNP Robin nano v1.2 with Emulated DOGM FSMC
12
 #
12
 #
13
 use_example_configs Mks/Robin
13
 use_example_configs Mks/Robin
14
 opt_add USB_MOD
14
 opt_add USB_MOD
15
 opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO SERIAL_PORT -1
15
 opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO SERIAL_PORT -1
16
-exec_test $1 $2 "MKS/ZNP Robin nano v1.2 Emulated DOGM FSMC and native USB mod" "$3"
16
+exec_test $1 $2 "MKS/ZNP Robin nano v1.2 with Emulated DOGM FSMC (native USB mod)" "$3"
17
 
17
 
18
 # cleanup
18
 # cleanup
19
 restore_configs
19
 restore_configs

+ 2
- 2
ini/stm32f1.ini View File

238
                               -DUSBCON -DUSBD_USE_CDC
238
                               -DUSBCON -DUSBD_USE_CDC
239
 
239
 
240
 #
240
 #
241
-# MKS/ZNP Robin Nano v1.2 with native USB modification
241
+# MKS/ZNP Robin Nano V1.2 and V2 with native USB modification
242
 #
242
 #
243
-[env:mks_robin_nano_v1_2_usbmod]
243
+[env:mks_robin_nano_v1v2_usbmod]
244
 extends                     = mks_robin_nano_v1v2_common
244
 extends                     = mks_robin_nano_v1v2_common
245
 build_flags                 = ${common_stm32.build_flags}
245
 build_flags                 = ${common_stm32.build_flags}
246
                               -DMCU_STM32F103VE -DSS_TIMER=4
246
                               -DMCU_STM32F103VE -DSS_TIMER=4

Loading…
Cancel
Save