Merge pull request #1 from tenlog/master

1.0.18 Multi language

HexFile/Touch_Screen/DWIN-Touch-Screen/4.3/V1.3.6/Note.txt

@@ -0,0 +1,2 @@
+This version can not work Below mb version 1.0.17
+Spanish language enabled.

Marlin/Configuration_adv.h

@@ -214,8 +214,8 @@
 //default stepper release if idle
 #define DEFAULT_STEPPER_DEACTIVE_TIME 5				//By zyf
 
-#define DEFAULT_MINIMUMFEEDRATE       0.5       // 5 by zyf minimum feedrate
-#define DEFAULT_MINTRAVELFEEDRATE     1.5      // 15 By zyf
+#define DEFAULT_MINIMUMFEEDRATE       0.0       // 5 by zyf minimum feedrate
+#define DEFAULT_MINTRAVELFEEDRATE     0.0      // 15 By zyf
 
 // minimum time in microseconds that a movement needs to take if the buffer is emptied.
 #define DEFAULT_MINSEGMENTTIME        20000

Marlin/Configuration_tenlog.h

@@ -39,14 +39,27 @@ BOF UPDATE LOG
 20201231    Reduce data transmission of DWIN touch screen.
             Version 1.0.16
             DWIN UI Version 1.3.4
+20210112    DWIN UI Spanish language enabled.
+            Version 1.0.17
+            Need DWIN UI V1.3.6 
+            Do not support DWIN UI Below 1.3.6
+20210128    Multi language enabled (only for DWIN UI), 
+            now we support English, Chinese, Spanish, French, German, Italian and Japanses,
+            more language is comming soon.
+            DWN UI V 1.3.7
+            Fix some UI bugs.
+            Add DWN Screen saver function
+            Need DWIN UI V 1.3.7
+            Version 1.0.18
+            Disabled beeper for TJC UI
 EOF UPDATE LOG
 */
 
-#define VERSION_STRING   "1.0.16"
+#define VERSION_STRING   "1.0.18"
 //#define TL_DEBUG
 
-//#define TL_TJC_CONTROLLER
-#define TL_DWN_CONTROLLER
+#define TL_TJC_CONTROLLER
+//#define TL_DWN_CONTROLLER
 
 #define FILAMENT_FAIL_DETECT 
 #define POWER_LOSS_RECOVERY 
@@ -82,17 +95,17 @@ const bool Y_ENDSTOPS_INVERTING = true;             //Y Optical switch
 	#define INVERT_E0_DIR true  
 	#define INVERT_E1_DIR false  
 #elif defined(DRIVER_4988)
-	#define INVERT_X_DIR true   
-	#define INVERT_Z_DIR true   
+	#define INVERT_X_DIR true
+	#define INVERT_Z_DIR true
 	#define INVERT_E0_DIR false 
-	#define INVERT_E1_DIR true  
+	#define INVERT_E1_DIR true 
 #endif
 
 #if defined(DRIVER_2225) 
     #define DEFAULT_AXIS_STEPS_PER_UNIT {160,160,1600,184} 
     #define DEFAULT_MAX_FEEDRATE {50, 50, 2, 12}    // (mm/pul)
 #else
-    #define DEFAULT_AXIS_STEPS_PER_UNIT {80,80,792,92.6} 
+    #define DEFAULT_AXIS_STEPS_PER_UNIT {80,80,800,92.6} 
     #define DEFAULT_MAX_FEEDRATE {80, 80, 3, 25}    // (mm/pul)
 #endif
 

Marlin/Configuration_xy.h

@@ -545,7 +545,8 @@
     #define DWN_P_SETTING_MAIN 45
     #define DWN_P_SETTING_PRINTING 69
     #define DWN_P_MOVE 47
-    #define DWN_P_SEL_FILE 49
+    #define DWN_P_SEL_Z_FILE 49
+    #define DWN_P_SEL_FILE 70
     #define DWN_P_PRINTING 0x33
     #define DWN_P_TEMP 53
     #define DWN_P_MODE 57
@@ -560,7 +561,25 @@
     #define DWN_TXT_PRINTFILE 0x20
     #define DWN_TXT_PERCENT 0x21
 
-    #define DWN_ECO_HEIGHT 5
+    #define DWN_ECO_HEIGHT                  5
+
+    #define DWN_MSG_START_PRINT	            0
+    #define DWN_MSG_PRINT_FINISHED          1
+    #define DWN_MSG_POWER_OFF               2
+    #define DWN_MSG_POWER_LOSS_DETECTED     3
+    #define DWN_MSG_RESET_DEFALT            4
+    #define DWN_MSG_STOP_PRINT              5
+    #define DWN_MSG_FILAMENT_RUNOUT		    6
+    #define DWN_MSG_INPUT_Z_HEIGHT    	    7
+    #define DWN_MSG_NOZZLE_HEATING_ERROR	8
+    #define DWN_MSG_NOZZLE_HIGH_TEMP_ERROR	9
+    #define DWN_MSG_NOZZLE_LOW_TEMP_ERROR	10
+    #define DWN_MSG_BED_HIGH_TEMP_ERROR	    11
+    #define DWN_MSG_BED_LOW_TEMP_ERROR	    12
+
+    #define DWN_LED_ON  88
+    #define DWN_LED_OFF  03
+    #define DWN_LED_TIMEOUT  300
 
 #endif
 

Marlin/Marlin.ino

@@ -91,7 +91,7 @@ int MSerial2_read(){
 #define CP_CMD {0x5A,0x01}
 
 void DWN_begin(){
-    Serial2.begin(115200);    
+    Serial2.begin(115200);
 }
 
 void DWN_Page(int ID){    
@@ -267,6 +267,30 @@ void DWN_Data(long ID, long Data, int DataLen){
     }
 }
 
+void DWN_LED(int LED){
+
+    Serial2.write(DWN_HEAD0);
+    Serial2.write(DWN_HEAD1);
+    Serial2.write(0x05);
+    Serial2.write(DWN_WRITE);
+    Serial2.write(0x00);
+    Serial2.write(0x82);
+    Serial2.write(LED);
+    Serial2.write(LED);
+
+
+    /*
+    Serial2.write(DWN_HEAD0);
+    Serial2.write(DWN_HEAD1);
+    Serial2.write(0x07);
+    Serial2.write(DWN_WRITE);
+    Serial2.write(0x64);
+    Serial2.write(0x0A);
+    Serial2.write(0x46);
+    Serial2.write(0x80);
+    */
+}
+
 #endif
 
 #ifdef ULTRA_LCD