Skip to content

Fixed wrong MAX_PIN assignments in pins.h and other misc #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seemecnc wants to merge 3 commits into
base: deltaLcd
Choose a base branch
from
Open

Fixed wrong MAX_PIN assignments in pins.h and other misc #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
063a0af
Fixed wrong MAX_PIN assignments in pins.h and other misc
Sep 25, 2014
e7c3589
Updated delta segments and lcd_status_update
Sep 30, 2014
fcf8db2
updated some LCD-stuff
Sep 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions Marlin/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// Make delta curves from many straight lines (linear interpolation).
// This is a trade-off between visible corners (not enough segments)
// and processor overload (too many expensive sqrt calls).
#define DELTA_SEGMENTS_PER_SECOND 200
#define DELTA_SEGMENTS_PER_SECOND 120

// NOTE NB all values for DELTA_* values MOUST be floating point, so always have a decimal point in them

Expand Down Expand Up @@ -165,10 +165,10 @@
// 110 is Pt100 with 1k pullup (non standard)
// 70 is 500C thermistor for Pico hot end

#define TEMP_SENSOR_0 1
#define TEMP_SENSOR_1 1
#define TEMP_SENSOR_0 5
#define TEMP_SENSOR_1 5
#define TEMP_SENSOR_2 0
#define TEMP_SENSOR_BED 1
#define TEMP_SENSOR_BED 5

// This makes temp sensor 1 a redundant sensor for sensor 0. If the temperatures difference between these sensors is to high the print will be aborted.
//#define TEMP_SENSOR_1_AS_REDUNDANT
Expand Down Expand Up @@ -315,9 +315,9 @@
const bool X_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
const bool Y_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
const bool Z_MIN_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
const bool X_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
const bool Y_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of the endstop.
const bool X_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
const bool Y_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic of the endstop.
//#define DISABLE_MAX_ENDSTOPS
#define DISABLE_MIN_ENDSTOPS

Expand All @@ -339,10 +339,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#define DISABLE_E false // For all extruders
#define DISABLE_INACTIVE_EXTRUDER true //disable only inactive extruders and keep active extruder enabled

#define INVERT_X_DIR false // for Mendel set to false, for Orca set to true
#define INVERT_X_DIR true // for Mendel set to false, for Orca set to true
#define INVERT_Y_DIR false // for Mendel set to true, for Orca set to false
#define INVERT_Z_DIR false // for Mendel set to false, for Orca set to true
#define INVERT_E0_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false
#define INVERT_Z_DIR true // for Mendel set to false, for Orca set to true
#define INVERT_E0_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false
#define INVERT_E1_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false
#define INVERT_E2_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false

Expand All @@ -356,11 +356,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#define max_software_endstops true // If true, axis won't move to coordinates greater than the defined lengths below.

// Travel limits after homing
#define X_MAX_POS 205
#define X_MIN_POS 0
#define Y_MAX_POS 205
#define Y_MIN_POS 0
#define Z_MAX_POS 200
#define X_MAX_POS 75
#define X_MIN_POS -75
#define Y_MAX_POS 75
#define Y_MIN_POS -75
#define Z_MAX_POS MANUAL_Z_HOME_POS
#define Z_MIN_POS 0

#define X_MAX_LENGTH (X_MAX_POS - X_MIN_POS)
Expand Down Expand Up @@ -465,7 +465,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
// For deltabots this means top and center of the Cartesian print volume.
#define MANUAL_X_HOME_POS 0
#define MANUAL_Y_HOME_POS 0
#define MANUAL_Z_HOME_POS 240.7
#define MANUAL_Z_HOME_POS 247.3
//#define MANUAL_Z_HOME_POS 402 // For delta: Distance between nozzle and print surface after homing.

//// MOVEMENT SETTINGS
Expand All @@ -476,10 +476,10 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of

#define DEFAULT_AXIS_STEPS_PER_UNIT {80,80,80,92.4} // default steps per unit for Ultimaker
#define DEFAULT_MAX_FEEDRATE {300, 300, 300, 110} // (mm/sec)
#define DEFAULT_MAX_ACCELERATION {3000,3000,3000,3500} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
#define DEFAULT_MAX_ACCELERATION {3500,3500,3500,3500} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.

#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E max acceleration in mm/s^2 for printing moves
#define DEFAULT_RETRACT_ACCELERATION 3000 // X, Y, Z and E max acceleration in mm/s^2 for retracts
#define DEFAULT_ACCELERATION 1850 // X, Y, Z and E max acceleration in mm/s^2 for printing moves
#define DEFAULT_RETRACT_ACCELERATION 1850 // X, Y, Z and E max acceleration in mm/s^2 for retracts

// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing).
// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder).
Expand All @@ -488,9 +488,9 @@ 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_XYJERK 20.0 // (mm/sec)
#define DEFAULT_ZJERK 0.4 // (mm/sec)
#define DEFAULT_EJERK 5.0 // (mm/sec)
#define DEFAULT_XYJERK 32.0 // (mm/sec)
#define DEFAULT_ZJERK 32.0 // (mm/sec)
#define DEFAULT_EJERK 7.0 // (mm/sec)

//===========================================================================
//=============================Additional Features===========================
Expand All @@ -517,13 +517,13 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
//#define EEPROM_CHITCHAT

// Preheat Constants
#define PLA_PREHEAT_HOTEND_TEMP 180
#define PLA_PREHEAT_HPB_TEMP 70
#define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
#define PLA_PREHEAT_HOTEND_TEMP 170
#define PLA_PREHEAT_HPB_TEMP 60
#define PLA_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255

#define ABS_PREHEAT_HOTEND_TEMP 240
#define ABS_PREHEAT_HOTEND_TEMP 200
#define ABS_PREHEAT_HPB_TEMP 100
#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255

//LCD and SD support
//#define ULTRA_LCD //general LCD support, also 16x2
Expand Down
4 changes: 2 additions & 2 deletions Marlin/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,8 +420,8 @@ const unsigned int dropsegments=5; //everything with less than this number of st
#ifdef ULTIPANEL
#define FILAMENTCHANGEENABLE
#ifdef FILAMENTCHANGEENABLE
#define FILAMENTCHANGE_XPOS 3
#define FILAMENTCHANGE_YPOS 3
#define FILAMENTCHANGE_XPOS 0
#define FILAMENTCHANGE_YPOS 0
#define FILAMENTCHANGE_ZADD 10
#define FILAMENTCHANGE_FIRSTRETRACT -2
#define FILAMENTCHANGE_FINALRETRACT -100
Expand Down
66 changes: 66 additions & 0 deletions Marlin/DOGMbitmaps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#define START_BMPHEIGHT 64 //Height in pixels
#define START_BMPBYTEWIDTH 8 //Width in bytes
const unsigned char start_bmp[574] PROGMEM = { //AVR-GCC, WinAVR
/* reprap bmp for start page

0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,
0xFF,0xFF,0xFF,0xF9,0xFF,0xFF,0xFF,0xF0,
Expand Down Expand Up @@ -66,6 +68,70 @@ const unsigned char start_bmp[574] PROGMEM = { //AVR-GCC, WinAVR
0xFF,0xFF,0xF9,0xFF,0xFF,0xFF,0xC7,0xF0,
0xFF,0xFF,0xF9,0xFF,0xFF,0xFF,0xC7,0xF0,
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0
*/



0x02, 0xF8, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, // # ##### #######
0x0B, 0xFA, 0x00, 0x3F, 0xE0, 0x00, 0x00, 0x00, // # ####### # #########
0x1F, 0xFC, 0x00, 0x7F, 0xF0, 0x00, 0x00, 0x00, // ########### ###########
0x1F, 0xFE, 0x00, 0xFF, 0xF0, 0x00, 0x00, 0x00, // ############ ############
0x3E, 0x04, 0x03, 0xF0, 0x60, 0x00, 0x00, 0x00, // ##### # ###### ##
0x38, 0x00, 0x03, 0x80, 0x00, 0x00, 0x00, 0x00, // ### ###
0x70, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, // ### ##
0x60, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, // ## ##
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, // #
0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // #
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //
0x00, 0x7E, 0x00, 0x07, 0xE0, 0x00, 0x00, 0x00, // ###### ######
0x00, 0x67, 0x80, 0x0E, 0x70, 0x00, 0x00, 0x00, // ## #### ### ###
0x01, 0x81, 0xC0, 0x18, 0x18, 0x00, 0x00, 0x00, // ## ### ## ##
0x03, 0x00, 0x40, 0x10, 0x08, 0x00, 0x00, 0x00, // ## # # #
0x02, 0x00, 0x60, 0x30, 0x04, 0x00, 0x00, 0x00, // # ## ## #
0x06, 0x00, 0x20, 0x20, 0x04, 0x00, 0x00, 0x00, // ## # # #
0x00, 0x00, 0x10, 0x40, 0x02, 0x00, 0x00, 0x00, // # # #
0x0C, 0x00, 0x00, 0x40, 0x02, 0x00, 0x00, 0x00, // ## # #
0x08, 0x00, 0x10, 0x40, 0x02, 0x00, 0x00, 0x00, // # # # #
0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, // #
0x08, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, // # #
0x18, 0x00, 0x09, 0x80, 0x01, 0x80, 0x00, 0x00, // ## # ## ##
0x10, 0x00, 0x05, 0x80, 0x01, 0x80, 0x00, 0x00, // # # ## ##
0x10, 0x01, 0xC4, 0x00, 0x3C, 0x80, 0x00, 0x00, // # ### # #### #
0x10, 0x01, 0xC4, 0x00, 0x1C, 0x00, 0x00, 0x00, // # ### # ###
0x10, 0x07, 0xF4, 0x00, 0x7E, 0x00, 0x00, 0x00, // # ####### # ######
0x10, 0x07, 0xF4, 0x00, 0x7F, 0x80, 0x00, 0x00, // # ####### # ########
0x30, 0x07, 0xFE, 0x00, 0x7F, 0x80, 0x00, 0x00, // ## ########## ########
0x20, 0x0F, 0xFE, 0x00, 0xFF, 0x80, 0x00, 0x00, // # ########### #########
0x20, 0x0F, 0xFE, 0x00, 0xFF, 0x80, 0x00, 0x00, // # ########### #########
0x20, 0x0F, 0xFE, 0x00, 0xFF, 0x80, 0x00, 0x00, // # ########### #########
0x20, 0x0F, 0xFE, 0x00, 0xFF, 0x80, 0x00, 0x00, // # ########### #########
0x20, 0x0F, 0xFE, 0x00, 0xFF, 0x80, 0x00, 0x00, // # ########### #########
0x20, 0x0F, 0xFE, 0x00, 0xFF, 0x80, 0x00, 0x00, // # ########### #########
0x20, 0x0F, 0xFE, 0x00, 0x7F, 0x80, 0x00, 0x00, // # ########### ########
0x20, 0x0F, 0xFE, 0x00, 0x7F, 0x80, 0x00, 0x00, // # ########### ########
0x20, 0x07, 0xF2, 0x00, 0x7F, 0x80, 0x00, 0x00, // # ####### # ########
0x30, 0x07, 0xF3, 0x00, 0x7C, 0x00, 0x00, 0x00, // ## ####### ## #####
0x10, 0x07, 0xF6, 0x00, 0x7E, 0x00, 0x00, 0x00, // # ####### ## ######
0x10, 0x01, 0xD4, 0x00, 0x3C, 0x00, 0x00, 0x00, // # ### # # ####
0x10, 0x03, 0xE5, 0x00, 0x18, 0x80, 0x00, 0x00, // # ##### # # ## #
0x00, 0x00, 0x85, 0x80, 0x01, 0x80, 0x00, 0x00, // # # ## ##
0x10, 0x00, 0x05, 0x80, 0x01, 0x80, 0x00, 0x00, // # # ## ##
0x18, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, // ## #
0x08, 0x00, 0x08, 0x80, 0x00, 0x00, 0x00, 0x00, // # # #
0x00, 0x00, 0x08, 0x40, 0x02, 0x00, 0x00, 0x00, // # # #
0x08, 0x00, 0x18, 0x40, 0x02, 0x00, 0x00, 0x00, // # ## # #
0x0C, 0x00, 0x10, 0x40, 0x02, 0x00, 0x00, 0x00, // ## # # #
0x04, 0x00, 0x10, 0x20, 0x04, 0x00, 0x00, 0x00, // # # # #
0x06, 0x00, 0x20, 0x30, 0x04, 0x00, 0x00, 0x00, // ## # ## #
0x02, 0x00, 0x20, 0x10, 0x08, 0x00, 0x00, 0x00, // # # # #
0x02, 0x00, 0x60, 0x18, 0x18, 0x00, 0x00, 0x00, // # ## ## ##
0x00, 0x80, 0xC0, 0x0E, 0x70, 0x00, 0x00, 0x00, // # ## ### ###
0x00, 0x63, 0x80, 0x07, 0xE0, 0x00, 0x00, 0x00, // ## ### ######
0x00, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // #####
0x00, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // #####


};

#define STATUS_SCREENWIDTH 115 //Width in pixels
Expand Down
52 changes: 40 additions & 12 deletions Marlin/dogm_lcd_implementation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#define LCD_CLICKED (buttons&EN_C)
#endif


#include <U8glib.h>
#include "DOGMbitmaps.h"
#include "dogm_font_data_marlin.h"
Expand Down Expand Up @@ -129,19 +130,19 @@ static void lcd_implementation_init()
u8g.drawBitmapP(0,0,START_BMPBYTEWIDTH,START_BMPHEIGHT,start_bmp);
// Welcome message
u8g.setFont(u8g_font_6x10_marlin);
u8g.drawStr(62,10,"MARLIN");
u8g.drawStr(62,10,"ORION");
u8g.setFont(u8g_font_5x8);
u8g.drawStr(62,19,"V1.0.0 RC2-mm");
u8g.drawStr(62,19,"by SEEMECNC");
u8g.setFont(u8g_font_6x10_marlin);
u8g.drawStr(62,28,"by ErikZalm");
u8g.drawStr(62,41,"DOGM128 LCD");
u8g.drawStr(62,28,"MIREGLI LCD");
u8g.drawStr(62,41,"and");
u8g.setFont(u8g_font_5x8);
u8g.drawStr(62,48,"enhancements");
u8g.drawStr(62,48,"MINI-RAMBO");
u8g.setFont(u8g_font_5x8);
u8g.drawStr(62,55,"by STB, MM");
u8g.drawStr(62,61,"uses u");
u8g.drawStr90(92,57,"8");
u8g.drawStr(100,61,"glib");
u8g.drawStr(62,54,"by");
u8g.drawStr(62,61,"ULTIMACHINE");
u8g.drawStr90(92,57,"");
u8g.drawStr(100,61,"");
} while( u8g.nextPage() );
}

Expand All @@ -160,6 +161,8 @@ static void lcd_implementation_clear()
}

/* Arduino < 1.0.0 is missing a function to print PROGMEM strings, so we need to implement our own */


static void lcd_printPGM(const char* str)
{
char c;
Expand All @@ -170,6 +173,7 @@ static void lcd_printPGM(const char* str)
}



static void lcd_implementation_status_screen()
{

Expand All @@ -178,8 +182,13 @@ static void lcd_implementation_status_screen()
u8g.setColorIndex(1); // black on white

// Symbols menu graphics, animated fan

/* REMOVING FAN ANIMATION FROM STATUS SCREEN AND JUST HAVING FAN SYMBOL IN TOP RIGHT CORNER FOR NOW

if ((blink % 2) && fanSpeed ) u8g.drawBitmapP(9,1,STATUS_SCREENBYTEWIDTH,STATUS_SCREENHEIGHT,status_screen0_bmp);
else u8g.drawBitmapP(9,1,STATUS_SCREENBYTEWIDTH,STATUS_SCREENHEIGHT,status_screen1_bmp);
*/
u8g.drawBitmapP(9,1,STATUS_SCREENBYTEWIDTH,STATUS_SCREENHEIGHT,status_screen1_bmp);

#ifdef SDSUPPORT
//SD Card Symbol
Expand Down Expand Up @@ -211,7 +220,7 @@ static void lcd_implementation_status_screen()
u8g.print(':');
u8g.print(itostr2(time%60));
}else{
lcd_printPGM(PSTR("--:--"));
lcd_printPGM(PSTR("N/A"));
}
#endif

Expand All @@ -231,6 +240,10 @@ static void lcd_implementation_status_screen()
u8g.setColorIndex(1); // black on white
}


/* REMOVING EXT 2 AND 3 FROM STATUS SCREEN


// Extruder 2
u8g.setFont(FONT_STATUSMENU);
#if EXTRUDERS > 1
Expand Down Expand Up @@ -272,15 +285,18 @@ static void lcd_implementation_status_screen()
u8g.setPrintPos(55,27);
u8g.print("---");
#endif
*/



// Heatbed
u8g.setFont(FONT_STATUSMENU);
u8g.setPrintPos(81,6);
u8g.print(itostr3(int(degTargetBed() + 0.5)));
lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
u8g.setPrintPos(81,27);
u8g.print(itostr3(int(degBed() + 0.5)));
lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
if (!isHeatingBed()) u8g.drawBox(88,18,2,2);
else
{
Expand All @@ -289,6 +305,9 @@ static void lcd_implementation_status_screen()
u8g.setColorIndex(1); // black on white
}


/* REMOVING FAN PERCENTAGE FROM STATUS SCREEN

// Fan
u8g.setFont(FONT_STATUSMENU);
u8g.setPrintPos(104,27);
Expand All @@ -299,11 +318,14 @@ static void lcd_implementation_status_screen()
u8g.print("---");
#endif

*/


// X, Y, Z-Coordinates
u8g.setFont(FONT_STATUSMENU);
u8g.drawBox(0,29,128,10);
u8g.setColorIndex(0); // white on black
/* REMOVING X AND Y COORDINATES FROM STATUS SCREEN
u8g.setPrintPos(2,37);
u8g.print("X");
u8g.drawPixel(8,33);
Expand All @@ -316,6 +338,12 @@ static void lcd_implementation_status_screen()
u8g.drawPixel(49,35);
u8g.setPrintPos(51,37);
u8g.print(ftostr31ns(current_position[Y_AXIS]));
*/
// ADDING NAME TO HOMESCREEN
u8g.setPrintPos(2,37);
u8g.print("NOZZLE HEIGHT");


u8g.setPrintPos(83,37);
u8g.print("Z");
u8g.drawPixel(89,33);
Expand Down
6 changes: 3 additions & 3 deletions Marlin/language.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@
#ifdef CUSTOM_MENDEL_NAME
#define MACHINE_NAME CUSTOM_MENDEL_NAME
#else
#define MACHINE_NAME "Mendel"
#define MACHINE_NAME "Orion"
#endif

// Default firmware set to Mendel
#define FIRMWARE_URL "https://github.com/ErikZalm/Marlin/"
#define FIRMWARE_URL "https://github.com/seemecnc/Marlin"
#endif


#ifndef MACHINE_UUID
#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
#define MACHINE_UUID "1"
#endif


Expand Down
Loading