Skip to content

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

Fix

parent 9a9328d3
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 128 deletions
MarlinKimbra/Configuration.h
View file @ 52727590
...@@ -8,8 +8,11 @@ ...@@ -8,8 +8,11 @@
// User-specified version info of this build to display in [Pronterface, etc] terminal window during // User-specified version info of this build to display in [Pronterface, etc] terminal window during
// startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
// build by the user have been successfully uploaded into firmware. // build by the user have been successfully uploaded into firmware.
#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time #define STRING_VERSION "v4.0.2"
#define STRING_CONFIG_H_AUTHOR "(MagoKimbra: magokimbra@hotmail.com, Version 4.0)" // Who made the changes. #define STRING_URL "reprap.org"
#define STRING_VERSION_CONFIG_H __DATE__ " " __TIME__ // build date and time
#define STRING_CONFIG_H_AUTHOR "(MagoKimbra: magokimbra@hotmail.com)" // Who made the changes.
#define STRING_SPLASH STRING_VERSION " - " STRING_URL // will be shown during bootu
// SERIAL_PORT selects which serial port should be used for communication with the host. // SERIAL_PORT selects which serial port should be used for communication with the host.
// This allows the connection of wireless adapters (for instance) to non-default port pins. // This allows the connection of wireless adapters (for instance) to non-default port pins.
...@@ -218,6 +221,7 @@ ...@@ -218,6 +221,7 @@
#ifdef PIDTEMP #ifdef PIDTEMP
//#define PID_DEBUG // Sends debug data to the serial port. //#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 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 (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 #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. // 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 #define PID_INTEGRAL_DRIVE_MAX PID_MAX //limit for the integral term
...@@ -358,7 +362,7 @@ ...@@ -358,7 +362,7 @@
// The Elefu RA Board Control Panel // The Elefu RA Board Control Panel
// http://www.elefu.com/index.php?route=product/product&product_id=53 // http://www.elefu.com/index.php?route=product/product&product_id=53
// REMEMBER TO INSTALL LiquidCrystal_I2C.h in your ARUDINO library folder: https://github.com/kiyoshigawa/LiquidCrystal_I2C // REMEMBER TO INSTALL LiquidCrystal_I2C.h in your ARDUINO library folder: https://github.com/kiyoshigawa/LiquidCrystal_I2C
//#define RA_CONTROL_PANEL //#define RA_CONTROL_PANEL
//automatic expansion //automatic expansion
......
MarlinKimbra/DOGMbitmaps.h
View file @ 52727590
#define START_BMPWIDTH 60 //Width in pixels // BitMap for splashscreen
#define START_BMPHEIGHT 64 //Height in pixels // Generated with: http://www.digole.com/tools/PicturetoC_Hex_converter.php
#define START_BMPBYTEWIDTH 8 //Width in bytes // Please note that using the high-res version takes about 0.5KB of
const unsigned char start_bmp[574] PROGMEM = { //AVR-GCC, WinAVR #ifdef START_BMPHIGH
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, #define START_BMPWIDTH 112
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, #define START_BMPHEIGHT 38
0xFF,0xFF,0xFF,0xF9,0xFF,0xFF,0xFF,0xF0, #define START_BMPBYTEWIDTH 14
0xFF,0xFF,0xFF,0xF0,0xFF,0xFF,0xFF,0xF0, #define START_BMPBYTES 532 // START_BMPWIDTH * START_BMPHEIGHT / 8
0xFF,0xFF,0xFF,0xE0,0x7F,0xFF,0xFF,0xF0,
0xFF,0xFF,0xFF,0xC0,0x3F,0xFF,0xFF,0xF0, const unsigned char start_bmp[START_BMPBYTES] PROGMEM = {
0xFF,0xFF,0xFF,0x80,0x1F,0xFF,0xFF,0xF0, 0x01,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff
0xFF,0xFF,0xFF,0x00,0x0F,0xFF,0xFF,0xF0, ,0x0f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff
0xFF,0xFF,0xFE,0x00,0x07,0xFF,0xFF,0xF0, ,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0xff,0xff
0xFF,0xFF,0xFC,0x00,0x03,0xFF,0xFF,0xF0, ,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0xff,0xff
0xFF,0xFF,0xF8,0x00,0x01,0xFF,0xFF,0xF0, ,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xff,0xff
0xFF,0xFF,0xF0,0x00,0x00,0xFF,0xFF,0xF0, ,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff
0xFF,0xFF,0xE0,0x00,0x00,0x7F,0xFF,0xF0, ,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7f,0xff
0xFF,0xFF,0xC0,0x00,0x00,0x3F,0xFF,0xF0, ,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78,0x00,0x00,0x3f,0xff
0xFF,0xFF,0x80,0x00,0x00,0x3F,0xFF,0xF0, ,0xc0,0x0f,0xc0,0xfc,0x00,0x00,0x00,0x00,0x00,0x78,0x18,0x00,0x1f,0xff
0xFF,0xFF,0x00,0x00,0x00,0x1F,0xFF,0xF0, ,0xc0,0x3f,0xe1,0xff,0x00,0x00,0x00,0x00,0x00,0x78,0x3c,0x00,0x0f,0xff
0xFF,0xFE,0x00,0x00,0x00,0x0F,0xFF,0xF0, ,0xc0,0x7f,0xf3,0xff,0x80,0x00,0x00,0x00,0x00,0x78,0x3c,0x00,0x07,0xff
0xFF,0xFE,0x00,0x00,0x00,0x07,0xFF,0xF0, ,0xc0,0xff,0xff,0xff,0xc0,0x00,0x00,0x00,0x00,0x78,0x3c,0x00,0x03,0xff
0xFF,0xFC,0x00,0x00,0x00,0x07,0xFF,0xF0, ,0xc1,0xf8,0x7f,0x87,0xe0,0x00,0x00,0x00,0x00,0x78,0x00,0x00,0x01,0xff
0xFF,0xFC,0x00,0x00,0x00,0x03,0xFF,0xF0, ,0xc1,0xf0,0x3f,0x03,0xe0,0x00,0x00,0x00,0x00,0x78,0x00,0x00,0x00,0xff
0xFF,0xF8,0x00,0x00,0x00,0x03,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe0,0x1f,0x00,0x03,0xe0,0x78,0x3c,0x03,0xf0,0x7f
0xFF,0xF8,0x00,0x00,0x00,0x03,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe0,0x7f,0xc0,0x0f,0xf8,0x78,0x3c,0x07,0xfc,0x3f
0xFF,0xF8,0x00,0x00,0x00,0x01,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe1,0xff,0xe0,0x1f,0xfc,0x78,0x3c,0x0f,0xfe,0x1f
0xFF,0xF8,0x00,0x00,0x00,0x01,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe3,0xff,0xf0,0x3f,0xfe,0x78,0x3c,0x1f,0xfe,0x0f
0xFF,0xF8,0x00,0x00,0x00,0x01,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe3,0xf3,0xf8,0x3f,0x3e,0x78,0x3c,0x3f,0x3f,0x07
0xFF,0xF8,0x00,0x00,0x00,0x01,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe7,0xe0,0xfc,0x7c,0x1f,0x78,0x3c,0x3e,0x1f,0x07
0xFF,0xF8,0x00,0x00,0x00,0x01,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe7,0xc0,0x7c,0x7c,0x0f,0x78,0x3c,0x3c,0x0f,0x03
0xFF,0xF8,0x00,0x00,0x00,0x01,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe7,0x80,0x7c,0x78,0x0f,0x78,0x3c,0x3c,0x0f,0x03
0xFF,0xF8,0x00,0x00,0x00,0x01,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe7,0x80,0x3c,0x78,0x00,0x78,0x3c,0x3c,0x0f,0x03
0xFF,0xF8,0x00,0x00,0x00,0x01,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe7,0x80,0x3c,0x78,0x00,0x78,0x3c,0x3c,0x0f,0x03
0xFF,0xF8,0x00,0x00,0x00,0x03,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe7,0x80,0x3c,0x78,0x00,0x78,0x3c,0x3c,0x0f,0x03
0xFF,0xF8,0x00,0x00,0x00,0x03,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe7,0xc0,0x3c,0x78,0x00,0x78,0x3c,0x3c,0x0f,0x03
0xFF,0xFC,0x00,0x00,0x00,0x03,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe3,0xe0,0x3c,0x78,0x00,0x7c,0x3c,0x3c,0x0f,0x03
0xFF,0xFC,0x00,0x00,0x00,0x07,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe3,0xff,0x3f,0xf8,0x00,0x7f,0xbc,0x3c,0x0f,0x03
0xFF,0xFE,0x00,0x00,0x00,0x07,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe1,0xff,0x3f,0xf8,0x00,0x3f,0xbf,0xfc,0x0f,0x03
0xFF,0xFE,0x00,0x00,0x00,0x0F,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe0,0xff,0x3f,0xf8,0x00,0x1f,0xbf,0xfc,0x0f,0x03
0xFF,0xFF,0x00,0x00,0x00,0x1F,0xFF,0xF0, ,0xc1,0xe0,0x1e,0x01,0xe0,0x7f,0x3f,0xf8,0x00,0x0f,0xbf,0xfc,0x0f,0x03
0xFF,0xFF,0x80,0x00,0x00,0x1F,0xFF,0xF0, ,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07
0xFF,0xFF,0xC0,0x00,0x00,0x3F,0xFF,0xF0, ,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x06
0xFF,0xFF,0xE0,0x00,0x00,0x7F,0xFF,0xF0, ,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0e
0xFF,0xFF,0xF0,0x00,0x01,0xFF,0xFF,0xF0, ,0x38,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1c
0xFF,0xFF,0xFC,0x00,0x03,0xFF,0xFF,0xF0, ,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x78
0xFF,0xFF,0xFF,0x00,0x1F,0xFF,0xFF,0xF0, ,0x0f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf0
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, ,0x01,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x80 };
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, #else
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, #define START_BMPWIDTH 56
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, #define START_BMPHEIGHT 19
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, #define START_BMPBYTEWIDTH 7
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0, #define START_BMPBYTES 133 // START_BMPWIDTH * START_BMPHEIGHT / 8
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0,
0x83,0xFF,0xFF,0xFE,0x0F,0xFF,0xFF,0xF0, const unsigned char start_bmp[START_BMPBYTES] PROGMEM = {
0x80,0xFF,0xFF,0xFE,0x03,0xFF,0xFF,0xF0, 0x1f,0xff,0xff,0xff,0xff,0xff,0xff
0x88,0x7F,0xFF,0xFE,0x23,0xFF,0xFF,0xF0, ,0x60,0x00,0x00,0x00,0x00,0x01,0xff
0x8C,0x70,0x38,0x0E,0x71,0x81,0xC0,0x70, ,0x40,0x00,0x00,0x00,0x00,0x00,0xff
0x8C,0x60,0x38,0x0E,0x63,0x80,0xC0,0x30, ,0x80,0x00,0x00,0x00,0x00,0x00,0x7f
0x80,0xE3,0x19,0xC6,0x07,0xF8,0xC7,0x30, ,0x83,0xcf,0x00,0x00,0x0c,0x30,0x3f
0x80,0xE0,0x19,0xC6,0x03,0x80,0xC7,0x10, ,0x87,0xff,0x80,0x00,0x0c,0x30,0x1f
0x8C,0x62,0x79,0xC6,0x63,0x9C,0xC7,0x30, ,0x86,0x79,0x80,0x00,0x0c,0x00,0x0f
0x8C,0x63,0xF8,0xC6,0x71,0x18,0xC6,0x30, ,0x8c,0x30,0xc7,0x83,0x8c,0x30,0xe7
0x8E,0x30,0x18,0x0E,0x71,0x80,0xC0,0x30, ,0x8c,0x30,0xcf,0xc7,0xcc,0x31,0xf3
0x9E,0x38,0x39,0x1E,0x79,0xC4,0xC4,0xF0, ,0x8c,0x30,0xdc,0xec,0xec,0x33,0xb9
0xFF,0xFF,0xF9,0xFF,0xFF,0xFF,0xC7,0xF0, ,0x8c,0x30,0xd8,0x6c,0x6c,0x33,0x19
0xFF,0xFF,0xF9,0xFF,0xFF,0xFF,0xC7,0xF0, ,0x8c,0x30,0xd0,0x6c,0x0c,0x33,0x19
0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xF0 ,0x8c,0x30,0xd8,0x6c,0x0c,0x33,0x19
}; ,0x8c,0x30,0xdc,0x6c,0x0e,0x3b,0x19
,0x8c,0x30,0xcf,0x7c,0x07,0x9f,0x19
,0x8c,0x30,0xc7,0x7c,0x03,0x8f,0x19
,0x40,0x00,0x00,0x00,0x00,0x00,0x02
,0x60,0x00,0x00,0x00,0x00,0x00,0x06
,0x1f,0xff,0xff,0xff,0xff,0xff,0xf8 };
#endif
// Here comes a compile-time operation to match the extruder symbols // Here comes a compile-time operation to match the extruder symbols
// on the info screen to the set number of extruders in configuration.h // on the info screen to the set number of extruders in configuration.h
......
MarlinKimbra/Marlin_main.cpp
View file @ 52727590
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
#include "firmware_test.h" #include "firmware_test.h"
#endif #endif
#define VERSION_STRING " 4.0.1 " #define VERSION_STRING "4.0.2"
// look here for descriptions of G-codes: http://linuxcnc.org/handbook/gcode/g-code.html // look here for descriptions of G-codes: http://linuxcnc.org/handbook/gcode/g-code.html
// http://objects.reprap.org/wiki/Mendel_User_Manual:_RepRapGCodes // http://objects.reprap.org/wiki/Mendel_User_Manual:_RepRapGCodes
......
MarlinKimbra/dogm_lcd_implementation.h
View file @ 52727590
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#ifndef DOGM_LCD_IMPLEMENTATION_H #ifndef DOGM_LCD_IMPLEMENTATION_H
#define DOGM_LCD_IMPLEMENTATION_H #define DOGM_LCD_IMPLEMENTATION_H
#define MARLIN_VERSION "4.0.1" #define MARLIN_VERSION "4.0.2"
/** /**
* Implementation of the LCD display routines for a DOGM128 graphic display. These are common LCD 128x64 pixel graphic displays. * Implementation of the LCD display routines for a DOGM128 graphic display. These are common LCD 128x64 pixel graphic displays.
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
/* Russian language not supported yet, needs custom font /* Russian language not supported yet, needs custom font
#if LANGUAGE_CHOICE == 6 #ifdef LANGUAGE_RU
#include "LiquidCrystalRus.h" #include "LiquidCrystalRus.h"
#define LCD_CLASS LiquidCrystalRus #define LCD_CLASS LiquidCrystalRus
#else #else
...@@ -86,46 +86,53 @@ U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0); ...@@ -86,46 +86,53 @@ U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);
U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0); // HW-SPI Com: CS, A0 U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0); // HW-SPI Com: CS, A0
#endif #endif
static void lcd_implementation_init() { static void lcd_implementation_init()
#ifdef LCD_PIN_BL {
pinMode(LCD_PIN_BL, OUTPUT); // Enable LCD backlight #ifdef LCD_PIN_BL // Enable LCD backlight
digitalWrite(LCD_PIN_BL, HIGH); pinMode(LCD_PIN_BL, OUTPUT);
digitalWrite(LCD_PIN_BL, HIGH);
#endif #endif
u8g.setContrast(lcd_contrast); u8g.setContrast(lcd_contrast);
// FIXME: remove this workaround
/* // Uncomment this if you have the first generation (V1.10) of STBs board
// Uncomment this if you have the first generation (V1.10) of STBs board // pinMode(17, OUTPUT); // Enable LCD backlight
// digitalWrite(17, HIGH);
pinMode(17, OUTPUT); // Enable LCD backlight
digitalWrite(17, HIGH); #ifdef LCD_SCREEN_ROT_90
u8g.setRot90(); // Rotate screen by 90°
//*/ #elif defined(LCD_SCREEN_ROT_180)
u8g.setRot180(); // Rotate screen by 180°
u8g.firstPage(); #elif defined(LCD_SCREEN_ROT_270)
do { u8g.setRot270(); // Rotate screen by 270°
u8g.setFont(u8g_font_6x10_marlin); #endif
u8g.setColorIndex(1);
u8g.drawBox (0, 0, u8g.getWidth(), u8g.getHeight()); // FIXME: whats the purpose of the box? Maybe clear screen?
u8g.setColorIndex(1); u8g.firstPage();
} while( u8g.nextPage() );
#if defined(LCD_SCREEN_ROT_90)
u8g.setRot90(); // Rotate screen by 90°
#elif defined(LCD_SCREEN_ROT_180)
u8g.setRot180(); // Rotate screen by 180°
#elif defined(LCD_SCREEN_ROT_270)
u8g.setRot270(); // Rotate screen by 270°
#endif
u8g.firstPage();
do { do {
// RepRap init bmp u8g.setFont(u8g_font_6x10_marlin);
u8g.drawBitmapP(7,7,START_BMPBYTEWIDTH,START_BMPHEIGHT,start_bmp); u8g.setColorIndex(1);
// Welcome message u8g.drawBox (0, 0, u8g.getWidth(), u8g.getHeight());
u8g.setColorIndex(1);
} while(u8g.nextPage());
// Show splashscreen
int off = (u8g.getWidth() - START_BMPWIDTH) / 2;
int txtX = (u8g.getWidth() - sizeof(STRING_SPLASH) - 1) / 2;
int txtY = u8g.getHeight() - 10;
u8g.firstPage();
do {
#ifdef START_BMPHIGH
u8g.drawBitmapP(off, off, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp);
#else
u8g.setScale2x2();
u8g.drawBitmapP(off, off, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp);
u8g.undoScale();
#endif
u8g.setFont(u8g_font_5x8); u8g.setFont(u8g_font_5x8);
u8g.drawStr(7, 51, "V" MARLIN_VERSION " - marlin.reprap.org"); u8g.drawStr(txtX, txtY, STRING_SPLASH);
} while( u8g.nextPage() ); } while(u8g.nextPage());
} }
static void lcd_implementation_clear() { } // Automatically cleared by Picture Loop static void lcd_implementation_clear() { } // Automatically cleared by Picture Loop
......
MarlinKimbra/language_en.h
View file @ 52727590
...@@ -156,11 +156,11 @@ ...@@ -156,11 +156,11 @@
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm" #define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#ifdef DELTA #ifdef DELTA
#define MSG_DELTA_CALIBRATE "Delta Calibration" #define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X" #define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y" #define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z" #define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center" #define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA #endif // DELTA
#ifdef FIRMWARE_TEST #ifdef FIRMWARE_TEST
......
MarlinKimbra/language_it.h
View file @ 52727590
...@@ -123,10 +123,10 @@ ...@@ -123,10 +123,10 @@
#define MSG_DWELL "Sospensione..." #define MSG_DWELL "Sospensione..."
#define MSG_USERWAIT "Attendi Utente..." #define MSG_USERWAIT "Attendi Utente..."
#define MSG_RESUMING "Riprendi Stampa" #define MSG_RESUMING "Riprendi Stampa"
#define MSG_PRINT_ABORTED "Print aborted" #define MSG_PRINT_ABORTED "Stampa abortita"
#define MSG_NO_MOVE "Nessun Movimento." #define MSG_NO_MOVE "Nessun Movimento"
#define MSG_KILLED "UCCISO. " #define MSG_KILLED "UCCISO "
#define MSG_STOPPED "ARRESTATO. " #define MSG_STOPPED "ARRESTATO "
#define MSG_CONTROL_RETRACT "Ritrai mm" #define MSG_CONTROL_RETRACT "Ritrai mm"
#define MSG_CONTROL_RETRACT_SWAP "Scamb. Ritrai mm" #define MSG_CONTROL_RETRACT_SWAP "Scamb. Ritrai mm"
#define MSG_CONTROL_RETRACTF "Ritrai V" #define MSG_CONTROL_RETRACTF "Ritrai V"
...@@ -158,11 +158,11 @@ ...@@ -158,11 +158,11 @@
#define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm" #define MSG_RETRACT_XMM "Retract " STRINGIFY(LCD_RETRACT_LENGTH) "mm"
#ifdef DELTA #ifdef DELTA
#define MSG_DELTA_CALIBRATE "Delta Calibration" #define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X" #define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y" #define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z" #define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center" #define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA #endif // DELTA
#ifdef FIRMWARE_TEST #ifdef FIRMWARE_TEST
......
MarlinKimbra/planner.h
View file @ 52727590
...@@ -40,7 +40,7 @@ typedef struct { ...@@ -40,7 +40,7 @@ typedef struct {
long decelerate_after; // The index of the step event on which to start decelerating long decelerate_after; // The index of the step event on which to start decelerating
long acceleration_rate; // The acceleration rate used for acceleration calculation long acceleration_rate; // The acceleration rate used for acceleration calculation
unsigned char direction_bits; // The direction bit set for this block (refers to *_DIRECTION_BIT in config.h) unsigned char direction_bits; // The direction bit set for this block (refers to *_DIRECTION_BIT in config.h)
unsigned char active_driver; // Selects the active driver unsigned char active_driver; // Selects the active driver
#ifdef ADVANCE #ifdef ADVANCE
long advance_rate; long advance_rate;
volatile long initial_advance; volatile long initial_advance;
......
MarlinKimbra/ultralcd.cpp
View file @ 52727590
...@@ -203,7 +203,7 @@ static void lcd_goto_menu(menuFunc_t menu, const uint32_t encoder=0, const bool ...@@ -203,7 +203,7 @@ static void lcd_goto_menu(menuFunc_t menu, const uint32_t encoder=0, const bool
if (feedback) lcd_quick_feedback(); if (feedback) lcd_quick_feedback();
// For LCD_PROGRESS_BAR re-initialize the custom characters // For LCD_PROGRESS_BAR re-initialize the custom characters
#if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT) #if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT) && !defined(DOGLCD)
lcd_set_custom_characters(menu == lcd_status_screen); lcd_set_custom_characters(menu == lcd_status_screen);
#endif #endif
} }
...@@ -212,7 +212,7 @@ static void lcd_goto_menu(menuFunc_t menu, const uint32_t encoder=0, const bool ...@@ -212,7 +212,7 @@ static void lcd_goto_menu(menuFunc_t menu, const uint32_t encoder=0, const bool
/* Main status screen. It's up to the implementation specific part to show what is needed. As this is very display dependent */ /* Main status screen. It's up to the implementation specific part to show what is needed. As this is very display dependent */
static void lcd_status_screen() static void lcd_status_screen()
{ {
#if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT) #if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT) && !defined(DOGLCD)
uint16_t mil = millis(); uint16_t mil = millis();
#ifndef PROGRESS_BAR_MSG_ONCE #ifndef PROGRESS_BAR_MSG_ONCE
if (mil > progressBarTick + PROGRESS_BAR_MSG_TIME + PROGRESS_BAR_BAR_TIME) { if (mil > progressBarTick + PROGRESS_BAR_MSG_TIME + PROGRESS_BAR_BAR_TIME) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment