From 4f9a8147a4c428db34d77231710ed02513afb607 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Sat, 1 Jul 2017 17:28:32 +0200 Subject: [PATCH] renamed EINY 0.1a to EINY 0.3a added EINY 0.4a changed jerk (optimized for MK3 silent mode) --- Firmware/Configuration.h | 6 ++- Firmware/boards.h | 3 +- Firmware/pins.h | 109 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 113 insertions(+), 5 deletions(-) diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 5a4e3b1b..90747b83 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -424,8 +424,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of // #define EXTRUDER_OFFSET_Y {0.0, 5.00} // (in mm) for each extruder, offset of the hotend on the Y axis // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously) -#define DEFAULT_XJERK 5.0 // (mm/sec) -#define DEFAULT_YJERK 5.0 // (mm/sec) +//#define DEFAULT_XJERK 5.0 // (mm/sec) +//#define DEFAULT_YJERK 5.0 // (mm/sec) +#define DEFAULT_XJERK 2.5 // (mm/sec) +#define DEFAULT_YJERK 2.5 // (mm/sec) #define DEFAULT_ZJERK 0.2 // (mm/sec) #define DEFAULT_EJERK 2.5 // (mm/sec) diff --git a/Firmware/boards.h b/Firmware/boards.h index c4566296..a292bed1 100644 --- a/Firmware/boards.h +++ b/Firmware/boards.h @@ -3,7 +3,8 @@ #define BOARD_UNKNOWN -1 -#define BOARD_EINY_0_1a 300 // EINY 0.1a +#define BOARD_EINY_0_4a 299 // EINY 0.4a +#define BOARD_EINY_0_3a 300 // EINY 0.3a #define BOARD_RAMBO 301 // Rambo #define BOARD_RAMBO_MINI_1_3 302 // Rambo-mini 1.3 #define BOARD_RAMBO_MINI_1_0 102 // Rambo-mini 1.0 diff --git a/Firmware/pins.h b/Firmware/pins.h index 1ed3958b..8299b405 100644 --- a/Firmware/pins.h +++ b/Firmware/pins.h @@ -316,10 +316,10 @@ #endif /***************************************************************** -* EINY Rambo Pin Assignments 0.1a +* EINY Rambo Pin Assignments 0.3a ******************************************************************/ #if MOTHERBOARD == 300 -#define ELECTRONICS "EINY_01a" +#define ELECTRONICS "EINY_03a" #define KNOWN_BOARD #ifndef __AVR_ATmega2560__ #error Oops! Make sure you have 'Arduino Mega 2560 or Rambo' selected from the 'Tools -> Boards' menu. @@ -418,10 +418,115 @@ #endif //NEWPANEL #endif //ULTRA_LCD +#endif //MOTHERBOARD == 300 + +/***************************************************************** +* EINY Rambo Pin Assignments 0.4a +******************************************************************/ +#if MOTHERBOARD == 299 +#define ELECTRONICS "EINY_04a" +#define KNOWN_BOARD +#ifndef __AVR_ATmega2560__ +#error Oops! Make sure you have 'Arduino Mega 2560 or Rambo' selected from the 'Tools -> Boards' menu. #endif +#define LARGE_FLASH true +#define HAVE_TMC2130_DRIVERS +#define X_STEP_PIN 37 +#define X_DIR_PIN 49 +#define X_MIN_PIN 12 +#define X_MAX_PIN 30 +#define X_ENABLE_PIN 29 +#define X_MS1_PIN -1 +#define X_MS2_PIN -1 +#define X_TMC2130_CS 41 + +#define Y_STEP_PIN 36 +#define Y_DIR_PIN 48 +#define Y_MIN_PIN 11 +#define Y_MAX_PIN 24 +#define Y_ENABLE_PIN 28 +#define Y_MS1_PIN -1 +#define Y_MS2_PIN -1 +#define Y_TMC2130_CS 39 + +#define Z_STEP_PIN 35 +#define Z_DIR_PIN 47 +#define Z_MIN_PIN 10 +#define Z_MAX_PIN 23 +#define Z_ENABLE_PIN 27 +#define Z_MS1_PIN -1 +#define Z_MS2_PIN -1 +#define Z_TMC2130_CS 67 + +#define HEATER_BED_PIN 4 +#define TEMP_BED_PIN 2 + +#define HEATER_0_PIN 3 +#define TEMP_0_PIN 0 + +#define HEATER_1_PIN 7 +#define TEMP_1_PIN 1 + +#ifdef BARICUDA +#define HEATER_2_PIN 6 +#else +#define HEATER_2_PIN -1 +#endif + +#define TEMP_2_PIN -1 + +#define E0_STEP_PIN 34 +#define E0_DIR_PIN 43 +#define E0_ENABLE_PIN 26 +#define E0_MS1_PIN -1 +#define E0_MS2_PIN -1 +#define E0_TMC2130_CS 66 + +#define MOTOR_CURRENT_PWM_XY_PIN 46 +#define MOTOR_CURRENT_PWM_Z_PIN 45 +#define MOTOR_CURRENT_PWM_E_PIN 44 +#define SDPOWER -1 +#define SDSS 53 +#define LED_PIN 13 +#define FAN_PIN 6 +#define FAN_1_PIN -1 +#define PS_ON_PIN -1 +#define KILL_PIN -1 // 80 with Smart Controller LCD +#define SUICIDE_PIN -1 // PIN that has to be turned on right after start, to keep power flowing. + +#ifdef ULTRA_LCD + +#define KILL_PIN 32 + +#ifdef NEWPANEL + +#define BEEPER 84 // Beeper on AUX-4 +#define LCD_PINS_RS 82 +//#define LCD_PINS_ENABLE 18 +//#define LCD_PINS_D4 19 +#define LCD_PINS_ENABLE 61 +#define LCD_PINS_D4 59 +#define LCD_PINS_D5 70 +#define LCD_PINS_D6 85 +#define LCD_PINS_D7 71 + +//buttons are directly attached using AUX-2 +#define BTN_EN1 72 +#define BTN_EN2 14 +#define BTN_ENC 9 // the click + +#define SDCARDDETECT 15 + +#define TACH_0 81 +#define TACH_1 80 + +#endif //NEWPANEL +#endif //ULTRA_LCD + +#endif //MOTHERBOARD == 300 #ifndef KNOWN_BOARD