From 7ae548cf34f44f99ceb4892a6aaa155786035d76 Mon Sep 17 00:00:00 2001 From: Luis E Alvarado Date: Wed, 7 Jan 2015 04:04:43 -0600 Subject: [PATCH 01/35] Update Marlin Firmware URL --- Marlin/language.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/language.h b/Marlin/language.h index 3adf265e54..36f42217fd 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -37,13 +37,13 @@ #define FIRMWARE_URL "http://firmware.ultimaker.com" #elif MB(RUMBA) #define MACHINE_NAME "Rumba" - #define FIRMWARE_URL "https://github.com/ErikZalm/Marlin/" + #define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin" #elif MB(3DRAG) #define MACHINE_NAME "3Drag" #define FIRMWARE_URL "http://3dprint.elettronicain.it/" #elif MB(5DPRINT) #define MACHINE_NAME "Makibox" - #define FIRMWARE_URL "https://github.com/ErikZalm/Marlin/" + #define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin" #elif MB(SAV_MKI) #define MACHINE_NAME "SAV MkI" #define FIRMWARE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" @@ -55,7 +55,7 @@ #endif // Default firmware set to Mendel - #define FIRMWARE_URL "https://github.com/ErikZalm/Marlin/" + #define FIRMWARE_URL "https://github.com/MarlinFirmware/Marlin" #endif From b291a422e994a160d2d2522827732ef7d5f12cd5 Mon Sep 17 00:00:00 2001 From: Bo Herrmannsen Date: Wed, 7 Jan 2015 13:00:37 +0100 Subject: [PATCH 02/35] added square png version of logo 406*406 pixels --- Marlin/documentation/marlin logoscript.png | Bin 0 -> 9662 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Marlin/documentation/marlin logoscript.png diff --git a/Marlin/documentation/marlin logoscript.png b/Marlin/documentation/marlin logoscript.png new file mode 100644 index 0000000000000000000000000000000000000000..96a337f8bf52e404a8f6981827a4803be0efb0fd GIT binary patch literal 9662 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 Date: Wed, 7 Jan 2015 14:27:51 +0100 Subject: [PATCH 03/35] changed reprap logo to marlin logo --- Marlin/DOGMbitmaps.h | 124 +++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 64 deletions(-) diff --git a/Marlin/DOGMbitmaps.h b/Marlin/DOGMbitmaps.h index d4b8659a0a..4e7bcec04d 100644 --- a/Marlin/DOGMbitmaps.h +++ b/Marlin/DOGMbitmaps.h @@ -2,70 +2,66 @@ #define START_BMPHEIGHT 64 //Height in pixels #define START_BMPBYTEWIDTH 8 //Width in bytes const unsigned char start_bmp[574] PROGMEM = { //AVR-GCC, WinAVR -0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFF,0xF9,0xFF,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFF,0xF0,0xFF,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFF,0xE0,0x7F,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFF,0xC0,0x3F,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFF,0x80,0x1F,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFF,0x00,0x0F,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFE,0x00,0x07,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFC,0x00,0x03,0xFF,0xFF,0xF0, -0xFF,0xFF,0xF8,0x00,0x01,0xFF,0xFF,0xF0, -0xFF,0xFF,0xF0,0x00,0x00,0xFF,0xFF,0xF0, -0xFF,0xFF,0xE0,0x00,0x00,0x7F,0xFF,0xF0, -0xFF,0xFF,0xC0,0x00,0x00,0x3F,0xFF,0xF0, -0xFF,0xFF,0x80,0x00,0x00,0x3F,0xFF,0xF0, -0xFF,0xFF,0x00,0x00,0x00,0x1F,0xFF,0xF0, -0xFF,0xFE,0x00,0x00,0x00,0x0F,0xFF,0xF0, -0xFF,0xFE,0x00,0x00,0x00,0x07,0xFF,0xF0, -0xFF,0xFC,0x00,0x00,0x00,0x07,0xFF,0xF0, -0xFF,0xFC,0x00,0x00,0x00,0x03,0xFF,0xF0, -0xFF,0xF8,0x00,0x00,0x00,0x03,0xFF,0xF0, -0xFF,0xF8,0x00,0x00,0x00,0x03,0xFF,0xF0, -0xFF,0xF8,0x00,0x00,0x00,0x01,0xFF,0xF0, -0xFF,0xF8,0x00,0x00,0x00,0x01,0xFF,0xF0, -0xFF,0xF8,0x00,0x00,0x00,0x01,0xFF,0xF0, -0xFF,0xF8,0x00,0x00,0x00,0x01,0xFF,0xF0, -0xFF,0xF8,0x00,0x00,0x00,0x01,0xFF,0xF0, -0xFF,0xF8,0x00,0x00,0x00,0x01,0xFF,0xF0, -0xFF,0xF8,0x00,0x00,0x00,0x01,0xFF,0xF0, -0xFF,0xF8,0x00,0x00,0x00,0x01,0xFF,0xF0, -0xFF,0xF8,0x00,0x00,0x00,0x03,0xFF,0xF0, -0xFF,0xF8,0x00,0x00,0x00,0x03,0xFF,0xF0, -0xFF,0xFC,0x00,0x00,0x00,0x03,0xFF,0xF0, -0xFF,0xFC,0x00,0x00,0x00,0x07,0xFF,0xF0, -0xFF,0xFE,0x00,0x00,0x00,0x07,0xFF,0xF0, -0xFF,0xFE,0x00,0x00,0x00,0x0F,0xFF,0xF0, -0xFF,0xFF,0x00,0x00,0x00,0x1F,0xFF,0xF0, -0xFF,0xFF,0x80,0x00,0x00,0x1F,0xFF,0xF0, -0xFF,0xFF,0xC0,0x00,0x00,0x3F,0xFF,0xF0, -0xFF,0xFF,0xE0,0x00,0x00,0x7F,0xFF,0xF0, -0xFF,0xFF,0xF0,0x00,0x01,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFC,0x00,0x03,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFF,0x00,0x1F,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, -0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, -0x83,0xFF,0xFF,0xFE,0x0F,0xFF,0xFF,0xF0, -0x80,0xFF,0xFF,0xFE,0x03,0xFF,0xFF,0xF0, -0x88,0x7F,0xFF,0xFE,0x23,0xFF,0xFF,0xF0, -0x8C,0x70,0x38,0x0E,0x71,0x81,0xC0,0x70, -0x8C,0x60,0x38,0x0E,0x63,0x80,0xC0,0x30, -0x80,0xE3,0x19,0xC6,0x07,0xF8,0xC7,0x30, -0x80,0xE0,0x19,0xC6,0x03,0x80,0xC7,0x10, -0x8C,0x62,0x79,0xC6,0x63,0x9C,0xC7,0x30, -0x8C,0x63,0xF8,0xC6,0x71,0x18,0xC6,0x30, -0x8E,0x30,0x18,0x0E,0x71,0x80,0xC0,0x30, -0x9E,0x38,0x39,0x1E,0x79,0xC4,0xC4,0xF0, -0xFF,0xFF,0xF9,0xFF,0xFF,0xFF,0xC7,0xF0, -0xFF,0xFF,0xF9,0xFF,0xFF,0xFF,0xC7,0xF0, -0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0 +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x0f,0xff,0xff,0xff,0xff,0xff,0xff,0xef, +0x30,0x00,0x00,0x00,0x00,0x00,0x7f,0xff, +0x60,0x00,0x00,0x00,0x00,0x00,0x1f,0xff, +0x40,0x00,0x00,0x00,0x00,0x00,0x0f,0xff, +0x40,0x00,0x00,0x00,0x01,0x80,0x0f,0xff, +0x83,0xef,0xc0,0x00,0x01,0x8c,0x07,0xff, +0x87,0xff,0xe0,0x00,0x01,0x8c,0x03,0xff, +0x86,0x38,0x60,0x00,0x01,0x80,0x01,0xff, +0x86,0x18,0x63,0xe0,0xf9,0x8c,0x7c,0xff, +0x86,0x18,0x67,0xf1,0xfd,0x8c,0xfe,0x7f, +0x86,0x18,0x6e,0x31,0x8d,0x8c,0xc6,0x3f, +0x86,0x18,0x6c,0x39,0x8d,0x8c,0xc7,0x1f, +0x86,0x18,0x6c,0x19,0x81,0x8c,0xc7,0x1f, +0x86,0x18,0x6c,0x19,0x81,0x8c,0xc7,0x1f, +0x86,0x18,0x6f,0x9f,0x81,0xcd,0xc7,0x1f, +0x06,0x18,0x67,0xdf,0x80,0xef,0xc7,0x1f, +0x44,0x18,0x61,0x9f,0x00,0x2f,0xc2,0x2f, +0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x2f, +0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x4f, +0x1f,0xff,0xff,0xff,0xff,0xff,0xff,0x8f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f }; // Here comes a compile-time operation to match the extruder symbols From 3c9e6b7b6244c73fcfee32eccaae7bfa9e13b500 Mon Sep 17 00:00:00 2001 From: Bo Herrmannsen Date: Wed, 7 Jan 2015 14:28:51 +0100 Subject: [PATCH 04/35] added link for pic to hex converter --- Marlin/DOGMbitmaps.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/DOGMbitmaps.h b/Marlin/DOGMbitmaps.h index 4e7bcec04d..de4365437c 100644 --- a/Marlin/DOGMbitmaps.h +++ b/Marlin/DOGMbitmaps.h @@ -1,4 +1,4 @@ -#define START_BMPWIDTH 60 //Width in pixels +#define START_BMPWIDTH 60 //Width in pixels - http://www.digole.com/tools/PicturetoC_Hex_converter.php #define START_BMPHEIGHT 64 //Height in pixels #define START_BMPBYTEWIDTH 8 //Width in bytes const unsigned char start_bmp[574] PROGMEM = { //AVR-GCC, WinAVR From 8d7bfd03d8a409311b2680af4b8a4c467948220e Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 7 Jan 2015 15:33:50 +0100 Subject: [PATCH 05/35] moved/renamed documentation stuff to top-level directory --- .../LCD Menu Tree.pdf | Bin .../Logo/Marlin Logo.ai | 0 .../Logo/Marlin Logo.cdr | Bin .../Logo/Marlin Logo.dxf | 0 .../Logo/Marlin Logo.pdf | Bin .../Logo/Marlin Logo.png | Bin .../Logo/Marlin Logo.svg | 0 .../documentation => Documentation}/Menu Plans.xlsx | Bin 8 files changed, 0 insertions(+), 0 deletions(-) rename {Marlin/documentation => Documentation}/LCD Menu Tree.pdf (100%) rename Marlin/documentation/marlin logoscript.ai => Documentation/Logo/Marlin Logo.ai (100%) rename Marlin/documentation/marlin logoscript.cdr => Documentation/Logo/Marlin Logo.cdr (100%) rename Marlin/documentation/marlin logoscript.dxf => Documentation/Logo/Marlin Logo.dxf (100%) rename Marlin/documentation/marlin logoscript.pdf => Documentation/Logo/Marlin Logo.pdf (100%) rename Marlin/documentation/marlin logoscript.png => Documentation/Logo/Marlin Logo.png (100%) rename Marlin/documentation/marlin logoscript.svg => Documentation/Logo/Marlin Logo.svg (100%) rename {Marlin/documentation => Documentation}/Menu Plans.xlsx (100%) diff --git a/Marlin/documentation/LCD Menu Tree.pdf b/Documentation/LCD Menu Tree.pdf similarity index 100% rename from Marlin/documentation/LCD Menu Tree.pdf rename to Documentation/LCD Menu Tree.pdf diff --git a/Marlin/documentation/marlin logoscript.ai b/Documentation/Logo/Marlin Logo.ai similarity index 100% rename from Marlin/documentation/marlin logoscript.ai rename to Documentation/Logo/Marlin Logo.ai diff --git a/Marlin/documentation/marlin logoscript.cdr b/Documentation/Logo/Marlin Logo.cdr similarity index 100% rename from Marlin/documentation/marlin logoscript.cdr rename to Documentation/Logo/Marlin Logo.cdr diff --git a/Marlin/documentation/marlin logoscript.dxf b/Documentation/Logo/Marlin Logo.dxf similarity index 100% rename from Marlin/documentation/marlin logoscript.dxf rename to Documentation/Logo/Marlin Logo.dxf diff --git a/Marlin/documentation/marlin logoscript.pdf b/Documentation/Logo/Marlin Logo.pdf similarity index 100% rename from Marlin/documentation/marlin logoscript.pdf rename to Documentation/Logo/Marlin Logo.pdf diff --git a/Marlin/documentation/marlin logoscript.png b/Documentation/Logo/Marlin Logo.png similarity index 100% rename from Marlin/documentation/marlin logoscript.png rename to Documentation/Logo/Marlin Logo.png diff --git a/Marlin/documentation/marlin logoscript.svg b/Documentation/Logo/Marlin Logo.svg similarity index 100% rename from Marlin/documentation/marlin logoscript.svg rename to Documentation/Logo/Marlin Logo.svg diff --git a/Marlin/documentation/Menu Plans.xlsx b/Documentation/Menu Plans.xlsx similarity index 100% rename from Marlin/documentation/Menu Plans.xlsx rename to Documentation/Menu Plans.xlsx From 3d2b471c1aa55bd8c008e45302e3683ac58053d9 Mon Sep 17 00:00:00 2001 From: Bo Herrmannsen Date: Wed, 7 Jan 2015 21:05:28 +0100 Subject: [PATCH 06/35] added link to google hangout --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 4fdc50c191..97d0161849 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,12 @@ IRC channel on freenode: #marlin-firmware (baaaah, #marlin was taken) +If a google hangout is needed then use this link: + +https://plus.google.com/hangouts/_/event/cps5d0ru0iruhl6ebqbk9dpqpa4?authuser=0&hl=da + +It's valid for the next 10 years, must remember to renew then :-P + Developer Notes =================== From 269ec9f87f6a968dafa210a0dc9749f03e75e102 Mon Sep 17 00:00:00 2001 From: andrewsil1 Date: Wed, 7 Jan 2015 12:41:09 -0800 Subject: [PATCH 07/35] Fix grammar/typos in new Configuration.h option (For the SLOW_PWM_HEATERS option) --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 6a8fd36789..aacd69295e 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -148,7 +148,7 @@ #ifdef PIDTEMP //#define PID_DEBUG // Sends debug data to the serial port. //#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX - //#define SLOW_PWM_HEATERS // PWM with very low frequency (circa 0.125Hz=8s) and miminum state time of circa 1s usefoul for heater drived by relay + //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max. #define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term From 3a30d45c2ec3ea997e69294092351a5eb8c5c987 Mon Sep 17 00:00:00 2001 From: Erik van der Zalm Date: Wed, 7 Jan 2015 23:40:17 +0100 Subject: [PATCH 08/35] Revert "issue 968 for dev branch" --- Marlin/Marlin_main.cpp | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index b8ab94fa88..e3e5ef3588 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -376,7 +376,6 @@ const int sensitive_pins[] = SENSITIVE_PINS; // Sensitive pin list for M42 //Inactivity shutdown variables static unsigned long previous_millis_cmd = 0; -static unsigned long previous_millis_ok = 0; static unsigned long max_inactive_time = 0; static unsigned long stepper_inactive_time = DEFAULT_STEPPER_DEACTIVE_TIME*1000l; @@ -646,7 +645,6 @@ void loop() else { SERIAL_PROTOCOLLNPGM(MSG_OK); - previous_millis_ok = millis(); } } else @@ -3157,13 +3155,12 @@ Sigma_Exit: } } else if (servo_index >= 0) { - SERIAL_PROTOCOL(MSG_OK); + SERIAL_PROTOCOL(MSG_OK); SERIAL_PROTOCOL(" Servo "); SERIAL_PROTOCOL(servo_index); SERIAL_PROTOCOL(": "); SERIAL_PROTOCOL(servos[servo_index].read()); SERIAL_PROTOCOLLN(""); - previous_millis_ok = millis(); } } break; @@ -3238,7 +3235,6 @@ Sigma_Exit: SERIAL_PROTOCOL(" d:"); SERIAL_PROTOCOL(unscalePID_d(bedKd)); SERIAL_PROTOCOLLN(""); - previous_millis_ok = millis(); } break; #endif //PIDTEMP @@ -3529,7 +3525,6 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp SERIAL_ECHO_START; SERIAL_ECHOLNPGM(MSG_ZPROBE_ZOFFSET " " MSG_OK); SERIAL_PROTOCOLLN(""); - previous_millis_ok = millis(); } else { @@ -3916,7 +3911,6 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp ClearToSend(); } - void FlushSerialRequestResend() { //char cmdbuffer[bufindr][100]="Resend:"; @@ -3934,7 +3928,6 @@ void ClearToSend() return; #endif //SDSUPPORT SERIAL_PROTOCOLLNPGM(MSG_OK); - previous_millis_ok = millis(); } void get_coordinates() @@ -4359,14 +4352,6 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s if( (millis() - previous_millis_cmd) > max_inactive_time ) if(max_inactive_time) kill(); - - // If 'OK' is garbled on sending PC won't receive it. Both machines will wait on each other forever. - // This resends OK if nothing is heard from PC for a while to avoid this bad case. - if( (millis() - previous_millis_ok) > max_inactive_time/4 ) { - SERIAL_PROTOCOL(MSG_OK); - previous_millis_ok=millis(); - } - if(stepper_inactive_time) { if( (millis() - previous_millis_cmd) > stepper_inactive_time ) { From fdf9dbb6fe4be03ad9835dfdac72ee047d5997b4 Mon Sep 17 00:00:00 2001 From: Bo Herrmannsen Date: Wed, 7 Jan 2015 21:05:28 +0100 Subject: [PATCH 09/35] added link to google hangout --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 4fdc50c191..97d0161849 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,12 @@ IRC channel on freenode: #marlin-firmware (baaaah, #marlin was taken) +If a google hangout is needed then use this link: + +https://plus.google.com/hangouts/_/event/cps5d0ru0iruhl6ebqbk9dpqpa4?authuser=0&hl=da + +It's valid for the next 10 years, must remember to renew then :-P + Developer Notes =================== From 489b4fd3a5cf6bb813f979314e805f2d00f55546 Mon Sep 17 00:00:00 2001 From: andrewsil1 Date: Wed, 7 Jan 2015 12:41:09 -0800 Subject: [PATCH 10/35] Fix grammar/typos in new Configuration.h option (For the SLOW_PWM_HEATERS option) --- Marlin/Configuration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 6a8fd36789..aacd69295e 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -148,7 +148,7 @@ #ifdef PIDTEMP //#define PID_DEBUG // Sends debug data to the serial port. //#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX - //#define SLOW_PWM_HEATERS // PWM with very low frequency (circa 0.125Hz=8s) and miminum state time of circa 1s usefoul for heater drived by relay + //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max. #define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term From a06700a14b1e49c19206d67c9b2bbb7ac237e390 Mon Sep 17 00:00:00 2001 From: Erik van der Zalm Date: Wed, 7 Jan 2015 23:40:17 +0100 Subject: [PATCH 11/35] Revert "issue 968 for dev branch" --- Marlin/Marlin_main.cpp | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index b8ab94fa88..e3e5ef3588 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -376,7 +376,6 @@ const int sensitive_pins[] = SENSITIVE_PINS; // Sensitive pin list for M42 //Inactivity shutdown variables static unsigned long previous_millis_cmd = 0; -static unsigned long previous_millis_ok = 0; static unsigned long max_inactive_time = 0; static unsigned long stepper_inactive_time = DEFAULT_STEPPER_DEACTIVE_TIME*1000l; @@ -646,7 +645,6 @@ void loop() else { SERIAL_PROTOCOLLNPGM(MSG_OK); - previous_millis_ok = millis(); } } else @@ -3157,13 +3155,12 @@ Sigma_Exit: } } else if (servo_index >= 0) { - SERIAL_PROTOCOL(MSG_OK); + SERIAL_PROTOCOL(MSG_OK); SERIAL_PROTOCOL(" Servo "); SERIAL_PROTOCOL(servo_index); SERIAL_PROTOCOL(": "); SERIAL_PROTOCOL(servos[servo_index].read()); SERIAL_PROTOCOLLN(""); - previous_millis_ok = millis(); } } break; @@ -3238,7 +3235,6 @@ Sigma_Exit: SERIAL_PROTOCOL(" d:"); SERIAL_PROTOCOL(unscalePID_d(bedKd)); SERIAL_PROTOCOLLN(""); - previous_millis_ok = millis(); } break; #endif //PIDTEMP @@ -3529,7 +3525,6 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp SERIAL_ECHO_START; SERIAL_ECHOLNPGM(MSG_ZPROBE_ZOFFSET " " MSG_OK); SERIAL_PROTOCOLLN(""); - previous_millis_ok = millis(); } else { @@ -3916,7 +3911,6 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp ClearToSend(); } - void FlushSerialRequestResend() { //char cmdbuffer[bufindr][100]="Resend:"; @@ -3934,7 +3928,6 @@ void ClearToSend() return; #endif //SDSUPPORT SERIAL_PROTOCOLLNPGM(MSG_OK); - previous_millis_ok = millis(); } void get_coordinates() @@ -4359,14 +4352,6 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s if( (millis() - previous_millis_cmd) > max_inactive_time ) if(max_inactive_time) kill(); - - // If 'OK' is garbled on sending PC won't receive it. Both machines will wait on each other forever. - // This resends OK if nothing is heard from PC for a while to avoid this bad case. - if( (millis() - previous_millis_ok) > max_inactive_time/4 ) { - SERIAL_PROTOCOL(MSG_OK); - previous_millis_ok=millis(); - } - if(stepper_inactive_time) { if( (millis() - previous_millis_cmd) > stepper_inactive_time ) { From 04eafe3d04fdad80383d654617049fe2a809b2a9 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 18:08:25 +0100 Subject: [PATCH 12/35] splitted huge README.md in several sections and moved them to the Documentation directory --- Documentation/BedLeveling.md | 105 ++++++++ Documentation/Compilation.md | 29 +++ Documentation/Contributing.md | 10 + Documentation/Features.md | 128 ++++++++++ Documentation/FilamentSensor.md | 9 + Documentation/GCodes.md | 0 README.md | 431 ++------------------------------ 7 files changed, 302 insertions(+), 410 deletions(-) create mode 100644 Documentation/BedLeveling.md create mode 100644 Documentation/Compilation.md create mode 100644 Documentation/Contributing.md create mode 100644 Documentation/Features.md create mode 100644 Documentation/FilamentSensor.md create mode 100644 Documentation/GCodes.md diff --git a/Documentation/BedLeveling.md b/Documentation/BedLeveling.md new file mode 100644 index 0000000000..62566ac7ba --- /dev/null +++ b/Documentation/BedLeveling.md @@ -0,0 +1,105 @@ +=============================================== +Instructions for configuring Bed Auto Leveling +=============================================== +There are two options for this feature. You may choose to use a servo mounted on the X carriage or you may use a sled that mounts on the X axis and can be docked when not in use. +See the section for each option below for specifics about installation and configuration. Also included are instructions that apply to both options. + +Instructions for Both Options +----------------------------- + +Uncomment the "ENABLE_AUTO_BED_LEVELING" define (commented by default) + +The following options define the probing positions. These are good starting values. +I recommend to keep a better clearance from borders in the first run and then make the probes as close as possible to borders: + +* \#define LEFT_PROBE_BED_POSITION 30 +* \#define RIGHT_PROBE_BED_POSITION 140 +* \#define BACK_PROBE_BED_POSITION 140 +* \#define FRONT_PROBE_BED_POSITION 30 + +A few more options: + +* \#define XY_TRAVEL_SPEED 6000 + +X and Y axis travel speed between probes, in mm/min. +Bear in mind that really fast moves may render step skipping. 6000 mm/min (100mm/s) is a good value. + +* \#define Z_RAISE_BEFORE_PROBING 10 +* \#define Z_RAISE_BETWEEN_PROBINGS 10 + +The Z axis is lifted when traveling to the first probe point by Z_RAISE_BEFORE_PROBING value +and then lifted when traveling from first to second and second to third point by Z_RAISE_BETWEEN_PROBINGS. +All values are in mm as usual. + +Servo Option Notes +------------------ +You will probably need a swivel Z-MIN endstop in the extruder. A rc servo do a great job. +Check the system working here: http://www.youtube.com/watch?v=3IKMeOYz-1Q (Enable English subtitles) +Teasing ;-) video: http://www.youtube.com/watch?v=x8eqSQNAyro + +In order to get the servo working, you need to enable: + +* \#define NUM_SERVOS 1 // Servo index starts with 0 for M280 command + +* \#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1 + +* \#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 165,60} // X,Y,Z Axis Extend and Retract angles + +The first define tells firmware how many servos you have. +The second tells what axis this servo will be attached to. In the example above, we have a servo in Z axis. +The third one tells the angle in 2 situations: Probing (165º) and resting (60º). Check this with command M280 P0 S{angle} (example: M280 P0 S60 moves the servo to 60º) + +Next you need to define the Z endstop (probe) offset from hotend. +My preferred method: + +* a) Make a small mark in the bed with a marker/felt-tip pen. +* b) Place the hotend tip as *exactly* as possible on the mark, touching the bed. Raise the hotend 0.1mm (a regular paper thickness) and zero all axis (G92 X0 Y0 Z0); +* d) Raise the hotend 10mm (or more) for probe clearance, lower the Z probe (Z-Endstop) with M401 and place it just on that mark by moving X, Y and Z; +* e) Lower the Z in 0.1mm steps, with the probe always touching the mark (it may be necessary to adjust X and Y as well) until you hear the "click" meaning the mechanical endstop was trigged. You can confirm with M119; +* f) Now you have the probe in the same place as your hotend tip was before. Perform a M114 and write down the values, for example: X:24.3 Y:-31.4 Z:5.1; +* g) You can raise the z probe with M402 command; +* h) Fill the defines bellow multiplying the values by "-1" (just change the signal) + + +* \#define X_PROBE_OFFSET_FROM_EXTRUDER -24.3 +* \#define Y_PROBE_OFFSET_FROM_EXTRUDER 31.4 +* \#define Z_PROBE_OFFSET_FROM_EXTRUDER -5.1 + +Sled Option Notes +----------------- +The sled option uses an electromagnet to attach and detach to/from the X carriage. See http://www.thingiverse.com/thing:396692 for more details on how to print and install this feature. It uses the same connections as the servo option. + +To use the sled option, you must define two additional things in Configuration.h: + +* \#define Z_PROBE_SLED +* \#define SLED_DOCKING_OFFSET 5 + +Uncomment the Z_PROBE_SLED to define to enable the sled (commented out by default). + +Uncomment the SLED_DOCKING_OFFSET to set the extra distance the X axis must travel to dock the sled. This value can be found by moving the X axis to its maximum position then measure the distance to the right X end and subtract the width of the sled (23mm if you printed the sled from Thingiverse). + +Next you need to define the Z endstop (probe) offset from hotend. +My preferred method: + +* a) Home the X and Y axes. +* b) Move the X axis to about the center of the print bed. Make a mark on the print bed. +* c) Move the Y axis to the maximum position. Make another mark. +* d) Home the X axis and use a straight edge to make a line between the two points. +* e) Repeat (b)-(d) reversing the X and Y. When you are done you will have two lines on the print bed. We will use these to measure the offset for the Z probe endstop. +* f) Move the nozzle so that it is positioned on the center point of the two lines. You can use fine movement of 0.1mm to get it as close as possible. Note the position of X and Y. +* g) Zero the Z axis with the G92 Z0 command. +* h) Raise the Z axis about 20mmm. +* i) Use the G32 command to retrieve the sled. +* j) Now more the X and Y axis to the position recorded in (f). +* k) Lower the Z axis in 0.1mm steps until you hear the "click" meaning the mechanical endstop was trigged. You can confirm with the M119 command. Note the position of the Z axis. +* l) Make a mark on the print bed where the endstop lever has touched the print bed. Raise the Z-axis about 30mm to give yourself some room. +* m) Now measure the distance from the center point to the endstop impact site along the X and Y axis using the lines drawn previously. +* n) Fill in the values below. If the endstop mark is in front of the line running left-to-right, use positive values. If it is behind, use negative values. For the Z axis use the value from (k) and subtract 0.1mm. + +For example, suppose you measured the endstop position and it was 20mm to the right of the line running front-to-back, 10mm toward the front of the line running left-to-right, and the value from (k) was 2.85. The values for the defines would be: + +* \#define X_PROBE_OFFSET_FROM_EXTRUDER 20 +* \#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 +* \#define Z_PROBE_OFFSET_FROM_EXTRUDER 2.75 + +That's it.. enjoy never having to calibrate your Z endstop neither leveling your bed by hand anymore ;-) diff --git a/Documentation/Compilation.md b/Documentation/Compilation.md new file mode 100644 index 0000000000..f36c7d88ff --- /dev/null +++ b/Documentation/Compilation.md @@ -0,0 +1,29 @@ +Configuring and compilation: + +Install the latest non-beta arduino software IDE/toolset + http://www.arduino.cc/en/Main/Software + +Download the Marlin firmware + https://github.com/MarlinFirmware/Marlin/tree/development + + For the latest development, or + + + + For the latest stable release + + In both cases use the "Download Zip" button on the right. + +For some spec. boards a spec. dir in the ArduinoAddons directory in the Marlin dir needs to be copied to the arduino environment. \hardware\ + +Start the arduino IDE. +Select Tools -> Board -> Arduino Mega 2560 or your microcontroller +Select the correct serial port in Tools ->Serial Port +Open Marlin.pde or .ino + +Click the Verify/Compile button + +Click the Upload button +If all goes well the firmware is uploading + +That's ok. Enjoy Silky Smooth Printing. \ No newline at end of file diff --git a/Documentation/Contributing.md b/Documentation/Contributing.md new file mode 100644 index 0000000000..2caa96442a --- /dev/null +++ b/Documentation/Contributing.md @@ -0,0 +1,10 @@ +Developer Notes +=================== + +- There are now 2 branches: The __development__ branch is where new features and code changes will be sorted out. This branch may have untested code in it, so please let us know if you find any bugs. When the __development__ branch has reached a state where it is stable, it will be moved to the __stable__ branch. + +- We are doing a kind of cleanup in the list of Issues and Pull Requests, the aim is to get to a state where we can certify the code as stable. To get the code tested as widely as possible we require several volunteers with a wide variety of hardware configurations willing to test the firmware and help us to certify it as stable. If you want to help out testing go to this issue and let us know: https://github.com/MarlinFirmware/Marlin/issues/1209 + +- Before you submit any pull request, we ask that you _PLEASE_ test your code before submission, even if the change seems innocuous. When creating the pull request, please include the hardware you used for testing and a short synopsis of your testing procedure. Untested pull requests are less likely to be merged, as even slight changes create the risk of breaking the main branch. + +- If you have a fix don't open an issue telling about it, but test the code and submit a pull request. Use the __development__ branch when you submit. \ No newline at end of file diff --git a/Documentation/Features.md b/Documentation/Features.md new file mode 100644 index 0000000000..304c638f9f --- /dev/null +++ b/Documentation/Features.md @@ -0,0 +1,128 @@ + +Features: +========= + +* Interrupt based movement with real linear acceleration +* High steprate +* Look ahead (Keep the speed high when possible. High cornering speed) +* Interrupt based temperature protection +* preliminary support for Matthew Roberts advance algorithm + For more info see: http://reprap.org/pipermail/reprap-dev/2011-May/003323.html +* Full endstop support +* SD Card support +* SD Card folders (works in pronterface) +* SD Card autostart support +* LCD support (ideally 20x4) +* LCD menu system for autonomous SD card printing, controlled by an click-encoder. +* EEPROM storage of e.g. max-velocity, max-acceleration, and similar variables +* many small but handy things originating from bkubicek's fork. +* Arc support +* Temperature oversampling +* Dynamic Temperature setpointing aka "AutoTemp" +* Support for QTMarlin, a very beta GUI for PID-tuning and velocity-acceleration testing. https://github.com/bkubicek/QTMarlin +* Endstop trigger reporting to the host software. +* Updated sdcardlib +* Heater power reporting. Useful for PID monitoring. +* PID tuning +* CoreXY kinematics (www.corexy.com/theory.html) +* Delta kinematics +* SCARA kinematics +* Dual X-carriage support for multiple extruder systems +* Configurable serial port to support connection of wireless adaptors. +* Automatic operation of extruder/cold-end cooling fans based on nozzle temperature +* RC Servo Support, specify angle or duration for continuous rotation servos. +* Bed Auto Leveling. +* Support for a filament diameter sensor, which adjusts extrusion volume + +The default baudrate is 250000. This baudrate has less jitter and hence errors than the usual 115200 baud, but is less supported by drivers and host-environments. + + +Differences and additions to the already good Sprinter firmware: +================================================================ + +Look-ahead: +----------- + +Marlin has look-ahead. While sprinter has to break and re-accelerate at each corner, +lookahead will only decelerate and accelerate to a velocity, +so that the change in vectorial velocity magnitude is less than the xy_jerk_velocity. +This is only possible, if some future moves are already processed, hence the name. +It leads to less over-deposition at corners, especially at flat angles. + +Arc support: +------------ + +Slic3r can find curves that, although broken into segments, were ment to describe an arc. +Marlin is able to print those arcs. The advantage is the firmware can choose the resolution, +and can perform the arc with nearly constant velocity, resulting in a nice finish. +Also, less serial communication is needed. + +Temperature Oversampling: +------------------------- + +To reduce noise and make the PID-differential term more useful, 16 ADC conversion results are averaged. + +AutoTemp: +--------- + +If your gcode contains a wide spread of extruder velocities, or you realtime change the building speed, the temperature should be changed accordingly. +Usually, higher speed requires higher temperature. +This can now be performed by the AutoTemp function +By calling M109 S B F you enter the autotemp mode. + +You can leave it by calling M109 without any F. +If active, the maximal extruder stepper rate of all buffered moves will be calculated, and named "maxerate" [steps/sec]. +The wanted temperature then will be set to t=tempmin+factor*maxerate, while being limited between tempmin and tempmax. +If the target temperature is set manually or by gcode to a value less then tempmin, it will be kept without change. +Ideally, your gcode can be completely free of temperature controls, apart from a M109 S T F in the start.gcode, and a M109 S0 in the end.gcode. + +EEPROM: +------- + +If you know your PID values, the acceleration and max-velocities of your unique machine, you can set them, and finally store them in the EEPROM. +After each reboot, it will magically load them from EEPROM, independent what your Configuration.h says. + +LCD Menu: +--------- + +If your hardware supports it, you can build yourself a LCD-CardReader+Click+encoder combination. It will enable you to realtime tune temperatures, +accelerations, velocities, flow rates, select and print files from the SD card, preheat, disable the steppers, and do other fancy stuff. +One working hardware is documented here: http://www.thingiverse.com/thing:12663 +Also, with just a 20x4 or 16x2 display, useful data is shown. + +SD card folders: +---------------- + +If you have an SD card reader attached to your controller, also folders work now. Listing the files in pronterface will show "/path/subpath/file.g". +You can write to file in a subfolder by specifying a similar text using small letters in the path. +Also, backup copies of various operating systems are hidden, as well as files not ending with ".g". + +SD card folders: +---------------- + +If you place a file auto[0-9].g into the root of the sd card, it will be automatically executed if you boot the printer. The same file will be executed by selecting "Autostart" from the menu. +First *0 will be performed, than *1 and so on. That way, you can heat up or even print automatically without user interaction. + +Endstop trigger reporting: +-------------------------- + +If an endstop is hit while moving towards the endstop, the location at which the firmware thinks that the endstop was triggered is outputed on the serial port. +This is useful, because the user gets a warning message. +However, also tools like QTMarlin can use this for finding acceptable combinations of velocity+acceleration. + +Coding paradigm: +---------------- + +Not relevant from a user side, but Marlin was split into thematic junks, and has tried to partially enforced private variables. +This is intended to make it clearer, what interacts which what, and leads to a higher level of modularization. +We think that this is a useful prestep for porting this firmware to e.g. an ARM platform in the future. +A lot of RAM (with enabled LCD ~2200 bytes) was saved by storing char []="some message" in Program memory. +In the serial communication, a #define based level of abstraction was enforced, so that it is clear that +some transfer is information (usually beginning with "echo:"), an error "error:", or just normal protocol, +necessary for backwards compatibility. + +Interrupt based temperature measurements: +----------------------------------------- + +An interrupt is used to manage ADC conversions, and enforce checking for critical temperatures. +This leads to less blocking in the heater management routine. diff --git a/Documentation/FilamentSensor.md b/Documentation/FilamentSensor.md new file mode 100644 index 0000000000..46e4251c1b --- /dev/null +++ b/Documentation/FilamentSensor.md @@ -0,0 +1,9 @@ +Filament Sensor +--------------- +Supports the use of a real time filament diameter sensor that measures the diameter of the filament going into the extruder and then adjusts the extrusion rate to compensate for filament that does not match what is defined in the g-code. The diameter can also be displayed on the LCD screen. This potentially eliminates the need to measure filament diameter when changing spools of filament. Gcode becomes independent of the filament diameter. Can also compensate for changing diameter. + +For examples of these sensors, see: http://www.thingiverse.com/thing:454584, https://www.youmagine.com/designs/filament-diameter-sensor, http://diy3dprinting.blogspot.com/2014/01/diy-filament-diameter-sensor.html. Any sensor which produces a voltage equivalent to the diameter in mm (i.e. 1v = 1mm) can be used. This provides a very simple interface and may encourage more innovation in this area. + +4 new Mcodes are defined to set relevant parameters: M404, M405, M406, M407 - see above. + + Implements a delay buffer to handle the transit delay between where the filament is measured and when it gets to the extruder. \ No newline at end of file diff --git a/Documentation/GCodes.md b/Documentation/GCodes.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/README.md b/README.md index 97d0161849..07ec0de3e9 100644 --- a/README.md +++ b/README.md @@ -1,42 +1,16 @@ -Current Status: Bug Fixing -=================== +# Marlin 3D Printer Firmware -What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201 - -IRC channel on freenode: #marlin-firmware - -(baaaah, #marlin was taken) - -If a google hangout is needed then use this link: - -https://plus.google.com/hangouts/_/event/cps5d0ru0iruhl6ebqbk9dpqpa4?authuser=0&hl=da - -It's valid for the next 10 years, must remember to renew then :-P - -Developer Notes -=================== - -- There are now 2 branches: The __development__ branch is where new features and code changes will be sorted out. This branch may have untested code in it, so please let us know if you find any bugs. When the __development__ branch has reached a state where it is stable, it will be moved to the __stable__ branch. - -- We are doing a kind of cleanup in the list of Issues and Pull Requests, the aim is to get to a state where we can certify the code as stable. To get the code tested as widely as possible we require several volunteers with a wide variety of hardware configurations willing to test the firmware and help us to certify it as stable. If you want to help out testing go to this issue and let us know: https://github.com/MarlinFirmware/Marlin/issues/1209 - -- Before you submit any pull request, we ask that you _PLEASE_ test your code before submission, even if the change seems innocuous. When creating the pull request, please include the hardware you used for testing and a short synopsis of your testing procedure. Untested pull requests are less likely to be merged, as even slight changes create the risk of breaking the main branch. - -- If you have a fix don't open an issue telling about it, but test the code and submit a pull request. Use the __development__ branch when you submit. - -========================== -Marlin 3D Printer Firmware -========================== -[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) -[![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin) - -Marlin has a GPL license because I believe in open development. -Please do not use this code in products (3D printers, CNC etc) that are closed source or are crippled by a patent. + * [Configuration & Compilation](/MarlinFirmware/Marlin/blob/Development/Documentation/Compilation.md) + * Supported + * [Features](/MarlinFirmware/Marlin/blob/Development/Documentation/Features.md) + * [Hardware](/MarlinFirmware/Marlin/blob/Development/Documentation/Hardware.md) + * [GCodes](/MarlinFirmware/Marlin/blob/Development/Documentation/GCodes.md) + * Notes + * [Auto Bed Leveling](/MarlinFirmware/Marlin/blob/Development/Documentation/BedLeveling.md) + * [Filament Sensor](/MarlinFirmware/Marlin/blob/Development/Documentation/FilamentSensor.md) -[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) +## Quick Information -Quick Information -=================== This RepRap firmware is a mashup between Sprinter, grbl and many original parts. Derived from Sprinter and Grbl by Erik van der Zalm. @@ -46,384 +20,21 @@ A fork by bkubicek for the Ultimaker was merged, and further development was aid Some features have been added by: Lampmaker, Bradley Feldman, and others... +## Current Status: Bug Fixing -Features: -========= - -* Interrupt based movement with real linear acceleration -* High steprate -* Look ahead (Keep the speed high when possible. High cornering speed) -* Interrupt based temperature protection -* preliminary support for Matthew Roberts advance algorithm - For more info see: http://reprap.org/pipermail/reprap-dev/2011-May/003323.html -* Full endstop support -* SD Card support -* SD Card folders (works in pronterface) -* SD Card autostart support -* LCD support (ideally 20x4) -* LCD menu system for autonomous SD card printing, controlled by an click-encoder. -* EEPROM storage of e.g. max-velocity, max-acceleration, and similar variables -* many small but handy things originating from bkubicek's fork. -* Arc support -* Temperature oversampling -* Dynamic Temperature setpointing aka "AutoTemp" -* Support for QTMarlin, a very beta GUI for PID-tuning and velocity-acceleration testing. https://github.com/bkubicek/QTMarlin -* Endstop trigger reporting to the host software. -* Updated sdcardlib -* Heater power reporting. Useful for PID monitoring. -* PID tuning -* CoreXY kinematics (www.corexy.com/theory.html) -* Delta kinematics -* SCARA kinematics -* Dual X-carriage support for multiple extruder systems -* Configurable serial port to support connection of wireless adaptors. -* Automatic operation of extruder/cold-end cooling fans based on nozzle temperature -* RC Servo Support, specify angle or duration for continuous rotation servos. -* Bed Auto Leveling. -* Support for a filament diameter sensor, which adjusts extrusion volume - -The default baudrate is 250000. This baudrate has less jitter and hence errors than the usual 115200 baud, but is less supported by drivers and host-environments. - - -Differences and additions to the already good Sprinter firmware: -================================================================ - -Look-ahead: ------------ - -Marlin has look-ahead. While sprinter has to break and re-accelerate at each corner, -lookahead will only decelerate and accelerate to a velocity, -so that the change in vectorial velocity magnitude is less than the xy_jerk_velocity. -This is only possible, if some future moves are already processed, hence the name. -It leads to less over-deposition at corners, especially at flat angles. - -Arc support: ------------- - -Slic3r can find curves that, although broken into segments, were ment to describe an arc. -Marlin is able to print those arcs. The advantage is the firmware can choose the resolution, -and can perform the arc with nearly constant velocity, resulting in a nice finish. -Also, less serial communication is needed. - -Temperature Oversampling: -------------------------- - -To reduce noise and make the PID-differential term more useful, 16 ADC conversion results are averaged. - -AutoTemp: ---------- - -If your gcode contains a wide spread of extruder velocities, or you realtime change the building speed, the temperature should be changed accordingly. -Usually, higher speed requires higher temperature. -This can now be performed by the AutoTemp function -By calling M109 S B F you enter the autotemp mode. - -You can leave it by calling M109 without any F. -If active, the maximal extruder stepper rate of all buffered moves will be calculated, and named "maxerate" [steps/sec]. -The wanted temperature then will be set to t=tempmin+factor*maxerate, while being limited between tempmin and tempmax. -If the target temperature is set manually or by gcode to a value less then tempmin, it will be kept without change. -Ideally, your gcode can be completely free of temperature controls, apart from a M109 S T F in the start.gcode, and a M109 S0 in the end.gcode. - -EEPROM: -------- - -If you know your PID values, the acceleration and max-velocities of your unique machine, you can set them, and finally store them in the EEPROM. -After each reboot, it will magically load them from EEPROM, independent what your Configuration.h says. - -LCD Menu: ---------- - -If your hardware supports it, you can build yourself a LCD-CardReader+Click+encoder combination. It will enable you to realtime tune temperatures, -accelerations, velocities, flow rates, select and print files from the SD card, preheat, disable the steppers, and do other fancy stuff. -One working hardware is documented here: http://www.thingiverse.com/thing:12663 -Also, with just a 20x4 or 16x2 display, useful data is shown. - -SD card folders: ----------------- - -If you have an SD card reader attached to your controller, also folders work now. Listing the files in pronterface will show "/path/subpath/file.g". -You can write to file in a subfolder by specifying a similar text using small letters in the path. -Also, backup copies of various operating systems are hidden, as well as files not ending with ".g". - -SD card folders: ----------------- - -If you place a file auto[0-9].g into the root of the sd card, it will be automatically executed if you boot the printer. The same file will be executed by selecting "Autostart" from the menu. -First *0 will be performed, than *1 and so on. That way, you can heat up or even print automatically without user interaction. - -Endstop trigger reporting: --------------------------- - -If an endstop is hit while moving towards the endstop, the location at which the firmware thinks that the endstop was triggered is outputed on the serial port. -This is useful, because the user gets a warning message. -However, also tools like QTMarlin can use this for finding acceptable combinations of velocity+acceleration. - -Coding paradigm: ----------------- - -Not relevant from a user side, but Marlin was split into thematic junks, and has tried to partially enforced private variables. -This is intended to make it clearer, what interacts which what, and leads to a higher level of modularization. -We think that this is a useful prestep for porting this firmware to e.g. an ARM platform in the future. -A lot of RAM (with enabled LCD ~2200 bytes) was saved by storing char []="some message" in Program memory. -In the serial communication, a #define based level of abstraction was enforced, so that it is clear that -some transfer is information (usually beginning with "echo:"), an error "error:", or just normal protocol, -necessary for backwards compatibility. - -Interrupt based temperature measurements: ------------------------------------------ - -An interrupt is used to manage ADC conversions, and enforce checking for critical temperatures. -This leads to less blocking in the heater management routine. - -Implemented G Codes: -==================== - -* G0 -> G1 -* G1 - Coordinated Movement X Y Z E -* G2 - CW ARC -* G3 - CCW ARC -* G4 - Dwell S or P -* G10 - retract filament according to settings of M207 -* G11 - retract recover filament according to settings of M208 -* G28 - Home all Axis -* G29 - Detailed Z-Probe, probes the bed at 3 points. You must de at the home position for this to work correctly. -* G30 - Single Z Probe, probes bed at current XY location. -* G31 - Dock Z Probe sled (if enabled) -* G32 - Undock Z Probe sled (if enabled) -* G90 - Use Absolute Coordinates -* G91 - Use Relative Coordinates -* G92 - Set current position to cordinates given - -M Codes -* M0 - Unconditional stop - Wait for user to press a button on the LCD (Only if ULTRA_LCD is enabled) -* M1 - Same as M0 -* M17 - Enable/Power all stepper motors -* M18 - Disable all stepper motors; same as M84 -* M20 - List SD card -* M21 - Init SD card -* M22 - Release SD card -* M23 - Select SD file (M23 filename.g) -* M24 - Start/resume SD print -* M25 - Pause SD print -* M26 - Set SD position in bytes (M26 S12345) -* M27 - Report SD print status -* M28 - Start SD write (M28 filename.g) -* M29 - Stop SD write -* M30 - Delete file from SD (M30 filename.g) -* M31 - Output time since last M109 or SD card start to serial -* M32 - Select file and start SD print (Can be used when printing from SD card) -* M42 - Change pin status via gcode Use M42 Px Sy to set pin x to value y, when omitting Px the onboard led will be used. -* M80 - Turn on Power Supply -* M81 - Turn off Power Supply -* M82 - Set E codes absolute (default) -* M83 - Set E codes relative while in Absolute Coordinates (G90) mode -* M84 - Disable steppers until next move, or use S to specify an inactivity timeout, after which the steppers will be disabled. S0 to disable the timeout. -* M85 - Set inactivity shutdown timer with parameter S. To disable set zero (default) -* M92 - Set axis_steps_per_unit - same syntax as G92 -* M104 - Set extruder target temp -* M105 - Read current temp -* M106 - Fan on -* M107 - Fan off -* M109 - Sxxx Wait for extruder current temp to reach target temp. Waits only when heating -* Rxxx Wait for extruder current temp to reach target temp. Waits when heating and cooling -* M112 - Emergency stop -* M114 - Output current position to serial port -* M115 - Capabilities string -* M117 - display message -* M119 - Output Endstop status to serial port -* M126 - Solenoid Air Valve Open (BariCUDA support by jmil) -* M127 - Solenoid Air Valve Closed (BariCUDA vent to atmospheric pressure by jmil) -* M128 - EtoP Open (BariCUDA EtoP = electricity to air pressure transducer by jmil) -* M129 - EtoP Closed (BariCUDA EtoP = electricity to air pressure transducer by jmil) -* M140 - Set bed target temp -* M190 - Sxxx Wait for bed current temp to reach target temp. Waits only when heating -* Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling -* M200 D- set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters). -* M201 - Set max acceleration in units/s^2 for print moves (M201 X1000 Y1000) -* M202 - Set max acceleration in units/s^2 for travel moves (M202 X1000 Y1000) Unused in Marlin!! -* M203 - Set maximum feedrate that your machine can sustain (M203 X200 Y200 Z300 E10000) in mm/sec -* M204 - Set default acceleration: S normal moves T filament only moves (M204 S3000 T7000) im mm/sec^2 also sets minimum segment time in ms (B20000) to prevent buffer underruns and M20 minimum feedrate -* M205 - advanced settings: minimum travel speed S=while printing T=travel only, B=minimum segment time X= maximum xy jerk, Z=maximum Z jerk, E=maximum E jerk -* M206 - set additional homeing offset -* M207 - set retract length S[positive mm] F[feedrate mm/min] Z[additional zlift/hop], stays in mm regardless of M200 setting -* M208 - set recover=unretract length S[positive mm surplus to the M207 S*] F[feedrate mm/min] -* M209 - S<1=true/0=false> enable automatic retract detect if the slicer did not support G10/11: every normal extrude-only move will be classified as retract depending on the direction. -* M218 - set hotend offset (in mm): T X Y -* M220 S- set speed factor override percentage -* M221 S- set extrude factor override percentage -* M240 - Trigger a camera to take a photograph -* M280 - Position an RC Servo P S, ommit S to report back current angle -* M300 - Play beepsound S P -* M301 - Set PID parameters P I and D -* M302 - Allow cold extrudes -* M303 - PID relay autotune S sets the target temperature. (default target temperature = 150C) -* M304 - Set bed PID parameters P I and D -* M400 - Finish all moves -* M401 - Lower z-probe if present -* M402 - Raise z-probe if present -* M404 - N Enter the nominal filament width (3mm, 1.75mm ) or will display nominal filament width without parameters -* M405 - Turn on Filament Sensor extrusion control. Optional D to set delay in centimeters between sensor and extruder -* M406 - Turn off Filament Sensor extrusion control -* M407 - Displays measured filament diameter -* M500 - stores paramters in EEPROM -* M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily). -* M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to. -* M503 - print the current settings (from memory not from eeprom) -* M540 - Use S[0|1] to enable or disable the stop SD card print on endstop hit (requires ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED) -* M600 - Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal] -* M907 - Set digital trimpot motor current using axis codes. -* M908 - Control digital trimpot directly. -* M350 - Set microstepping mode. -* M351 - Toggle MS1 MS2 pins directly. -* M928 - Start SD logging (M928 filename.g) - ended by M29 -* M999 - Restart after being stopped by error - - -Configuring and compilation: -============================ - -Install the latest non-beta arduino software IDE/toolset - http://www.arduino.cc/en/Main/Software - -Download the Marlin firmware - https://github.com/MarlinFirmware/Marlin/tree/development - - For the latest development, or - - - - For the latest stable release - - In both cases use the "Download Zip" button on the right. - -For some spec. boards a spec. dir in the ArduinoAddons directory in the Marlin dir needs to be copied to the arduino environment. \hardware\ - -Start the arduino IDE. -Select Tools -> Board -> Arduino Mega 2560 or your microcontroller -Select the correct serial port in Tools ->Serial Port -Open Marlin.pde or .ino - -Click the Verify/Compile button - -Click the Upload button -If all goes well the firmware is uploading - -That's ok. Enjoy Silky Smooth Printing. - -=============================================== -Instructions for configuring Bed Auto Leveling -=============================================== -There are two options for this feature. You may choose to use a servo mounted on the X carriage or you may use a sled that mounts on the X axis and can be docked when not in use. -See the section for each option below for specifics about installation and configuration. Also included are instructions that apply to both options. - -Instructions for Both Options ------------------------------ - -Uncomment the "ENABLE_AUTO_BED_LEVELING" define (commented by default) - -The following options define the probing positions. These are good starting values. -I recommend to keep a better clearance from borders in the first run and then make the probes as close as possible to borders: - -* \#define LEFT_PROBE_BED_POSITION 30 -* \#define RIGHT_PROBE_BED_POSITION 140 -* \#define BACK_PROBE_BED_POSITION 140 -* \#define FRONT_PROBE_BED_POSITION 30 - -A few more options: - -* \#define XY_TRAVEL_SPEED 6000 - -X and Y axis travel speed between probes, in mm/min. -Bear in mind that really fast moves may render step skipping. 6000 mm/min (100mm/s) is a good value. - -* \#define Z_RAISE_BEFORE_PROBING 10 -* \#define Z_RAISE_BETWEEN_PROBINGS 10 - -The Z axis is lifted when traveling to the first probe point by Z_RAISE_BEFORE_PROBING value -and then lifted when traveling from first to second and second to third point by Z_RAISE_BETWEEN_PROBINGS. -All values are in mm as usual. - -Servo Option Notes ------------------- -You will probably need a swivel Z-MIN endstop in the extruder. A rc servo do a great job. -Check the system working here: http://www.youtube.com/watch?v=3IKMeOYz-1Q (Enable English subtitles) -Teasing ;-) video: http://www.youtube.com/watch?v=x8eqSQNAyro - -In order to get the servo working, you need to enable: - -* \#define NUM_SERVOS 1 // Servo index starts with 0 for M280 command - -* \#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1 - -* \#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 165,60} // X,Y,Z Axis Extend and Retract angles - -The first define tells firmware how many servos you have. -The second tells what axis this servo will be attached to. In the example above, we have a servo in Z axis. -The third one tells the angle in 2 situations: Probing (165º) and resting (60º). Check this with command M280 P0 S{angle} (example: M280 P0 S60 moves the servo to 60º) - -Next you need to define the Z endstop (probe) offset from hotend. -My preferred method: - -* a) Make a small mark in the bed with a marker/felt-tip pen. -* b) Place the hotend tip as *exactly* as possible on the mark, touching the bed. Raise the hotend 0.1mm (a regular paper thickness) and zero all axis (G92 X0 Y0 Z0); -* d) Raise the hotend 10mm (or more) for probe clearance, lower the Z probe (Z-Endstop) with M401 and place it just on that mark by moving X, Y and Z; -* e) Lower the Z in 0.1mm steps, with the probe always touching the mark (it may be necessary to adjust X and Y as well) until you hear the "click" meaning the mechanical endstop was trigged. You can confirm with M119; -* f) Now you have the probe in the same place as your hotend tip was before. Perform a M114 and write down the values, for example: X:24.3 Y:-31.4 Z:5.1; -* g) You can raise the z probe with M402 command; -* h) Fill the defines bellow multiplying the values by "-1" (just change the signal) - - -* \#define X_PROBE_OFFSET_FROM_EXTRUDER -24.3 -* \#define Y_PROBE_OFFSET_FROM_EXTRUDER 31.4 -* \#define Z_PROBE_OFFSET_FROM_EXTRUDER -5.1 - - -Sled Option Notes ------------------ -The sled option uses an electromagnet to attach and detach to/from the X carriage. See http://www.thingiverse.com/thing:396692 for more details on how to print and install this feature. It uses the same connections as the servo option. - -To use the sled option, you must define two additional things in Configuration.h: - -* \#define Z_PROBE_SLED -* \#define SLED_DOCKING_OFFSET 5 - -Uncomment the Z_PROBE_SLED to define to enable the sled (commented out by default). - -Uncomment the SLED_DOCKING_OFFSET to set the extra distance the X axis must travel to dock the sled. This value can be found by moving the X axis to its maximum position then measure the distance to the right X end and subtract the width of the sled (23mm if you printed the sled from Thingiverse). - -Next you need to define the Z endstop (probe) offset from hotend. -My preferred method: - -* a) Home the X and Y axes. -* b) Move the X axis to about the center of the print bed. Make a mark on the print bed. -* c) Move the Y axis to the maximum position. Make another mark. -* d) Home the X axis and use a straight edge to make a line between the two points. -* e) Repeat (b)-(d) reversing the X and Y. When you are done you will have two lines on the print bed. We will use these to measure the offset for the Z probe endstop. -* f) Move the nozzle so that it is positioned on the center point of the two lines. You can use fine movement of 0.1mm to get it as close as possible. Note the position of X and Y. -* g) Zero the Z axis with the G92 Z0 command. -* h) Raise the Z axis about 20mmm. -* i) Use the G32 command to retrieve the sled. -* j) Now more the X and Y axis to the position recorded in (f). -* k) Lower the Z axis in 0.1mm steps until you hear the "click" meaning the mechanical endstop was trigged. You can confirm with the M119 command. Note the position of the Z axis. -* l) Make a mark on the print bed where the endstop lever has touched the print bed. Raise the Z-axis about 30mm to give yourself some room. -* m) Now measure the distance from the center point to the endstop impact site along the X and Y axis using the lines drawn previously. -* n) Fill in the values below. If the endstop mark is in front of the line running left-to-right, use positive values. If it is behind, use negative values. For the Z axis use the value from (k) and subtract 0.1mm. - -For example, suppose you measured the endstop position and it was 20mm to the right of the line running front-to-back, 10mm toward the front of the line running left-to-right, and the value from (k) was 2.85. The values for the defines would be: - -* \#define X_PROBE_OFFSET_FROM_EXTRUDER 20 -* \#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 -* \#define Z_PROBE_OFFSET_FROM_EXTRUDER 2.75 +[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) +[![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin) -That's it.. enjoy never having to calibrate your Z endstop neither leveling your bed by hand anymore ;-) +What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201 -Filament Sensor ---------------- -Supports the use of a real time filament diameter sensor that measures the diameter of the filament going into the extruder and then adjusts the extrusion rate to compensate for filament that does not match what is defined in the g-code. The diameter can also be displayed on the LCD screen. This potentially eliminates the need to measure filament diameter when changing spools of filament. Gcode becomes independent of the filament diameter. Can also compensate for changing diameter. +## Contact -For examples of these sensors, see: http://www.thingiverse.com/thing:454584, https://www.youmagine.com/designs/filament-diameter-sensor, http://diy3dprinting.blogspot.com/2014/01/diy-filament-diameter-sensor.html. Any sensor which produces a voltage equivalent to the diameter in mm (i.e. 1v = 1mm) can be used. This provides a very simple interface and may encourage more innovation in this area. +__IRC:__ #marlin-firmware @freenode +__Google Hangouts:__ https://plus.google.com/hangouts/_/event/cps5d0ru0iruhl6ebqbk9dpqpa4?authuser=0&hl=da -4 new Mcodes are defined to set relevant parameters: M404, M405, M406, M407 - see above. +## Licence - Implements a delay buffer to handle the transit delay between where the filament is measured and when it gets to the extruder. +Marlin has a GPL license because I believe in open development. +Please do not use this code in products (3D printers, CNC etc) that are closed source or are crippled by a patent. +[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) From abea094f9087f48272eeacb46f5cd34baf9aab23 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 18:13:23 +0100 Subject: [PATCH 13/35] fixed hyperlinks --- README.md | 81 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 07ec0de3e9..7738596c17 100644 --- a/README.md +++ b/README.md @@ -1,40 +1,41 @@ -# Marlin 3D Printer Firmware - - * [Configuration & Compilation](/MarlinFirmware/Marlin/blob/Development/Documentation/Compilation.md) - * Supported - * [Features](/MarlinFirmware/Marlin/blob/Development/Documentation/Features.md) - * [Hardware](/MarlinFirmware/Marlin/blob/Development/Documentation/Hardware.md) - * [GCodes](/MarlinFirmware/Marlin/blob/Development/Documentation/GCodes.md) - * Notes - * [Auto Bed Leveling](/MarlinFirmware/Marlin/blob/Development/Documentation/BedLeveling.md) - * [Filament Sensor](/MarlinFirmware/Marlin/blob/Development/Documentation/FilamentSensor.md) - -## Quick Information - -This RepRap firmware is a mashup between Sprinter, grbl and many original parts. - -Derived from Sprinter and Grbl by Erik van der Zalm. -Sprinters lead developers are Kliment and caru. -Grbls lead developer is Simen Svale Skogsrud. Sonney Jeon (Chamnit) improved some parts of grbl -A fork by bkubicek for the Ultimaker was merged, and further development was aided by him. -Some features have been added by: -Lampmaker, Bradley Feldman, and others... - -## Current Status: Bug Fixing - -[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) -[![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin) - -What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201 - -## Contact - -__IRC:__ #marlin-firmware @freenode -__Google Hangouts:__ https://plus.google.com/hangouts/_/event/cps5d0ru0iruhl6ebqbk9dpqpa4?authuser=0&hl=da - -## Licence - -Marlin has a GPL license because I believe in open development. -Please do not use this code in products (3D printers, CNC etc) that are closed source or are crippled by a patent. - -[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) +# Marlin 3D Printer Firmware + + * [Configuration & Compilation](/Documentation/Compilation.md) + * Supported + * [Features](/Documentation/Features.md) + * [Hardware](/Documentation/Hardware.md) + * [GCodes](/Documentation/GCodes.md) + * Notes + * [Auto Bed Leveling](/Documentation/BedLeveling.md) + * [Filament Sensor](/Documentation/FilamentSensor.md) + +## Quick Information + +This RepRap firmware is a mashup between Sprinter, grbl and many original parts. + +Derived from Sprinter and Grbl by Erik van der Zalm. +Sprinters lead developers are Kliment and caru. +Grbls lead developer is Simen Svale Skogsrud. Sonney Jeon (Chamnit) improved some parts of grbl +A fork by bkubicek for the Ultimaker was merged, and further development was aided by him. +Some features have been added by: +Lampmaker, Bradley Feldman, and others... + +## Current Status: Bug Fixing + +[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) +[![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin) + +What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201 + +## Contact + +__IRC:__ #marlin-firmware @freenode +__Google Hangouts:__ https://plus.google.com/hangouts/_/event/cps5d0ru0iruhl6ebqbk9dpqpa4?authuser=0&hl=da + +## Licence + +Marlin has a GPL license because I believe in open development. +Please do not use this code in products (3D printers, CNC etc) that are closed source or are crippled by a patent. + +[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) + From 5db6ffc03e59ed5f421870cbb7f3c1231c92d3de Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 18:14:57 +0100 Subject: [PATCH 14/35] fixed line endings --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7738596c17..c438889dcb 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,11 @@ Lampmaker, Bradley Feldman, and others... [![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) [![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin) +<<<<<<< HEAD What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201 +======= +What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201 +>>>>>>> fixed line endings ## Contact @@ -38,4 +42,3 @@ Marlin has a GPL license because I believe in open development. Please do not use this code in products (3D printers, CNC etc) that are closed source or are crippled by a patent. [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) - From 6f137bbe3e809e4b45fbe87035cc8796063130e4 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 18:21:54 +0100 Subject: [PATCH 15/35] updated compilation/configuring instructions --- Documentation/Compilation.md | 39 ++++++++++++------------------------ 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/Documentation/Compilation.md b/Documentation/Compilation.md index f36c7d88ff..56b4f356ca 100644 --- a/Documentation/Compilation.md +++ b/Documentation/Compilation.md @@ -1,29 +1,16 @@ -Configuring and compilation: +# Configuring and compilation -Install the latest non-beta arduino software IDE/toolset - http://www.arduino.cc/en/Main/Software - -Download the Marlin firmware - https://github.com/MarlinFirmware/Marlin/tree/development - - For the latest development, or - - - - For the latest stable release - - In both cases use the "Download Zip" button on the right. - -For some spec. boards a spec. dir in the ArduinoAddons directory in the Marlin dir needs to be copied to the arduino environment. \hardware\ - -Start the arduino IDE. -Select Tools -> Board -> Arduino Mega 2560 or your microcontroller -Select the correct serial port in Tools ->Serial Port -Open Marlin.pde or .ino - -Click the Verify/Compile button - -Click the Upload button -If all goes well the firmware is uploading + 1. Install the latest non-beta arduino software IDE/toolset: http://www.arduino.cc/en/Main/Software + 2. Download the Marlin firmware + - [Latest developement version](https://github.com/MarlinFirmware/Marlin/tree/Development) + - [Stable version](https://github.com/MarlinFirmware/Marlin/tree/Development) + 3. In both cases use the "Download Zip" button on the right. + 4. Some boards require special files and/or libraries from the ArduinoAddons directory. Take a look at the dedicated [README](/ArduinoAddons/README.md) for details. + 5. Start the arduino IDE. + 6. Select Tools -> Board -> Arduino Mega 2560 or your microcontroller + 7. Select the correct serial port in Tools ->Serial Port + 8. Open Marlin.pde or .ino + 9. Click the Verify/Compile button + 10. Click the Upload button. If all goes well the firmware is uploading That's ok. Enjoy Silky Smooth Printing. \ No newline at end of file From e351eec169d58165be103cde39952df6e9b9dd5c Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 18:32:35 +0100 Subject: [PATCH 16/35] added logo for GitHub Readme --- Documentation/Logo/Marlin Logo GitHub.png | Bin 0 -> 11017 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Documentation/Logo/Marlin Logo GitHub.png diff --git a/Documentation/Logo/Marlin Logo GitHub.png b/Documentation/Logo/Marlin Logo GitHub.png new file mode 100644 index 0000000000000000000000000000000000000000..40cd19b6c6bdc8aa74a86900a3c895772de47469 GIT binary patch literal 11017 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 Date: Thu, 8 Jan 2015 18:36:40 +0100 Subject: [PATCH 17/35] added logo to README --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index c438889dcb..a4e6f93c27 100644 --- a/README.md +++ b/README.md @@ -25,11 +25,7 @@ Lampmaker, Bradley Feldman, and others... [![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) [![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin) -<<<<<<< HEAD -What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201 -======= What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201 ->>>>>>> fixed line endings ## Contact @@ -42,3 +38,4 @@ Marlin has a GPL license because I believe in open development. Please do not use this code in products (3D printers, CNC etc) that are closed source or are crippled by a patent. [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) + From cf88d61c206ab8015089aadb9ec64b2186f49a41 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 18:40:57 +0100 Subject: [PATCH 18/35] added links to reprap.org and the license --- README.md | 85 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index a4e6f93c27..e8cf8bb00c 100644 --- a/README.md +++ b/README.md @@ -1,41 +1,44 @@ -# Marlin 3D Printer Firmware - - * [Configuration & Compilation](/Documentation/Compilation.md) - * Supported - * [Features](/Documentation/Features.md) - * [Hardware](/Documentation/Hardware.md) - * [GCodes](/Documentation/GCodes.md) - * Notes - * [Auto Bed Leveling](/Documentation/BedLeveling.md) - * [Filament Sensor](/Documentation/FilamentSensor.md) - -## Quick Information - -This RepRap firmware is a mashup between Sprinter, grbl and many original parts. - -Derived from Sprinter and Grbl by Erik van der Zalm. -Sprinters lead developers are Kliment and caru. -Grbls lead developer is Simen Svale Skogsrud. Sonney Jeon (Chamnit) improved some parts of grbl -A fork by bkubicek for the Ultimaker was merged, and further development was aided by him. -Some features have been added by: -Lampmaker, Bradley Feldman, and others... - -## Current Status: Bug Fixing - -[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) -[![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin) - -What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201 - -## Contact - -__IRC:__ #marlin-firmware @freenode -__Google Hangouts:__ https://plus.google.com/hangouts/_/event/cps5d0ru0iruhl6ebqbk9dpqpa4?authuser=0&hl=da - -## Licence - -Marlin has a GPL license because I believe in open development. -Please do not use this code in products (3D printers, CNC etc) that are closed source or are crippled by a patent. - -[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) - +# Marlin 3D Printer Firmware + + + * [Configuration & Compilation](/Documentation/Compilation.md) + * Supported + * [Features](/Documentation/Features.md) + * [Hardware](/Documentation/Hardware.md) + * [GCodes](/Documentation/GCodes.md) + * Notes + * [Auto Bed Leveling](/Documentation/BedLeveling.md) + * [Filament Sensor](/Documentation/FilamentSensor.md) + +##### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin) + +## Quick Information + +This RepRap firmware is a mashup between Sprinter, grbl and many original parts. + +Derived from Sprinter and Grbl by Erik van der Zalm. +Sprinters lead developers are Kliment and caru. +Grbls lead developer is Simen Svale Skogsrud. Sonney Jeon (Chamnit) improved some parts of grbl +A fork by bkubicek for the Ultimaker was merged, and further development was aided by him. +Some features have been added by: +Lampmaker, Bradley Feldman, and others... + +## Current Status: Bug Fixing + +[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) +[![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin) + +What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201 + +## Contact + +__IRC:__ #marlin-firmware @freenode + +__Google Hangouts:__ https://plus.google.com/hangouts/_/event/cps5d0ru0iruhl6ebqbk9dpqpa4?authuser=0&hl=da + +## Licence + +Marlin is published unde the [GPL license](/Documentation/COPYING.md) because I believe in open development. +Please do not use this code in products (3D printers, CNC etc) that are closed source or are crippled by a patent. + +[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) From fd68d0074b689c00786bf4d55e46b3054c36f098 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 18:44:20 +0100 Subject: [PATCH 19/35] added missing gcodes description --- Documentation/GCodes.md | 103 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/Documentation/GCodes.md b/Documentation/GCodes.md index e69de29bb2..dd582946eb 100644 --- a/Documentation/GCodes.md +++ b/Documentation/GCodes.md @@ -0,0 +1,103 @@ +# Implemented G Codes + +## G Codes + +* G0 -> G1 +* G1 - Coordinated Movement X Y Z E +* G2 - CW ARC +* G3 - CCW ARC +* G4 - Dwell S or P +* G10 - retract filament according to settings of M207 +* G11 - retract recover filament according to settings of M208 +* G28 - Home all Axis +* G29 - Detailed Z-Probe, probes the bed at 3 points. You must de at the home position for this to work correctly. +* G30 - Single Z Probe, probes bed at current XY location. +* G31 - Dock Z Probe sled (if enabled) +* G32 - Undock Z Probe sled (if enabled) +* G90 - Use Absolute Coordinates +* G91 - Use Relative Coordinates +* G92 - Set current position to cordinates given + +## M Codes +* M0 - Unconditional stop - Wait for user to press a button on the LCD (Only if ULTRA_LCD is enabled) +* M1 - Same as M0 +* M17 - Enable/Power all stepper motors +* M18 - Disable all stepper motors; same as M84 +* M20 - List SD card +* M21 - Init SD card +* M22 - Release SD card +* M23 - Select SD file (M23 filename.g) +* M24 - Start/resume SD print +* M25 - Pause SD print +* M26 - Set SD position in bytes (M26 S12345) +* M27 - Report SD print status +* M28 - Start SD write (M28 filename.g) +* M29 - Stop SD write +* M30 - Delete file from SD (M30 filename.g) +* M31 - Output time since last M109 or SD card start to serial +* M32 - Select file and start SD print (Can be used when printing from SD card) +* M42 - Change pin status via gcode Use M42 Px Sy to set pin x to value y, when omitting Px the onboard led will be used. +* M80 - Turn on Power Supply +* M81 - Turn off Power Supply +* M82 - Set E codes absolute (default) +* M83 - Set E codes relative while in Absolute Coordinates (G90) mode +* M84 - Disable steppers until next move, or use S to specify an inactivity timeout, after which the steppers will be disabled. S0 to disable the timeout. +* M85 - Set inactivity shutdown timer with parameter S. To disable set zero (default) +* M92 - Set axis_steps_per_unit - same syntax as G92 +* M104 - Set extruder target temp +* M105 - Read current temp +* M106 - Fan on +* M107 - Fan off +* M109 - Sxxx Wait for extruder current temp to reach target temp. Waits only when heating +* Rxxx Wait for extruder current temp to reach target temp. Waits when heating and cooling +* M112 - Emergency stop +* M114 - Output current position to serial port +* M115 - Capabilities string +* M117 - display message +* M119 - Output Endstop status to serial port +* M126 - Solenoid Air Valve Open (BariCUDA support by jmil) +* M127 - Solenoid Air Valve Closed (BariCUDA vent to atmospheric pressure by jmil) +* M128 - EtoP Open (BariCUDA EtoP = electricity to air pressure transducer by jmil) +* M129 - EtoP Closed (BariCUDA EtoP = electricity to air pressure transducer by jmil) +* M140 - Set bed target temp +* M190 - Sxxx Wait for bed current temp to reach target temp. Waits only when heating +* Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling +* M200 D- set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters). +* M201 - Set max acceleration in units/s^2 for print moves (M201 X1000 Y1000) +* M202 - Set max acceleration in units/s^2 for travel moves (M202 X1000 Y1000) Unused in Marlin!! +* M203 - Set maximum feedrate that your machine can sustain (M203 X200 Y200 Z300 E10000) in mm/sec +* M204 - Set default acceleration: S normal moves T filament only moves (M204 S3000 T7000) im mm/sec^2 also sets minimum segment time in ms (B20000) to prevent buffer underruns and M20 minimum feedrate +* M205 - advanced settings: minimum travel speed S=while printing T=travel only, B=minimum segment time X= maximum xy jerk, Z=maximum Z jerk, E=maximum E jerk +* M206 - set additional homeing offset +* M207 - set retract length S[positive mm] F[feedrate mm/min] Z[additional zlift/hop], stays in mm regardless of M200 setting +* M208 - set recover=unretract length S[positive mm surplus to the M207 S*] F[feedrate mm/min] +* M209 - S<1=true/0=false> enable automatic retract detect if the slicer did not support G10/11: every normal extrude-only move will be classified as retract depending on the direction. +* M218 - set hotend offset (in mm): T X Y +* M220 S- set speed factor override percentage +* M221 S- set extrude factor override percentage +* M240 - Trigger a camera to take a photograph +* M280 - Position an RC Servo P S, ommit S to report back current angle +* M300 - Play beepsound S P +* M301 - Set PID parameters P I and D +* M302 - Allow cold extrudes +* M303 - PID relay autotune S sets the target temperature. (default target temperature = 150C) +* M304 - Set bed PID parameters P I and D +* M400 - Finish all moves +* M401 - Lower z-probe if present +* M402 - Raise z-probe if present +* M404 - N Enter the nominal filament width (3mm, 1.75mm ) or will display nominal filament width without parameters +* M405 - Turn on Filament Sensor extrusion control. Optional D to set delay in centimeters between sensor and extruder +* M406 - Turn off Filament Sensor extrusion control +* M407 - Displays measured filament diameter +* M500 - stores paramters in EEPROM +* M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily). +* M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to. +* M503 - print the current settings (from memory not from eeprom) +* M540 - Use S[0|1] to enable or disable the stop SD card print on endstop hit (requires ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED) +* M600 - Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal] +* M907 - Set digital trimpot motor current using axis codes. +* M908 - Control digital trimpot directly. +* M350 - Set microstepping mode. +* M351 - Toggle MS1 MS2 pins directly. +* M928 - Start SD logging (M928 filename.g) - ended by M29 +* M999 - Restart after being stopped by error From bc91167363df8b74d8e380a39e4db5a98dc68639 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 18:45:41 +0100 Subject: [PATCH 20/35] moved licence to Documentation (its linked from the frontpage) to get a cleaner top level dir --- COPYING.md => Documentation/COPYING.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename COPYING.md => Documentation/COPYING.md (100%) diff --git a/COPYING.md b/Documentation/COPYING.md similarity index 100% rename from COPYING.md rename to Documentation/COPYING.md From d19ef561997e8f7cd21a323e460e1832ed1441da Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 19:21:57 +0100 Subject: [PATCH 21/35] started hardware list --- Documentation/Hardware.md | 120 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 Documentation/Hardware.md diff --git a/Documentation/Hardware.md b/Documentation/Hardware.md new file mode 100644 index 0000000000..c26ab55708 --- /dev/null +++ b/Documentation/Hardware.md @@ -0,0 +1,120 @@ +# Supported Hardware + +__Please note:__ We need more feedback from users weather their board is actually working! + +Supported boards are listed under: [/Marlin/boards.h](/Marlin/boards.h) + + + + +##### RAMPS + +http://reprap.org/wiki/RAMPS + +``` +#define BOARD_RAMPS_OLD 3 // MEGA/RAMPS up to 1.2 +#define BOARD_RAMPS_13_EFB 33 // RAMPS 1.3 / 1.4 (Power outputs: Extruder, Fan, Bed) +#define BOARD_RAMPS_13_EEB 34 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Bed) +#define BOARD_RAMPS_13_EFF 35 // RAMPS 1.3 / 1.4 (Power outputs: Extruder, Fan, Fan) +#define BOARD_RAMPS_13_EEF 36 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan) +``` + +#define BOARD_DUEMILANOVE_328P 4 // Duemilanove w/ ATMega328P pin assignment + +##### Generation 3 Electronics + +http://reprap.org/wiki/Generation_3_Electronics + +``` +#define BOARD_GEN3_PLUS 9 // Gen3+ +#define BOARD_GEN3_MONOLITHIC 22 // Gen3 Monolithic Electronics +``` + +##### Generation 6 Electronics + +http://reprap.org/wiki/Generation_6_Electronics + +``` +#define BOARD_GEN6 5 // Gen6 +#define BOARD_GEN6_DELUXE 51 // Gen6 deluxe +``` + +##### Generation 7 Electronics + +http://reprap.org/wiki/Generation_7_Electronics + +``` +#define BOARD_GEN7_CUSTOM 10 // Gen7 custom (Alfons3 Version) "https://github.com/Alfons3/Generation_7_Electronics" +#define BOARD_GEN7_12 11 // Gen7 v1.1, v1.2 +#define BOARD_GEN7_13 12 // Gen7 v1.3 +#define BOARD_GEN7_14 13 // Gen7 v1.4 +``` + + +``` +#define BOARD_CHEAPTRONIC 2 // Cheaptronic v1.0 +#define BOARD_SETHI 20 // Sethi 3D_1 +``` + +##### Sanguinololu + +http://reprap.org/wiki/Sanguinololu + +``` +#define BOARD_SANGUINOLOLU_11 6 // Sanguinololu < 1.2 +#define BOARD_SANGUINOLOLU_12 62 // Sanguinololu 1.2 and above + +``` + +##### Melzi + +http://reprap.org/wiki/Melzi + +``` +#define BOARD_MELZI 63 // Melzi +#define BOARD_MELZI_1284 66 // Melzi with ATmega1284 (MaKr3d version) +``` + +##### RUMBA + +http://reprap.org/wiki/RUMBA + +``` +#define BOARD_RUMBA 80 // Rumba +``` + +##### Azteeg + + - http://reprap.org/wiki/Azteeg_X1 + - http://reprap.org/wiki/Azteeg_X3 + + +``` +#define BOARD_AZTEEG_X1 65 // Azteeg X1 +#define BOARD_AZTEEG_X3 67 // Azteeg X3 +#define BOARD_AZTEEG_X3_PRO 68 // Azteeg X3 Pro +``` + +#### Others + +``` +#define BOARD_STB_11 64 // STB V1.1 +#define BOARD_ULTIMAKER 7 // Ultimaker +#define BOARD_ULTIMAKER_OLD 71 // Ultimaker (Older electronics. Pre 1.5.4. This is rare) +#define BOARD_ULTIMAIN_2 72 // Ultimainboard 2.x (Uses TEMP_SENSOR 20) +#define BOARD_3DRAG 77 // 3Drag Controller +#define BOARD_TEENSYLU 8 // Teensylu +#define BOARD_PRINTRBOARD 81 // Printrboard (AT90USB1286) +#define BOARD_BRAINWAVE 82 // Brainwave (AT90USB646) +#define BOARD_SAV_MKI 83 // SAV Mk-I (AT90USB1286) +#define BOARD_TEENSY2 84 // Teensy++2.0 (AT90USB1286) - CLI compile: DEFINES=AT90USBxx_TEENSYPP_ASSIGNMENTS HARDWARE_MOTHERBOARD=84 make +#define BOARD_MEGATRONICS 70 // Megatronics +#define BOARD_MEGATRONICS_2 701 // Megatronics v2.0 +#define BOARD_MEGATRONICS_1 702 // Minitronics v1.0 +#define BOARD_OMCA_A 90 // Alpha OMCA board +#define BOARD_OMCA 91 // Final OMCA board +#define BOARD_RAMBO 301 // Rambo +#define BOARD_ELEFU_3 21 // Elefu Ra Board (v3) +#define BOARD_5DPRINT 88 // 5DPrint D8 Driver Board +#define BOARD_LEAPFROG 999 // Leapfrog +``` \ No newline at end of file From 11a42c32150da22ec3721f2ae222d71c60e573a6 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 19:26:23 +0100 Subject: [PATCH 22/35] fixed formatting issue --- Documentation/Hardware.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Documentation/Hardware.md b/Documentation/Hardware.md index c26ab55708..26b03ae3fc 100644 --- a/Documentation/Hardware.md +++ b/Documentation/Hardware.md @@ -19,8 +19,6 @@ http://reprap.org/wiki/RAMPS #define BOARD_RAMPS_13_EEF 36 // RAMPS 1.3 / 1.4 (Power outputs: Extruder0, Extruder1, Fan) ``` -#define BOARD_DUEMILANOVE_328P 4 // Duemilanove w/ ATMega328P pin assignment - ##### Generation 3 Electronics http://reprap.org/wiki/Generation_3_Electronics @@ -98,6 +96,7 @@ http://reprap.org/wiki/RUMBA #### Others ``` +#define BOARD_DUEMILANOVE_328P 4 // Duemilanove w/ ATMega328P pin assignment #define BOARD_STB_11 64 // STB V1.1 #define BOARD_ULTIMAKER 7 // Ultimaker #define BOARD_ULTIMAKER_OLD 71 // Ultimaker (Older electronics. Pre 1.5.4. This is rare) @@ -117,4 +116,4 @@ http://reprap.org/wiki/RUMBA #define BOARD_ELEFU_3 21 // Elefu Ra Board (v3) #define BOARD_5DPRINT 88 // 5DPrint D8 Driver Board #define BOARD_LEAPFROG 999 // Leapfrog -``` \ No newline at end of file +``` From c98d87935a3f754691a3468ee98d9478f7543683 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 19:37:36 +0100 Subject: [PATCH 23/35] reformatting --- Documentation/Features.md | 45 +++++++++++++-------------------------- 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/Documentation/Features.md b/Documentation/Features.md index 304c638f9f..99fd7bbbbf 100644 --- a/Documentation/Features.md +++ b/Documentation/Features.md @@ -1,6 +1,4 @@ - -Features: -========= +# Features * Interrupt based movement with real linear acceleration * High steprate @@ -19,12 +17,12 @@ Features: * Arc support * Temperature oversampling * Dynamic Temperature setpointing aka "AutoTemp" -* Support for QTMarlin, a very beta GUI for PID-tuning and velocity-acceleration testing. https://github.com/bkubicek/QTMarlin +* Support for [QTMarlin](https://github.com/bkubicek/QTMarlin), a very beta GUI for PID-tuning and velocity-acceleration testing. * Endstop trigger reporting to the host software. * Updated sdcardlib * Heater power reporting. Useful for PID monitoring. * PID tuning -* CoreXY kinematics (www.corexy.com/theory.html) +* [CoreXY kinematics](www.corexy.com/theory.html) * Delta kinematics * SCARA kinematics * Dual X-carriage support for multiple extruder systems @@ -36,12 +34,9 @@ Features: The default baudrate is 250000. This baudrate has less jitter and hence errors than the usual 115200 baud, but is less supported by drivers and host-environments. +## Differences and additions to the already good Sprinter firmware -Differences and additions to the already good Sprinter firmware: -================================================================ - -Look-ahead: ------------ +### Look-ahead Marlin has look-ahead. While sprinter has to break and re-accelerate at each corner, lookahead will only decelerate and accelerate to a velocity, @@ -49,21 +44,18 @@ so that the change in vectorial velocity magnitude is less than the xy_jerk_velo This is only possible, if some future moves are already processed, hence the name. It leads to less over-deposition at corners, especially at flat angles. -Arc support: ------------- +### Arc support Slic3r can find curves that, although broken into segments, were ment to describe an arc. Marlin is able to print those arcs. The advantage is the firmware can choose the resolution, and can perform the arc with nearly constant velocity, resulting in a nice finish. Also, less serial communication is needed. -Temperature Oversampling: -------------------------- +### Temperature Oversampling To reduce noise and make the PID-differential term more useful, 16 ADC conversion results are averaged. -AutoTemp: ---------- +### AutoTemp If your gcode contains a wide spread of extruder velocities, or you realtime change the building speed, the temperature should be changed accordingly. Usually, higher speed requires higher temperature. @@ -76,42 +68,36 @@ The wanted temperature then will be set to t=tempmin+factor*maxerate, while bein If the target temperature is set manually or by gcode to a value less then tempmin, it will be kept without change. Ideally, your gcode can be completely free of temperature controls, apart from a M109 S T F in the start.gcode, and a M109 S0 in the end.gcode. -EEPROM: -------- +### EEPROM If you know your PID values, the acceleration and max-velocities of your unique machine, you can set them, and finally store them in the EEPROM. After each reboot, it will magically load them from EEPROM, independent what your Configuration.h says. -LCD Menu: ---------- +### LCD Menu If your hardware supports it, you can build yourself a LCD-CardReader+Click+encoder combination. It will enable you to realtime tune temperatures, accelerations, velocities, flow rates, select and print files from the SD card, preheat, disable the steppers, and do other fancy stuff. One working hardware is documented here: http://www.thingiverse.com/thing:12663 Also, with just a 20x4 or 16x2 display, useful data is shown. -SD card folders: ----------------- +### SD card directories If you have an SD card reader attached to your controller, also folders work now. Listing the files in pronterface will show "/path/subpath/file.g". You can write to file in a subfolder by specifying a similar text using small letters in the path. Also, backup copies of various operating systems are hidden, as well as files not ending with ".g". -SD card folders: ----------------- +### Autostart If you place a file auto[0-9].g into the root of the sd card, it will be automatically executed if you boot the printer. The same file will be executed by selecting "Autostart" from the menu. First *0 will be performed, than *1 and so on. That way, you can heat up or even print automatically without user interaction. -Endstop trigger reporting: --------------------------- +### Endstop trigger reporting If an endstop is hit while moving towards the endstop, the location at which the firmware thinks that the endstop was triggered is outputed on the serial port. This is useful, because the user gets a warning message. However, also tools like QTMarlin can use this for finding acceptable combinations of velocity+acceleration. -Coding paradigm: ----------------- +### Coding paradigm Not relevant from a user side, but Marlin was split into thematic junks, and has tried to partially enforced private variables. This is intended to make it clearer, what interacts which what, and leads to a higher level of modularization. @@ -121,8 +107,7 @@ In the serial communication, a #define based level of abstraction was enforced, some transfer is information (usually beginning with "echo:"), an error "error:", or just normal protocol, necessary for backwards compatibility. -Interrupt based temperature measurements: ------------------------------------------ +### Interrupt based temperature measurements An interrupt is used to manage ADC conversions, and enforce checking for critical temperatures. This leads to less blocking in the heater management routine. From 6388be07310338f8cfdc46dac571fa2c830bbfea Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 19:38:52 +0100 Subject: [PATCH 24/35] reformatting --- Documentation/Features.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Documentation/Features.md b/Documentation/Features.md index 99fd7bbbbf..b306741e8f 100644 --- a/Documentation/Features.md +++ b/Documentation/Features.md @@ -4,8 +4,7 @@ * High steprate * Look ahead (Keep the speed high when possible. High cornering speed) * Interrupt based temperature protection -* preliminary support for Matthew Roberts advance algorithm - For more info see: http://reprap.org/pipermail/reprap-dev/2011-May/003323.html +* Preliminary support for [Matthew Roberts Advance Algorithm](http://reprap.org/pipermail/reprap-dev/2011-May/003323.html) * Full endstop support * SD Card support * SD Card folders (works in pronterface) From 49b759b804c5f77ed5cccbf270a38d20ba2bf3bd Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 19:48:56 +0100 Subject: [PATCH 25/35] added credits --- README.md | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e8cf8bb00c..7b9cf5287b 100644 --- a/README.md +++ b/README.md @@ -14,17 +14,15 @@ ## Quick Information -This RepRap firmware is a mashup between Sprinter, grbl and many original parts. - -Derived from Sprinter and Grbl by Erik van der Zalm. -Sprinters lead developers are Kliment and caru. -Grbls lead developer is Simen Svale Skogsrud. Sonney Jeon (Chamnit) improved some parts of grbl -A fork by bkubicek for the Ultimaker was merged, and further development was aided by him. -Some features have been added by: -Lampmaker, Bradley Feldman, and others... +This is a firmware for reprap single-processor electronics setups. +It also works on the Ultimaker PCB. It supports printing from SD card+Folders, and look-ahead trajectory planning. +This firmware is a mashup between [Sprinter](https://github.com/kliment/Sprinter), [grbl](https://github.com/simen/grbl) and many original parts. ## Current Status: Bug Fixing +The Marlin development is currently revived. There's a long list of reported issues and pull requests, which we are working on currently. +We are actively looking for testers. So please try the current development version and report new issues and feedback. + [![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) [![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin) @@ -36,6 +34,14 @@ __IRC:__ #marlin-firmware @freenode __Google Hangouts:__ https://plus.google.com/hangouts/_/event/cps5d0ru0iruhl6ebqbk9dpqpa4?authuser=0&hl=da +## Credits + +Sprinters lead developers are Kliment and caru. +Grbls lead developer is Simen Svale Skogsrud. Sonney Jeon (Chamnit) improved some parts of grbl +A fork by bkubicek for the Ultimaker was merged, and further development was aided by him. +Some features have been added by: +Lampmaker, Bradley Feldman, and others... + ## Licence Marlin is published unde the [GPL license](/Documentation/COPYING.md) because I believe in open development. From 38669a56cba9f9374d7c290730e344c3994f3493 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 19:54:46 +0100 Subject: [PATCH 26/35] updated credits --- README.md | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7b9cf5287b..d51482caed 100644 --- a/README.md +++ b/README.md @@ -36,11 +36,21 @@ __Google Hangouts:__ https://plus.google.com/hangouts/_/event/cps5d0ru0iruhl6ebq ## Credits +The current Marlin dev team consists of: + + - Erik van der Zalm ([@ErikZalm](https://github.com/ErikZalm) + - [@daid](https://github.com/daid) + - Bo Herrmannsen ([@boelle](https://github.com/boelle)) + Sprinters lead developers are Kliment and caru. -Grbls lead developer is Simen Svale Skogsrud. Sonney Jeon (Chamnit) improved some parts of grbl -A fork by bkubicek for the Ultimaker was merged, and further development was aided by him. -Some features have been added by: -Lampmaker, Bradley Feldman, and others... +Grbls lead developer is Simen Svale Skogsrud. +Sonney Jeon (Chamnit) improved some parts of grbl +A fork by bkubicek for the Ultimaker was merged. + +More features have been added by: + - Lampmaker, + - Bradley Feldman, + - and others... ## Licence From 6dc9e87b689fe049ab75d137b3cdd27bf57432e5 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 19:55:33 +0100 Subject: [PATCH 27/35] added missing bracket --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d51482caed..d82cc4ddc4 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ __Google Hangouts:__ https://plus.google.com/hangouts/_/event/cps5d0ru0iruhl6ebq The current Marlin dev team consists of: - - Erik van der Zalm ([@ErikZalm](https://github.com/ErikZalm) + - Erik van der Zalm ([@ErikZalm](https://github.com/ErikZalm)) - [@daid](https://github.com/daid) - Bo Herrmannsen ([@boelle](https://github.com/boelle)) From 67121795029b7347c718447e071c577b57875268 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 8 Jan 2015 19:57:09 +0100 Subject: [PATCH 28/35] updated milestone link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d82cc4ddc4..4118ffc7ae 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ We are actively looking for testers. So please try the current development versi [![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) [![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin) -What bugs are we working on: https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%201 +What bugs are we working on: [Bug Fixing Round 2](https://github.com/MarlinFirmware/Marlin/milestones/Bug%20Fixing%20Round%202) ## Contact From 3bb9b31515eda8102573464102e1e77500f697e8 Mon Sep 17 00:00:00 2001 From: Bo Herrmannsen Date: Fri, 9 Jan 2015 12:51:21 +0100 Subject: [PATCH 29/35] changed boot logo a bit to test if fat wall goes away --- Marlin/DOGMbitmaps.h | 78 +++++++++++--------------------------------- 1 file changed, 19 insertions(+), 59 deletions(-) diff --git a/Marlin/DOGMbitmaps.h b/Marlin/DOGMbitmaps.h index de4365437c..b149b76098 100644 --- a/Marlin/DOGMbitmaps.h +++ b/Marlin/DOGMbitmaps.h @@ -2,66 +2,26 @@ #define START_BMPHEIGHT 64 //Height in pixels #define START_BMPBYTEWIDTH 8 //Width in bytes const unsigned char start_bmp[574] PROGMEM = { //AVR-GCC, WinAVR -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x0f,0xff,0xff,0xff,0xff,0xff,0xff,0xef, -0x30,0x00,0x00,0x00,0x00,0x00,0x7f,0xff, -0x60,0x00,0x00,0x00,0x00,0x00,0x1f,0xff, -0x40,0x00,0x00,0x00,0x00,0x00,0x0f,0xff, -0x40,0x00,0x00,0x00,0x01,0x80,0x0f,0xff, -0x83,0xef,0xc0,0x00,0x01,0x8c,0x07,0xff, -0x87,0xff,0xe0,0x00,0x01,0x8c,0x03,0xff, -0x86,0x38,0x60,0x00,0x01,0x80,0x01,0xff, -0x86,0x18,0x63,0xe0,0xf9,0x8c,0x7c,0xff, -0x86,0x18,0x67,0xf1,0xfd,0x8c,0xfe,0x7f, -0x86,0x18,0x6e,0x31,0x8d,0x8c,0xc6,0x3f, -0x86,0x18,0x6c,0x39,0x8d,0x8c,0xc7,0x1f, -0x86,0x18,0x6c,0x19,0x81,0x8c,0xc7,0x1f, -0x86,0x18,0x6c,0x19,0x81,0x8c,0xc7,0x1f, -0x86,0x18,0x6f,0x9f,0x81,0xcd,0xc7,0x1f, -0x06,0x18,0x67,0xdf,0x80,0xef,0xc7,0x1f, -0x44,0x18,0x61,0x9f,0x00,0x2f,0xc2,0x2f, +0x1f,0xff,0xff,0xff,0xff,0xff,0xff,0xff, +0x30,0x00,0x00,0x00,0x00,0x00,0x3f,0xff, +0x40,0x00,0x00,0x00,0x00,0x00,0x1f,0xff, +0xc0,0x00,0x00,0x00,0x00,0x00,0x0f,0xff, +0x80,0x83,0x00,0x00,0x01,0x80,0x07,0xff, +0x83,0xef,0xc0,0x00,0x01,0x8c,0x03,0xff, +0x87,0xff,0xe0,0x00,0x01,0x8c,0x01,0xff, +0x8e,0x38,0x60,0x00,0x01,0x80,0x00,0xff, +0x8c,0x18,0x67,0xe0,0xf9,0x8c,0x7e,0x7f, +0x8c,0x18,0x6f,0xf1,0xfd,0x8c,0xfe,0x3f, +0x8c,0x18,0x6e,0x31,0x8d,0x8c,0xc7,0x1f, +0x8c,0x18,0x6c,0x39,0x8d,0x8c,0xc3,0x1f, +0x8c,0x18,0x6c,0x19,0x81,0x8c,0xc3,0x1f, +0x8c,0x18,0x6e,0x19,0x81,0x8c,0xc3,0x1f, +0x8c,0x18,0x6f,0x9f,0x81,0xef,0xc3,0x1f, +0x8c,0x18,0x67,0xdf,0x80,0xef,0xc3,0x1f, +0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x1f, 0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x2f, -0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x4f, -0x1f,0xff,0xff,0xff,0xff,0xff,0xff,0x8f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0f +0x30,0x00,0x00,0x00,0x00,0x00,0x00,0xcf, +0x1f,0xff,0xff,0xff,0xff,0xff,0xff,0x8f }; // Here comes a compile-time operation to match the extruder symbols From 590caafa2dbcc3640bdb8dec93ec7952d7077d53 Mon Sep 17 00:00:00 2001 From: Bo Herrmannsen Date: Fri, 9 Jan 2015 13:17:08 +0100 Subject: [PATCH 30/35] changed ver info --- Marlin/dogm_lcd_implementation.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index 95314f683e..f28efb8b4f 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -124,19 +124,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,""); u8g.setFont(u8g_font_5x8); - u8g.drawStr(62,19,"V1.0.0 RC2-mm"); + u8g.drawStr(62,19,""); u8g.setFont(u8g_font_6x10_marlin); - u8g.drawStr(62,28,"by ErikZalm"); - u8g.drawStr(62,41,"DOGM128 LCD"); + u8g.drawStr(62,28,"MARLIN"); + u8g.drawStr(62,41,""); u8g.setFont(u8g_font_5x8); - u8g.drawStr(62,48,"enhancements"); + u8g.drawStr(62,48,"V1.0.2"); 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,55,""); + u8g.drawStr(62,61,""); + u8g.drawStr90(92,57,""); + u8g.drawStr(100,61,""); } while( u8g.nextPage() ); } From 2bbb68be8a42cc0c523a7a20c422a533b8494710 Mon Sep 17 00:00:00 2001 From: Alex Borro Date: Fri, 9 Jan 2015 10:17:22 -0200 Subject: [PATCH 31/35] Fix calculation of BAL grid fitting into the bed The previous calc was wrong. Between N points there are only N-1 gaps, not N. So changing AUTO_BED_LEVELING_GRID_POINTS to (AUTO_BED_LEVELING_GRID_POINTS-1) --- Marlin/Configuration.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index aacd69295e..9b77f96f4f 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -435,20 +435,20 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of #ifdef AUTO_BED_LEVELING_GRID // Check if Probe_Offset * Grid Points is greater than Probing Range #if X_PROBE_OFFSET_FROM_EXTRUDER < 0 - #if (-(X_PROBE_OFFSET_FROM_EXTRUDER * AUTO_BED_LEVELING_GRID_POINTS) >= (RIGHT_PROBE_BED_POSITION - LEFT_PROBE_BED_POSITION)) + #if (-(X_PROBE_OFFSET_FROM_EXTRUDER * (AUTO_BED_LEVELING_GRID_POINTS-1)) >= (RIGHT_PROBE_BED_POSITION - LEFT_PROBE_BED_POSITION)) #error "The X axis probing range is not enough to fit all the points defined in AUTO_BED_LEVELING_GRID_POINTS" #endif #else - #if ((X_PROBE_OFFSET_FROM_EXTRUDER * AUTO_BED_LEVELING_GRID_POINTS) >= (RIGHT_PROBE_BED_POSITION - LEFT_PROBE_BED_POSITION)) + #if ((X_PROBE_OFFSET_FROM_EXTRUDER * (AUTO_BED_LEVELING_GRID_POINTS-1)) >= (RIGHT_PROBE_BED_POSITION - LEFT_PROBE_BED_POSITION)) #error "The X axis probing range is not enough to fit all the points defined in AUTO_BED_LEVELING_GRID_POINTS" #endif #endif #if Y_PROBE_OFFSET_FROM_EXTRUDER < 0 - #if (-(Y_PROBE_OFFSET_FROM_EXTRUDER * AUTO_BED_LEVELING_GRID_POINTS) >= (BACK_PROBE_BED_POSITION - FRONT_PROBE_BED_POSITION)) + #if (-(Y_PROBE_OFFSET_FROM_EXTRUDER * (AUTO_BED_LEVELING_GRID_POINTS-1)) >= (BACK_PROBE_BED_POSITION - FRONT_PROBE_BED_POSITION)) #error "The Y axis probing range is not enough to fit all the points defined in AUTO_BED_LEVELING_GRID_POINTS" #endif #else - #if ((Y_PROBE_OFFSET_FROM_EXTRUDER * AUTO_BED_LEVELING_GRID_POINTS) >= (BACK_PROBE_BED_POSITION - FRONT_PROBE_BED_POSITION)) + #if ((Y_PROBE_OFFSET_FROM_EXTRUDER * (AUTO_BED_LEVELING_GRID_POINTS-1)) >= (BACK_PROBE_BED_POSITION - FRONT_PROBE_BED_POSITION)) #error "The Y axis probing range is not enough to fit all the points defined in AUTO_BED_LEVELING_GRID_POINTS" #endif #endif From ffa09f86f47fac6605e16f4dfab01ce9312b9a29 Mon Sep 17 00:00:00 2001 From: Bo Herrmannsen Date: Fri, 9 Jan 2015 13:31:23 +0100 Subject: [PATCH 32/35] moved ver info 5 spaces to the right --- Marlin/dogm_lcd_implementation.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index f28efb8b4f..2400f3f7f7 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -128,10 +128,10 @@ static void lcd_implementation_init() u8g.setFont(u8g_font_5x8); u8g.drawStr(62,19,""); u8g.setFont(u8g_font_6x10_marlin); - u8g.drawStr(62,28,"MARLIN"); + u8g.drawStr(62,28," MARLIN"); u8g.drawStr(62,41,""); u8g.setFont(u8g_font_5x8); - u8g.drawStr(62,48,"V1.0.2"); + u8g.drawStr(62,48," V1.0.2"); u8g.setFont(u8g_font_5x8); u8g.drawStr(62,55,""); u8g.drawStr(62,61,""); From 9b6c1cfda6c7a3ffa8ee934952c23b5d99591950 Mon Sep 17 00:00:00 2001 From: Bo Herrmannsen Date: Fri, 9 Jan 2015 15:20:41 +0100 Subject: [PATCH 33/35] removed unneeded lines in welcome msg --- Marlin/dogm_lcd_implementation.h | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index 2400f3f7f7..79fecb7ea2 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -123,20 +123,13 @@ static void lcd_implementation_init() // RepRap init bmp u8g.drawBitmapP(0,0,START_BMPBYTEWIDTH,START_BMPHEIGHT,start_bmp); // Welcome message + u8g.setFont(u8g_font_6x10_marlin); - u8g.drawStr(62,10,""); + u8g.drawStr(64,28," MARLIN"); + u8g.setFont(u8g_font_5x8); - u8g.drawStr(62,19,""); - u8g.setFont(u8g_font_6x10_marlin); - u8g.drawStr(62,28," MARLIN"); - u8g.drawStr(62,41,""); - u8g.setFont(u8g_font_5x8); - u8g.drawStr(62,48," V1.0.2"); - u8g.setFont(u8g_font_5x8); - u8g.drawStr(62,55,""); - u8g.drawStr(62,61,""); - u8g.drawStr90(92,57,""); - u8g.drawStr(100,61,""); + u8g.drawStr(64,48," V1.0.2"); + } while( u8g.nextPage() ); } From cd33b5b0620640d6f91496aa0d5a4d99e5f20644 Mon Sep 17 00:00:00 2001 From: Bo Herrmannsen Date: Fri, 9 Jan 2015 15:44:47 +0100 Subject: [PATCH 34/35] changed logo and ver info logo is now 110 pixels wide and starts 9 pixels in from top left corner and also 9 pixels down from same corner... this will give a 9 pixel border all way round ver info is placed centered and there is a 9 pixel from bottom of display to ver info --- Marlin/dogm_lcd_implementation.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index 79fecb7ea2..13ecf08333 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -121,14 +121,13 @@ static void lcd_implementation_init() u8g.firstPage(); do { // RepRap init bmp - u8g.drawBitmapP(0,0,START_BMPBYTEWIDTH,START_BMPHEIGHT,start_bmp); + u8g.drawBitmapP(9,9,START_BMPBYTEWIDTH,START_BMPHEIGHT,start_bmp); // Welcome message - u8g.setFont(u8g_font_6x10_marlin); - u8g.drawStr(64,28," MARLIN"); + u8g.setFont(u8g_font_5x8); - u8g.drawStr(64,48," V1.0.2"); + u8g.drawStr(49,50," V1.0.2"); } while( u8g.nextPage() ); } From d94109e8867bd5d9c68273bf995aff6353ce3031 Mon Sep 17 00:00:00 2001 From: Bo Herrmannsen Date: Fri, 9 Jan 2015 15:51:15 +0100 Subject: [PATCH 35/35] updated logo post and ver info --- Marlin/dogm_lcd_implementation.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index 13ecf08333..bcbe5f792d 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -121,13 +121,13 @@ static void lcd_implementation_init() u8g.firstPage(); do { // RepRap init bmp - u8g.drawBitmapP(9,9,START_BMPBYTEWIDTH,START_BMPHEIGHT,start_bmp); + u8g.drawBitmapP(7,7,START_BMPBYTEWIDTH,START_BMPHEIGHT,start_bmp); // Welcome message u8g.setFont(u8g_font_5x8); - u8g.drawStr(49,50," V1.0.2"); + u8g.drawStr(7,51,"V1.0.2 - marlin.reprap.org"); } while( u8g.nextPage() ); }