From d92ce8849b6e0d64f9a38ed9271b0c29663082f7 Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 30 Nov 2016 19:28:41 +0900 Subject: [PATCH 1/3] Fix for the PR #5072 (Add predefined AUTO_FAN_PINs to pins files), etc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ・Make descriptions the same as others --- .../example_configurations/delta/biv2.5/Configuration_adv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h index 1617cbb68..513e72d90 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h @@ -211,8 +211,8 @@ * Extruder auto fans automatically turn on when their extruders' * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE. * - * Your board's pins file specifies the recommended pins. - * Override those here. Set to -1 to disable unused fans. + * Your board's pins file specifies the recommended pins. Override those here + * or set to -1 to disable completely. * * Multiple extruders can be assigned to the same pin in which case * the fan will turn on when any selected extruder is above the threshold. From 8e9e9c17b0e75558b3fd2a565a6a721644d21e96 Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 30 Nov 2016 19:15:45 +0900 Subject: [PATCH 2/3] Follow-up the PR #5323 (Adding ukrainian language support) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ・Update forgotten Configuration_adv.h of Felix\DUAL and K8400\Dual-head --- Marlin/example_configurations/Felix/DUAL/Configuration.h | 4 ++-- Marlin/example_configurations/K8400/Dual-head/Configuration.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/example_configurations/Felix/DUAL/Configuration.h b/Marlin/example_configurations/Felix/DUAL/Configuration.h index e4f92618b..56d025ae4 100644 --- a/Marlin/example_configurations/Felix/DUAL/Configuration.h +++ b/Marlin/example_configurations/Felix/DUAL/Configuration.h @@ -1020,9 +1020,9 @@ // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: // en, an, bg, ca, cn, cz, de, el, el-gr, es, eu, fi, fr, gl, hr, it, -// kana, kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, tr, test +// kana, kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, tr, uk, test // -// :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'tr':'Turkish', 'test':'TEST' } +// :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'tr':'Turkish', 'uk':'Ukrainian', 'test':'TEST' } // //#define LCD_LANGUAGE en diff --git a/Marlin/example_configurations/K8400/Dual-head/Configuration.h b/Marlin/example_configurations/K8400/Dual-head/Configuration.h index 5d1c84c45..edead267e 100644 --- a/Marlin/example_configurations/K8400/Dual-head/Configuration.h +++ b/Marlin/example_configurations/K8400/Dual-head/Configuration.h @@ -1037,9 +1037,9 @@ // Here you may choose the language used by Marlin on the LCD menus, the following // list of languages are available: // en, an, bg, ca, cn, cz, de, el, el-gr, es, eu, fi, fr, gl, hr, it, -// kana, kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, tr, test +// kana, kana_utf8, nl, pl, pt, pt_utf8, pt-br, pt-br_utf8, ru, tr, uk, test // -// :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'tr':'Turkish', 'test':'TEST' } +// :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'tr':'Turkish', 'uk':'Ukrainian', 'test':'TEST' } // #define LCD_LANGUAGE en From 0909cf3d46bd10c87604e317afaf69d008177175 Mon Sep 17 00:00:00 2001 From: esenapaj Date: Wed, 30 Nov 2016 13:17:54 +0900 Subject: [PATCH 3/3] Adjust spacing --- Marlin/example_configurations/Cartesio/Configuration_adv.h | 1 - Marlin/example_configurations/Felix/Configuration_adv.h | 1 - Marlin/example_configurations/Hephestos/Configuration_adv.h | 1 - Marlin/example_configurations/Hephestos_2/Configuration_adv.h | 1 - Marlin/example_configurations/K8200/Configuration_adv.h | 1 - Marlin/example_configurations/K8400/Configuration_adv.h | 1 - Marlin/example_configurations/RigidBot/Configuration_adv.h | 1 - Marlin/example_configurations/SCARA/Configuration_adv.h | 1 - Marlin/example_configurations/TAZ4/Configuration_adv.h | 1 - Marlin/example_configurations/WITBOX/Configuration_adv.h | 2 +- Marlin/example_configurations/delta/biv2.5/Configuration_adv.h | 1 - Marlin/example_configurations/delta/generic/Configuration_adv.h | 1 - .../delta/kossel_mini/Configuration_adv.h | 1 - .../example_configurations/delta/kossel_pro/Configuration_adv.h | 1 - .../example_configurations/delta/kossel_xl/Configuration_adv.h | 1 - Marlin/example_configurations/makibox/Configuration_adv.h | 1 - Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h | 1 - 17 files changed, 1 insertion(+), 17 deletions(-) diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h index 5aede9304..b5b3546b8 100644 --- a/Marlin/example_configurations/Cartesio/Configuration_adv.h +++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h @@ -971,7 +971,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this. diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 90076a1ff..50ef6f223 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -971,7 +971,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this. diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index 79c5ab87f..7ba3a61b9 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -971,7 +971,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this. diff --git a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h index ee2c63fcb..fa22b59a8 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h @@ -971,7 +971,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this. diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index 0cb7199be..679cb6d07 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -984,7 +984,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this. diff --git a/Marlin/example_configurations/K8400/Configuration_adv.h b/Marlin/example_configurations/K8400/Configuration_adv.h index d5be523ab..4cf838e85 100644 --- a/Marlin/example_configurations/K8400/Configuration_adv.h +++ b/Marlin/example_configurations/K8400/Configuration_adv.h @@ -971,7 +971,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this. diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index c71179460..18f96aabc 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -971,7 +971,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this. diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index 63cc1bc4e..4b9ecba4d 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -971,7 +971,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this. diff --git a/Marlin/example_configurations/TAZ4/Configuration_adv.h b/Marlin/example_configurations/TAZ4/Configuration_adv.h index 3163bebea..706ab81a5 100644 --- a/Marlin/example_configurations/TAZ4/Configuration_adv.h +++ b/Marlin/example_configurations/TAZ4/Configuration_adv.h @@ -979,7 +979,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this. diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index c04fe9202..7ba3a61b9 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -764,6 +764,7 @@ // @section TMC2130 + /** * Enable this for SilentStepStick Trinamic TMC2130 SPI-configurable stepper drivers. * @@ -970,7 +971,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this. diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h index 513e72d90..b3468cba5 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h @@ -973,7 +973,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this. diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index 0cc37d591..7587b1c23 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -973,7 +973,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this. diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index 0cc37d591..7587b1c23 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -973,7 +973,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this. diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index 14cf0fa5f..b1cdfe840 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -978,7 +978,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this. diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h index 45d077bf9..fa838047c 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h @@ -973,7 +973,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this. diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index cf3a92626..3c65ea02e 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -971,7 +971,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this. diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index 312f4bdab..9d5cd456a 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -971,7 +971,6 @@ // @section L6470 - /** * Enable this section if you have L6470 motor drivers. * You need to import the L6470 library into the Arduino IDE for this.