File tree Expand file tree Collapse file tree 5 files changed +10
-10
lines changed
Expand file tree Collapse file tree 5 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ ini_use_config = none
5050# Load config file relative to Marlin/
5151; ini_use_config = another.ini
5252# Download configurations from GitHub
53- ; ini_use_config = example/Creality/Ender-5 Plus @ bugfix-2.1.x
53+ ; ini_use_config = Andrew427
5454# Download configurations from your server
5555; ini_use_config = https://me.myserver.com/path/to/configs
5656# Evaluate config:base and do a config dump
Original file line number Diff line number Diff line change @@ -124,11 +124,11 @@ else
124124fi
125125
126126# Delete any config files from previous builds
127- rm -f Marlin/_Bootscreen.h Marlin/_Statusscreen.h
127+ # rm -f Marlin/_Bootscreen.h Marlin/_Statusscreen.h
128128
129129# Copy configurations into the Marlin folder
130130echo " Getting configuration files from $SUB "
131- cp " $BASE " /configurations/Andrew427 /* .h Marlin/
131+ cp " $BASE " /configurations/Voxelab \ Aquila/UBL /* .h Marlin/
132132cp " $SUB " /* .h Marlin/
133133
134134rm -f Marlin/Config.h Marlin/Config-export.h
Original file line number Diff line number Diff line change 33import os , sys , subprocess
44
55files_to_remove = [
6- "Marlin/_Bootscreen.h" ,
7- "Marlin/_Statusscreen.h" ,
6+ # "Marlin/_Bootscreen.h",
7+ # "Marlin/_Statusscreen.h",
88 "marlin_config.json" ,
99 ".pio/build/mc.zip"
1010]
Original file line number Diff line number Diff line change @@ -112,7 +112,7 @@ def main():
112112 else :
113113 config_path = arg
114114 else :
115- config_path = "Andrew427 "
115+ config_path = "configurations "
116116
117117 try :
118118 subprocess .run (['restore_configs' ], check = True )
Original file line number Diff line number Diff line change @@ -132,8 +132,7 @@ def fetch_example(url):
132132 if not url .startswith ("http" ):
133133 brch = "HEAD"
134134 if "@" in url : url , brch = map (str .strip , url .split ("@" ))
135- if url == "configurations" : url = "Andrew427"
136- url = f"https://raw.githubusercontent.com/classicrocker883/MRiscoCProUI/{ brch } /configurations/{ url } "
135+ url = f"https://raw.githubusercontent.com/classicrocker883/MRiscoCProUI/{ brch } /{ url } "
137136 url = url .replace ("%" , "%25" ).replace (" " , "%20" )
138137
139138 # Find a suitable fetch command
@@ -234,8 +233,9 @@ def apply_config_ini(cp):
234233 ckey = "base"
235234
236235 # (Allow 'example/' as a shortcut for 'examples/')
237- elif ckey .startswith ("configuration/" ):
238- ckey = "configurations" + ckey [7 :]
236+ elif not ckey .startswith ("configuration/" ):
237+ ckey = "configurations/" + ckey
238+ # ckey = ckey[7:]
239239
240240 # For 'examples/<path>' fetch an example set from GitHub.
241241 # For https?:// do a direct fetch of the URL.
You can’t perform that action at this time.
0 commit comments