Add language

MarlinKimbra/Configuration_Basic.h

@@ -225,9 +225,14 @@
  * 9  Finnish                                                          *
  * 10 Aragonese                                                        *
  * 11 Dutch                                                            *
- * 12 Catalan                                                          * 
- * 13 Basque-Euskera                                                   * 
- * 14 Portuguese (Brazil)                                              * 
+ * 12 Danish                                                           *
+ * 13 Catalan                                                          *
+ * 14 Basque-Euskera                                                   *
+ * 15 Portuguese (Brazil)                                              *
+ * 16 Bulgarian                                                        *
+ * 17 Japanese                                                         *
+ * 18 Japanese utf                                                     *
+ * 19 Chinese                                                          *
  *                                                                     *
  ***********************************************************************/
 #define LANGUAGE_CHOICE 1

MarlinKimbra/Configuration_Delta.h

@@ -303,17 +303,21 @@
 /*****************************************************************************************
  ******************************* Axis steps per unit *************************************
  *****************************************************************************************/
-// Default steps per unit               X,  Y,  Z,  E0...(per extruder)
-#define DEFAULT_AXIS_STEPS_PER_UNIT   {80, 80, 80, 625, 625, 625, 625}
+#define XYZ_STEPS_PER_UNIT 80
+ // Default steps per unit                              X,                  Y,                  Z,  E0...(per extruder)
+#define DEFAULT_AXIS_STEPS_PER_UNIT   {XYZ_STEPS_PER_UNIT, XYZ_STEPS_PER_UNIT, XYZ_STEPS_PER_UNIT, 625, 625, 625, 625}
 /*****************************************************************************************/
 
 
 /*****************************************************************************************
  ********************************** Axis feedrate ****************************************
  *****************************************************************************************/
+#define XYZ_MAX_FEEDRATE              500   // (mm/sec)
+#define XYZ_MANUAL_FEEDRATE           50    // (mm/min)
 //                                                    X,                Y,                Z, E0...(per extruder). (mm/sec)
-#define DEFAULT_MAX_FEEDRATE          {500, 500, 500, 100, 100, 100, 100}
-#define MANUAL_FEEDRATE               {50*60, 50*60, 50*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
+#define DEFAULT_MAX_FEEDRATE          {XYZ_MAX_FEEDRATE, XYZ_MAX_FEEDRATE, XYZ_MAX_FEEDRATE, 100, 100, 100, 100}
+// Feedrates for manual moves along                      X,                   Y,                   Z, E from panel
+#define MANUAL_FEEDRATE               {XYZ_MANUAL_FEEDRATE*60, XYZ_MANUAL_FEEDRATE*60, XYZ_MANUAL_FEEDRATE*60, 60}
 #define DEFAULT_MINIMUMFEEDRATE       0.0                       // minimum feedrate
 #define DEFAULT_MINTRAVELFEEDRATE     0.0
 // Minimum planner junction speed. Sets the default minimum speed the planner plans for at the end
@@ -326,8 +330,9 @@
 /*****************************************************************************************
  ******************************** Axis accelleration *************************************
  *****************************************************************************************/
+#define XYZ_MAX_ACCELERATION          5000 // (mm/s^2)
 //  Maximum start speed for accelerated moves.            X,                    Y,                    Z,   E0...(per extruder)
-#define DEFAULT_MAX_ACCELERATION              {5000, 5000, 5000, 1000, 1000, 1000, 1000}
+#define DEFAULT_MAX_ACCELERATION      {XYZ_MAX_ACCELERATION, XYZ_MAX_ACCELERATION, XYZ_MAX_ACCELERATION, 1000, 1000, 1000, 1000}
 //  Maximum acceleration in mm/s^2 for retracts   E0... (per extruder)
 #define DEFAULT_RETRACT_ACCELERATION  {10000, 10000, 10000, 10000}
 //  X, Y, Z and E* maximum acceleration in mm/s^2 for printing moves
@@ -355,13 +360,14 @@
 /*****************************************************************************************
  ************************************ Homing feedrate ************************************
  *****************************************************************************************/
-#define HOMING_FEEDRATE {100*60, 100*60, 100*60, 0} // set the homing speeds (mm/min)
+// set the homing speeds (mm/min)
+#define HOMING_XYZ_FEEDRATE 100
+#define HOMING_FEEDRATE {HOMING_XYZ_FEEDRATE*60, HOMING_XYZ_FEEDRATE*60, HOMING_XYZ_FEEDRATE*60, 0}
 
 // homing hits the endstop, then retracts by this distance, before it tries to slowly bump again:
-#define X_HOME_BUMP_MM 5
-#define Y_HOME_BUMP_MM 5
-#define Z_HOME_BUMP_MM 5
-#define HOMING_BUMP_DIVISOR {5, 5, 5}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
+#define XYZ_HOME_BUMP_MM 5
+// Re-Bump Speed Divisor (Divides the Homing Feedrate)
+#define XYZ_BUMP_DIVISOR 10
 /*****************************************************************************************/
 
 

MarlinKimbra/conditionals.h

@@ -313,10 +313,10 @@
   #undef SLOWDOWN //DELTA not needs SLOWDOWN
   #define AUTOLEVEL_GRID_MULTI 1/AUTOLEVEL_GRID
   // DELTA must have same valour for 3 axis endstop hits
-  #undef Y_HOME_BUMP_MM
-  #undef Z_HOME_BUMP_MM
-  #define Y_HOME_BUMP_MM X_HOME_BUMP_MM
-  #define Z_HOME_BUMP_MM X_HOME_BUMP_MM
+  #define X_HOME_BUMP_MM XYZ_HOME_BUMP_MM
+  #define Y_HOME_BUMP_MM XYZ_HOME_BUMP_MM
+  #define Z_HOME_BUMP_MM XYZ_HOME_BUMP_MM
+  #define HOMING_BUMP_DIVISOR {XYZ_BUMP_DIVISOR, XYZ_BUMP_DIVISOR, XYZ_BUMP_DIVISOR}
 
   // Effective horizontal distance bridged by diagonal push rods.
   #define DEFAULT_DELTA_RADIUS (DELTA_SMOOTH_ROD_OFFSET-DELTA_EFFECTOR_OFFSET-DELTA_CARRIAGE_OFFSET)

MarlinKimbra/language.h

@@ -19,9 +19,14 @@
 // 9  Finnish
 // 10 Aragonese
 // 11 Dutch
-// 12 Catalan
-// 13 Basque-Euskera
-// 14 Portuguese (Brazil)
+// 12 Danish
+// 13 Catalan
+// 14 Basque-Euskera
+// 15 Portuguese (Brazil)
+// 16 Bulgarian
+// 17 Japanese
+// 18 Japanese utf
+// 19 Chinese
 
 #if DISABLED(LANGUAGE_CHOICE)
   #define LANGUAGE_CHOICE 7  // Pick your language from the list above
@@ -255,12 +260,22 @@
   #include "language_an.h"
 #elif LANGUAGE_CHOICE == 11 // Dutch
   #include "language_nl.h"
-#elif LANGUAGE_CHOICE == 12 // Catalan
+#elif LANGUAGE_CHOICE == 12 // Danish
+  #include "language_da.h"
+#elif LANGUAGE_CHOICE == 13 // Catalan
   #include "language_ca.h"
-#elif LANGUAGE_CHOICE == 13 // Basque-Euskera
+#elif LANGUAGE_CHOICE == 14 // Basque-Euskera
   #include "language_eu.h"
-#elif LANGUAGE_CHOICE == 14 // Portuguese - Brasil
+#elif LANGUAGE_CHOICE == 15 // Portuguese - Brasil
   #include "language_pt-br.h"
+#elif LANGUAGE_CHOICE == 16 // Bulgarian
+  #include "language_bg.h"
+#elif LANGUAGE_CHOICE == 17 // Japanese
+  #include "language_kana.h"
+#elif LANGUAGE_CHOICE == 18 // Japanese utf
+  #include "language_kana_utf8.h"
+#elif LANGUAGE_CHOICE == 19 // Chinese
+  #include "language_cn.h"
 #endif
 
 #endif //__LANGUAGE_H

MarlinKimbra/language_en.h

@@ -8,12 +8,12 @@
 #ifndef LANGUAGE_EN_H
 #define LANGUAGE_EN_H
 
-#if !( ENABLED(MAPPER_NON)|| ENABLED(MAPPER_C2C3)|| ENABLED(MAPPER_D0D1)|| ENABLED(MAPPER_D0D1_MOD)|| ENABLED(MAPPER_E382E383) )
+#if DISABLED(MAPPER_NON) && DISABLED(MAPPER_C2C3) && DISABLED(MAPPER_D0D1) && DISABLED(MAPPER_D0D1_MOD) && DISABLED(MAPPER_E382E383)
   #define MAPPER_NON         // For direct asci codes
 #endif
 
 //#define SIMULATE_ROMFONT //Comment in to see what is seen on the character based displays
-#if !( ENABLED(SIMULATE_ROMFONT)|| ENABLED(DISPLAY_CHARSET_ISO10646_1)|| ENABLED(DISPLAY_CHARSET_ISO10646_5)|| ENABLED(DISPLAY_CHARSET_ISO10646_KANA)|| ENABLED(DISPLAY_CHARSET_ISO10646_CN) )
+#if DISABLED(SIMULATE_ROMFONT) && DISABLED(DISPLAY_CHARSET_ISO10646_1) && DISABLED(DISPLAY_CHARSET_ISO10646_5) && DISABLED(DISPLAY_CHARSET_ISO10646_KANA) && DISABLED(DISPLAY_CHARSET_ISO10646_CN)
   #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
 #endif