Skip to content

Commit b6abc76

Browse files
committed
🔨 Move, tweak maple envs
1 parent 0ae0617 commit b6abc76

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+184
-299
lines changed

.github/workflows/test-builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
#- STM32F103RC_btt_maple
6060
- STM32F103RC_btt_USB_maple
6161
- STM32F103RC_fysetc_maple
62-
- STM32F103RC_meeb
62+
- STM32F103RC_meeb_maple
6363
- jgaurora_a5s_a1_maple
6464
- STM32F103VE_longer_maple
6565
#- mks_robin_maple

Marlin/src/pins/pins.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -492,15 +492,15 @@
492492
#elif MB(STM3R_MINI)
493493
#include "stm32f1/pins_STM3R_MINI.h" // STM32F103VE? env:STM32F103VE env:STM32F103RE_maple
494494
#elif MB(GTM32_PRO_VB)
495-
#include "stm32f1/pins_GTM32_PRO_VB.h" // STM32F103VE env:STM32F103VE env:STM32F103RE_maple
495+
#include "stm32f1/pins_GTM32_PRO_VB.h" // STM32F103VE env:STM32F103VE env:STM32F103VE_GTM32_maple
496496
#elif MB(GTM32_PRO_VD)
497-
#include "stm32f1/pins_GTM32_PRO_VD.h" // STM32F103VE env:STM32F103VE env:STM32F103RE_maple
497+
#include "stm32f1/pins_GTM32_PRO_VD.h" // STM32F103VE env:STM32F103VE env:STM32F103VE_GTM32_maple
498498
#elif MB(GTM32_MINI)
499-
#include "stm32f1/pins_GTM32_MINI.h" // STM32F103VE env:STM32F103VE env:STM32F103RE_maple
499+
#include "stm32f1/pins_GTM32_MINI.h" // STM32F103VE env:STM32F103VE env:STM32F103VE_GTM32_maple
500500
#elif MB(GTM32_MINI_A30)
501-
#include "stm32f1/pins_GTM32_MINI_A30.h" // STM32F103VE env:STM32F103VE env:STM32F103RE_maple
501+
#include "stm32f1/pins_GTM32_MINI_A30.h" // STM32F103VE env:STM32F103VE env:STM32F103VE_GTM32_maple
502502
#elif MB(GTM32_REV_B)
503-
#include "stm32f1/pins_GTM32_REV_B.h" // STM32F103VE env:STM32F103VE env:STM32F103RE_maple
503+
#include "stm32f1/pins_GTM32_REV_B.h" // STM32F103VE env:STM32F103VE env:STM32F103VE_GTM32_maple
504504
#elif MB(MORPHEUS)
505505
#include "stm32f1/pins_MORPHEUS.h" // STM32F103RE env:STM32F103RE env:STM32F103RE_maple
506506
#elif MB(CHITU3D)
@@ -556,7 +556,7 @@
556556
#elif MB(LONGER3D_LK)
557557
#include "stm32f1/pins_LONGER3D_LK.h" // STM32F1 env:STM32F103VE_longer env:STM32F103VE_longer_maple
558558
#elif MB(CCROBOT_MEEB_3DP)
559-
#include "stm32f1/pins_CCROBOT_MEEB_3DP.h" // STM32F1 env:STM32F103RC_meeb
559+
#include "stm32f1/pins_CCROBOT_MEEB_3DP.h" // STM32F1 env:STM32F103RC_meeb_maple
560560
#elif MB(CHITU3D_V5)
561561
#include "stm32f1/pins_CHITU3D_V5.h" // STM32F1 env:chitu_f103 env:chitu_f103_maple env:chitu_v5_gpio_init env:chitu_v5_gpio_init_maple
562562
#elif MB(CHITU3D_V6)

buildroot/share/PlatformIO/boards/marlin_CHITU_F103.json renamed to buildroot/share/PlatformIO/boards/marlin_maple_CHITU_F103.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
],
1717
"mcu": "stm32f103zet6",
18-
"variant": "marlin_CHITU_F103"
18+
"variant": "marlin_maple_CHITU_F103"
1919
},
2020
"debug": {
2121
"jlink_device": "STM32F103ZE",

buildroot/share/PlatformIO/boards/marlin_MEEB_3DP.json renamed to buildroot/share/PlatformIO/boards/marlin_maple_MEEB_3DP.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"ldscript": "stm32f103xc.ld"
1919
},
2020
"mcu": "stm32f103rct6",
21-
"variant": "marlin_MEEB_3DP"
21+
"variant": "marlin_maple_MEEB_3DP"
2222
},
2323
"debug": {
2424
"jlink_device": "STM32F103RC",

buildroot/share/PlatformIO/ldscripts/fysetc_stm32f103rc.ld

Lines changed: 0 additions & 18 deletions
This file was deleted.

buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,9 @@
44
import pioutil
55
if pioutil.is_pio_build():
66

7-
try:
8-
import configparser
9-
except ImportError:
10-
import ConfigParser as configparser
11-
127
import os
138
Import("env", "projenv")
149

15-
config = configparser.ConfigParser()
16-
config.read("platformio.ini")
17-
18-
#
19-
# Upload actions
20-
#
21-
def before_upload(source, target, env):
22-
env.Execute("pwd")
23-
24-
def after_upload(source, target, env):
25-
env.Execute("pwd")
26-
27-
env.AddPreAction("upload", before_upload)
28-
env.AddPostAction("upload", after_upload)
29-
3010
flash_size = 0
3111
vect_tab_addr = 0
3212

@@ -38,6 +18,3 @@ def after_upload(source, target, env):
3818

3919
print('Use the {0:s} address as the marlin app entry point.'.format(vect_tab_addr))
4020
print('Use the {0:d}KB flash version of stm32f103rct6 chip.'.format(flash_size))
41-
42-
import marlin
43-
marlin.custom_ld_script("STM32F103RC_MEEB_3DP.ld")

buildroot/share/PlatformIO/scripts/mks_robin.py

Lines changed: 0 additions & 5 deletions
This file was deleted.

buildroot/share/PlatformIO/scripts/mks_robin_e3.py

Lines changed: 0 additions & 5 deletions
This file was deleted.

buildroot/share/PlatformIO/scripts/mks_robin_e3p.py

Lines changed: 0 additions & 5 deletions
This file was deleted.

buildroot/share/PlatformIO/scripts/mks_robin_lite.py

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)