Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into Development
This commit is contained in:
Erik van der Zalm
@ -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
|
||||
@ -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
|
||||
|
||||
@ -1,71 +1,27 @@
|
||||
#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
|
||||
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
|
||||
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,
|
||||
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
|
||||
|
||||
@ -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
|
||||
@ -3161,13 +3159,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;
|
||||
@ -3242,7 +3239,6 @@ Sigma_Exit:
|
||||
SERIAL_PROTOCOL(" d:");
|
||||
SERIAL_PROTOCOL(unscalePID_d(bedKd));
|
||||
SERIAL_PROTOCOLLN("");
|
||||
previous_millis_ok = millis();
|
||||
}
|
||||
break;
|
||||
#endif //PIDTEMP
|
||||
@ -3533,7 +3529,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
|
||||
{
|
||||
@ -3920,7 +3915,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:";
|
||||
@ -3938,7 +3932,6 @@ void ClearToSend()
|
||||
return;
|
||||
#endif //SDSUPPORT
|
||||
SERIAL_PROTOCOLLNPGM(MSG_OK);
|
||||
previous_millis_ok = millis();
|
||||
}
|
||||
|
||||
void get_coordinates()
|
||||
@ -4363,14 +4356,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 )
|
||||
{
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -1,353 +0,0 @@
|
||||
%!PS-Adobe-3.0
|
||||
%%Creator:Adobe Illustrator (TM) 8.000000 Exported from CorelDRAW X6
|
||||
%%Title:marlin logoscript.ai
|
||||
%%CreationDate:
|
||||
%%Canvassize:16383
|
||||
%%BoundingBox:-62 3484 337 3617
|
||||
%%DocumentProcessColors: Cyan Magenta Yellow Black
|
||||
%%DocumentSuppliedResources: procset Adobe_level2_AI5 1.2 0
|
||||
%%+ procset Adobe_typography_AI5 1.0 1
|
||||
%%+ procset Adobe_ColorImage_AI6 1.1 0
|
||||
%%+ procset Adobe_Illustrator_AI5 1.2 0
|
||||
%%+ procset Adobe_cshow 2.0 8
|
||||
%%+ procset Adobe_shading_AI8 1.0 0
|
||||
%%DocumentSuppliedResources: procset Adobe_level2_AI5 1.2 0
|
||||
%%+ procset Adobe_typography_AI5 1.0 1
|
||||
%%+ procset Adobe_ColorImage_AI6 1.1 0
|
||||
%%+ procset Adobe_Illustrator_AI5 1.2 0
|
||||
%%+ procset Adobe_cshow 2.0 8
|
||||
%%DocumentNeededResources: procset Adobe_level2_AI5 1.2 0
|
||||
%%+ procset Adobe_typography_AI5 1.0 0
|
||||
%%+ procset Adobe_ColorImage_AI6 1.1 0
|
||||
%%+ procset Adobe_Illustrator_AI5 1.0 0
|
||||
%%DocumentNeededResources: procset Adobe_level2_AI5 1.2 0
|
||||
%%+ procset Adobe_Illustrator_AI5 1.0 0
|
||||
%%+ procset Adobe_packedarray 2.0 0
|
||||
%%+ procset Adobe_cmykcolor 1.1 0
|
||||
%%+ procset Adobe_cshow 1.1 0
|
||||
%%+ procset Adobe_customcolor 1.0 0
|
||||
%%+ procset Adobe_typography_AI3 1.0 1
|
||||
%%+ procset Adobe_pattern_AI3 1.0 1
|
||||
%%+ procset Adobe_IllustratorA_AI3 1.0 1
|
||||
%%DocumentNeededResources: procset Adobe_packedarray 2.0 0
|
||||
%%+ procset Adobe_cmykcolor 1.1 0
|
||||
%%+ procset Adobe_cshow 1.1 0
|
||||
%%+ procset Adobe_customcolor 1.0 0
|
||||
%%+ procset Adobe_typography_AI3 1.0 1
|
||||
%%+ procset Adobe_pattern_AI3 1.0 1
|
||||
%%+ procset Adobe_IllustratorA_AI3 1.0 1
|
||||
%AI3_ColorUsage: Color
|
||||
%AI3_Cropmarks:0 0 842 595
|
||||
%AI3_TileBox:0 0 842 595
|
||||
%AI3_TemplateBox:421 297 421 297
|
||||
%AI3_DocumentPreview: None
|
||||
%AI5_ArtSize: 842 595
|
||||
%AI5_NumLayers: 1
|
||||
%AI5_FileFormat 2.0
|
||||
%AI9_ColorModel: 2
|
||||
%AI12_CMSettings: 00.MS
|
||||
%AI7_Thumbnail: 128 44 8
|
||||
%%BeginData: 4580 Hex Bytes
|
||||
%2B2A29FEFEFE000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000000000000000000000000000
|
||||
%000000000000000000000000000000000000
|
||||
%524C45FD0601FD7A00FD0401FD7C00FD0301FD7D000101FD0500FD6301FD
|
||||
%160001FD0400FD6601FD150001FD0300FD6801FD1800FD6901FD1600FD6B
|
||||
%01FD1500FD5001FD0600FD1601FD1400FD0C01FD0500FD0901FD0600FD30
|
||||
%01FD0600FD0501FD0300FD0F01FD1300FD0A01FD0A00FD0401FD0A00FD2E
|
||||
%01FD0600FD0401FD0500FD0F01FD1200FD0901FD0C000101FD0C00FD2D01
|
||||
%FD0600FD0401FD0500FD1001FD1100FD0801FD1C00FD2C01FD0600FD0401
|
||||
%FD0500FD1101FD1000FD0701FD1E00FD2B01FD0600FD0401FD0500FD1201
|
||||
%FD0F00FD0601FD1F00FD2B01FD0600FD0401FD0500FD1301FD0E00FD0601
|
||||
%FD0700FD0401FD0900FD0501FD0700FD2A01FD0600FD1D01FD0D00FD0601
|
||||
%FD0600FD0601FD0700FD0701FD0600FD0701FD0700FD0F01FD0700FD0601
|
||||
%FD0600FD0401FD0500FD0901FD0700FD0501FD0C00FD0501FD0600FD0801
|
||||
%FD0600FD0701FD0600FD0601FD0A00FD0C01FD0A00FD0401FD0600FD0401
|
||||
%FD0500FD0801FD0A00FD0401FD0B00FD0501FD0600FD0801FD0600FD0701
|
||||
%FD0600FD0401FD0D00FD0901FD0D00FD0301FD0600FD0401FD0500FD0601
|
||||
%FD0D00FD0401FD0A00FD0501FD0600FD0801FD0600FD0701FD0600FD0301
|
||||
%FD0F00FD0801FD0E000101FD0600FD0401FD0500FD0601FD0E00FD0401FD
|
||||
%0900FD0501FD0600FD0801FD0600FD0701FD06000101FD1100FD0601FD10
|
||||
%0001FD0600FD0401FD0500FD0501FD1000FD0401FD0800FD0501FD0600FD
|
||||
%0801FD0600FD0701FD06000101FD1100FD0501FD110001FD0600FD0401FD
|
||||
%0500FD0401FD1100FD0501FD0700FD0501FD0600FD0801FD0600FD0701FD
|
||||
%060001FD0700FD0501FD0700FD0401FD0700FD0401FD060001FD0600FD04
|
||||
%01FD0500FD0401FD0700FD0401FD0600FD0601FD0600FD0501FD0600FD08
|
||||
%01FD0600FD0701FD060001FD0600FD0701FD0600FD0401FD0600FD0601FD
|
||||
%050001FD0600FD0401FD0500FD0401FD0600FD0601FD0600FD0501FD0600
|
||||
%FD0501FD0600FD0801FD0600FD0701FD060001FD0600FD0801FD0500FD04
|
||||
%01FD0600FD0601FD0C00FD0401FD0500FD0401FD0600FD0601FD0600FD05
|
||||
%01FD0600FD0501FD0600FD0801FD0600FD0701FD060001FD0500FD0901FD
|
||||
%0600FD0301FD0600FD0601FD0C00FD0401FD0500FD0401FD0600FD0601FD
|
||||
%0600FD0501FD0600FD0501FD0600FD0801FD0600FD0701FD0C00FD0901FD
|
||||
%0600FD0301FD0600FD0C01FD0600FD0401FD0500FD0401FD0600FD0601FD
|
||||
%0600FD0501FD0600FD0501FD0600FD0801FD0600FD0701FD060001FD0500
|
||||
%FD0901FD0600FD0301FD0600FD0C01FD0600FD0401FD0500FD0401FD0600
|
||||
%FD0601FD0600FD0501FD0600FD0501FD0600FD0801FD0600FD0701FD0600
|
||||
%01FD0600FD0801FD0600FD0301FD0600FD0C01FD0600FD0401FD0500FD04
|
||||
%01FD0600FD0601FD0600FD0501FD0600FD0501FD0600FD0801FD0600FD07
|
||||
%01FD060001FD0600FD0801FD0600FD0301FD0600FD0C01FD0600FD0401FD
|
||||
%0500FD0401FD0600FD0601FD0600FD0501FD0600FD0501FD0600FD0801FD
|
||||
%0600FD0701FD060001FD0800FD0601FD0600FD0301FD0600FD0C01FD0600
|
||||
%FD0401FD0500FD0401FD0600FD0601FD0600FD0501FD0600FD0501FD0600
|
||||
%FD0801FD0600FD0701FD06000101FD0C0001FD0F00FD0C01FD090001FD0F
|
||||
%00FD0601FD0600FD0501FD0600FD0501FD0600FD0801FD0600FD0701FD06
|
||||
%000101FD0C0001FD0F00FD0D01FD080001FD0F00FD0601FD0600FD0501FD
|
||||
%0600FD0501FD0600FD0801FD0600FD0701FD0600FD0301FD0B0001FD0F00
|
||||
%FD0D01FD080001FD0F00FD0601FD0600FD0501FD0600FD0501FD0600FD08
|
||||
%01FD0600FD0701FD0600FD0401FD0A0001FD0F00FD0E01FD070001FD0F00
|
||||
%FD0601FD0600FD0501FD0600FD0501FD0600FD0801FD0600FD0701FD0600
|
||||
%FD0601FD080001FD0F00FD0F01FD060001FD0F00FD0601FD0600FD0501FD
|
||||
%0600FD0601FD0500FD0801FD0600FD0701FD0600FD0801FD060001FD0F00
|
||||
%FD1101FD040001FD0F00FD0601FD0500FD0601FD0700FD7801FD040001FD
|
||||
%0300FD7801FD03000101FD0400FD7601FD0400FD0301FD0500FD7201FD05
|
||||
%00FD0501FD7A00FD0701FD7800FD0A01FD7400FD0601
|
||||
%%EndData
|
||||
%%EndComments
|
||||
%%BeginProlog
|
||||
%%IncludeResource: procset Adobe_level2_AI5 1.2 0
|
||||
%%IncludeResource: procset Adobe_typography_AI5 1.0 1
|
||||
%%IncludeResource: procset Adobe_ColorImage_AI6 1.1 0
|
||||
%%IncludeResource: procset Adobe_Illustrator_AI5 1.2 0
|
||||
%%IncludeResource: procset Adobe_cshow 2.0 8
|
||||
%%IncludeResource: procset Adobe_level2_AI5 1.2 0
|
||||
%%IncludeResource: procset Adobe_typography_AI5 1.0 1
|
||||
%%IncludeResource: procset Adobe_ColorImage_AI6 1.1 0
|
||||
%%IncludeResource: procset Adobe_Illustrator_AI5 1.2 0
|
||||
%%IncludeResource: procset Adobe_cshow 2.0 8
|
||||
%%IncludeResource: procset Adobe_level2_AI5 1.2 0
|
||||
%%IncludeResource: procset Adobe_typography_AI5 1.0 0
|
||||
%%IncludeResource: procset Adobe_ColorImage_AI6 1.1 0
|
||||
%%IncludeResource: procset Adobe_Illustrator_AI5 1.0 0
|
||||
%%IncludeResource: procset Adobe_level2_AI5 1.2 0
|
||||
%%IncludeResource: procset Adobe_Illustrator_AI5 1.0 0
|
||||
%%IncludeResource: procset Adobe_packedarray 2.0 0
|
||||
Adobe_packedarray /initialize get exec
|
||||
%%IncludeResource: procset Adobe_cmykcolor 1.1 0
|
||||
%%IncludeResource: procset Adobe_cshow 1.1 0
|
||||
%%IncludeResource: procset Adobe_customcolor 1.0 0
|
||||
%%IncludeResource: procset Adobe_typography_AI3 1.0 1
|
||||
%%IncludeResource: procset Adobe_pattern_AI3 1.0 1
|
||||
%%IncludeResource: procset Adobe_IllustratorA_AI3 1.0 1
|
||||
%%IncludeResource: procset Adobe_packedarray 2.0 0
|
||||
Adobe_packedarray /initialize get exec
|
||||
%%IncludeResource: procset Adobe_cmykcolor 1.1 0
|
||||
%%IncludeResource: procset Adobe_cshow 1.1 0
|
||||
%%IncludeResource: procset Adobe_customcolor 1.0 0
|
||||
%%IncludeResource: procset Adobe_typography_AI3 1.0 1
|
||||
%%IncludeResource: procset Adobe_pattern_AI3 1.0 1
|
||||
%%IncludeResource: procset Adobe_IllustratorA_AI3 1.0 1
|
||||
%%EndProlog
|
||||
%%BeginSetup
|
||||
Adobe_level2_AI5 /initialize get exec
|
||||
Adobe_cshow /initialize get exec
|
||||
Adobe_Illustrator_AI5_vars Adobe_Illustrator_AI5 Adobe_typography_AI5 /initialize get exec
|
||||
Adobe_ColorImage_AI6 /initialize get exec
|
||||
Adobe_Illustrator_AI5 /initialize get exec
|
||||
Adobe_level2_AI5 /initialize get exec
|
||||
Adobe_cshow /initialize get exec
|
||||
Adobe_Illustrator_AI5_vars Adobe_Illustrator_AI5 Adobe_typography_AI5 /initialize get exec
|
||||
Adobe_ColorImage_AI6 /initialize get exec
|
||||
Adobe_Illustrator_AI5 /initialize get exec
|
||||
Adobe_level2_AI5 /initialize get exec
|
||||
Adobe_Illustrator_AI5_vars Adobe_Illustrator_AI5 Adobe_typography_AI5 /initialize get exec
|
||||
Adobe_ColorImage_AI6 /initialize get exec
|
||||
Adobe_Illustrator_AI5 /initialize get exec
|
||||
Adobe_cmykcolor /initialize get exec
|
||||
Adobe_cshow /initialize get exec
|
||||
Adobe_customcolor /initialize get exec
|
||||
Adobe_typography_AI3 /initialize get exec
|
||||
Adobe_pattern_AI3 /initialize get exec
|
||||
Adobe_IllustratorA_AI3 /initialize get exec
|
||||
Adobe_level2_AI5 /initialize get exec
|
||||
Adobe_Illustrator_AI5 /initialize get exec
|
||||
Adobe_cmykcolor /initialize get exec
|
||||
Adobe_cshow /initialize get exec
|
||||
Adobe_customcolor /initialize get exec
|
||||
Adobe_typography_AI3 /initialize get exec
|
||||
Adobe_pattern_AI3 /initialize get exec
|
||||
Adobe_IllustratorA_AI3 /initialize get exec
|
||||
%%EndSetup
|
||||
%AI5_BeginLayer
|
||||
1 1 1 1 0 0 -1 43 42 41 Lb
|
||||
(Layer 1) Ln
|
||||
*u
|
||||
1 XR
|
||||
0 O
|
||||
0.0000 0.0000 0.0000 1.0000 k
|
||||
256.4660 3540.8095 m
|
||||
256.4660 3520.4596 L
|
||||
242.7843 3520.4596 L
|
||||
242.7843 3565.7580 L
|
||||
227.6082 3565.7580 L
|
||||
227.6082 3520.4596 L
|
||||
227.6082 3506.5480 L
|
||||
242.7843 3506.5480 L
|
||||
256.4660 3506.5480 L
|
||||
271.6421 3506.5480 L
|
||||
271.6421 3520.4596 L
|
||||
271.6421 3541.1542 l
|
||||
271.6421 3547.8227 276.4709 3552.4216 283.1394 3552.4216 c
|
||||
293.1418 3552.4216 294.2915 3544.4886 294.2915 3541.1542 c
|
||||
294.2915 3506.5480 L
|
||||
298.3190 3506.5480 302.3467 3506.5480 306.3742 3506.5480 C
|
||||
307.8984 3506.5145 309.4679 3507.4029 309.4679 3510.6398 c
|
||||
309.4679 3540.8095 l
|
||||
309.4679 3556.3306 299.6952 3567.2528 283.1394 3567.2528 c
|
||||
267.0435 3567.2528 256.4660 3555.8705 256.4660 3540.8095 c
|
||||
256.4660 3540.8095 l
|
||||
f
|
||||
140.5471 3506.5480 m
|
||||
128.2450 3506.5480 L
|
||||
113.0689 3506.5480 L
|
||||
113.0689 3521.2643 L
|
||||
113.0689 3535.9807 l
|
||||
113.0689 3545.0634 106.2856 3552.5364 97.8928 3552.5364 c
|
||||
89.5000 3552.5364 82.7167 3545.2933 82.7167 3536.4404 c
|
||||
82.7167 3527.7026 89.5000 3521.2643 98.2378 3521.2643 c
|
||||
106.9756 3521.2643 L
|
||||
106.9756 3506.5480 L
|
||||
96.3981 3506.5480 l
|
||||
79.8423 3506.5480 67.4254 3519.8847 67.4254 3536.4404 c
|
||||
67.4254 3553.2264 79.9571 3567.2528 97.8928 3567.2528 c
|
||||
115.7134 3567.2528 128.2450 3553.2264 128.2450 3535.9807 c
|
||||
128.2450 3521.2643 L
|
||||
140.5471 3521.2643 L
|
||||
140.5471 3540.8095 l
|
||||
140.5471 3555.8705 151.1246 3567.2528 167.2206 3567.2528 c
|
||||
183.7763 3567.2528 193.5490 3556.3306 193.5490 3540.8095 c
|
||||
193.5490 3538.1650 L
|
||||
178.3726 3538.1650 L
|
||||
178.3726 3541.1542 l
|
||||
178.3726 3544.4886 177.2229 3552.4216 167.2206 3552.4216 c
|
||||
160.5521 3552.4216 155.7232 3547.8227 155.7232 3541.1542 c
|
||||
155.7232 3521.2643 L
|
||||
155.7232 3506.5480 L
|
||||
140.5471 3506.5480 L
|
||||
140.5471 3506.5480 L
|
||||
f
|
||||
64.0239 3559.5496 m
|
||||
64.0239 3575.5308 52.1819 3588.2926 35.0512 3588.2926 c
|
||||
26.3134 3588.2926 18.6103 3584.2686 13.7815 3577.9450 C
|
||||
8.8379 3584.2686 1.3646 3588.2926 -7.4880 3588.2926 c
|
||||
-24.5038 3588.2926 -36.3458 3575.5305 -36.3458 3559.5496 c
|
||||
-36.3458 3542.7838 -36.3458 3526.0183 -36.3458 3509.2525 C
|
||||
-36.3458 3507.8134 -35.2460 3506.5480 -33.5305 3506.5480 C
|
||||
-21.2848 3506.5480 L
|
||||
-21.2848 3559.7798 l
|
||||
-21.2848 3567.3678 -15.8811 3573.4612 -7.4880 3573.4612 c
|
||||
0.7897 3573.4612 6.1934 3567.3678 6.1934 3559.7798 c
|
||||
6.1934 3506.5480 L
|
||||
21.4846 3506.5480 L
|
||||
21.4846 3559.7798 l
|
||||
21.4846 3567.3678 26.6584 3573.4612 35.0512 3573.4612 c
|
||||
43.3293 3573.4612 48.8477 3567.3678 48.8477 3559.7798 c
|
||||
48.8477 3506.5480 L
|
||||
64.0239 3506.5480 L
|
||||
64.0239 3559.5496 l
|
||||
64.0239 3559.5496 l
|
||||
f
|
||||
197.0773 3531.3817 m
|
||||
197.0773 3515.1707 206.2749 3504.8234 223.6357 3506.6631 C
|
||||
223.6357 3520.4596 L
|
||||
216.1624 3519.9995 212.3685 3522.9889 212.3685 3531.3817 c
|
||||
212.3685 3592.0865 L
|
||||
197.0773 3592.0865 L
|
||||
197.0773 3531.3817 l
|
||||
197.0773 3531.3817 l
|
||||
f
|
||||
242.7843 3572.1967 m
|
||||
242.7843 3580.7043 l
|
||||
242.7843 3584.9582 239.3351 3588.2926 235.1962 3588.2926 c
|
||||
230.9423 3588.2926 227.4931 3584.9582 227.4931 3580.7043 c
|
||||
227.4931 3572.1967 L
|
||||
242.7843 3572.1967 L
|
||||
f
|
||||
*U
|
||||
1 XR
|
||||
0 R
|
||||
0.0000 0.0000 0.0000 1.0000 K
|
||||
0 1 0 0 0 Xy
|
||||
0 J
|
||||
0 j
|
||||
22.9256 M
|
||||
7.0866 w
|
||||
[]0 d
|
||||
-31.5927 3613.1664 m
|
||||
304.7145 3613.1664 l
|
||||
320.3050 3613.1664 333.0609 3600.4107 333.0609 3584.8202 c
|
||||
333.0609 3515.5123 l
|
||||
333.0609 3499.9217 320.3050 3487.1661 304.7145 3487.1661 c
|
||||
-31.5927 3487.1661 l
|
||||
-47.1832 3487.1661 -59.9391 3499.9217 -59.9391 3515.5123 c
|
||||
-59.9391 3584.8202 l
|
||||
-59.9391 3600.4107 -47.1832 3613.1664 -31.5927 3613.1664 c
|
||||
s
|
||||
1 XR
|
||||
0 O
|
||||
0.0000 0.0000 0.0000 1.0000 k
|
||||
336.5671 3616.7281 m
|
||||
260.4297 3616.7281 L
|
||||
336.5671 3539.4786 L
|
||||
336.5671 3616.7281 L
|
||||
f
|
||||
LB
|
||||
%AI5_EndLayer--
|
||||
%%PageTrailer
|
||||
gsave annotatepage grestore showpage
|
||||
%%Trailer
|
||||
Adobe_Illustrator_AI5 /terminate get exec
|
||||
Adobe_ColorImage_AI6 /terminate get exec
|
||||
Adobe_typography_AI5 /terminate get exec
|
||||
Adobe_cshow /terminate get exec
|
||||
Adobe_level2_AI5 /terminate get exec
|
||||
Adobe_Illustrator_AI5 /terminate get exec
|
||||
Adobe_ColorImage_AI6 /terminate get exec
|
||||
Adobe_typography_AI5 /terminate get exec
|
||||
Adobe_cshow /terminate get exec
|
||||
Adobe_level2_AI5 /terminate get exec
|
||||
Adobe_Illustrator_AI5 /terminate get exec
|
||||
Adobe_ColorImage_AI6 /terminate get exec
|
||||
Adobe_typography_AI5 /terminate get exec
|
||||
Adobe_level2_AI5 /terminate get exec
|
||||
Adobe_Illustrator_AI5 /terminate get exec
|
||||
Adobe_level2_AI5 /terminate get exec
|
||||
Adobe_IllustratorA_AI3 /terminate get exec
|
||||
Adobe_pattern_AI3 /terminate get exec
|
||||
Adobe_typography_AI3 /terminate get exec
|
||||
Adobe_customcolor /terminate get exec
|
||||
Adobe_cshow /terminate get exec
|
||||
Adobe_cmykcolor /terminate get exec
|
||||
Adobe_packedarray /terminate get exec
|
||||
Adobe_IllustratorA_AI3 /terminate get exec
|
||||
Adobe_pattern_AI3 /terminate get exec
|
||||
Adobe_typography_AI3 /terminate get exec
|
||||
Adobe_customcolor /terminate get exec
|
||||
Adobe_cshow /terminate get exec
|
||||
Adobe_cmykcolor /terminate get exec
|
||||
Adobe_packedarray /terminate get exec
|
||||
%%EOF
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -1,24 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="595.28px" height="841.89px" viewBox="0 0 595.28 841.89" enable-background="new 0 0 595.28 841.89" xml:space="preserve">
|
||||
<path d="M428.064,394.44v20.351h-13.682v-45.299h-15.177v45.299v13.911h15.177h13.682h15.176v-13.911v-20.694
|
||||
c0-6.669,4.828-11.268,11.496-11.268c10.004,0,11.152,7.933,11.152,11.268v34.605c4.027,0,8.057,0,12.084,0
|
||||
c1.523,0.034,3.094-0.854,3.094-4.092v-30.17c0-15.521-9.773-26.443-26.33-26.443C438.641,367.997,428.064,379.379,428.064,394.44
|
||||
L428.064,394.44z M312.145,428.702h-12.301h-15.177v-14.716v-14.717c0-9.083-6.783-16.556-15.176-16.556
|
||||
c-8.393,0-15.176,7.243-15.176,16.096c0,8.738,6.783,15.177,15.521,15.177h8.738v14.716h-10.578
|
||||
c-16.556,0-28.973-13.337-28.973-29.893c0-16.786,12.532-30.812,30.467-30.812c17.821,0,30.353,14.026,30.353,31.272v14.717h12.301
|
||||
V394.44c0-15.061,10.578-26.443,26.674-26.443c16.557,0,26.328,10.922,26.328,26.443v2.645h-15.176v-2.988
|
||||
c0-3.335-1.15-11.268-11.152-11.268c-6.668,0-11.497,4.599-11.497,11.268v19.89v14.716H312.145L312.145,428.702z M235.622,375.7
|
||||
c0-15.981-11.842-28.743-28.973-28.743c-8.738,0-16.441,4.023-21.27,10.348c-4.943-6.324-12.417-10.348-21.269-10.348
|
||||
c-17.016,0-28.858,12.762-28.858,28.743c0,16.766,0,33.532,0,50.297c0,1.439,1.1,2.704,2.815,2.704h12.246V375.47
|
||||
c0-7.588,5.403-13.682,13.797-13.682c8.277,0,13.681,6.094,13.681,13.682v53.231h15.292V375.47c0-7.588,5.173-13.682,13.566-13.682
|
||||
c8.278,0,13.796,6.094,13.796,13.682v53.231h15.176V375.7L235.622,375.7z M368.676,403.868c0,16.212,9.197,26.559,26.559,24.719
|
||||
v-13.796c-7.474,0.46-11.268-2.529-11.268-10.923v-60.704h-15.291V403.868L368.676,403.868z M414.383,363.053v-8.508
|
||||
c0-4.254-3.449-7.588-7.588-7.588c-4.254,0-7.703,3.334-7.703,7.588v8.508H414.383L414.383,363.053z"/>
|
||||
<path fill="none" stroke="#000000" stroke-width="7.0866" stroke-miterlimit="22.9256" d="M140.005,322.083h336.307
|
||||
c15.59,0,28.346,12.756,28.346,28.346v69.308c0,15.591-12.756,28.346-28.346,28.346H140.005c-15.59,0-28.346-12.755-28.346-28.346
|
||||
V350.43C111.659,334.839,124.415,322.083,140.005,322.083L140.005,322.083z"/>
|
||||
<polygon fill-rule="evenodd" clip-rule="evenodd" points="508.164,318.522 432.027,318.522 508.164,395.771 508.164,318.522 "/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 2.5 KiB |
@ -121,22 +121,14 @@ static void lcd_implementation_init()
|
||||
u8g.firstPage();
|
||||
do {
|
||||
// RepRap init bmp
|
||||
u8g.drawBitmapP(0,0,START_BMPBYTEWIDTH,START_BMPHEIGHT,start_bmp);
|
||||
u8g.drawBitmapP(7,7,START_BMPBYTEWIDTH,START_BMPHEIGHT,start_bmp);
|
||||
// Welcome message
|
||||
u8g.setFont(u8g_font_6x10_marlin);
|
||||
u8g.drawStr(62,10,"MARLIN");
|
||||
|
||||
|
||||
|
||||
u8g.setFont(u8g_font_5x8);
|
||||
u8g.drawStr(62,19,"V1.0.0 RC2-mm");
|
||||
u8g.setFont(u8g_font_6x10_marlin);
|
||||
u8g.drawStr(62,28,"by ErikZalm");
|
||||
u8g.drawStr(62,41,"DOGM128 LCD");
|
||||
u8g.setFont(u8g_font_5x8);
|
||||
u8g.drawStr(62,48,"enhancements");
|
||||
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(7,51,"V1.0.2 - marlin.reprap.org");
|
||||
|
||||
} while( u8g.nextPage() );
|
||||
}
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user