Sfoglia il codice sorgente

Clean up RUMBA32 PlatformIO & tests (#18271)

Chris Barr 5 anni fa
parent
commit
d2363c5b35
Nessun account collegato all'indirizzo email del committer

+ 1
- 2
.github/workflows/test-builds.yml Vedi File

64
         - malyan_M300
64
         - malyan_M300
65
         - mks_robin_lite
65
         - mks_robin_lite
66
         - FLYF407ZG
66
         - FLYF407ZG
67
-        - rumba32_f446ve
68
-        - rumba32_mks
67
+        - rumba32
69
         - mks_robin_pro
68
         - mks_robin_pro
70
         - STM32F103RET6_creality
69
         - STM32F103RET6_creality
71
 
70
 

+ 3
- 3
Marlin/src/pins/pins.h Vedi File

567
 #elif MB(ARMED)
567
 #elif MB(ARMED)
568
   #include "stm32f4/pins_ARMED.h"               // STM32F4                                env:ARMED
568
   #include "stm32f4/pins_ARMED.h"               // STM32F4                                env:ARMED
569
 #elif MB(RUMBA32_V1_0)
569
 #elif MB(RUMBA32_V1_0)
570
-  #include "stm32f4/pins_RUMBA32_AUS3D.h"       // STM32F4                                env:rumba32_f446ve
570
+  #include "stm32f4/pins_RUMBA32_AUS3D.h"       // STM32F4                                env:rumba32
571
 #elif MB(RUMBA32_V1_1)
571
 #elif MB(RUMBA32_V1_1)
572
-  #include "stm32f4/pins_RUMBA32_AUS3D.h"       // STM32F4                                env:rumba32_f446ve
572
+  #include "stm32f4/pins_RUMBA32_AUS3D.h"       // STM32F4                                env:rumba32
573
 #elif MB(RUMBA32_MKS)
573
 #elif MB(RUMBA32_MKS)
574
-  #include "stm32f4/pins_RUMBA32_MKS.h"         // STM32F4                                env:rumba32_mks
574
+  #include "stm32f4/pins_RUMBA32_MKS.h"         // STM32F4                                env:rumba32
575
 #elif MB(BLACK_STM32F407VE)
575
 #elif MB(BLACK_STM32F407VE)
576
   #include "stm32f4/pins_BLACK_STM32F407VE.h"   // STM32F4                                env:STM32F407VE_black
576
   #include "stm32f4/pins_BLACK_STM32F407VE.h"   // STM32F4                                env:STM32F407VE_black
577
 #elif MB(STEVAL_3DP001V1)
577
 #elif MB(STEVAL_3DP001V1)

buildroot/share/tests/rumba32_f446ve-tests → buildroot/share/tests/rumba32-tests Vedi File

1
 #!/usr/bin/env bash
1
 #!/usr/bin/env bash
2
 #
2
 #
3
-# Build tests for rumba32_f446ve
3
+# Build tests for rumba32
4
 #
4
 #
5
 
5
 
6
 # exit on first failure
6
 # exit on first failure
15
 opt_set TEMP_SENSOR_BED 1
15
 opt_set TEMP_SENSOR_BED 1
16
 opt_disable THERMAL_PROTECTION_BED
16
 opt_disable THERMAL_PROTECTION_BED
17
 opt_set X_DRIVER_TYPE TMC2130
17
 opt_set X_DRIVER_TYPE TMC2130
18
-exec_test $1 $2 "rumba32_f446ve V1.0 with TMC2130, PID Bed, and bed thermal protection disabled"
18
+exec_test $1 $2 "RUMBA32 V1.0 with TMC2130, PID Bed, and bed thermal protection disabled"
19
 
19
 
20
 # Build examples
20
 # Build examples
21
 restore_configs
21
 restore_configs
25
 opt_set TEMP_SENSOR_BED 1
25
 opt_set TEMP_SENSOR_BED 1
26
 opt_set X_DRIVER_TYPE TMC2130
26
 opt_set X_DRIVER_TYPE TMC2130
27
 opt_set Y_DRIVER_TYPE TMC2208
27
 opt_set Y_DRIVER_TYPE TMC2208
28
-exec_test $1 $2 "rumba32_f446ve V1.1 with TMC2130, TMC2208, PID Bed, EEPROM settings, and graphic LCD controller"
28
+exec_test $1 $2 "RUMBA32 V1.1 with TMC2130, TMC2208, PID Bed, EEPROM settings, and graphic LCD controller"
29
+
30
+# Build examples
31
+restore_configs
32
+opt_set MOTHERBOARD BOARD_RUMBA32_MKS
33
+opt_set SERIAL_PORT -1
34
+opt_set X_DRIVER_TYPE TMC2130
35
+opt_set Y_DRIVER_TYPE TMC2208
36
+exec_test $1 $2 "RUMBA32 MKS Default Config with Mixed TMC Drivers"
29
 
37
 
30
 # cleanup
38
 # cleanup
31
 restore_configs
39
 restore_configs

+ 0
- 18
buildroot/share/tests/rumba32_mks-tests Vedi File

1
-#!/usr/bin/env bash
2
-#
3
-# Build tests for rumba32_mks
4
-#
5
-
6
-# exit on first failure
7
-set -e
8
-
9
-# Build examples
10
-restore_configs
11
-opt_set MOTHERBOARD BOARD_RUMBA32_MKS
12
-opt_set SERIAL_PORT -1
13
-opt_set X_DRIVER_TYPE TMC2130
14
-opt_set Y_DRIVER_TYPE TMC2208
15
-exec_test $1 $2 "rumba32_mks Default Config with Mixed TMC Drivers"
16
-
17
-# cleanup
18
-restore_configs

+ 8
- 32
platformio.ini Vedi File

320
 #
320
 #
321
 # HAL/STM32 Base Environment values
321
 # HAL/STM32 Base Environment values
322
 #
322
 #
323
-[base_stm32]
323
+[common_stm32]
324
 platform      = ststm32@<6.2.0
324
 platform      = ststm32@<6.2.0
325
 platform_packages = framework-arduinoststm32@>=4.10700,<4.10800
325
 platform_packages = framework-arduinoststm32@>=4.10700,<4.10800
326
 lib_deps      = ${common.lib_deps}
326
 lib_deps      = ${common.lib_deps}
328
 build_flags   = ${common.build_flags}
328
 build_flags   = ${common.build_flags}
329
   -IMarlin/src/HAL/STM32 -std=gnu++14
329
   -IMarlin/src/HAL/STM32 -std=gnu++14
330
   -DUSBCON -DUSBD_USE_CDC
330
   -DUSBCON -DUSBD_USE_CDC
331
+  -DUSBD_VID=0x0483
331
 build_unflags = -std=gnu++11
332
 build_unflags = -std=gnu++11
332
 src_filter    = ${common.default_src_filter} +<src/HAL/STM32>
333
 src_filter    = ${common.default_src_filter} +<src/HAL/STM32>
333
 
334
 
334
 #
335
 #
335
-# HAL/STM32 Common Environment values
336
-#
337
-[common_stm32]
338
-platform      = ${base_stm32.platform}
339
-extends       = base_stm32
340
-build_flags   = ${base_stm32.build_flags} -DUSBD_VID=0x0483
341
-
342
-#
343
 # HAL/STM32F1 Common Environment values
336
 # HAL/STM32F1 Common Environment values
344
 #
337
 #
345
 [common_stm32f1]
338
 [common_stm32f1]
814
 #
807
 #
815
 # RUMBA32
808
 # RUMBA32
816
 #
809
 #
817
-
818
-[common_rumba32]
819
-platform      = ${base_stm32.platform}
820
-extends       = base_stm32
821
-build_flags   = ${base_stm32.build_flags} -Os
822
-  -DSTM32F4xx -DARDUINO_RUMBA32_F446VE -DARDUINO_ARCH_STM32 "-DBOARD_NAME=\"RUMBA32_F446VE\""
823
-  -DSTM32F446xx "-DUSB_PRODUCT=\"RUMBA32_F446VE\""
810
+[env:rumba32]
811
+platform      = ${common_stm32.platform}
812
+extends       = common_stm32
813
+build_flags   = ${common_stm32.build_flags} 
814
+  -Os
815
+  "-DUSB_PRODUCT=\"RUMBA32\""
824
   -DHAL_PCD_MODULE_ENABLED
816
   -DHAL_PCD_MODULE_ENABLED
825
   -DDISABLE_GENERIC_SERIALUSB
817
   -DDISABLE_GENERIC_SERIALUSB
826
   -DHAL_UART_MODULE_ENABLED
818
   -DHAL_UART_MODULE_ENABLED
828
 upload_protocol = dfu
820
 upload_protocol = dfu
829
 monitor_speed = 500000
821
 monitor_speed = 500000
830
 
822
 
831
-#
832
-# RUMBA32 F446VE
833
-#
834
-[env:rumba32_f446ve]
835
-platform      = ${common_rumba32.platform}
836
-extends       = common_rumba32
837
-build_flags   = ${common_rumba32.build_flags} -DUSBD_VID=0x0483
838
-
839
-#
840
-# MKS RUMBA32 (adds TMC2208/2209 UART interface and AUX-1)
841
-#
842
-[env:rumba32_mks]
843
-platform      = ${common_rumba32.platform}
844
-extends       = common_rumba32
845
-build_flags   = ${common_rumba32.build_flags} -DUSBD_VID=0x8000
846
-
847
 #################################
823
 #################################
848
 #                               #
824
 #                               #
849
 #      Other Architectures      #
825
 #      Other Architectures      #

Loading…
Annulla
Salva