From 6be369f3eacad705a49680f9f2edb5238f4e746a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 7 Jul 2017 04:45:14 -0500 Subject: [PATCH 1/2] Add some config names to AUTHOR --- Marlin/example_configurations/Felix/Configuration.h | 2 +- Marlin/example_configurations/Felix/DUAL/Configuration.h | 2 +- Marlin/example_configurations/RigidBot/Configuration.h | 2 +- Marlin/example_configurations/TAZ4/Configuration.h | 2 +- Marlin/example_configurations/TinyBoy2/Configuration.h | 2 +- Marlin/example_configurations/wt150/Configuration.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index a5a060395..3c83423fd 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -74,7 +74,7 @@ // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. -#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "(none, Felix)" // Who made the changes. #define SHOW_BOOTSCREEN #define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 #define STRING_SPLASH_LINE2 WEBSITE_URL // will be shown during bootup in line 2 diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index 5a9fa5185..015398267 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -74,7 +74,7 @@ // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. -#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "(none, Felix/DUAL)" // Who made the changes. #define SHOW_BOOTSCREEN #define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 #define STRING_SPLASH_LINE2 WEBSITE_URL // will be shown during bootup in line 2 diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index dd88d90ef..f8c6e921b 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -74,7 +74,7 @@ // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. -#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "(none, RigidBot)" // Who made the changes. #define SHOW_BOOTSCREEN #define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 #define STRING_SPLASH_LINE2 WEBSITE_URL // will be shown during bootup in line 2 diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/TAZ4/Configuration.h index 825e7fab7..43b52cdb6 100644 --- a/Marlin/example_configurations/TAZ4/Configuration.h +++ b/Marlin/example_configurations/TAZ4/Configuration.h @@ -74,7 +74,7 @@ // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. -#define STRING_CONFIG_H_AUTHOR "(Aleph Objects, Inc, TAZ config)" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "(Aleph Objects Inc, TAZ)" // Who made the changes. #define SHOW_BOOTSCREEN #define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 #define STRING_SPLASH_LINE2 WEBSITE_URL // will be shown during bootup in line 2 diff --git a/Marlin/example_configurations/TinyBoy2/Configuration.h b/Marlin/example_configurations/TinyBoy2/Configuration.h index 07ac3077e..cbcd267b0 100644 --- a/Marlin/example_configurations/TinyBoy2/Configuration.h +++ b/Marlin/example_configurations/TinyBoy2/Configuration.h @@ -90,7 +90,7 @@ // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. -#define STRING_CONFIG_H_AUTHOR "(StefanB, default config)" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "(StefanB, TinyBoy2)" // Who made the changes. #define SHOW_BOOTSCREEN #define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 #define STRING_SPLASH_LINE2 WEBSITE_URL // will be shown during bootup in line 2 diff --git a/Marlin/example_configurations/wt150/Configuration.h b/Marlin/example_configurations/wt150/Configuration.h index 7487dcee5..e26923620 100644 --- a/Marlin/example_configurations/wt150/Configuration.h +++ b/Marlin/example_configurations/wt150/Configuration.h @@ -74,7 +74,7 @@ // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. -#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "(none, wt150)" // Who made the changes. #define SHOW_BOOTSCREEN #define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 #define STRING_SPLASH_LINE2 WEBSITE_URL // will be shown during bootup in line 2 From 186580b55fe7a9cf8e9c4e0fb7bf1be2333055f6 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 7 Jul 2017 04:03:27 -0500 Subject: [PATCH 2/2] Arrange example configurations by vendor --- .../{ => AlephObjects}/TAZ4/Configuration.h | 0 .../{ => AlephObjects}/TAZ4/Configuration_adv.h | 0 .../{ => AliExpress}/CL-260/Configuration.h | 2 +- .../example_configurations/{ => AliExpress}/CL-260/README.txt | 2 +- .../example_configurations/{ => BQ}/Hephestos/Configuration.h | 0 .../{ => BQ}/Hephestos/Configuration_adv.h | 0 .../example_configurations/{ => BQ}/Hephestos_2/Configuration.h | 0 .../{ => BQ}/Hephestos_2/Configuration_adv.h | 0 Marlin/example_configurations/{ => BQ}/Hephestos_2/README.md | 0 .../example_configurations/{ => BQ}/Hephestos_2/_Bootscreen.h | 0 Marlin/example_configurations/{ => BQ}/WITBOX/Configuration.h | 0 .../example_configurations/{ => BQ}/WITBOX/Configuration_adv.h | 0 .../{FolgerTech-i3-2020 => Folger Tech/i3-2020}/Configuration.h | 0 .../i3-2020}/Configuration_adv.h | 0 .../{Infitary-i3-M508 => Infitary/i3-M508}/Configuration.h | 0 .../{Infitary-i3-M508 => Infitary/i3-M508}/Configuration_adv.h | 0 Marlin/example_configurations/{ => Malyan}/M150/Configuration.h | 0 .../{ => Malyan}/M150/Configuration_adv.h | 0 Marlin/example_configurations/{ => Malyan}/M150/README.md | 0 Marlin/example_configurations/{ => Malyan}/M150/_Bootscreen.h | 0 .../example_configurations/{ => Velleman}/K8200/Configuration.h | 0 .../{ => Velleman}/K8200/Configuration_adv.h | 0 Marlin/example_configurations/{ => Velleman}/K8200/README.md | 0 .../example_configurations/{ => Velleman}/K8400/Configuration.h | 0 .../{ => Velleman}/K8400/Configuration_adv.h | 0 .../{ => Velleman}/K8400/Dual-head/Configuration.h | 0 Marlin/example_configurations/{ => Velleman}/K8400/README.md | 0 .../{gCreate_gMax1.5+ => gCreate/gMax1.5+}/Configuration.h | 0 .../{gCreate_gMax1.5+ => gCreate/gMax1.5+}/Configuration_adv.h | 0 .../{gCreate_gMax1.5+ => gCreate/gMax1.5+}/_Bootscreen.h | 0 30 files changed, 2 insertions(+), 2 deletions(-) rename Marlin/example_configurations/{ => AlephObjects}/TAZ4/Configuration.h (100%) rename Marlin/example_configurations/{ => AlephObjects}/TAZ4/Configuration_adv.h (100%) rename Marlin/example_configurations/{ => AliExpress}/CL-260/Configuration.h (99%) rename Marlin/example_configurations/{ => AliExpress}/CL-260/README.txt (89%) rename Marlin/example_configurations/{ => BQ}/Hephestos/Configuration.h (100%) rename Marlin/example_configurations/{ => BQ}/Hephestos/Configuration_adv.h (100%) rename Marlin/example_configurations/{ => BQ}/Hephestos_2/Configuration.h (100%) rename Marlin/example_configurations/{ => BQ}/Hephestos_2/Configuration_adv.h (100%) rename Marlin/example_configurations/{ => BQ}/Hephestos_2/README.md (100%) rename Marlin/example_configurations/{ => BQ}/Hephestos_2/_Bootscreen.h (100%) rename Marlin/example_configurations/{ => BQ}/WITBOX/Configuration.h (100%) rename Marlin/example_configurations/{ => BQ}/WITBOX/Configuration_adv.h (100%) rename Marlin/example_configurations/{FolgerTech-i3-2020 => Folger Tech/i3-2020}/Configuration.h (100%) rename Marlin/example_configurations/{FolgerTech-i3-2020 => Folger Tech/i3-2020}/Configuration_adv.h (100%) rename Marlin/example_configurations/{Infitary-i3-M508 => Infitary/i3-M508}/Configuration.h (100%) rename Marlin/example_configurations/{Infitary-i3-M508 => Infitary/i3-M508}/Configuration_adv.h (100%) rename Marlin/example_configurations/{ => Malyan}/M150/Configuration.h (100%) rename Marlin/example_configurations/{ => Malyan}/M150/Configuration_adv.h (100%) rename Marlin/example_configurations/{ => Malyan}/M150/README.md (100%) rename Marlin/example_configurations/{ => Malyan}/M150/_Bootscreen.h (100%) rename Marlin/example_configurations/{ => Velleman}/K8200/Configuration.h (100%) rename Marlin/example_configurations/{ => Velleman}/K8200/Configuration_adv.h (100%) rename Marlin/example_configurations/{ => Velleman}/K8200/README.md (100%) rename Marlin/example_configurations/{ => Velleman}/K8400/Configuration.h (100%) rename Marlin/example_configurations/{ => Velleman}/K8400/Configuration_adv.h (100%) rename Marlin/example_configurations/{ => Velleman}/K8400/Dual-head/Configuration.h (100%) rename Marlin/example_configurations/{ => Velleman}/K8400/README.md (100%) rename Marlin/example_configurations/{gCreate_gMax1.5+ => gCreate/gMax1.5+}/Configuration.h (100%) rename Marlin/example_configurations/{gCreate_gMax1.5+ => gCreate/gMax1.5+}/Configuration_adv.h (100%) rename Marlin/example_configurations/{gCreate_gMax1.5+ => gCreate/gMax1.5+}/_Bootscreen.h (100%) diff --git a/Marlin/example_configurations/TAZ4/Configuration.h b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h similarity index 100% rename from Marlin/example_configurations/TAZ4/Configuration.h rename to Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h diff --git a/Marlin/example_configurations/TAZ4/Configuration_adv.h b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h similarity index 100% rename from Marlin/example_configurations/TAZ4/Configuration_adv.h rename to Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h diff --git a/Marlin/example_configurations/CL-260/Configuration.h b/Marlin/example_configurations/AliExpress/CL-260/Configuration.h similarity index 99% rename from Marlin/example_configurations/CL-260/Configuration.h rename to Marlin/example_configurations/AliExpress/CL-260/Configuration.h index 9f0a82ac7..e72d15b5a 100644 --- a/Marlin/example_configurations/CL-260/Configuration.h +++ b/Marlin/example_configurations/AliExpress/CL-260/Configuration.h @@ -74,7 +74,7 @@ // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. -#define STRING_CONFIG_H_AUTHOR "(none, example CL-260 config)" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "(none, CL-260)" // Who made the changes. #define SHOW_BOOTSCREEN #define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 #define STRING_SPLASH_LINE2 WEBSITE_URL // will be shown during bootup in line 2 diff --git a/Marlin/example_configurations/CL-260/README.txt b/Marlin/example_configurations/AliExpress/CL-260/README.txt similarity index 89% rename from Marlin/example_configurations/CL-260/README.txt rename to Marlin/example_configurations/AliExpress/CL-260/README.txt index 80f82893f..b8d6856a6 100644 --- a/Marlin/example_configurations/CL-260/README.txt +++ b/Marlin/example_configurations/AliExpress/CL-260/README.txt @@ -1,4 +1,4 @@ -This is an example configuration for the CL-260. +This is an example configuration for the CL-260 Ultimaker 2 clone. Change Z_MAX_POS to 300 for the CL-260MAX. (The printer is available on AliExpress; be aware that this is not a beginner's diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/BQ/Hephestos/Configuration.h similarity index 100% rename from Marlin/example_configurations/Hephestos/Configuration.h rename to Marlin/example_configurations/BQ/Hephestos/Configuration.h diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h similarity index 100% rename from Marlin/example_configurations/Hephestos/Configuration_adv.h rename to Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h diff --git a/Marlin/example_configurations/Hephestos_2/Configuration.h b/Marlin/example_configurations/BQ/Hephestos_2/Configuration.h similarity index 100% rename from Marlin/example_configurations/Hephestos_2/Configuration.h rename to Marlin/example_configurations/BQ/Hephestos_2/Configuration.h diff --git a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h similarity index 100% rename from Marlin/example_configurations/Hephestos_2/Configuration_adv.h rename to Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h diff --git a/Marlin/example_configurations/Hephestos_2/README.md b/Marlin/example_configurations/BQ/Hephestos_2/README.md similarity index 100% rename from Marlin/example_configurations/Hephestos_2/README.md rename to Marlin/example_configurations/BQ/Hephestos_2/README.md diff --git a/Marlin/example_configurations/Hephestos_2/_Bootscreen.h b/Marlin/example_configurations/BQ/Hephestos_2/_Bootscreen.h similarity index 100% rename from Marlin/example_configurations/Hephestos_2/_Bootscreen.h rename to Marlin/example_configurations/BQ/Hephestos_2/_Bootscreen.h diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/BQ/WITBOX/Configuration.h similarity index 100% rename from Marlin/example_configurations/WITBOX/Configuration.h rename to Marlin/example_configurations/BQ/WITBOX/Configuration.h diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h similarity index 100% rename from Marlin/example_configurations/WITBOX/Configuration_adv.h rename to Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h diff --git a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h b/Marlin/example_configurations/Folger Tech/i3-2020/Configuration.h similarity index 100% rename from Marlin/example_configurations/FolgerTech-i3-2020/Configuration.h rename to Marlin/example_configurations/Folger Tech/i3-2020/Configuration.h diff --git a/Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h b/Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h similarity index 100% rename from Marlin/example_configurations/FolgerTech-i3-2020/Configuration_adv.h rename to Marlin/example_configurations/Folger Tech/i3-2020/Configuration_adv.h diff --git a/Marlin/example_configurations/Infitary-i3-M508/Configuration.h b/Marlin/example_configurations/Infitary/i3-M508/Configuration.h similarity index 100% rename from Marlin/example_configurations/Infitary-i3-M508/Configuration.h rename to Marlin/example_configurations/Infitary/i3-M508/Configuration.h diff --git a/Marlin/example_configurations/Infitary-i3-M508/Configuration_adv.h b/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h similarity index 100% rename from Marlin/example_configurations/Infitary-i3-M508/Configuration_adv.h rename to Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h diff --git a/Marlin/example_configurations/M150/Configuration.h b/Marlin/example_configurations/Malyan/M150/Configuration.h similarity index 100% rename from Marlin/example_configurations/M150/Configuration.h rename to Marlin/example_configurations/Malyan/M150/Configuration.h diff --git a/Marlin/example_configurations/M150/Configuration_adv.h b/Marlin/example_configurations/Malyan/M150/Configuration_adv.h similarity index 100% rename from Marlin/example_configurations/M150/Configuration_adv.h rename to Marlin/example_configurations/Malyan/M150/Configuration_adv.h diff --git a/Marlin/example_configurations/M150/README.md b/Marlin/example_configurations/Malyan/M150/README.md similarity index 100% rename from Marlin/example_configurations/M150/README.md rename to Marlin/example_configurations/Malyan/M150/README.md diff --git a/Marlin/example_configurations/M150/_Bootscreen.h b/Marlin/example_configurations/Malyan/M150/_Bootscreen.h similarity index 100% rename from Marlin/example_configurations/M150/_Bootscreen.h rename to Marlin/example_configurations/Malyan/M150/_Bootscreen.h diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/Velleman/K8200/Configuration.h similarity index 100% rename from Marlin/example_configurations/K8200/Configuration.h rename to Marlin/example_configurations/Velleman/K8200/Configuration.h diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h similarity index 100% rename from Marlin/example_configurations/K8200/Configuration_adv.h rename to Marlin/example_configurations/Velleman/K8200/Configuration_adv.h diff --git a/Marlin/example_configurations/K8200/README.md b/Marlin/example_configurations/Velleman/K8200/README.md similarity index 100% rename from Marlin/example_configurations/K8200/README.md rename to Marlin/example_configurations/Velleman/K8200/README.md diff --git a/Marlin/example_configurations/K8400/Configuration.h b/Marlin/example_configurations/Velleman/K8400/Configuration.h similarity index 100% rename from Marlin/example_configurations/K8400/Configuration.h rename to Marlin/example_configurations/Velleman/K8400/Configuration.h diff --git a/Marlin/example_configurations/K8400/Configuration_adv.h b/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h similarity index 100% rename from Marlin/example_configurations/K8400/Configuration_adv.h rename to Marlin/example_configurations/Velleman/K8400/Configuration_adv.h diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h similarity index 100% rename from Marlin/example_configurations/K8400/Dual-head/Configuration.h rename to Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h diff --git a/Marlin/example_configurations/K8400/README.md b/Marlin/example_configurations/Velleman/K8400/README.md similarity index 100% rename from Marlin/example_configurations/K8400/README.md rename to Marlin/example_configurations/Velleman/K8400/README.md diff --git a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h similarity index 100% rename from Marlin/example_configurations/gCreate_gMax1.5+/Configuration.h rename to Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h diff --git a/Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h similarity index 100% rename from Marlin/example_configurations/gCreate_gMax1.5+/Configuration_adv.h rename to Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h diff --git a/Marlin/example_configurations/gCreate_gMax1.5+/_Bootscreen.h b/Marlin/example_configurations/gCreate/gMax1.5+/_Bootscreen.h similarity index 100% rename from Marlin/example_configurations/gCreate_gMax1.5+/_Bootscreen.h rename to Marlin/example_configurations/gCreate/gMax1.5+/_Bootscreen.h