Skip to content

Commit 8c627b4

Browse files
thinkyheadthinkyhead
committed
Make maple secondary to unified
1 parent dae959b commit 8c627b4

File tree

14 files changed

+220
-216
lines changed

14 files changed

+220
-216
lines changed

‎.github/workflows/test-builds.yml‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,29 +56,33 @@ jobs:
5656

5757
# STM32F1 (Maple) Environments
5858

59-
- STM32F103RC_btt
60-
- STM32F103RC_btt_USB
61-
- STM32F103RE_btt
62-
- STM32F103RE_btt_USB
59+
#- STM32F103RC_btt_maple
60+
#- STM32F103RC_btt_USB_maple
61+
#- STM32F103RE_btt_maple
62+
#- STM32F103RE_btt_USB_maple
6363
- STM32F103RC_fysetc
6464
- STM32F103RC_meeb
6565
- jgaurora_a5s_a1
6666
- STM32F103VE_longer
67-
- mks_robin
67+
#- mks_robin_maple
6868
- mks_robin_lite
6969
- mks_robin_pro
70-
- STM32F103RET6_creality
71-
- mks_robin_nano35
70+
#- mks_robin_nano35_maple
71+
#- STM32F103RET6_creality_maple
7272

7373
# STM32 (ST) Environments
7474

75-
- STM32F103RC_btt_stm32
75+
- STM32F103RC_btt
76+
#- STM32F103RC_btt_USB
77+
#- STM32F103RE_btt
78+
#- STM32F103RE_btt_USB
79+
- STM32F103RET6_creality
7680
- STM32F407VE_black
7781
- STM32F401VE_STEVAL
7882
- BIGTREE_BTT002
7983
- BIGTREE_SKR_PRO
8084
- BIGTREE_GTR_V1_0
81-
- mks_robin_stm32
85+
- mks_robin
8286
- ARMED
8387
- FYSETC_S6
8488
- STM32F070CB_malyan
@@ -88,7 +92,7 @@ jobs:
8892
- rumba32
8993
- LERDGEX
9094
- LERDGEK
91-
- mks_robin_nano35_stm32
95+
- mks_robin_nano35
9296
- NUCLEO_F767ZI
9397
- REMRAM_V1
9498
- BTT_SKR_SE_BX

‎Marlin/Configuration.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
*
103103
* :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
104104
*/
105-
#define SERIAL_PORT 0
105+
#define SERIAL_PORT 1 // 0
106106

107107
/**
108108
* Serial Port Baud Rate
@@ -123,7 +123,7 @@
123123
* Currently Ethernet (-2) is only supported on Teensy 4.1 boards.
124124
* :[-2, -1, 0, 1, 2, 3, 4, 5, 6, 7]
125125
*/
126-
//#define SERIAL_PORT_2 -1
126+
#define SERIAL_PORT_2 -1 // -1
127127
//#define BAUDRATE_2 250000 // Enable to override BAUDRATE
128128

129129
/**
@@ -139,11 +139,11 @@
139139

140140
// Choose the name from boards.h that matches your setup
141141
#ifndef MOTHERBOARD
142-
#define MOTHERBOARD BOARD_RAMPS_14_EFB
142+
#define MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 // BOARD_RAMPS_14_EFB
143143
#endif
144144

145145
// Name displayed in the LCD "Ready" message and Info menu
146-
//#define CUSTOM_MACHINE_NAME "3D Printer"
146+
#define CUSTOM_MACHINE_NAME "Test STM32F103RC_btt_USB (1)" // "3D Printer"
147147

148148
// Printer's unique ID, used by some programs to differentiate between machines.
149149
// Choose your own or use a service like https://www.uuidgenerator.net/version4

‎Marlin/src/pins/pins.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -487,13 +487,13 @@
487487
#elif MB(CHITU3D)
488488
#include "stm32f1/pins_CHITU3D.h" // STM32F1 env:STM32F103RE
489489
#elif MB(MKS_ROBIN)
490-
#include "stm32f1/pins_MKS_ROBIN.h" // STM32F1 env:mks_robin env:mks_robin_stm32
490+
#include "stm32f1/pins_MKS_ROBIN.h" // STM32F1 env:mks_robin env:mks_robin_maple
491491
#elif MB(MKS_ROBIN_MINI)
492492
#include "stm32f1/pins_MKS_ROBIN_MINI.h" // STM32F1 env:mks_robin_mini
493493
#elif MB(MKS_ROBIN_NANO)
494-
#include "stm32f1/pins_MKS_ROBIN_NANO.h" // STM32F1 env:mks_robin_nano35 env:mks_robin_nano35_stm32
494+
#include "stm32f1/pins_MKS_ROBIN_NANO.h" // STM32F1 env:mks_robin_nano35 env:mks_robin_nano35_maple
495495
#elif MB(MKS_ROBIN_NANO_V2)
496-
#include "stm32f1/pins_MKS_ROBIN_NANO_V2.h" // STM32F1 env:mks_robin_nano35 env:mks_robin_nano35_stm32
496+
#include "stm32f1/pins_MKS_ROBIN_NANO_V2.h" // STM32F1 env:mks_robin_nano35 env:mks_robin_nano35_maple
497497
#elif MB(MKS_ROBIN_LITE)
498498
#include "stm32f1/pins_MKS_ROBIN_LITE.h" // STM32F1 env:mks_robin_lite
499499
#elif MB(MKS_ROBIN_LITE3)
@@ -511,15 +511,15 @@
511511
#elif MB(MKS_ROBIN_E3P)
512512
#include "stm32f1/pins_MKS_ROBIN_E3P.h" // STM32F1 env:mks_robin_e3p
513513
#elif MB(BTT_SKR_MINI_V1_1)
514-
#include "stm32f1/pins_BTT_SKR_MINI_V1_1.h" // STM32F1 env:STM32F103RC_btt_stm32 env:STM32F103RC_btt_512K_stm32 env:STM32F103RC_btt_USB_stm32 env:STM32F103RC_btt_512K_USB_stm32 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
514+
#include "stm32f1/pins_BTT_SKR_MINI_V1_1.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
515515
#elif MB(BTT_SKR_MINI_E3_V1_0)
516-
#include "stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h" // STM32F1 env:STM32F103RC_btt_stm32 env:STM32F103RC_btt_512K_stm32 env:STM32F103RC_btt_USB_stm32 env:STM32F103RC_btt_512K_USB_stm32 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
516+
#include "stm32f1/pins_BTT_SKR_MINI_E3_V1_0.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
517517
#elif MB(BTT_SKR_MINI_E3_V1_2)
518-
#include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h" // STM32F1 env:STM32F103RC_btt_stm32 env:STM32F103RC_btt_512K_stm32 env:STM32F103RC_btt_USB_stm32 env:STM32F103RC_btt_512K_USB_stm32 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
518+
#include "stm32f1/pins_BTT_SKR_MINI_E3_V1_2.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
519519
#elif MB(BTT_SKR_MINI_E3_V2_0)
520-
#include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h" // STM32F1 env:STM32F103RC_btt_stm32 env:STM32F103RC_btt_512K_stm32 env:STM32F103RC_btt_USB_stm32 env:STM32F103RC_btt_512K_USB_stm32 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
520+
#include "stm32f1/pins_BTT_SKR_MINI_E3_V2_0.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
521521
#elif MB(BTT_SKR_MINI_MZ_V1_0)
522-
#include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h" // STM32F1 env:STM32F103RC_btt_stm32 env:STM32F103RC_btt_512K_stm32 env:STM32F103RC_btt_USB_stm32 env:STM32F103RC_btt_512K_USB_stm32 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
522+
#include "stm32f1/pins_BTT_SKR_MINI_MZ_V1_0.h" // STM32F1 env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB env:STM32F103RC_btt_maple env:STM32F103RC_btt_512K_maple env:STM32F103RC_btt_USB_maple env:STM32F103RC_btt_512K_USB_maple
523523
#elif MB(BTT_SKR_E3_DIP)
524524
#include "stm32f1/pins_BTT_SKR_E3_DIP.h" // STM32F1 env:STM32F103RE_btt env:STM32F103RE_btt_USB env:STM32F103RC_btt env:STM32F103RC_btt_512K env:STM32F103RC_btt_USB env:STM32F103RC_btt_512K_USB
525525
#elif MB(BTT_SKR_CR6)
@@ -541,17 +541,17 @@
541541
#elif MB(CHITU3D_V6)
542542
#include "stm32f1/pins_CHITU3D_V6.h" // STM32F1 env:chitu_f103
543543
#elif MB(CREALITY_V4)
544-
#include "stm32f1/pins_CREALITY_V4.h" // STM32F1 env:STM32F103RET6_creality env:STM32F103RET6_creality_stm32
544+
#include "stm32f1/pins_CREALITY_V4.h" // STM32F1 env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
545545
#elif MB(CREALITY_V4210)
546-
#include "stm32f1/pins_CREALITY_V4210.h" // STM32F1 env:STM32F103RET6_creality env:STM32F103RET6_creality_stm32
546+
#include "stm32f1/pins_CREALITY_V4210.h" // STM32F1 env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
547547
#elif MB(CREALITY_V427)
548-
#include "stm32f1/pins_CREALITY_V427.h" // STM32F1 env:STM32F103RET6_creality env:STM32F103RET6_creality_stm32
548+
#include "stm32f1/pins_CREALITY_V427.h" // STM32F1 env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
549549
#elif MB(CREALITY_V431)
550-
#include "stm32f1/pins_CREALITY_V431.h" // STM32F1 env:STM32F103RET6_creality env:STM32F103RET6_creality_stm32
550+
#include "stm32f1/pins_CREALITY_V431.h" // STM32F1 env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
551551
#elif MB(CREALITY_V452)
552-
#include "stm32f1/pins_CREALITY_V452.h" // STM32F1 env:STM32F103RET6_creality env:STM32F103RET6_creality_stm32
552+
#include "stm32f1/pins_CREALITY_V452.h" // STM32F1 env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
553553
#elif MB(CREALITY_V453)
554-
#include "stm32f1/pins_CREALITY_V453.h" // STM32F1 env:STM32F103RET6_creality env:STM32F103RET6_creality_stm32
554+
#include "stm32f1/pins_CREALITY_V453.h" // STM32F1 env:STM32F103RET6_creality env:STM32F103RET6_creality_maple
555555
#elif MB(TRIGORILLA_PRO)
556556
#include "stm32f1/pins_TRIGORILLA_PRO.h" // STM32F1 env:trigorilla_pro
557557
#elif MB(FLY_MINI)

‎buildroot/share/PlatformIO/scripts/mks_encrypt.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# buildroot/share/PlatformIO/scripts/mks_encrypt.py
33
#
44
# Apply encryption and save as 'build.firmware' for these environments:
5-
# - env:mks_robin_stm32
5+
# - env:mks_robin
66
# - env:flsun_hispeedv1
7-
# - env:mks_robin_nano35_stm32
7+
# - env:mks_robin_nano35
88
#
99
Import("env")
1010

‎buildroot/tests/STM32F103RC_btt_USB‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set -e
1010
# Build with the default configurations
1111
#
1212
restore_configs
13-
opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1 BAUDRATE_2 115200
13+
opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1
1414
exec_test $1 $2 "BigTreeTech SKR Mini v1.1 - Basic Configuration" "$3"
1515

1616
# clean up

buildroot/tests/STM32F103RC_btt_USB_stm32 renamed to buildroot/tests/STM32F103RC_btt_USB_maple

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Build tests for STM32F103RC BigTreeTech (SKR Mini v1.1)
3+
# Build tests for STM32F103RC BigTreeTech (SKR Mini v1.1) with LibMaple STM32F1 HAL
44
#
55

66
# exit on first failure
@@ -10,7 +10,7 @@ set -e
1010
# Build with the default configurations
1111
#
1212
restore_configs
13-
opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1
13+
opt_set MOTHERBOARD BOARD_BTT_SKR_MINI_V1_1 SERIAL_PORT 1 SERIAL_PORT_2 -1 BAUDRATE_2 115200
1414
exec_test $1 $2 "BigTreeTech SKR Mini v1.1 - Basic Configuration" "$3"
1515

1616
# clean up

buildroot/tests/STM32F103RC_btt_stm32 renamed to buildroot/tests/STM32F103RC_btt_maple

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Build tests for STM32F103RC BigTreeTech (SKR Mini E3)
3+
# Build tests for STM32F103RC BigTreeTech (SKR Mini E3) with LibMaple STM32F1 HAL
44
#
55

66
# exit on first failure

‎buildroot/tests/mks_robin‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
#!/usr/bin/env bash
22
#
3-
# Build tests for MKS Robin
4-
# (STM32F1 genericSTM32F103ZE)
3+
# Build tests for MKS Robin (HAL/STM32)
54
#
65

76
# exit on first failure
87
set -e
98

109
use_example_configs Mks/Robin
11-
exec_test $1 $2 "MKS Robin config (FSMC Color UI)" "$3"
12-
13-
#
14-
# MKS Robin LVGL FSMC
15-
#
16-
use_example_configs Mks/Robin
17-
opt_disable TFT_CLASSIC_UI TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
18-
opt_enable TFT_LVGL_UI TFT_RES_480x320
19-
exec_test $1 $2 "MKS Robin nano v1.2 LVGL FSMC" "$3"
10+
exec_test $1 $2 "MKS Robin base configuration" "$3"
2011

2112
# cleanup
2213
restore_configs

‎buildroot/tests/mks_robin_maple‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/usr/bin/env bash
2+
#
3+
# Build tests for MKS Robin with LibMaple STM32F1 HAL
4+
# (STM32F1 genericSTM32F103ZE)
5+
#
6+
7+
# exit on first failure
8+
set -e
9+
10+
use_example_configs Mks/Robin
11+
exec_test $1 $2 "MKS Robin config (FSMC Color UI)" "$3"
12+
13+
#
14+
# MKS Robin LVGL FSMC
15+
#
16+
use_example_configs Mks/Robin
17+
opt_disable TFT_CLASSIC_UI TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
18+
opt_enable TFT_LVGL_UI TFT_RES_480x320
19+
exec_test $1 $2 "MKS Robin nano v1.2 LVGL FSMC" "$3"
20+
21+
# cleanup
22+
restore_configs

‎buildroot/tests/mks_robin_nano35‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,24 @@ opt_disable TFT_INTERFACE_FSMC
2424
opt_enable TFT_INTERFACE_SPI
2525
exec_test $1 $2 "MKS Robin v2 nano Emulated DOGM SPI" "$3"
2626

27+
#
28+
# MKS Robin nano v1.2 LVGL FSMC
29+
#
30+
# use_example_configs Mks/Robin
31+
# opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO
32+
# opt_disable TFT_CLASSIC_UI TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
33+
# opt_enable TFT_LVGL_UI TFT_RES_480x320
34+
# exec_test $1 $2 "MKS Robin nano v1.2 LVGL FSMC" "$3"
35+
2736
#
2837
# MKS Robin v2 nano LVGL SPI
2938
# (Robin v2 nano has no FSMC interface)
3039
#
31-
use_example_configs Mks/Robin
32-
opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
33-
opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240 SERIAL_PORT_2
34-
opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320 MKS_WIFI_MODULE
35-
exec_test $1 $2 "MKS Robin v2 nano LVGL SPI w/ WiFi" "$3"
40+
# use_example_configs Mks/Robin
41+
# opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
42+
# opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
43+
# opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320
44+
# exec_test $1 $2 "MKS Robin v2 nano LVGL SPI" "$3"
3645

3746
#
3847
# MKS Robin v2 nano New Color UI 480x320 SPI
@@ -42,27 +51,17 @@ use_example_configs Mks/Robin
4251
opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
4352
opt_disable TFT_INTERFACE_FSMC TFT_RES_320x240
4453
opt_enable TFT_INTERFACE_SPI TFT_RES_480x320
45-
opt_enable BINARY_FILE_TRANSFER
46-
exec_test $1 $2 "MKS Robin v2 nano New Color UI 480x320 SPI + BINARY_FILE_TRANSFER" "$3"
54+
exec_test $1 $2 "MKS Robin v2 nano New Color UI 480x320 SPI" "$3"
4755

4856
#
4957
# MKS Robin v2 nano LVGL SPI + TMC
5058
# (Robin v2 nano has no FSMC interface)
5159
#
52-
use_example_configs Mks/Robin
53-
opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2 X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209
54-
opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
55-
opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320
56-
exec_test $1 $2 "MKS Robin v2 nano LVGL SPI + TMC" "$3"
57-
58-
#
59-
# MKS Robin v2 nano New Color UI 480x320 SPI Without Touch Screen
60-
#
61-
use_example_configs Mks/Robin
62-
opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2
63-
opt_disable TFT_INTERFACE_FSMC TFT_RES_320x240 TOUCH_SCREEN
64-
opt_enable TFT_INTERFACE_SPI TFT_RES_480x320 TFT_COLOR_UI
65-
exec_test $1 $2 "MKS Robin v2 nano New Color UI 480x320 SPI without TOUCH_SCREEN" "$3"
60+
# use_example_configs Mks/Robin
61+
# opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2 X_DRIVER_TYPE TMC2209 Y_DRIVER_TYPE TMC2209
62+
# opt_disable TFT_INTERFACE_FSMC TFT_COLOR_UI TOUCH_SCREEN TFT_RES_320x240
63+
# opt_enable TFT_INTERFACE_SPI TFT_LVGL_UI TFT_RES_480x320
64+
# exec_test $1 $2 "MKS Robin v2 nano LVGL SPI + TMC" "$3"
6665

6766
# cleanup
6867
restore_configs

0 commit comments

Comments
 (0)