Update config SR

Foxies-CSTL · Dec 26, 2021 · e6c0f4b · e6c0f4b
1 parent 2ca4cd0
commit e6c0f4b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -174,6 +174,7 @@
   #ifdef QQSP
     #define MOTHERBOARD BOARD_FLSUN_HISPEED
     //#define MOTHERBOARD BOARD_MKS_ROBIN_MINI
+    //#define MOTHERBOARD BOARD_MKS_SGEN_L
     #define BAUD_RATE_GCODE
   #endif  
 
@@ -683,6 +684,9 @@
       #define DEFAULT_Ki 0.72
       #define DEFAULT_Kd 57.54
     #elif ANY(SR_MKS, SR_BTT)
+    //M301 P23.7612 I1.7268 D81.7385-220
+    //M301 P19.6543 I1.4039 D68.7900-240
+    //M301 P19.8891 I1.4288 D69.2140-250
       #define DEFAULT_Kp   13.7
       #define DEFAULT_Ki   0.48
       #define DEFAULT_Kd   70.22
@@ -745,6 +749,9 @@
     #define DEFAULT_bedKi 3.94
     #define DEFAULT_bedKd 69.11
   #elif ANY(SR_MKS, SR_BTT)
+  //M304 P56.1605 I10.9688 D191.6944-60
+  //M304 P100.4504 I19.3174 D348.2281-80
+  //M304 P136.6639 I26.2815 D473.7682-90
     #define DEFAULT_bedKp 111.12
     #define DEFAULT_bedKi 22.05
     #define DEFAULT_bedKd 373.36
@@ -934,7 +941,7 @@
     #define DELTA_TOWER_ANGLE_TRIM { 0.0278, 0.1700, -0.1978}    //XYZ
     #define DELTA_DIAGONAL_ROD_TRIM_TOWER { 0.1243, -0.2939, 0.4182 } //ABC
     //#define DELTA_RADIUS_TRIM_TOWER { 0.0, 0.0, 0.0 }
-    #define PROBING_MARGIN 5
+    #define PROBING_MARGIN 10
   #elif ANY(SR_MKS, SR_BTT)
     #define DELTA_PRINTABLE_RADIUS  132.0
     #define DELTA_MAX_RADIUS        132.0
@@ -945,7 +952,7 @@
     #define DELTA_TOWER_ANGLE_TRIM { 0.0, 0.0, 0.0 }
     #define DELTA_DIAGONAL_ROD_TRIM_TOWER { 0.0, 0.0, 0.0 } //ABC
     //#define DELTA_RADIUS_TRIM_TOWER { 0.0, 0.0, 0.0 }
-    //#define PROBING_MARGIN 5
+    #define PROBING_MARGIN 10
   #else
 
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
@@ -1486,7 +1493,7 @@
 #define Z_PROBE_FEEDRATE_FAST (40*60)  //2400
 
 // Feedrate (mm/min) for the "accurate" probe of each point
-#define Z_PROBE_FEEDRATE_SLOW (Z_PROBE_FEEDRATE_FAST / 6) //750
+#define Z_PROBE_FEEDRATE_SLOW (Z_PROBE_FEEDRATE_FAST / 6) //400
 
 /**
  * Probe Activation Switch

diff --git a/Marlin/Version.h b/Marlin/Version.h
@@ -59,10 +59,13 @@
 /**
  * Default generic printer UUID.
  */
+//#define DEFAULT_MACHINE_UUID "cede2a2f-41a2-4748-9b12-c55c62f367ff"
 #if ANY(SR_MKS, SR_BTT)
+    #define DEFAULT_MACHINE_UUID "3f2714ca-2781-453f-a95c-c52848b8d061"
+#elif ENABLED Q5
     #define DEFAULT_MACHINE_UUID "cede2a2f-41a2-4748-9b12-c55c62f367ff"
 #else
-    #define DEFAULT_MACHINE_UUID "cede2a2f-41a2-4748-9b12-c55c62f367ff"
+    #define DEFAULT_MACHINE_UUID "8959c708-a02c-45fb-bb2e-a9bae09dbc02"
 #endif
 
 /**

diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -375,15 +375,21 @@
 #endif
 /* Module TEST TFT BTT */
 #if HAS_WIRED_LCD
-    #define BEEPER_PIN                      PC5 //PB5//EXP1_10
-    #define BTN_ENC                         -1 //PA15//EXP1_09
+    //#define BEEPER_PIN                      PC5 //PB5//EXP1_10
+    //#define BTN_ENC                         -1 //PA15//EXP1_09
 
     #define BTN_EN1                         PA9//EXP1_06//RX1
     #define BTN_EN2                         PA10//EXP1_08//TX1
 
     #define LCD_PINS_RS                     -1 //PB8
-    #define LCD_PINS_ENABLE                 PA5 //EXP1_3
-    #define LCD_PINS_D4                     -1  //PB9
+    #define LCD_PINS_ENABLE                 -1 //EXP1_3
+    //#define LCD_PINS_D4                     -1  //PB9
+    #ifndef TFT_BUFFER_SIZE
+      #define TFT_BUFFER_SIZE               1200
+    #endif
+    #ifndef TFT_QUEUE_SIZE
+      #define TFT_QUEUE_SIZE                6144
+    #endif    
 #endif
 
 /**