Skip to content

M
MarlinKimbra
Commit 521d08d1 authored by MagoKimbra's avatar MagoKimbra
Browse files
Options

Update!!!

parent bb233423
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 505 additions and 271 deletions
MarlinKimbra/Configuration_Cartesian.h
View file @ 521d08d1
// Define this to set a custom name for your generic Mendel, // Define this to set a custom name for your generic Mendel,
#define CUSTOM_MENDEL_NAME "Prusa" // Displayed in the LCD "Ready" message
#define CUSTOM_MACHINE_NAME "Prusa"
//=========================================================================== //===========================================================================
//=============================Mechanical Settings=========================== //=============================Mechanical Settings===========================
......
MarlinKimbra/Configuration_Corexy.h
View file @ 521d08d1
// Define this to set a custom name for your generic Mendel, // Define this to set a custom name for your generic Mendel,
#define CUSTOM_MENDEL_NAME "Core XY" // Displayed in the LCD "Ready" message
#define CUSTOM_MACHINE_NAME "Core XY"
//=========================================================================== //===========================================================================
//=============================Mechanical Settings=========================== //=============================Mechanical Settings===========================
......
MarlinKimbra/Configuration_Delta.h
View file @ 521d08d1
// Define this to set a custom name for your generic Delta // Define this to set a custom name for your generic Delta
#define CUSTOM_MENDEL_NAME "Delta" // Displayed in the LCD "Ready" message
#define CUSTOM_MACHINE_NAME "Delta"
//=========================================================================== //===========================================================================
//============================== Delta Settings ============================= //============================== Delta Settings =============================
......
MarlinKimbra/Configuration_Scara.h
View file @ 521d08d1
// Define this to set a custom name for your generic Mendel, // Define this to set a custom name for your generic Mendel,
#define CUSTOM_MENDEL_NAME "Scara" // Displayed in the LCD "Ready" message
#define CUSTOM_MACHINE_NAME "Scara"
// SCARA-mode for Marlin has been developed by QHARLEY in ZA in 2012/2013. Implemented // SCARA-mode for Marlin has been developed by QHARLEY in ZA in 2012/2013. Implemented
// and slightly reworked by JCERNY in 06/2014 with the goal to bring it into Master-Branch // and slightly reworked by JCERNY in 06/2014 with the goal to bring it into Master-Branch
......
MarlinKimbra/Marlin_main.cpp
View file @ 521d08d1
This diff is collapsed.
MarlinKimbra/configuration_store.cpp
View file @ 521d08d1
...@@ -20,77 +20,77 @@ ...@@ -20,77 +20,77 @@
* V21 EEPROM Layout: * V21 EEPROM Layout:
* *
* ver * ver
* axis_steps_per_unit (x7) * M92 XYZ E0 E1 E2 E3 axis_steps_per_unit (x7)
* max_feedrate (x7) * M203 XYZ E0 E1 E2 E3 max_feedrate (x7)
* retraction_feedrate (x4) * M??? E0 E1 E2 E3 retraction_feedrate (x4)
* max_acceleration_units_per_sq_second (x7) * M201 XYZ E0 E1 E2 E3 max_acceleration_units_per_sq_second (x7)
* acceleration * M204 P acceleration
* retract_acceleration * M204 R retract_acceleration
* travel_acceleration * M204 T travel_acceleration
* minimumfeedrate * M205 S minimumfeedrate
* mintravelfeedrate * M205 T mintravelfeedrate
* minsegmenttime * M205 B minsegmenttime
* max_xy_jerk * M205 X max_xy_jerk
* max_z_jerk * M205 Z max_z_jerk
* max_e_jerk * M205 E max_e_jerk
* home_offset (x3) * M206 XYZ home_offset (x3)
* zprobe_zoffset * M666 P zprobe_zoffset
* *
* HOTEND OFFSET: * HOTEND OFFSET:
* hotend_offset (x4) * M218 T XY hotend_offset (x4) (T0..3)
* *
* DELTA: * DELTA:
* endstop_adj (x3) * M666 XYZ endstop_adj (x3)
* delta_radius * M666 ABCDEFG tower_adj (x6)
* delta_diagonal_rod * M666 R delta_radius
* max_pos * M666 D delta_diagonal_rod
* tower_adj (x3) * M666 H Z max_pos
* z_probe_offset * M666 P z_probe_offset
* *
* Z_DUAL_ENDSTOPS * Z_DUAL_ENDSTOPS
* z_endstop_adj * M666 Z z_endstop_adj
* *
* ULTIPANEL: * ULTIPANEL:
* plaPreheatHotendTemp * M145 S0 H plaPreheatHotendTemp
* plaPreheatHPBTemp * M145 S0 B plaPreheatHPBTemp
* plaPreheatFanSpeed * M145 S0 F plaPreheatFanSpeed
* absPreheatHotendTemp * M145 S1 H absPreheatHotendTemp
* absPreheatHPBTemp * M145 S1 B absPreheatHPBTemp
* absPreheatFanSpeed * M145 S1 F absPreheatFanSpeed
* gumPreheatHotendTemp * M145 S2 H gumPreheatHotendTemp
* gumPreheatHPBTemp * M145 S2 B gumPreheatHPBTemp
* gumPreheatFanSpeed * M145 S2 F gumPreheatFanSpeed
* *
* PIDTEMP: * PIDTEMP:
* Kp[0], Ki[0], Kd[0] * M301 E0 PID Kp[0], Ki[0], Kd[0]
* Kp[1], Ki[1], Kd[1] * M301 E1 PID Kp[1], Ki[1], Kd[1]
* Kp[2], Ki[2], Kd[2] * M301 E2 PID Kp[2], Ki[2], Kd[2]
* Kp[3], Ki[3], Kd[3] * M301 E3 PID Kp[3], Ki[3], Kd[3]
* *
* PIDTEMPBED: * PIDTEMPBED:
* bedKp, bedKi, bedKd * M304 PID bedKp, bedKi, bedKd
* *
* DOGLCD: * DOGLCD:
* lcd_contrast * M250 C lcd_contrast
* *
* SCARA: * SCARA:
* axis_scaling (x3) * M365 XYZ axis_scaling (x3)
* *
* FWRETRACT: * FWRETRACT:
* autoretract_enabled * M209 S autoretract_enabled
* retract_length * M207 S retract_length
* retract_length_swap * M207 W retract_length_swap
* retract_feedrate * M207 F retract_feedrate
* retract_zlift * M207 Z retract_zlift
* retract_recover_length * M208 S retract_recover_length
* retract_recover_length_swap * M208 W retract_recover_length_swap
* retract_recover_feedrate * M208 F retract_recover_feedrate
* *
* volumetric_enabled * M200 D volumetric_enabled (D>0 makes this enabled)
* *
* filament_size (x4) * M200 T D filament_size (x4) (T0..3)
* *
* idleoozing_enabled * M??? S idleoozing_enabled
* *
* *
* *
...@@ -127,8 +127,6 @@ void _EEPROM_readData(int &pos, uint8_t* value, uint8_t size) { ...@@ -127,8 +127,6 @@ void _EEPROM_readData(int &pos, uint8_t* value, uint8_t size) {
#define EEPROM_WRITE_VAR(pos, value) _EEPROM_writeData(pos, (uint8_t*)&value, sizeof(value)) #define EEPROM_WRITE_VAR(pos, value) _EEPROM_writeData(pos, (uint8_t*)&value, sizeof(value))
#define EEPROM_READ_VAR(pos, value) _EEPROM_readData(pos, (uint8_t*)&value, sizeof(value)) #define EEPROM_READ_VAR(pos, value) _EEPROM_readData(pos, (uint8_t*)&value, sizeof(value))
//======================================================================================
#define DUMMY_PID_VALUE 3000.0f #define DUMMY_PID_VALUE 3000.0f
#define EEPROM_OFFSET 100 #define EEPROM_OFFSET 100
...@@ -137,6 +135,9 @@ void _EEPROM_readData(int &pos, uint8_t* value, uint8_t size) { ...@@ -137,6 +135,9 @@ void _EEPROM_readData(int &pos, uint8_t* value, uint8_t size) {
#ifdef EEPROM_SETTINGS #ifdef EEPROM_SETTINGS
/**
* Store Configuration Settings - M500
*/
void Config_StoreSettings() { void Config_StoreSettings() {
float dummy = 0.0f; float dummy = 0.0f;
char ver[4] = "000"; char ver[4] = "000";
...@@ -272,12 +273,16 @@ void Config_StoreSettings() { ...@@ -272,12 +273,16 @@ void Config_StoreSettings() {
ECHO_EM(" bytes)"); ECHO_EM(" bytes)");
} }
/**
* Retrieve Configuration Settings - M501
*/
void Config_RetrieveSettings() { void Config_RetrieveSettings() {
int i = EEPROM_OFFSET; int i = EEPROM_OFFSET;
char stored_ver[4]; char stored_ver[4];
char ver[4] = EEPROM_VERSION; char ver[4] = EEPROM_VERSION;
EEPROM_READ_VAR(i, stored_ver); //read stored version EEPROM_READ_VAR(i, stored_ver); //read stored version
// ECHO_EM("Version: [" << ver << "] Stored version: [" << stored_ver << "]");
if (strncmp(ver, stored_ver, 3) != 0) { if (strncmp(ver, stored_ver, 3) != 0) {
Config_ResetDefault(); Config_ResetDefault();
...@@ -432,12 +437,15 @@ void Config_RetrieveSettings() { ...@@ -432,12 +437,15 @@ void Config_RetrieveSettings() {
#endif // EEPROM_SETTINGS #endif // EEPROM_SETTINGS
/**
* Reset Configuration Settings - M502
*/
void Config_ResetDefault() { void Config_ResetDefault() {
float tmp1[] = DEFAULT_AXIS_STEPS_PER_UNIT; float tmp1[] = DEFAULT_AXIS_STEPS_PER_UNIT;
float tmp2[] = DEFAULT_MAX_FEEDRATE; float tmp2[] = DEFAULT_MAX_FEEDRATE;
float tmp3[] = DEFAULT_RETRACTION_MAX_FEEDRATE; float tmp3[] = DEFAULT_RETRACTION_MAX_FEEDRATE;
long tmp4[] = DEFAULT_MAX_ACCELERATION; long tmp4[] = DEFAULT_MAX_ACCELERATION;
#ifdef PIDTEMP #ifdef PIDTEMP
float tmp5[] = DEFAULT_Kp; float tmp5[] = DEFAULT_Kp;
float tmp6[] = DEFAULT_Ki; float tmp6[] = DEFAULT_Ki;
...@@ -564,6 +572,9 @@ void Config_ResetDefault() { ...@@ -564,6 +572,9 @@ void Config_ResetDefault() {
#ifndef DISABLE_M503 #ifndef DISABLE_M503
/**
* Print Configuration Settings - M502
*/
void Config_PrintSettings(bool forReplay) { void Config_PrintSettings(bool forReplay) {
// Always have this function, even with EEPROM_SETTINGS disabled, the current values will be shown // Always have this function, even with EEPROM_SETTINGS disabled, the current values will be shown
...@@ -724,6 +735,24 @@ void Config_PrintSettings(bool forReplay) { ...@@ -724,6 +735,24 @@ void Config_PrintSettings(bool forReplay) {
ECHO_LMV(DB, " M666 P", zprobe_zoffset); ECHO_LMV(DB, " M666 P", zprobe_zoffset);
#endif // DELTA #endif // DELTA
#ifdef ULTIPANEL
if (!forReplay) {
ECHO_LM(DB, "Material heatup parameters:");
}
ECHO_SMV(DB, " M145 M0 H", plaPreheatHotendTemp);
ECHO_MV(" B", plaPreheatHPBTemp);
ECHO_MV(" F", plaPreheatFanSpeed);
ECHO_EM(" (Material PLA)");
ECHO_SMV(DB, " M145 M1 H", absPreheatHotendTemp);
ECHO_MV(" B", absPreheatHPBTemp);
ECHO_MV(" F", absPreheatFanSpeed);
ECHO_EM(" (Material ABS)");
ECHO_SMV(DB, " M145 M2 H", gumPreheatHotendTemp);
ECHO_MV(" B", gumPreheatHPBTemp);
ECHO_MV(" F", gumPreheatFanSpeed);
ECHO_EM(" (Material GUM)");
#endif // ULTIPANEL
#if defined(PIDTEMP) || defined(PIDTEMPBED) #if defined(PIDTEMP) || defined(PIDTEMPBED)
if (!forReplay) { if (!forReplay) {
ECHO_LM(DB, "PID settings:"); ECHO_LM(DB, "PID settings:");
......
MarlinKimbra/configuration_store.h
View file @ 521d08d1
...@@ -9,10 +9,8 @@ void save_lifetime_stats(); ...@@ -9,10 +9,8 @@ void save_lifetime_stats();
#ifndef DISABLE_M503 #ifndef DISABLE_M503
void Config_PrintSettings(bool forReplay=false); void Config_PrintSettings(bool forReplay=false);
void ConfigSD_PrintSettings(bool forReplay=false);
#else #else
FORCE_INLINE void Config_PrintSettings(bool forReplay=false) {} FORCE_INLINE void Config_PrintSettings(bool forReplay=false) {}
FORCE_INLINE void ConfigSD_PrintSettings(bool forReplay=false) {}
#endif #endif
#ifdef EEPROM_SETTINGS #ifdef EEPROM_SETTINGS
......
MarlinKimbra/dogm_lcd_implementation.h
View file @ 521d08d1
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#endif #endif
#include <U8glib.h> #include <U8glib.h>
#include "DOGMbitmaps.h" #include "dogm_bitmaps.h"
#include "ultralcd.h" #include "ultralcd.h"
#include "ultralcd_st7920_u8glib_rrd.h" #include "ultralcd_st7920_u8glib_rrd.h"
...@@ -64,6 +64,10 @@ ...@@ -64,6 +64,10 @@
#elif defined( DISPLAY_CHARSET_ISO10646_KANA ) #elif defined( DISPLAY_CHARSET_ISO10646_KANA )
#include "dogm_font_data_ISO10646_Kana.h" #include "dogm_font_data_ISO10646_Kana.h"
#define FONT_MENU_NAME ISO10646_Kana_5x7 #define FONT_MENU_NAME ISO10646_Kana_5x7
#elif defined( DISPLAY_CHARSET_ISO10646_CN )
#include "dogm_font_data_ISO10646_CN.h"
#define FONT_MENU_NAME ISO10646_CN
#define TALL_FONT_CORRECTION 1
#else // fall-back #else // fall-back
#include "dogm_font_data_ISO10646_1.h" #include "dogm_font_data_ISO10646_1.h"
#define FONT_MENU_NAME ISO10646_1_5x7 #define FONT_MENU_NAME ISO10646_1_5x7
...@@ -106,6 +110,10 @@ ...@@ -106,6 +110,10 @@
#define LCD_WIDTH_EDIT 22 #define LCD_WIDTH_EDIT 22
#endif #endif
#ifndef TALL_FONT_CORRECTION
#define TALL_FONT_CORRECTION 0
#endif
#define START_ROW 0 #define START_ROW 0
// LCD selection // LCD selection
...@@ -123,6 +131,13 @@ ...@@ -123,6 +131,13 @@
U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0); // HW-SPI Com: CS, A0 U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0); // HW-SPI Com: CS, A0
#endif #endif
#ifndef LCD_PIXEL_WIDTH
#define LCD_PIXEL_WIDTH 128
#endif
#ifndef LCD_PIXEL_HEIGHT
#define LCD_PIXEL_HEIGHT 64
#endif
#include "utf_mapper.h" #include "utf_mapper.h"
int lcd_contrast; int lcd_contrast;
...@@ -172,6 +187,7 @@ char lcd_printPGM(const char* str) { ...@@ -172,6 +187,7 @@ char lcd_printPGM(const char* str) {
static bool show_splashscreen = true; static bool show_splashscreen = true;
/* Warning: This function is called from interrupt context */
static void lcd_implementation_init() { static void lcd_implementation_init() {
#ifdef LCD_PIN_BL // Enable LCD backlight #ifdef LCD_PIN_BL // Enable LCD backlight
...@@ -252,20 +268,21 @@ static void lcd_implementation_status_screen() { ...@@ -252,20 +268,21 @@ static void lcd_implementation_status_screen() {
#ifdef SDSUPPORT #ifdef SDSUPPORT
// SD Card Symbol // SD Card Symbol
u8g.drawBox(42,42,8,7); u8g.drawBox(42, 42 - TALL_FONT_CORRECTION, 8, 7);
u8g.drawBox(50,44,2,5); u8g.drawBox(50, 44 - TALL_FONT_CORRECTION, 2, 5);
u8g.drawFrame(42,49,10,4); u8g.drawFrame(42, 49 - TALL_FONT_CORRECTION, 10, 4);
u8g.drawPixel(50,43); u8g.drawPixel(50, 43 - TALL_FONT_CORRECTION);
// Progress bar frame // Progress bar frame
u8g.drawFrame(54,49,73,4); u8g.drawFrame(54, 49, 73, 4 - TALL_FONT_CORRECTION);
// SD Card Progress bar and clock // SD Card Progress bar and clock
lcd_setFont(FONT_STATUSMENU); lcd_setFont(FONT_STATUSMENU);
if (IS_SD_PRINTING) { if (IS_SD_PRINTING) {
// Progress bar solid part // Progress bar solid part
u8g.drawBox(55, 50, (unsigned int)(71.f * card.percentDone() / 100.f), 2); u8g.drawBox(55, 50, (unsigned int)(71.f * card.percentDone() / 100.f), 2 - TALL_FONT_CORRECTION);
} }
u8g.setPrintPos(80,48); u8g.setPrintPos(80,48);
...@@ -319,9 +336,9 @@ static void lcd_implementation_status_screen() { ...@@ -319,9 +336,9 @@ static void lcd_implementation_status_screen() {
lcd_setFont(FONT_STATUSMENU); lcd_setFont(FONT_STATUSMENU);
#ifdef USE_SMALL_INFOFONT #ifdef USE_SMALL_INFOFONT
u8g.drawBox(0,30,128,10); u8g.drawBox(0,30,LCD_PIXEL_WIDTH,10);
#else #else
u8g.drawBox(0,30,128,9); u8g.drawBox(0,30,LCD_PIXEL_WIDTH,9);
#endif #endif
u8g.setColorIndex(0); // white on black u8g.setColorIndex(0); // white on black
u8g.setPrintPos(2,XYZ_BASELINE); u8g.setPrintPos(2,XYZ_BASELINE);
...@@ -396,7 +413,7 @@ static void lcd_implementation_status_screen() { ...@@ -396,7 +413,7 @@ static void lcd_implementation_status_screen() {
static void lcd_implementation_mark_as_selected(uint8_t row, bool isSelected) { static void lcd_implementation_mark_as_selected(uint8_t row, bool isSelected) {
if (isSelected) { if (isSelected) {
u8g.setColorIndex(1); // black on white u8g.setColorIndex(1); // black on white
u8g.drawBox(0, row * DOG_CHAR_HEIGHT + 3, 128, DOG_CHAR_HEIGHT); u8g.drawBox(0, row * DOG_CHAR_HEIGHT + 3 - TALL_FONT_CORRECTION, LCD_PIXEL_WIDTH, DOG_CHAR_HEIGHT);
u8g.setColorIndex(0); // following text must be white on black u8g.setColorIndex(0); // following text must be white on black
} }
else { else {
...@@ -416,13 +433,15 @@ static void lcd_implementation_drawmenu_generic(bool isSelected, uint8_t row, co ...@@ -416,13 +433,15 @@ static void lcd_implementation_drawmenu_generic(bool isSelected, uint8_t row, co
pstr++; pstr++;
} }
while (n--) lcd_print(' '); while (n--) lcd_print(' ');
u8g.setPrintPos(LCD_PIXEL_WIDTH - DOG_CHAR_WIDTH, (row + 1) * DOG_CHAR_HEIGHT);
lcd_print(post_char); lcd_print(post_char);
lcd_print(' '); lcd_print(' ');
} }
static void _drawmenu_setting_edit_generic(bool isSelected, uint8_t row, const char* pstr, const char* data, bool pgm) { static void _drawmenu_setting_edit_generic(bool isSelected, uint8_t row, const char* pstr, const char* data, bool pgm) {
char c; char c;
uint8_t n = LCD_WIDTH - 2 - (pgm ? lcd_strlen_P(data) : (lcd_strlen((char*)data))); uint8_t vallen = (pgm ? lcd_strlen_P(data) : (lcd_strlen((char*)data)));
uint8_t n = LCD_WIDTH - 2 - vallen;
lcd_implementation_mark_as_selected(row, isSelected); lcd_implementation_mark_as_selected(row, isSelected);
...@@ -432,6 +451,7 @@ static void _drawmenu_setting_edit_generic(bool isSelected, uint8_t row, const c ...@@ -432,6 +451,7 @@ static void _drawmenu_setting_edit_generic(bool isSelected, uint8_t row, const c
} }
lcd_print(':'); lcd_print(':');
while (n--) lcd_print(' '); while (n--) lcd_print(' ');
u8g.setPrintPos(LCD_PIXEL_WIDTH - DOG_CHAR_WIDTH * vallen, (row + 1) * DOG_CHAR_HEIGHT);
if (pgm) { lcd_printPGM(data); } else { lcd_print((char *)data); } if (pgm) { lcd_printPGM(data); } else { lcd_print((char *)data); }
} }
......
MarlinKimbra/language.h
View file @ 521d08d1
...@@ -30,17 +30,14 @@ ...@@ -30,17 +30,14 @@
#endif #endif
#define PROTOCOL_VERSION "1.0" #define PROTOCOL_VERSION "1.0"
#define FIRMWARE_URL "https://github.com/MagoKimbra/MarlinKimbra"
#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2) #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
#undef FIRMWARE_URL
#define MACHINE_NAME "Ultimaker" #define MACHINE_NAME "Ultimaker"
#define FIRMWARE_URL "http://firmware.ultimaker.com" #define FIRMWARE_URL "http://firmware.ultimaker.com"
#elif MB(RUMBA) #elif MB(RUMBA)
#define MACHINE_NAME "Rumba" #define MACHINE_NAME "Rumba"
#elif MB(3DRAG) #elif MB(3DRAG)
#define MACHINE_NAME "3Drag" #define MACHINE_NAME "3Drag"
#undef FIRMWARE_URL
#define FIRMWARE_URL "http://3dprint.elettronicain.it/" #define FIRMWARE_URL "http://3dprint.elettronicain.it/"
#elif MB(K8200) #elif MB(K8200)
#define MACHINE_NAME "K8200" #define MACHINE_NAME "K8200"
...@@ -48,15 +45,23 @@ ...@@ -48,15 +45,23 @@
#define MACHINE_NAME "Makibox" #define MACHINE_NAME "Makibox"
#elif MB(SAV_MKI) #elif MB(SAV_MKI)
#define MACHINE_NAME "SAV MkI" #define MACHINE_NAME "SAV MkI"
#undef FIRMWARE_URL
#define FIRMWARE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" #define FIRMWARE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
#else // Default firmware set to Mendel #else // Default firmware set to Mendel
#define MACHINE_NAME "Mendel" #define MACHINE_NAME "Mendel"
#endif #endif
#ifdef CUSTOM_MENDEL_NAME #ifdef CUSTOM_MENDEL_NAME
#error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME
#define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME
#endif
#ifdef CUSTOM_MACHINE_NAME
#undef MACHINE_NAME #undef MACHINE_NAME
#define MACHINE_NAME CUSTOM_MENDEL_NAME #define MACHINE_NAME CUSTOM_MACHINE_NAME
#endif
#ifndef FIRMWARE_URL
#define FIRMWARE_URL "https://github.com/MagoKimbra/MarlinKimbra"
#endif #endif
#ifndef BUILD_VERSION #ifndef BUILD_VERSION
...@@ -131,6 +136,7 @@ ...@@ -131,6 +136,7 @@
#define MSG_Z_MAX "z_max: " #define MSG_Z_MAX "z_max: "
#define MSG_Z2_MAX "z2_max: " #define MSG_Z2_MAX "z2_max: "
#define MSG_Z_PROBE "z_probe: " #define MSG_Z_PROBE "z_probe: "
#define MSG_ERR_MATERIAL_INDEX "M145 S<index> out of range (0-2)"
#define MSG_E_MIN "e_min: " #define MSG_E_MIN "e_min: "
#define MSG_FILAMENT_RUNOUT_PIN "filament_runout_pin: " #define MSG_FILAMENT_RUNOUT_PIN "filament_runout_pin: "
#define MSG_M119_REPORT "Reporting endstop status" #define MSG_M119_REPORT "Reporting endstop status"
......
MarlinKimbra/pins.h
View file @ 521d08d1
...@@ -2231,8 +2231,8 @@ ...@@ -2231,8 +2231,8 @@
/**************************************************************************************** /****************************************************************************************
* 502 * 502
* Arduino Due pin assignment
* Alligator R2 * Alligator R2
* http://www.3dartists.org/
****************************************************************************************/ ****************************************************************************************/
#if MB(ALLIGATOR) #if MB(ALLIGATOR)
#define KNOWN_BOARD 1 #define KNOWN_BOARD 1
...@@ -2245,106 +2245,187 @@ ...@@ -2245,106 +2245,187 @@
#define SPI_CHAN_DAC 1 #define SPI_CHAN_DAC 1
// X AXIS // X AXIS
#define ORIG_X_STEP_PIN 96 // PB24 #define ORIG_X_STEP_PIN 96 // PB24
#define ORIG_X_DIR_PIN 2 // PB25 #define ORIG_X_DIR_PIN 2 // PB25
#define ORIG_X_ENABLE_PIN 24 // PA15, motor RESET pin #define ORIG_X_ENABLE_PIN 24 // PA15, motor RESET pin
#define X_MIN_PIN 33 // PC1 #define X_MIN_PIN 33 // PC1
#define X_MAX_PIN 34 // PC2 #define X_MAX_PIN 34 // PC2
#define X_MS1_PIN 99 // PC10 #define X_MS1_PIN 99 // PC10
// Y AXIS // Y AXIS
#define ORIG_Y_STEP_PIN 94 // PB22 #define ORIG_Y_STEP_PIN 94 // PB22
#define ORIG_Y_DIR_PIN 95 // PB23 #define ORIG_Y_DIR_PIN 95 // PB23
#define ORIG_Y_ENABLE_PIN 24 // PA15, motor RESET pin #define ORIG_Y_ENABLE_PIN 24 // PA15, motor RESET pin
#define Y_MIN_PIN 35 // PC3 #define Y_MIN_PIN 35 // PC3
#define Y_MAX_PIN 37 // PC5 #define Y_MAX_PIN 37 // PC5
#define Y_MS1_PIN 10 // PC29 #define Y_MS1_PIN 10 // PC29
// Z AXIS // Z AXIS
#define ORIG_Z_STEP_PIN 98 // PC27 #define ORIG_Z_STEP_PIN 98 // PC27
#define ORIG_Z_DIR_PIN 3 // PC28 #define ORIG_Z_DIR_PIN 3 // PC28
#define ORIG_Z_ENABLE_PIN 24 // PA15, motor RESET pin #define ORIG_Z_ENABLE_PIN 24 // PA15, motor RESET pin
#define Z_MIN_PIN 38 // PC6 #define Z_MIN_PIN 38 // PC6
#define Z_MAX_PIN 39 // PC7 #define Z_MAX_PIN 39 // PC7
#define Z_MS1_PIN 44 // PC19 #define Z_MS1_PIN 44 // PC19
#define Z_PROBE_PIN 38 // PC6 #define Z_PROBE_PIN 38 // PC6
// E AXIS // E AXIS
#define ORIG_E0_STEP_PIN 5 // PC25 #define ORIG_E0_STEP_PIN 5 // PC25
#define ORIG_E0_DIR_PIN 4 // PC26 #define ORIG_E0_DIR_PIN 4 // PC26
#define ORIG_E0_ENABLE_PIN 24 // PA15, motor RESET pin #define ORIG_E0_ENABLE_PIN 24 // PA15, motor RESET pin
#define E0_MS1_PIN 45 // PC18 #define E0_MS1_PIN 45 // PC18
/* /*
#define ORIG_E1_STEP_PIN 28 // PD3 on piggy #define ORIG_E1_STEP_PIN 28 // PD3 on piggy
#define ORIG_E1_DIR_PIN 27 // PD2 on piggy #define ORIG_E1_DIR_PIN 27 // PD2 on piggy
#define ORIG_E1_ENABLE_PIN -1 #define ORIG_E1_ENABLE_PIN -1
#define E1_MS1_PIN -1 #define E1_MS1_PIN -1
#define ORIG_E2_STEP_PIN 11 // PD7 on piggy #define ORIG_E2_STEP_PIN 11 // PD7 on piggy
#define ORIG_E2_DIR_PIN 29 // PD6 on piggy #define ORIG_E2_DIR_PIN 29 // PD6 on piggy
#define ORIG_E2_ENABLE_PIN -1 #define ORIG_E2_ENABLE_PIN -1
#define E2_MS_PIN -1 #define E2_MS_PIN -1
#define ORIG_E3_STEP_PIN 30 // PD9 on piggy #define ORIG_E3_STEP_PIN 30 // PD9 on piggy
#define ORIG_E3_DIR_PIN 12 // PD8 on piggy #define ORIG_E3_DIR_PIN 12 // PD8 on piggy
#define ORIG_E3_ENABLE_PIN -1 #define ORIG_E3_ENABLE_PIN -1
#define E3_MS_PIN -1 #define E3_MS_PIN -1
*/ */
#define MOTOR_FAULT_PIN 22 // PB26 , motor X-Y-Z-E0 motor FAULT #define MOTOR_FAULT_PIN 22 // PB26 , motor X-Y-Z-E0 motor FAULT
#define SDPOWER -1 #define SDPOWER -1
#define SDSS 77 // PA28 #define SDSS 77 // PA28
#define SDCARDDETECT 87 // PA29 #define SDCARDDETECT 87 // PA29
#define SDCARDDETECTINVERTED false #define SDCARDDETECTINVERTED false
#define LED_PIN -1 #define LED_PIN -1
#define ORIG_FAN_PIN 92 // PA5 #define ORIG_FAN_PIN 92 // PA5
#define FAN2_PIN 31 // PA7 #define FAN2_PIN 31 // PA7
#define PS_ON_PIN -1 #define PS_ON_PIN -1
#define KILL_PIN -1 #define KILL_PIN -1
#define SUICIDE_PIN -1 //PIN that has to be turned on right after start, to keep power flowing. #define SUICIDE_PIN -1 //PIN that has to be turned on right after start, to keep power flowing.
#define HEAT_OFF_INT_PIN 50 // PC13 on raspberry expansion #define HEAT_OFF_INT_PIN 50 // PC13 on raspberry expansion
// Note that on the Due pin A0 on the board is channel 2 on the ARM chip // Note that on the Due pin A0 on the board is channel 2 on the ARM chip
#define HEATER_BED_PIN 69 // PA0 #define HEATER_BED_PIN 69 // PA0
#define HEATER_0_PIN 68 // PA1 #define HEATER_0_PIN 68 // PA1
/* /*
#define HEATER_1_PIN 8 // PC22 on piggy #define HEATER_1_PIN 8 // PC22 on piggy
#define HEATER_2_PIN 9 // PC21 on piggy #define HEATER_2_PIN 9 // PC21 on piggy
#define HEATER_3_PIN 97 // PC20 on piggy #define HEATER_3_PIN 97 // PC20 on piggy
*/ */
#define TEMP_BED_PIN 0 // PA16 #define TEMP_BED_PIN 0 // PA16
#define TEMP_0_PIN 1 // PA24, analog pin #define TEMP_0_PIN 1 // PA24, analog pin
/* /*
#define TEMP_1_PIN 5 // PA23 analog pin on piggy #define TEMP_1_PIN 5 // PA23 analog pin on piggy
#define TEMP_2_PIN 4 // PA22, analog pin on piggy #define TEMP_2_PIN 4 // PA22, analog pin on piggy
#define TEMP_3_PIN 3 // PA6, analog on piggy #define TEMP_3_PIN 3 // PA6, analog on piggy
*/ */
#define LED_RED_PIN 40 // PC8 #define LED_RED_PIN 40 // PC8
#define LED_GREEN_PIN 41 // PC9 #define LED_GREEN_PIN 41 // PC9
#define CASE_LIGHTS_PIN 36 // PC4 #define CASE_LIGHTS_PIN 36 // PC4
#define EXP_VOLTAGE_LEVEL_PIN 65 #define EXP_VOLTAGE_LEVEL_PIN 65
#define DAC_SYNC 53 // PB14 #define DAC_SYNC 53 // PB14
//64K SPI EEPROM //64K SPI EEPROM
#define SPI_CHAN_EEPROM1 2 #define SPI_CHAN_EEPROM1 2
#define SPI_EEPROM1_CS 25 // PD0 #define SPI_EEPROM1_CS 25 // PD0
//2K SPI EEPROM //2K SPI EEPROM
#define SPI_EEPROM2_CS 26 // PD1 #define SPI_EEPROM2_CS 26 // PD1
//** FLASH SPI**/ //** FLASH SPI**/
//32Mb //32Mb
#define SPI_FLASH_CS 23 //PA14 #define SPI_FLASH_CS 23 //PA14
#ifdef ULTRA_LCD
#ifdef NEWPANEL
#ifdef 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
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#define BEEPER 37
#define BTN_EN1 31
#define BTN_EN2 33
#define BTN_ENC 35
#define SDCARDDETECT 49
#elif defined(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 SDCARDDETECT -1
#define KILL_PIN 41
#elif defined(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 SDCARDDETECT 49
#else
//arduino pin which triggers an piezzo beeper
#define BEEPER 33 // Beeper on AUX-4
//buttons are directly attached using AUX-2
#ifdef 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 defined(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
#endif
#else //old style panel with shift register
//arduino pin witch triggers an piezzo beeper
#define BEEPER 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
#endif //ALLIGATOR #endif //ALLIGATOR
/****************************************************************************************/ /****************************************************************************************/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment