thomas
/
marlin
Sledovat 1
Oblíbit 0
Rozštěpit 0
Zdrojový kód Úkoly 0 Požadavky na natažení 0 Vydání 0 Wiki Activity
Procházet zdrojové kódy

U20: update config, ts, serial, jerk, limited edit values... (#15524)

Tanguy Pruvot před 4 roky
rodič
99f983d066
revize
93097af0ed
2 změnil soubory, kde provedl 64 přidání a 20 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 32
    10
      config/examples/Alfawise/U20-bltouch/Configuration.h
  2. 32
    10
      config/examples/Alfawise/U20/Configuration.h

+ 32
- 10
config/examples/Alfawise/U20-bltouch/Configuration.h Zobrazit soubor 

@@ -82,7 +82,7 @@
82 82
83 83 
 // Valid platformio.ini submodel values are U20_PLUS U20 U30 LK1 LK2 LK4
84 84
85 
-// Valid platformio.ini touchscreens are TS_V11 TS_V12
85 
+// Valid platformio.ini touchscreens are TS_V11 TS_V12 TS_V19
86 86
87 87 
 // 2 - Select the screen controller type. Most common is ILI9341 - First option. If your screen remains white,
88 88 
 //     Try the alternate setting - this should enable ST7789V or ILI9328. For other LCDs... code is needed
 
@@ -137,8 +137,7 @@
137 137 
  *
138 138 
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
139 139 
  */
140 
-#define SERIAL_PORT_2 2
141 
-#define NUM_SERIAL 2
140 
+//#define SERIAL_PORT_2 2
142 141
143 142 
 /**
144 143 
  * This setting determines the communication speed of the printer.
 
@@ -361,7 +360,7 @@
361 360 
  * Specify whether the power supply is active HIGH or active LOW.
362 361 
  */
363 362 
 //#define PSU_CONTROL
364 
-//#define PSU_NAME "Power Supply"
363 
+#define PSU_NAME "360W 24V/15A"
365 364
366 365 
 #if ENABLED(PSU_CONTROL)
367 366 
   #define PSU_ACTIVE_HIGH false // Set 'false' for ATX (1), 'true' for X-Box (2)
 
@@ -789,6 +788,11 @@
789 788 
  */
790 789 
 #define DEFAULT_MAX_FEEDRATE          { 200, 200, 100, 25 }
791 790
791 
+#define LIMITED_MAX_FR_EDITING        // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
792 
+#if ENABLED(LIMITED_MAX_FR_EDITING)
793 
+  #define MAX_FEEDRATE_EDIT_VALUES    { 250, 250, 200, 50 } // ...or, set your own edit limits
794 
+#endif
795 
+
792 796 
 /**
793 797 
  * Default Max Acceleration (change/s) change = mm/s
794 798 
  * (Maximum start speed for accelerated moves)
 
@@ -797,6 +801,11 @@
797 801 
  */
798 802 
 #define DEFAULT_MAX_ACCELERATION      { 200, 200, 100, 3000 }
799 803
804 
+#define LIMITED_MAX_ACCEL_EDITING     // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
805 
+#if ENABLED(LIMITED_MAX_ACCEL_EDITING)
806 
+  #define MAX_ACCEL_EDIT_VALUES       { 600, 600, 400, 6000 } // ...or, set your own edit limits
807 
+#endif
808 
+
800 809 
 /**
801 810 
  * Default Acceleration (change/s) change = mm/s
802 811 
  * Override with M204
 
@@ -817,11 +826,16 @@
817 826 
  * When changing speed and direction, if the difference is less than the
818 827 
  * value set here, it may happen instantaneously.
819 828 
  */
820 
-//#define CLASSIC_JERK
829 
+#define CLASSIC_JERK
821 830 
 #if ENABLED(CLASSIC_JERK)
822 831 
   #define DEFAULT_XJERK 10.0
823 832 
   #define DEFAULT_YJERK 10.0
824 833 
   #define DEFAULT_ZJERK  0.4
834 
+
835 
+  #define LIMITED_JERK_EDITING        // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
836 
+  #if ENABLED(LIMITED_JERK_EDITING)
837 
+    #define MAX_JERK_EDIT_VALUES { 20, 20, 0.6, 10 } // ...or, set your own edit limits
838 
+  #endif
825 839 
 #endif
826 840
827 841 
 #define DEFAULT_EJERK    5.0  // May be used by Linear Advance
 
@@ -834,7 +848,7 @@
834 848 
  *   http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
835 849 
  */
836 850 
 #if DISABLED(CLASSIC_JERK)
837 
-  #define JUNCTION_DEVIATION_MM 0.20  // (mm) Distance from real junction edge
851 
+  #define JUNCTION_DEVIATION_MM 0.10  // (mm) Distance from real junction edge
838 852 
 #endif
839 853
840 854 
 /**
 
@@ -2128,19 +2142,27 @@
2128 2142
2129 2143 
   #if ENABLED(TS_V11)
2130 2144 
     // Alfawise U20 ILI9341 2.8 TP Ver 1.1 / Green PCB on the back of touchscreen
2131 
-    #define XPT2046_X_CALIBRATION   11605
2132 
-    #define XPT2046_Y_CALIBRATION   9091
2145 
+    #define XPT2046_X_CALIBRATION   12000
2146 
+    #define XPT2046_Y_CALIBRATION   9000
2133 2147 
     #define XPT2046_X_OFFSET       -24
2134 2148 
     #define XPT2046_Y_OFFSET       -17
2135 2149 
   #endif
2136 2150
2137 2151 
   #if ENABLED(TS_V12)
2138 2152 
     // Alfawise U30 ILI9341 2.8 TP Ver 1.2 / Blue PCB on the back of touchscreen
2139 
-    #define XPT2046_X_CALIBRATION   12316
2140 
-    #define XPT2046_Y_CALIBRATION  -8981
2153 
+    #define XPT2046_X_CALIBRATION   12000
2154 
+    #define XPT2046_Y_CALIBRATION  -9000
2141 2155 
     #define XPT2046_X_OFFSET       -43
2142 2156 
     #define XPT2046_Y_OFFSET        257
2143 2157 
   #endif
2158 
+
2159 
+  #if ENABLED(TS_V19)
2160 
+    // Longer LK4/U30 2.8" Ver 2019 / Blue PCB, SID240x320-8PCB-D
2161 
+    #define XPT2046_X_CALIBRATION  -12000
2162 
+    #define XPT2046_Y_CALIBRATION   9000
2163 
+    #define XPT2046_X_OFFSET        320
2164 
+    #define XPT2046_Y_OFFSET        0
2165 
+  #endif
2144 2166 
 #endif
2145 2167
2146 2168 
 //

+ 32
- 10
config/examples/Alfawise/U20/Configuration.h Zobrazit soubor 

@@ -82,7 +82,7 @@
82 82
83 83 
 // Valid platformio.ini submodel values are U20_PLUS U20 U30 LK1 LK2 LK4
84 84
85 
-// Valid platformio.ini touchscreens are TS_V11 TS_V12
85 
+// Valid platformio.ini touchscreens are TS_V11 TS_V12 TS_V19
86 86
87 87 
 // 2 - Select the screen controller type. Most common is ILI9341 - First option. If your screen remains white,
88 88 
 //     Try the alternate setting - this should enable ST7789V or ILI9328. For other LCDs... code is needed
 
@@ -137,8 +137,7 @@
137 137 
  *
138 138 
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
139 139 
  */
140 
-#define SERIAL_PORT_2 2
141 
-#define NUM_SERIAL 2
140 
+//#define SERIAL_PORT_2 2
142 141
143 142 
 /**
144 143 
  * This setting determines the communication speed of the printer.
 
@@ -361,7 +360,7 @@
361 360 
  * Specify whether the power supply is active HIGH or active LOW.
362 361 
  */
363 362 
 //#define PSU_CONTROL
364 
-//#define PSU_NAME "Power Supply"
363 
+#define PSU_NAME "360W 24V/15A"
365 364
366 365 
 #if ENABLED(PSU_CONTROL)
367 366 
   #define PSU_ACTIVE_HIGH false // Set 'false' for ATX (1), 'true' for X-Box (2)
 
@@ -789,6 +788,11 @@
789 788 
  */
790 789 
 #define DEFAULT_MAX_FEEDRATE          { 200, 200, 100, 25 }
791 790
791 
+#define LIMITED_MAX_FR_EDITING        // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
792 
+#if ENABLED(LIMITED_MAX_FR_EDITING)
793 
+  #define MAX_FEEDRATE_EDIT_VALUES    { 250, 250, 200, 50 } // ...or, set your own edit limits
794 
+#endif
795 
+
792 796 
 /**
793 797 
  * Default Max Acceleration (change/s) change = mm/s
794 798 
  * (Maximum start speed for accelerated moves)
 
@@ -797,6 +801,11 @@
797 801 
  */
798 802 
 #define DEFAULT_MAX_ACCELERATION      { 200, 200, 100, 3000 }
799 803
804 
+#define LIMITED_MAX_ACCEL_EDITING     // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
805 
+#if ENABLED(LIMITED_MAX_ACCEL_EDITING)
806 
+  #define MAX_ACCEL_EDIT_VALUES       { 600, 600, 400, 6000 } // ...or, set your own edit limits
807 
+#endif
808 
+
800 809 
 /**
801 810 
  * Default Acceleration (change/s) change = mm/s
802 811 
  * Override with M204
 
@@ -817,11 +826,16 @@
817 826 
  * When changing speed and direction, if the difference is less than the
818 827 
  * value set here, it may happen instantaneously.
819 828 
  */
820 
-//#define CLASSIC_JERK
829 
+#define CLASSIC_JERK
821 830 
 #if ENABLED(CLASSIC_JERK)
822 831 
   #define DEFAULT_XJERK 10.0
823 832 
   #define DEFAULT_YJERK 10.0
824 833 
   #define DEFAULT_ZJERK  0.4
834 
+
835 
+  #define LIMITED_JERK_EDITING        // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
836 
+  #if ENABLED(LIMITED_JERK_EDITING)
837 
+    #define MAX_JERK_EDIT_VALUES { 20, 20, 0.6, 10 } // ...or, set your own edit limits
838 
+  #endif
825 839 
 #endif
826 840
827 841 
 #define DEFAULT_EJERK    5.0  // May be used by Linear Advance
 
@@ -834,7 +848,7 @@
834 848 
  *   http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
835 849 
  */
836 850 
 #if DISABLED(CLASSIC_JERK)
837 
-  #define JUNCTION_DEVIATION_MM 0.20  // (mm) Distance from real junction edge
851 
+  #define JUNCTION_DEVIATION_MM 0.10  // (mm) Distance from real junction edge
838 852 
 #endif
839 853
840 854 
 /**
 
@@ -2127,19 +2141,27 @@
2127 2141
2128 2142 
   #if ENABLED(TS_V11)
2129 2143 
     // Alfawise U20 ILI9341 2.8 TP Ver 1.1 / Green PCB on the back of touchscreen
2130 
-    #define XPT2046_X_CALIBRATION   11605
2131 
-    #define XPT2046_Y_CALIBRATION   9091
2144 
+    #define XPT2046_X_CALIBRATION   12000
2145 
+    #define XPT2046_Y_CALIBRATION   9000
2132 2146 
     #define XPT2046_X_OFFSET       -24
2133 2147 
     #define XPT2046_Y_OFFSET       -17
2134 2148 
   #endif
2135 2149
2136 2150 
   #if ENABLED(TS_V12)
2137 2151 
     // Alfawise U30 ILI9341 2.8 TP Ver 1.2 / Blue PCB on the back of touchscreen
2138 
-    #define XPT2046_X_CALIBRATION   12316
2139 
-    #define XPT2046_Y_CALIBRATION  -8981
2152 
+    #define XPT2046_X_CALIBRATION   12000
2153 
+    #define XPT2046_Y_CALIBRATION  -9000
2140 2154 
     #define XPT2046_X_OFFSET       -43
2141 2155 
     #define XPT2046_Y_OFFSET        257
2142 2156 
   #endif
2157 
+
2158 
+  #if ENABLED(TS_V19)
2159 
+    // Longer LK4/U30 2.8" Ver 2019 / Blue PCB, SID240x320-8PCB-D
2160 
+    #define XPT2046_X_CALIBRATION  -12000
2161 
+    #define XPT2046_Y_CALIBRATION   9000
2162 
+    #define XPT2046_X_OFFSET        320
2163 
+    #define XPT2046_Y_OFFSET        0
2164 
+  #endif
2143 2165 
 #endif
2144 2166
2145 2167 
 //

Write Preview
Loading…
Zrušit
Uložit