From 6e041d6c02f6eb26fc4e5a7568412c1cbf0d0c5a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 1 Jan 2022 20:01:24 -0600 Subject: [PATCH 1/8] =?UTF-8?q?=F0=9F=94=A8=20Add=20.vscode/extensions.jso?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/extensions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 7226831cb182..a3459ef549e4 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -5,4 +5,4 @@ "marlinfirmware.auto-build", "platformio.platformio-ide" ] -} +} \ No newline at end of file From 77f7f1cbada1ce33401b0973b5864e7d20f5e65c Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 1 Jan 2022 20:01:24 -0600 Subject: [PATCH 2/8] =?UTF-8?q?=F0=9F=94=A8=20Add=20.vscode/extensions.jso?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 0b852d767325..bea798f44f5f 100755 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,10 @@ applet/ *.rej *.bak *.idea +<<<<<<< HEAD +======= +*.s +>>>>>>> 🔨 Add .vscode/extensions.json *.i *.ii *.swp From fd7397ed2f2b1ea006d553739448ba35f75ad94e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 1 Jan 2022 20:01:24 -0600 Subject: [PATCH 3/8] =?UTF-8?q?=F0=9F=94=A8=20Add=20.vscode/extensions.jso?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/extensions.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index a3459ef549e4..aa4ce8dd096c 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,7 +2,14 @@ // See http://go.microsoft.com/fwlink/?LinkId=827846 // for the documentation about the extensions.json format "recommendations": [ +<<<<<<< HEAD "marlinfirmware.auto-build", "platformio.platformio-ide" ] -} \ No newline at end of file +} +======= + "platformio.platformio-ide", + "marlinfirmware.auto-build" + ] +} +>>>>>>> 🔨 Add .vscode/extensions.json From 1397a6c680a3aae969f496a76b5fa3afec2cdf1d Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Mon, 7 Feb 2022 14:21:10 +1300 Subject: [PATCH 4/8] add renamed.ini --- ini/renamed.ini | 25 +++++++++++++++++++++++++ platformio.ini | 1 + 2 files changed, 26 insertions(+) create mode 100644 ini/renamed.ini diff --git a/ini/renamed.ini b/ini/renamed.ini new file mode 100644 index 000000000000..3aea034a03fe --- /dev/null +++ b/ini/renamed.ini @@ -0,0 +1,25 @@ +# +# Marlin Firmware +# PlatformIO Configuration File +# + +################################# +# # +# Renamed Environments # +# # +################################# + +# +# List of environment name that are no longer used +# + +[env:STM32F103RET6_creality_maple] +extends = env:STM32F103RE_maple + +[env:STM32F103RET6_creality] +extends = STM32F103Rx_creality +board = genericSTM32F103RE + +[env:STM32F103RET6_creality_xfer] +extends = STM32F103Rx_creality_xfer +board = genericSTM32F103RE diff --git a/platformio.ini b/platformio.ini index e1db73a4bd12..43c7e2be6bf4 100644 --- a/platformio.ini +++ b/platformio.ini @@ -32,6 +32,7 @@ extra_configs = ini/stm32h7.ini ini/stm32g0.ini ini/teensy.ini + ini/renamed.ini # # The 'common' section applies to most Marlin builds. From f5175627285947c9bebea36693177eb77be831f1 Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Mon, 7 Feb 2022 14:22:46 +1300 Subject: [PATCH 5/8] fix gitignore --- .gitignore | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bea798f44f5f..55dd8cee3785 100755 --- a/.gitignore +++ b/.gitignore @@ -41,10 +41,6 @@ applet/ *.rej *.bak *.idea -<<<<<<< HEAD -======= -*.s ->>>>>>> 🔨 Add .vscode/extensions.json *.i *.ii *.swp @@ -172,4 +168,4 @@ cmake-build-* __pycache__ # IOLogger logs -*_log.csv +*_log.csv \ No newline at end of file From b6804e88e35bee79f47d7421e61dbb4553fa1663 Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Mon, 7 Feb 2022 14:23:54 +1300 Subject: [PATCH 6/8] fix extensions.json --- .vscode/extensions.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index aa4ce8dd096c..a3459ef549e4 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,14 +2,7 @@ // See http://go.microsoft.com/fwlink/?LinkId=827846 // for the documentation about the extensions.json format "recommendations": [ -<<<<<<< HEAD "marlinfirmware.auto-build", "platformio.platformio-ide" ] -} -======= - "platformio.platformio-ide", - "marlinfirmware.auto-build" - ] -} ->>>>>>> 🔨 Add .vscode/extensions.json +} \ No newline at end of file From 1fa1c0b99690f5f16a326354a5101f0ee30b61a6 Mon Sep 17 00:00:00 2001 From: ellensp <530024+ellensp@users.noreply.github.com> Date: Mon, 7 Feb 2022 14:25:05 +1300 Subject: [PATCH 7/8] add linefeeds --- .gitignore | 2 +- .vscode/extensions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 55dd8cee3785..0b852d767325 100755 --- a/.gitignore +++ b/.gitignore @@ -168,4 +168,4 @@ cmake-build-* __pycache__ # IOLogger logs -*_log.csv \ No newline at end of file +*_log.csv diff --git a/.vscode/extensions.json b/.vscode/extensions.json index a3459ef549e4..7226831cb182 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -5,4 +5,4 @@ "marlinfirmware.auto-build", "platformio.platformio-ide" ] -} \ No newline at end of file +} From fbb8a548650cabe71010592d76bb8170c4a0e5b4 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 7 Feb 2022 14:43:10 -0600 Subject: [PATCH 8/8] Update renamed.ini --- ini/renamed.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ini/renamed.ini b/ini/renamed.ini index 3aea034a03fe..bc1e438d60c1 100644 --- a/ini/renamed.ini +++ b/ini/renamed.ini @@ -10,7 +10,7 @@ ################################# # -# List of environment name that are no longer used +# List of environment names that are no longer used # [env:STM32F103RET6_creality_maple]