From 967db181d0f783fe4b1183c71571e5621bd572e3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 6 Apr 2015 21:46:18 -0700
Subject: [PATCH] Latest upstream commits
---
Marlin/Configuration.h | 9 ++++++---
Marlin/configurator/config/Configuration.h | 8 +++++---
Marlin/configurator/js/configurator.js | 5 +++--
Marlin/example_configurations/Felix/Configuration.h | 8 +++++---
Marlin/example_configurations/Felix/Configuration_DUAL.h | 8 +++++---
Marlin/example_configurations/Hephestos/Configuration.h | 8 +++++---
Marlin/example_configurations/K8200/Configuration.h | 8 +++++---
Marlin/example_configurations/SCARA/Configuration.h | 8 +++++---
Marlin/example_configurations/WITBOX/Configuration.h | 8 +++++---
.../example_configurations/delta/generic/Configuration.h | 8 +++++---
.../delta/kossel_mini/Configuration.h | 8 +++++---
Marlin/example_configurations/makibox/Configuration.h | 8 +++++---
.../example_configurations/tvrrug/Round2/Configuration.h | 8 +++++---
13 files changed, 64 insertions(+), 38 deletions(-)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 174f9e386e..33a419b6b7 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -614,9 +614,12 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
//define this to enable EEPROM support
//#define EEPROM_SETTINGS
-//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
-// please keep turned on if you can.
-//#define EEPROM_CHITCHAT
+
+#ifdef EEPROM_SETTINGS
+ // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
+ #define EEPROM_CHITCHAT // please keep turned on if you can.
+#endif
+
// @section temperature
diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h
index 174f9e386e..52d0d4b851 100644
--- a/Marlin/configurator/config/Configuration.h
+++ b/Marlin/configurator/config/Configuration.h
@@ -614,9 +614,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
//define this to enable EEPROM support
//#define EEPROM_SETTINGS
-//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
-// please keep turned on if you can.
-//#define EEPROM_CHITCHAT
+
+#ifdef EEPROM_SETTINGS
+ // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
+ #define EEPROM_CHITCHAT // please keep turned on if you can.
+#endif
// @section temperature
diff --git a/Marlin/configurator/js/configurator.js b/Marlin/configurator/js/configurator.js
index 9330c5e7ff..1088484ac4 100644
--- a/Marlin/configurator/js/configurator.js
+++ b/Marlin/configurator/js/configurator.js
@@ -397,7 +397,7 @@ window.configuratorApp = (function(){
* .count number of items in the group
*/
refreshDefineGroups: function(cindex) {
- var findDef = /^(|.*_)(([XYZE](MAX|MIN))|(E[0-3]|[XYZE01234])|MAX|MIN|(bed)?K[pid]|HOTEND|HPB|JAPAN|WESTERN|LEFT|RIGHT|BACK|FRONT|[XYZ]_POINT)(_.*|)$/i;
+ var findDef = /^(|.*_)(([XYZE](MAX|MIN))|(E[0-3]|[XYZE01234])|MAX|MIN|(bed)?K[pid]|HOTEND|HPB|JAPAN|WESTERN|CYRILLIC|LEFT|RIGHT|BACK|FRONT|[XYZ]_POINT)(_.*|)$/i;
var match_prev, patt, title, nameList, groups = {}, match_section;
$.each(define_list[cindex], function(i, name) {
if (match_prev) {
@@ -458,7 +458,8 @@ window.configuratorApp = (function(){
break;
case 'JAPAN':
case 'WESTERN':
- patt = '(JAPAN|WESTERN)';
+ case 'CYRILLIC':
+ patt = '(JAPAN|WESTERN|CYRILLIC)';
break;
case 'XMIN':
case 'XMAX':
diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h
index 72d716989b..7778488521 100644
--- a/Marlin/example_configurations/Felix/Configuration.h
+++ b/Marlin/example_configurations/Felix/Configuration.h
@@ -550,9 +550,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
//define this to enable EEPROM support
//#define EEPROM_SETTINGS
-//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
-// please keep turned on if you can.
-//#define EEPROM_CHITCHAT
+
+#ifdef EEPROM_SETTINGS
+ // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
+ #define EEPROM_CHITCHAT // please keep turned on if you can.
+#endif
// Preheat Constants
#define PLA_PREHEAT_HOTEND_TEMP 180
diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h
index e6683b4e81..0e99709418 100644
--- a/Marlin/example_configurations/Felix/Configuration_DUAL.h
+++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h
@@ -550,9 +550,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
//define this to enable EEPROM support
//#define EEPROM_SETTINGS
-//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
-// please keep turned on if you can.
-//#define EEPROM_CHITCHAT
+
+#ifdef EEPROM_SETTINGS
+ // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
+ #define EEPROM_CHITCHAT // please keep turned on if you can.
+#endif
// Preheat Constants
#define PLA_PREHEAT_HOTEND_TEMP 180
diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h
index ac101be4d3..bc644f8c68 100644
--- a/Marlin/example_configurations/Hephestos/Configuration.h
+++ b/Marlin/example_configurations/Hephestos/Configuration.h
@@ -572,9 +572,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
//define this to enable EEPROM support
//#define EEPROM_SETTINGS
-//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
-// please keep turned on if you can.
-//#define EEPROM_CHITCHAT
+
+#ifdef EEPROM_SETTINGS
+ // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
+ #define EEPROM_CHITCHAT // please keep turned on if you can.
+#endif
// Preheat Constants
#define PLA_PREHEAT_HOTEND_TEMP 200
diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h
index 6d743e9379..9d741d430a 100644
--- a/Marlin/example_configurations/K8200/Configuration.h
+++ b/Marlin/example_configurations/K8200/Configuration.h
@@ -578,9 +578,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
//define this to enable EEPROM support
#define EEPROM_SETTINGS
-//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
-// please keep turned on if you can.
-//#define EEPROM_CHITCHAT
+
+#ifdef EEPROM_SETTINGS
+ // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
+ #define EEPROM_CHITCHAT // please keep turned on if you can.
+#endif
// Preheat Constants
#define PLA_PREHEAT_HOTEND_TEMP 190
diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h
index f126ab99bc..8bdb407ddc 100644
--- a/Marlin/example_configurations/SCARA/Configuration.h
+++ b/Marlin/example_configurations/SCARA/Configuration.h
@@ -601,9 +601,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
//define this to enable EEPROM support
//#define EEPROM_SETTINGS
-//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
-// please keep turned on if you can.
-#define EEPROM_CHITCHAT
+
+#ifdef EEPROM_SETTINGS
+ // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
+ #define EEPROM_CHITCHAT // please keep turned on if you can.
+#endif
// Preheat Constants
#define PLA_PREHEAT_HOTEND_TEMP 180
diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h
index 265f73fce1..d308fbd028 100644
--- a/Marlin/example_configurations/WITBOX/Configuration.h
+++ b/Marlin/example_configurations/WITBOX/Configuration.h
@@ -571,9 +571,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
//define this to enable EEPROM support
//#define EEPROM_SETTINGS
-//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
-// please keep turned on if you can.
-//#define EEPROM_CHITCHAT
+
+#ifdef EEPROM_SETTINGS
+ // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
+ #define EEPROM_CHITCHAT // please keep turned on if you can.
+#endif
// Preheat Constants
#define PLA_PREHEAT_HOTEND_TEMP 200
diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h
index 3218d2d9d7..8bb4b3a8f8 100644
--- a/Marlin/example_configurations/delta/generic/Configuration.h
+++ b/Marlin/example_configurations/delta/generic/Configuration.h
@@ -618,9 +618,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
//define this to enable EEPROM support
//#define EEPROM_SETTINGS
-//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
-// please keep turned on if you can.
-//#define EEPROM_CHITCHAT
+
+#ifdef EEPROM_SETTINGS
+ // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
+ #define EEPROM_CHITCHAT // please keep turned on if you can.
+#endif
// Preheat Constants
#define PLA_PREHEAT_HOTEND_TEMP 180
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
index 489dca6d58..d594cde726 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h
@@ -622,9 +622,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
//define this to enable EEPROM support
//#define EEPROM_SETTINGS
-//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
-// please keep turned on if you can.
-//#define EEPROM_CHITCHAT
+
+#ifdef EEPROM_SETTINGS
+ // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
+ #define EEPROM_CHITCHAT // please keep turned on if you can.
+#endif
// Preheat Constants
#define PLA_PREHEAT_HOTEND_TEMP 180
diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h
index 45350960f8..6c4bdc2325 100644
--- a/Marlin/example_configurations/makibox/Configuration.h
+++ b/Marlin/example_configurations/makibox/Configuration.h
@@ -569,9 +569,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
//define this to enable EEPROM support
#define EEPROM_SETTINGS
-//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
-// please keep turned on if you can.
-//#define EEPROM_CHITCHAT
+
+#ifdef EEPROM_SETTINGS
+ // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
+ #define EEPROM_CHITCHAT // please keep turned on if you can.
+#endif
// Preheat Constants
#define PLA_PREHEAT_HOTEND_TEMP 180
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
index 2c98a310fb..81f4dab5d2 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h
@@ -575,9 +575,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to.
//define this to enable EEPROM support
//#define EEPROM_SETTINGS
-//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
-// please keep turned on if you can.
-//#define EEPROM_CHITCHAT
+
+#ifdef EEPROM_SETTINGS
+ // To disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out:
+ #define EEPROM_CHITCHAT // please keep turned on if you can.
+#endif
// Preheat Constants
#define PLA_PREHEAT_HOTEND_TEMP 180
--
GitLab