JGAurora A5S & A1 touch support (#14768)

This commit is contained in:
pinchies
2019-07-31 08:08:11 +10:00
committed by Scott Lahteine
parent c1b99c43b6
commit d98b9d54f1
13 changed files with 131 additions and 115 deletions

View File

@ -73,9 +73,14 @@
// User-specified version info of this build to display in [Pronterface, etc] terminal window during
// startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
// build by the user have been successfully uploaded into firmware.
// ╦╔═╗╔═╗┬ ┬┬─┐┌─┐┬─┐┌─┐╔═╗┌─┐┬─┐┬ ┬┌┬┐ ┌─┐┌─┐┌┬┐
// ║║ ╦╠═╣│ │├┬┘│ │├┬┘├─┤╠╣ │ │├┬┘│ ││││ │ │ ││││
// ╚╝╚═╝╩ ╩└─┘┴└─└─┘┴└─┴ ┴╚ └─┘┴└─└─┘┴ ┴o└─┘└─┘┴ ┴
#define STRING_CONFIG_H_AUTHOR "(Roberto Mariani & Samuel Pinches)" // Who made the changes.
#define SHOW_BOOTSCREEN
#define STRING_SPLASH_LINE1 "Marlin 2b6 (10/6/19)" // will be shown during bootup in line 1
#define STRING_SPLASH_LINE1 "JG-A5S v2.0 (29-7-19)" // will be shown during bootup in line 1
#define STRING_SPLASH_LINE2 "JGAuroraForum.com" // will be shown during bootup in line 2
/**
@ -725,7 +730,7 @@
* Override with M203
* X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
*/
#define DEFAULT_MAX_FEEDRATE { 360, 150, 15, 25 }
#define DEFAULT_MAX_FEEDRATE { 360, 150, 30, 40 }
/**
* Default Max Acceleration (change/s) change = mm/s
@ -921,7 +926,7 @@
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
// Feedrate (mm/m) for the "accurate" probe of each point
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 4)
/**
* Multiple Probing
@ -1330,7 +1335,7 @@
#endif
// Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60)
#define HOMING_FEEDRATE_XY (90*60)
#define HOMING_FEEDRATE_Z (12*60)
// Validate that endstops are triggered on homing moves
@ -2036,7 +2041,7 @@
// FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, A1, etc.)
//
#define FSMC_GRAPHICAL_TFT
#define PRINTER_EVENT_LEDS
//#define PRINTER_EVENT_LEDS
//=============================================================================
//============================ Other Controllers ============================
@ -2045,12 +2050,13 @@
//
// ADS7843/XPT2046 ADC Touchscreen such as ILI9341 2.8
//
//#define TOUCH_BUTTONS
#define TOUCH_BUTTONS
#if ENABLED(TOUCH_BUTTONS)
#define XPT2046_X_CALIBRATION 12316
#define XPT2046_Y_CALIBRATION -8981
#define XPT2046_X_OFFSET -43
#define XPT2046_Y_OFFSET 257
#define XPT2046_Z1_THRESHOLD 1
#endif
//