Add board MKS_BASE 1.0

MarlinKimbra/Boards.h

@@ -24,6 +24,7 @@
 #define BOARD_MINIRAMBO         302  // Mini-Rambo
 
 #define BOARD_DUEMILANOVE_328P  4    // Duemilanove w/ ATMega328P pin assignments
+#define BOARD_MKS_BASE          40   // MKS BASE 1.0
 #define BOARD_RADDS             402  // RADDS ARM 32
 #define BOARD_RAMPS_FD_V1       403  // RAMPS-FD V1
 #define BOARD_RAMPS_FD_V2       404  // RAMPS-FD V2

MarlinKimbra/pins.h

@@ -24,6 +24,7 @@
 *302 BOARD_MINIRAMBO - Mini Rambo
 *
 *  4 BOARD_DUEMILANOVE_328P - Duemilanove w/ ATMega328P pin assignment
+* 40 BOARD_MKS_BASE     Arduino Mega2560 with RAMPS v1.4 pin assignments
 *401 BOARD_RADDS       - Radds Arduino DUE
 *403 BOARD_RAMPS_FD_V1 - Ramps FD version 1
 *404 BOARD_RAMPS_FD_V2 - Ramps FD version 2
@@ -2043,6 +2044,214 @@
 /****************************************************************************************/
 
 
+
+/****************************************************************************************
+* 40
+* MKS_BASE 1.0 
+****************************************************************************************/
+
+#if MB(MKS_BASE)
+  #define KNOWN_BOARD 1
+  
+  #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
+    #error Oops!  Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu.
+  #endif
+  
+  #define LARGE_FLASH true
+  
+  // X axis pins
+  #define ORIG_X_STEP_PIN         54
+  #define ORIG_X_DIR_PIN          55
+  #define ORIG_X_ENABLE_PIN       38
+  #define ORIG_X_MIN_PIN          3
+  #define ORIG_X_MAX_PIN          2
+  
+  // Y axis pins
+  #define ORIG_Y_STEP_PIN         60
+  #define ORIG_Y_DIR_PIN          61
+  #define ORIG_Y_ENABLE_PIN       56
+  #define ORIG_Y_MIN_PIN          14
+  #define ORIG_Y_MAX_PIN          15
+  
+  #define Y2_STEP_PIN             36
+  #define Y2_DIR_PIN              34
+  #define Y2_ENABLE_PIN           30
+
+  // Z axis pins
+  #define ORIG_Z_STEP_PIN         46
+  #define ORIG_Z_DIR_PIN          48
+  #define ORIG_Z_ENABLE_PIN       62
+  #define ORIG_Z_MIN_PIN          18
+  #define ORIG_Z_MAX_PIN          19
+
+  #define Z2_STEP_PIN             36
+  #define Z2_DIR_PIN              34
+  #define Z2_ENABLE_PIN           30
+
+  // E axis pins
+  #define ORIG_E0_STEP_PIN        26
+  #define ORIG_E0_DIR_PIN         28
+  #define ORIG_E0_ENABLE_PIN      24
+
+  #define ORIG_E1_STEP_PIN        36
+  #define ORIG_E1_DIR_PIN         34
+  #define ORIG_E1_ENABLE_PIN      30
+  
+  #define SDPOWER                 -1
+  #define SDSS                    53
+  #define LED_PIN                 13
+  
+  #define ORIG_FAN_PIN            9
+  #define PS_ON_PIN               12
+  
+  #define ORIG_HEATER_0_PIN       10  // Hotend 1
+  #define ORIG_HEATER_1_PIN        7  // Hotend 2
+  #define ORIG_HEATER_2_PIN       -1
+  #define ORIG_HEATER_3_PIN       -1
+
+  #define ORIG_TEMP_0_PIN         13  // ANALOG NUMBERING
+  #define ORIG_TEMP_1_PIN         15  // ANALOG NUMBERING
+  #define ORIG_TEMP_2_PIN         -1  // ANALOG NUMBERING
+  #define ORIG_TEMP_3_PIN         -1  // ANALOG NUMBERING
+  
+  #define ORIG_HEATER_BED_PIN     8   // BED
+  #define ORIG_TEMP_BED_PIN       14  // ANALOG NUMBERING
+
+  #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL)
+    #define KILL_PIN              41
+  #else
+    #define KILL_PIN              -1
+  #endif
+
+  #if NUM_SERVOS > 0
+    #define SERVO0_PIN            11
+    #if NUM_SERVOS > 1
+      #define SERVO1_PIN          6
+      #if NUM_SERVOS > 2
+        #define SERVO2_PIN        5
+        #if NUM_SERVOS > 3
+          #define SERVO3_PIN      4
+        #endif
+      #endif
+    #endif
+  #endif
+
+  #if ENABLED(ULTRA_LCD)
+    #if ENABLED(NEWPANEL)
+      #if ENABLED(PANEL_ONE)
+        #define LCD_PINS_RS       40
+        #define LCD_PINS_ENABLE   42
+        #define LCD_PINS_D4       65
+        #define LCD_PINS_D5       66
+        #define LCD_PINS_D6       44
+        #define LCD_PINS_D7       64
+      #else
+        #define LCD_PINS_RS       16
+        #define LCD_PINS_ENABLE   17
+        #define LCD_PINS_D4       23
+        #define LCD_PINS_D5       25
+        #define LCD_PINS_D6       27
+        #define LCD_PINS_D7       29
+      #endif // PANEL_ONE
+  
+      #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
+        #define BEEPER_PIN        37
+
+        #define BTN_EN1           31
+        #define BTN_EN2           33
+        #define BTN_ENC           35
+
+        #define SD_DETECT_PIN     49
+      #elif ENABLED(LCD_I2C_PANELOLU2)
+        #define BTN_EN1           47  // reverse if the encoder turns the wrong way.
+        #define BTN_EN2           43
+        #define BTN_ENC           32
+        #define LCD_SDSS          53
+        #define SD_DETECT_PIN     -1
+        #define KILL_PIN          41
+      #elif ENABLED(LCD_I2C_VIKI)
+        #define BTN_EN1           22  // reverse if the encoder turns the wrong way.
+        #define BTN_EN2           7
+        #define BTN_ENC           -1
+        #define LCD_SDSS          53
+        #define SD_DETECT_PIN     49
+      #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
+        #define BTN_EN1           35  // reverse if the encoder turns the wrong way.
+        #define BTN_EN2           37
+        #define BTN_ENC           31
+        #define SD_DETECT_PIN     49
+        #define LCD_SDSS          53
+        #define KILL_PIN          41
+        #define BEEPER_PIN        23
+        #define DOGLCD_CS         29
+        #define DOGLCD_A0         27
+        #define LCD_PIN_BL        33
+      #else
+        // arduino pin which triggers an piezzo beeper
+        #define BEEPER_PIN        33  // Beeper on AUX-4
+
+        // buttons are directly attached using AUX-2
+        #if ENABLED(REPRAPWORLD_KEYPAD)
+          #define BTN_EN1         64  // encoder
+          #define BTN_EN2         59  // encoder
+          #define BTN_ENC         63  // enter button
+          #define SHIFT_OUT       40  // shift register
+          #define SHIFT_CLK       44  // shift register
+          #define SHIFT_LD        42  // shift register
+        #elif ENABLED(PANEL_ONE)
+          #define BTN_EN1         59  // AUX2 PIN 3
+          #define BTN_EN2         63  // AUX2 PIN 4
+          #define BTN_ENC         49  // AUX3 PIN 7
+        #else
+          #define BTN_EN1         37
+          #define BTN_EN2         35
+          #define BTN_ENC         31  // the click
+        #endif
+  
+        #if ENABLED(G3D_PANEL)
+          #define SD_DETECT_PIN   49
+        #else
+          #define SD_DETECT_PIN   -1  // Ramps does not use this port
+        #endif
+
+      #endif
+  
+    #else // old style panel with shift register
+      // arduino pin witch triggers an piezo beeper
+      #define BEEPER_PIN          33  // No Beeper added
+
+      //buttons are attached to a shift register
+      // Not wired this yet
+      //#define SHIFT_CLK         38
+      //#define SHIFT_LD          42
+      //#define SHIFT_OUT         40
+      //#define SHIFT_EN          17
+  
+      #define LCD_PINS_RS         16
+      #define LCD_PINS_ENABLE     17
+      #define LCD_PINS_D4         23
+      #define LCD_PINS_D5         25
+      #define LCD_PINS_D6         27
+      #define LCD_PINS_D7         29
+    #endif // NEWPANEL
+  #endif // ULTRA_LCD
+
+  // SPI for Max6675 Thermocouple
+  #if DISABLED(SDSUPPORT)
+  // these pins are defined in the SD library if building with SD support
+    #define SCK_PIN               52
+    #define MISO_PIN              50
+    #define MOSI_PIN              51
+    #define MAX6675_SS            66  // Do not use pin 53 if there is even the remote possibility of using Display/SD card
+  #else
+    #define MAX6675_SS            66  // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
+  #endif
+
+#endif // MKS_BASE
+/****************************************************************************************/
+
+
+
 /****************************************************************************************
 * 401
 *

MarlinKimbra/ultralcd.cpp

@@ -619,7 +619,6 @@ static void nozzle_bed_fan_menu_items(uint8_t &encoderLine, uint8_t &_lineNr, ui
  * "Tune" submenu
  *
  */
-
 static void lcd_tune_menu() {
   START_MENU(lcd_main_menu);
 
@@ -995,8 +994,15 @@ static void _lcd_move(const char* name, AxisEnum axis, int min, int max) {
   if (lcdDrawUpdate) lcd_implementation_drawedit(name, ftostr31(current_position[axis]));
   if (LCD_CLICKED) lcd_goto_menu(lcd_move_menu_axis);
 }
-static void lcd_move_x() { _lcd_move(PSTR(MSG_MOVE_X), X_AXIS, X_MIN_POS, X_MAX_POS); }
-static void lcd_move_y() { _lcd_move(PSTR(MSG_MOVE_Y), Y_AXIS, Y_MIN_POS, Y_MAX_POS); }
+#if MECH(DELTA)
+  static float delta_clip_radius_2 =  BED_PRINTER_RADIUS * BED_PRINTER_RADIUS;
+  static int delta_clip( float a ) { return sqrt(delta_clip_radius_2 - a * a); }
+  static void lcd_move_x() { int clip = delta_clip(current_position[Y_AXIS]); _lcd_move(PSTR(MSG_MOVE_X), X_AXIS, max(X_MIN_POS, -clip), min(X_MAX_POS, clip)); }
+  static void lcd_move_y() { int clip = delta_clip(current_position[X_AXIS]); _lcd_move(PSTR(MSG_MOVE_X), X_AXIS, max(X_MIN_POS, -clip), min(X_MAX_POS, clip)); }
+#else
+  static void lcd_move_x() { _lcd_move(PSTR(MSG_MOVE_X), X_AXIS, X_MIN_POS, X_MAX_POS); }
+  static void lcd_move_y() { _lcd_move(PSTR(MSG_MOVE_Y), Y_AXIS, Y_MIN_POS, Y_MAX_POS); }
+#endif
 static void lcd_move_z() { _lcd_move(PSTR(MSG_MOVE_Z), Z_AXIS, Z_MIN_POS, Z_MAX_POS); }
 static void lcd_move_e(
   #if EXTRUDERS > 1