zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
muele-marlin/Marlin/ultralcd.cpp

3040 lines
73 KiB
C++
Raw Normal View History

Suggestion to improve (TODO), no actual code changed
2012-05-08 15:18:31 +00:00
#include "language.h"
#include "temperature.h"
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
#include "ultralcd.h"
#ifdef ULTRA_LCD
simplified the includes, makefile now works with arduino23
2011-12-22 13:55:45 +00:00
#include "Marlin.h"
explicit includes to make it compile with AVRStudio/Eclipse
2012-05-03 12:22:43 +00:00
#include "language.h"
#include "temperature.h"
Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.
2012-11-07 09:02:45 +00:00
#include "ConfigurationStore.h"
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
//===========================================================================
//=============================imported variables============================
//===========================================================================
extern long position[4];
Fixed general 16x2 LCD build without SD support.
2012-02-29 14:33:23 +00:00
#ifdef SDSUPPORT
explicit includes to make it compile with AVRStudio/Eclipse
2012-05-03 12:22:43 +00:00
#include "cardreader.h"
Fixed general 16x2 LCD build without SD support.
2012-02-29 14:33:23 +00:00
#endif
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
//===========================================================================
//=============================public variables============================
//===========================================================================
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
volatile uint8_t buttons=0; //the last checked buttons in a bit array.
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
long encoderpos=0;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
short lastenc=0;
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
//TODO: This should be in a preferences file.
int plaPreheatHotendTemp;
int plaPreheatHPBTemp;
int plaPreheatFanSpeed;
int absPreheatHotendTemp;
int absPreheatHPBTemp;
int absPreheatFanSpeed;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
//===========================================================================
//=============================private variables============================
//===========================================================================
static char messagetext[LCD_WIDTH]="";
//return for string conversion routines
static char conv[8];
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
LCD_CLASS lcd(LCD_PINS_RS, LCD_PINS_ENABLE, LCD_PINS_D4, LCD_PINS_D5,LCD_PINS_D6,LCD_PINS_D7); //RS,Enable,D4,D5,D6,D7
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
static unsigned long previous_millis_lcd=0;
one step closer to a functional makefile..
2011-12-22 15:43:28 +00:00
//static long previous_millis_buttons=0;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
#ifdef NEWPANEL
signed/unsigned fixes.
2012-11-06 14:33:49 +00:00
static unsigned long blocking=0;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
#else
signed/unsigned fixes.
2012-11-06 14:33:49 +00:00
static unsigned long blocking[8]={0,0,0,0,0,0,0,0};
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
#endif
static MainMenu menu;
void lcdProgMemprint(const char *str)
{
char ch=pgm_read_byte(str);
while(ch)
{
lcd.print(ch);
ch=pgm_read_byte(++str);
}
}
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
#define LCD_PRINT_PGM(x) lcdProgMemprint(PSTR(x))
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
//===========================================================================
//=============================functions ============================
//===========================================================================
Added support for Gen3+ (Pins file only) Added late z enable. (blddk request) Only calculate look ahead if >2 moves in buffer. Removed some FORCE_INLINE to save memory. Signed-off-by: Erik van der Zalm <erik@vdzalm.eu>
2012-02-05 11:42:15 +00:00
int intround(const float &x){return int(0.5+x);}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
void lcd_setstatus(const char* message)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
strncpy(messagetext,message,LCD_WIDTH);
messagetext[strlen(message)]=0;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
void lcd_setstatuspgm(const char* message)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
char ch=pgm_read_byte(message);
char *target=messagetext;
uint8_t cnt=0;
while(ch &&cnt<LCD_WIDTH)
{
*target=ch;
target++;
cnt++;
ch=pgm_read_byte(++message);
}
*target=0;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
void lcd_setalertstatuspgm(const char* message)
new method for message for making KILLED message visible The cli(); at the start of the kill() function also stops the internal arduino timer which stops updating of millis() which prevents the display of the "KILLED." message. The new function updates the display directly without checking any timers.
2012-08-22 10:44:41 +00:00
{
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
lcd_setstatuspgm(message);
new method for message for making KILLED message visible The cli(); at the start of the kill() function also stops the internal arduino timer which stops updating of millis() which prevents the display of the "KILLED." message. The new function updates the display directly without checking any timers.
2012-08-22 10:44:41 +00:00
menu.showStatus();
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
FORCE_INLINE void clear()
{
lcd.clear();
}
void lcd_init()
{
//beep();
Moved LCD initialization out of constructor Since the class "MainMenu" was used within a static variable the initialization of the object (constructor call) was done before Arduino library startup. It always caused a crash when using AVRStudio with JTAG debugger (caused from calling the LCD initialization / the lot of I/O work / the stack used during this calls). By moving the LCD_INIT out of the constructor and using an explicit call inside of Arduino setup() implementation immediately fixed all problems and the JTAG debugger runs fine.
2012-05-03 12:28:17 +00:00
#ifdef ULTIPANEL
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
lcd_buttons_init();
Moved LCD initialization out of constructor Since the class "MainMenu" was used within a static variable the initialization of the object (constructor call) was done before Arduino library startup. It always caused a crash when using AVRStudio with JTAG debugger (caused from calling the LCD initialization / the lot of I/O work / the stack used during this calls). By moving the LCD_INIT out of the constructor and using an explicit call inside of Arduino setup() implementation immediately fixed all problems and the JTAG debugger runs fine.
2012-05-03 12:28:17 +00:00
#endif
reinitialize the lcd, if the SD card is inserted or removed. It seems that LCDs can confused by electrical discharges from time to time. Since a removal or insert of the sd card takes a long time in firmware, just reinitializing the lcd does not hurt. actually, it solves a problem with the UltiControlle
2012-04-22 19:12:17 +00:00
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
byte Degree[8] =
{
B01100,
B10010,
B10010,
B01100,
B00000,
B00000,
B00000,
B00000
};
byte Thermometer[8] =
{
B00100,
B01010,
B01010,
B01010,
B01010,
B10001,
B10001,
B01110
};
Update Marlin/ultralcd.pde The joris' char drawins are expressed in binary so to show their content's in a more visual fashion. This is not a code modification as much as a readibility modification.
2012-09-14 13:29:43 +00:00
byte uplevel[8]={
B00100,
B01110,
B11111,
B00100,
B11100,
B00000,
B00000,
B00000
}; //thanks joris
byte refresh[8]={
B00000,
B00110,
B11001,
B11000,
B00011,
B10011,
B01100,
B00000,
}; //thanks joris
byte folder [8]={
B00000,
B11100,
B11111,
B10001,
B10001,
B11111,
B00000,
B00000
}; //thanks joris
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.begin(LCD_WIDTH, LCD_HEIGHT);
lcd.createChar(1,Degree);
lcd.createChar(2,Thermometer);
lcd.createChar(3,uplevel);
lcd.createChar(4,refresh);
lcd.createChar(5,folder);
Added a structure that will allow easy translations/modifications to the LCD menu. Signed-off-by: Blair Thompson <mail@justblair.co.uk>
2012-02-20 22:22:46 +00:00
LCD_MESSAGEPGM(WELCOME_MSG);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
void beep()
{
//return;
#ifdef ULTIPANEL
-disabled CARDDETECT if PIN is set to -1 - redo disable Beeper if PIN is set to -1
2012-02-06 11:22:44 +00:00
#if (BEEPER > -1)
-disalbe beeper if BEEPER_PIN = -1
2012-02-06 11:10:32 +00:00
{
pinMode(BEEPER,OUTPUT);
for(int8_t i=0;i<20;i++){
WRITE(BEEPER,HIGH);
delay(5);
WRITE(BEEPER,LOW);
delay(5);
}
}
-disabled CARDDETECT if PIN is set to -1 - redo disable Beeper if PIN is set to -1
2012-02-06 11:22:44 +00:00
#endif
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
#endif
}
void beepshort()
{
//return;
#ifdef ULTIPANEL
-disabled CARDDETECT if PIN is set to -1 - redo disable Beeper if PIN is set to -1
2012-02-06 11:22:44 +00:00
#if (BEEPER > -1)
-disalbe beeper if BEEPER_PIN = -1
2012-02-06 11:10:32 +00:00
{
pinMode(BEEPER,OUTPUT);
for(int8_t i=0;i<10;i++){
WRITE(BEEPER,HIGH);
delay(3);
WRITE(BEEPER,LOW);
delay(3);
}
}
-disabled CARDDETECT if PIN is set to -1 - redo disable Beeper if PIN is set to -1
2012-02-06 11:22:44 +00:00
#endif
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
#endif
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
void lcd_update()
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
#ifdef ULTIPANEL
static uint8_t oldbuttons=0;
//static long previous_millis_buttons=0;
//static long previous_lcdinit=0;
// buttons_check(); // Done in temperature interrupt
//previous_millis_buttons=millis();
signed/unsigned fixes.
2012-11-06 14:33:49 +00:00
unsigned long ms=millis();
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
for(int8_t i=0; i<8; i++) {
lcd panel bed support advance and ultipanel not any more in default config
2011-12-22 10:45:52 +00:00
#ifndef NEWPANEL
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
if((blocking[i]>ms))
buttons &= ~(1<<i);
lcd panel bed support advance and ultipanel not any more in default config
2011-12-22 10:45:52 +00:00
#else
if((blocking>ms))
buttons &= ~(1<<i);
#endif
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if((buttons==oldbuttons) && ((millis() - previous_millis_lcd) < LCD_UPDATE_INTERVAL) )
return;
oldbuttons=buttons;
#else
if(((millis() - previous_millis_lcd) < LCD_UPDATE_INTERVAL) )
return;
#endif
previous_millis_lcd=millis();
menu.update();
}
#ifdef ULTIPANEL
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
void lcd_buttons_init()
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
#ifdef NEWPANEL
pinMode(BTN_EN1,INPUT);
pinMode(BTN_EN2,INPUT);
pinMode(BTN_ENC,INPUT);
pinMode(SDCARDDETECT,INPUT);
WRITE(BTN_EN1,HIGH);
WRITE(BTN_EN2,HIGH);
WRITE(BTN_ENC,HIGH);
-disabled CARDDETECT if PIN is set to -1 - redo disable Beeper if PIN is set to -1
2012-02-06 11:22:44 +00:00
#if (SDCARDDETECT > -1)
{
WRITE(SDCARDDETECT,HIGH);
}
#endif
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
#else
pinMode(SHIFT_CLK,OUTPUT);
pinMode(SHIFT_LD,OUTPUT);
pinMode(SHIFT_EN,OUTPUT);
pinMode(SHIFT_OUT,INPUT);
WRITE(SHIFT_OUT,HIGH);
WRITE(SHIFT_LD,HIGH);
WRITE(SHIFT_EN,LOW);
#endif
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
/* Warning, this is called from interrupt context! */
void lcd_buttons_update()
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
#ifdef NEWPANEL
uint8_t newbutton=0;
if(READ(BTN_EN1)==0) newbutton|=EN_A;
if(READ(BTN_EN2)==0) newbutton|=EN_B;
if((blocking<millis()) &&(READ(BTN_ENC)==0))
newbutton|=EN_C;
buttons=newbutton;
#else //read it from the shift register
uint8_t newbutton=0;
WRITE(SHIFT_LD,LOW);
WRITE(SHIFT_LD,HIGH);
unsigned char tmp_buttons=0;
for(int8_t i=0;i<8;i++)
{
newbutton = newbutton>>1;
if(READ(SHIFT_OUT))
newbutton|=(1<<7);
WRITE(SHIFT_CLK,HIGH);
WRITE(SHIFT_CLK,LOW);
}
buttons=~newbutton; //invert it, because a pressed switch produces a logical 0
#endif
//manage encoder rotation
char enc=0;
if(buttons&EN_A)
enc|=(1<<0);
if(buttons&EN_B)
enc|=(1<<1);
if(enc!=lastenc)
{
switch(enc)
{
case encrot0:
if(lastenc==encrot3)
encoderpos++;
else if(lastenc==encrot1)
encoderpos--;
break;
case encrot1:
if(lastenc==encrot0)
encoderpos++;
else if(lastenc==encrot2)
encoderpos--;
break;
case encrot2:
if(lastenc==encrot1)
encoderpos++;
else if(lastenc==encrot3)
encoderpos--;
break;
case encrot3:
if(lastenc==encrot2)
encoderpos++;
else if(lastenc==encrot0)
encoderpos--;
break;
default:
;
}
}
lastenc=enc;
}
#endif
MainMenu::MainMenu()
{
status=Main_Status;
displayStartingRow=0;
activeline=0;
force_lcd_update=true;
linechanging=false;
tune=false;
}
void MainMenu::showStatus()
{
#if LCD_HEIGHT==4
static int olddegHotEnd0=-1;
static int oldtargetHotEnd0=-1;
//force_lcd_update=true;
Added PID autotune. (experimental) M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed. Put these values in Configuration.h
2012-03-08 20:43:21 +00:00
if(force_lcd_update) //initial display of content
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
encoderpos=feedmultiply;
clear();
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,0);LCD_PRINT_PGM("\002000/000\001 ");
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
#if defined BED_USES_THERMISTOR || defined BED_USES_AD595
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(10,0);LCD_PRINT_PGM("B000/000\001 ");
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
#elif EXTRUDERS > 1
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(10,0);LCD_PRINT_PGM("\002000/000\001 ");
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
#endif
}
int tHotEnd0=intround(degHotend0());
Added PID autotune. (experimental) M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed. Put these values in Configuration.h
2012-03-08 20:43:21 +00:00
if((tHotEnd0!=olddegHotEnd0)||force_lcd_update)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
lcd.setCursor(1,0);
lcd.print(ftostr3(tHotEnd0));
olddegHotEnd0=tHotEnd0;
}
int ttHotEnd0=intround(degTargetHotend0());
if((ttHotEnd0!=oldtargetHotEnd0)||force_lcd_update)
{
lcd.setCursor(5,0);
lcd.print(ftostr3(ttHotEnd0));
oldtargetHotEnd0=ttHotEnd0;
}
#if defined BED_USES_THERMISTOR || defined BED_USES_AD595
static int oldtBed=-1;
static int oldtargetBed=-1;
int tBed=intround(degBed());
if((tBed!=oldtBed)||force_lcd_update)
{
lcd panel bed support advance and ultipanel not any more in default config
2011-12-22 10:45:52 +00:00
lcd.setCursor(11,0);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.print(ftostr3(tBed));
oldtBed=tBed;
}
int targetBed=intround(degTargetBed());
if((targetBed!=oldtargetBed)||force_lcd_update)
{
lcd panel bed support advance and ultipanel not any more in default config
2011-12-22 10:45:52 +00:00
lcd.setCursor(15,0);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.print(ftostr3(targetBed));
oldtargetBed=targetBed;
}
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
#elif EXTRUDERS > 1
static int olddegHotEnd1=-1;
static int oldtargetHotEnd1=-1;
int tHotEnd1=intround(degHotend1());
if((tHotEnd1!=olddegHotEnd1)||force_lcd_update)
{
lcd.setCursor(11,0);
Show proper temperature for extruder 2
2012-04-27 13:00:01 +00:00
lcd.print(ftostr3(tHotEnd1));
olddegHotEnd1=tHotEnd1;
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
}
int ttHotEnd1=intround(degTargetHotend1());
Show proper temperature for extruder 2
2012-04-27 13:00:01 +00:00
if((ttHotEnd1!=oldtargetHotEnd1)||force_lcd_update)
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
{
lcd.setCursor(15,0);
lcd.print(ftostr3(ttHotEnd1));
Show proper temperature for extruder 2
2012-04-27 13:00:01 +00:00
oldtargetHotEnd1=ttHotEnd1;
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
#endif
//starttime=2;
static uint16_t oldtime=0;
if(starttime!=0)
{
lcd.setCursor(0,1);
uint16_t time=millis()/60000-starttime/60000;
if(starttime!=oldtime)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.print(itostr2(time/60));LCD_PRINT_PGM("h ");lcd.print(itostr2(time%60));LCD_PRINT_PGM("m");
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
oldtime=time;
}
}
static int oldzpos=0;
lcd panel bed support advance and ultipanel not any more in default config
2011-12-22 10:45:52 +00:00
int currentz=current_position[2]*100;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
if((currentz!=oldzpos)||force_lcd_update)
{
lcd.setCursor(10,1);
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
LCD_PRINT_PGM("Z:");lcd.print(ftostr52(current_position[2]));
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
oldzpos=currentz;
}
Added PID autotune. (experimental) M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed. Put these values in Configuration.h
2012-03-08 20:43:21 +00:00
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
static int oldfeedmultiply=0;
int curfeedmultiply=feedmultiply;
Added PID autotune. (experimental) M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed. Put these values in Configuration.h
2012-03-08 20:43:21 +00:00
if(feedmultiplychanged == true) {
Fixed typo
2012-03-09 16:49:48 +00:00
feedmultiplychanged = false;
Added PID autotune. (experimental) M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed. Put these values in Configuration.h
2012-03-08 20:43:21 +00:00
encoderpos = curfeedmultiply;
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
if(encoderpos!=curfeedmultiply||force_lcd_update)
{
curfeedmultiply=encoderpos;
if(curfeedmultiply<10)
curfeedmultiply=10;
if(curfeedmultiply>999)
curfeedmultiply=999;
feedmultiply=curfeedmultiply;
encoderpos=curfeedmultiply;
}
Added PID autotune. (experimental) M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed. Put these values in Configuration.h
2012-03-08 20:43:21 +00:00
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
if((curfeedmultiply!=oldfeedmultiply)||force_lcd_update)
{
oldfeedmultiply=curfeedmultiply;
lcd.setCursor(0,2);
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.print(itostr3(curfeedmultiply));LCD_PRINT_PGM("% ");
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
Added PID autotune. (experimental) M303 Starts autotune. Wait till the Kp Ki and Kd constants are printed. Put these values in Configuration.h
2012-03-08 20:43:21 +00:00
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
if(messagetext[0]!='\0')
{
lcd.setCursor(0,LCD_HEIGHT-1);
lcd.print(messagetext);
uint8_t n=strlen(messagetext);
for(int8_t i=0;i<LCD_WIDTH-n;i++)
lcd.print(" ");
messagetext[0]='\0';
}
Fixed compile errors in ultralcd when no ultra_lcd is selected.
2012-03-15 21:29:31 +00:00
#ifdef SDSUPPORT
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
static uint8_t oldpercent=101;
uint8_t percent=card.percentDone();
if(oldpercent!=percent ||force_lcd_update)
{
The percent complete for the SD file statistic sits squint. Changed "lcd.Setcursor (7,2);" to "lcd.Setcursor (10,2);". The percent complete now lines up with the temperatures and Z-axis position figures, nicer to read and nicer to look at IMHO.
2012-03-03 16:47:27 +00:00
lcd.setCursor(10,2);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.print(itostr3((int)percent));
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
LCD_PRINT_PGM("%SD");
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
Fixed compile errors in ultralcd when no ultra_lcd is selected.
2012-03-15 21:29:31 +00:00
#endif
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
#else //smaller LCDS----------------------------------
static int olddegHotEnd0=-1;
static int oldtargetHotEnd0=-1;
if(force_lcd_update) //initial display of content
{
encoderpos=feedmultiply;
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,0);LCD_PRINT_PGM("\002---/---\001 ");
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
int tHotEnd0=intround(degHotend0());
int ttHotEnd0=intround(degTargetHotend0());
if((abs(tHotEnd0-olddegHotEnd0)>1)||force_lcd_update)
{
lcd.setCursor(1,0);
lcd.print(ftostr3(tHotEnd0));
olddegHotEnd0=tHotEnd0;
}
if((ttHotEnd0!=oldtargetHotEnd0)||force_lcd_update)
{
lcd.setCursor(5,0);
lcd.print(ftostr3(ttHotEnd0));
oldtargetHotEnd0=ttHotEnd0;
}
if(messagetext[0]!='\0')
{
lcd.setCursor(0,LCD_HEIGHT-1);
lcd.print(messagetext);
uint8_t n=strlen(messagetext);
for(int8_t i=0;i<LCD_WIDTH-n;i++)
lcd.print(" ");
messagetext[0]='\0';
}
#endif
force_lcd_update=false;
}
Added new menu items under the prepare submenu. Instead of a single pre-heat, now there is pre-heat ABS and PLA options Added defines to the configuration file to adjust preheat temperatures for both
2012-02-22 22:51:04 +00:00
enum {ItemP_exit, ItemP_autostart,ItemP_disstep,ItemP_home, ItemP_origin, ItemP_preheat_pla, ItemP_preheat_abs, ItemP_cooldown,/*ItemP_extrude,*/ItemP_move};
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
//any action must not contain a ',' character anywhere, or this breaks:
#define MENUITEM(repaint_action, click_action) \
{\
if(force_lcd_update) { lcd.setCursor(0,line); repaint_action; } \
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if((activeline==line) && LCD_CLICKED) {click_action} \
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
void MainMenu::showPrepare()
{
Fixed compile errors in ultralcd when no ultra_lcd is selected.
2012-03-15 21:29:31 +00:00
#ifdef ULTIPANEL
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
uint8_t line=0;
clearIfNecessary();
for(int8_t i=lineoffset;i<lineoffset+LCD_HEIGHT;i++)
{
//Serial.println((int)(line-lineoffset));
switch(i)
{
case ItemP_exit:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_MAIN) , LCD_BLOCK;status=Main_Menu;beepshort(); ) ;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
merging
2011-12-12 19:35:46 +00:00
case ItemP_autostart:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_AUTOSTART) , LCD_BLOCK;
Fixed general 16x2 LCD build without SD support.
2012-02-29 14:33:23 +00:00
#ifdef SDSUPPORT
card.lastnr=0;card.setroot();card.checkautostart(true);
#endif
beepshort(); ) ;
merging
2011-12-12 19:35:46 +00:00
break;
case ItemP_disstep:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_DISABLE_STEPPERS) , LCD_BLOCK;enquecommand("M84");beepshort(); ) ;
merging
2011-12-12 19:35:46 +00:00
break;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
case ItemP_home:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_AUTO_HOME) , LCD_BLOCK;enquecommand("G28");beepshort(); ) ;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
case ItemP_origin:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_SET_ORIGIN) , LCD_BLOCK;enquecommand("G92 X0 Y0 Z0");beepshort(); ) ;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
Added new menu items under the prepare submenu. Instead of a single pre-heat, now there is pre-heat ABS and PLA options Added defines to the configuration file to adjust preheat temperatures for both
2012-02-22 22:51:04 +00:00
case ItemP_preheat_pla:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_PREHEAT_PLA) , LCD_BLOCK;setTargetHotend0(plaPreheatHotendTemp);setTargetBed(plaPreheatHPBTemp);
Added FAN_PIN -1 checks
2012-03-08 21:09:49 +00:00
#if FAN_PIN > -1
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
fanSpeed = plaPreheatFanSpeed;
analogWrite(FAN_PIN, fanSpeed);
Added FAN_PIN -1 checks
2012-03-08 21:09:49 +00:00
#endif
beepshort(); );
Added new menu items under the prepare submenu. Instead of a single pre-heat, now there is pre-heat ABS and PLA options Added defines to the configuration file to adjust preheat temperatures for both
2012-02-22 22:51:04 +00:00
break;
case ItemP_preheat_abs:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_PREHEAT_ABS) , LCD_BLOCK;setTargetHotend0(absPreheatHotendTemp);setTargetBed(absPreheatHPBTemp);
Added FAN_PIN -1 checks
2012-03-08 21:09:49 +00:00
#if FAN_PIN > -1
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
fanSpeed = absPreheatFanSpeed;
analogWrite(FAN_PIN, fanSpeed);
Added FAN_PIN -1 checks
2012-03-08 21:09:49 +00:00
#endif
beepshort(); );
cooldown
2011-12-22 11:02:33 +00:00
break;
case ItemP_cooldown:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_COOLDOWN) , LCD_BLOCK;setTargetHotend0(0);setTargetHotend1(0);setTargetHotend2(0);setTargetBed(0);beepshort(); ) ;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
lcd menue "move_axis" added
2012-02-07 11:58:05 +00:00
// case ItemP_extrude:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
// MENUITEM( LCD_PRINT_PGM(" Extrude") , LCD_BLOCK;enquecommand("G92 E0");enquecommand("G1 F700 E50");beepshort(); ) ;
lcd menue "move_axis" added
2012-02-07 11:58:05 +00:00
// break;
case ItemP_move:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_MOVE_AXIS) , LCD_BLOCK;status=Sub_PrepareMove;beepshort(); );
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
lcd menue "move_axis" added
2012-02-07 11:58:05 +00:00
default:
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
}
line++;
}
lcd menue "move_axis" added
2012-02-07 11:58:05 +00:00
updateActiveLines(ItemP_move,encoderpos);
Fixed compile errors in ultralcd when no ultra_lcd is selected.
2012-03-15 21:29:31 +00:00
#endif
lcd menue "move_axis" added
2012-02-07 11:58:05 +00:00
}
enum {
ItemAM_exit,
Added pause and retract lcd menu items
2012-07-27 05:38:33 +00:00
ItemAM_X, ItemAM_Y, ItemAM_Z, ItemAM_E, ItemAM_ERetract
lcd menue "move_axis" added
2012-02-07 11:58:05 +00:00
};
void MainMenu::showAxisMove()
{
uint8_t line=0;
fixed manual axis movement lcd option
2012-02-21 08:31:28 +00:00
int oldencoderpos=0;
lcd menue "move_axis" added
2012-02-07 11:58:05 +00:00
clearIfNecessary();
for(int8_t i=lineoffset;i<lineoffset+LCD_HEIGHT;i++)
{
switch(i)
{
case ItemAM_exit:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_PREPARE_ALT) , LCD_BLOCK;status=Main_Prepare;beepshort(); ) ;
lcd menue "move_axis" added
2012-02-07 11:58:05 +00:00
break;
case ItemAM_X:
fixed manual axis movement lcd option
2012-02-21 08:31:28 +00:00
{
//oldencoderpos=0;
smaller changes
2012-02-13 11:31:53 +00:00
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(" X:");
Changed display format for some numbers.
2012-02-21 22:05:43 +00:00
lcd.setCursor(11,line);lcd.print(ftostr52(current_position[X_AXIS]));
smaller changes
2012-02-13 11:31:53 +00:00
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
smaller changes
2012-02-13 11:31:53 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
fixed manual axis movement lcd option
2012-02-21 08:31:28 +00:00
enquecommand("G91");
smaller changes
2012-02-13 11:31:53 +00:00
}
else
{
fixed manual axis movement lcd option
2012-02-21 08:31:28 +00:00
enquecommand("G90");
smaller changes
2012-02-13 11:31:53 +00:00
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
smaller changes
2012-02-13 11:31:53 +00:00
}
if(linechanging)
{
fixed manual axis movement lcd option
2012-02-21 08:31:28 +00:00
if (encoderpos >0)
{
enquecommand("G1 F700 X0.1");
oldencoderpos=encoderpos;
encoderpos=0;
}
else if (encoderpos < 0)
{
enquecommand("G1 F700 X-0.1");
oldencoderpos=encoderpos;
encoderpos=0;
}
Changed display format for some numbers.
2012-02-21 22:05:43 +00:00
lcd.setCursor(11,line);lcd.print(ftostr52(current_position[X_AXIS]));
smaller changes
2012-02-13 11:31:53 +00:00
}
}
lcd menue "move_axis" added
2012-02-07 11:58:05 +00:00
break;
case ItemAM_Y:
fixed manual axis movement lcd option
2012-02-21 08:31:28 +00:00
{
smaller changes
2012-02-13 11:31:53 +00:00
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(" Y:");
Changed display format for some numbers.
2012-02-21 22:05:43 +00:00
lcd.setCursor(11,line);lcd.print(ftostr52(current_position[Y_AXIS]));
smaller changes
2012-02-13 11:31:53 +00:00
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
smaller changes
2012-02-13 11:31:53 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
fixed manual axis movement lcd option
2012-02-21 08:31:28 +00:00
enquecommand("G91");
smaller changes
2012-02-13 11:31:53 +00:00
}
else
{
fixed manual axis movement lcd option
2012-02-21 08:31:28 +00:00
enquecommand("G90");
smaller changes
2012-02-13 11:31:53 +00:00
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
smaller changes
2012-02-13 11:31:53 +00:00
}
if(linechanging)
{
fixed manual axis movement lcd option
2012-02-21 08:31:28 +00:00
if (encoderpos >0)
{
enquecommand("G1 F700 Y0.1");
oldencoderpos=encoderpos;
encoderpos=0;
}
else if (encoderpos < 0)
{
enquecommand("G1 F700 Y-0.1");
oldencoderpos=encoderpos;
encoderpos=0;
}
Changed display format for some numbers.
2012-02-21 22:05:43 +00:00
lcd.setCursor(11,line);lcd.print(ftostr52(current_position[Y_AXIS]));
smaller changes
2012-02-13 11:31:53 +00:00
}
}
lcd menue "move_axis" added
2012-02-07 11:58:05 +00:00
break;
case ItemAM_Z:
smaller changes
2012-02-13 11:31:53 +00:00
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(" Z:");
Changed display format for some numbers.
2012-02-21 22:05:43 +00:00
lcd.setCursor(11,line);lcd.print(ftostr52(current_position[Z_AXIS]));
smaller changes
2012-02-13 11:31:53 +00:00
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
smaller changes
2012-02-13 11:31:53 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
fixed manual axis movement lcd option
2012-02-21 08:31:28 +00:00
enquecommand("G91");
smaller changes
2012-02-13 11:31:53 +00:00
}
else
{
fixed manual axis movement lcd option
2012-02-21 08:31:28 +00:00
enquecommand("G90");
smaller changes
2012-02-13 11:31:53 +00:00
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
smaller changes
2012-02-13 11:31:53 +00:00
}
if(linechanging)
{
fixed manual axis movement lcd option
2012-02-21 08:31:28 +00:00
if (encoderpos >0)
{
fixed LCD manual z axis move Feedrate to 70 (was 1700)
2012-03-01 13:38:50 +00:00
enquecommand("G1 F70 Z0.1");
fixed manual axis movement lcd option
2012-02-21 08:31:28 +00:00
oldencoderpos=encoderpos;
encoderpos=0;
}
else if (encoderpos < 0)
{
fixed LCD manual z axis move Feedrate to 70 (was 1700)
2012-03-01 13:38:50 +00:00
enquecommand("G1 F70 Z-0.1");
fixed manual axis movement lcd option
2012-02-21 08:31:28 +00:00
oldencoderpos=encoderpos;
encoderpos=0;
}
Changed display format for some numbers.
2012-02-21 22:05:43 +00:00
lcd.setCursor(11,line);lcd.print(ftostr52(current_position[Z_AXIS]));
smaller changes
2012-02-13 11:31:53 +00:00
}
}
lcd menue "move_axis" added
2012-02-07 11:58:05 +00:00
break;
case ItemAM_E:
Suggestion to improve (TODO), no actual code changed
2012-05-08 15:18:31 +00:00
// ErikDB: TODO: this length should be changed for volumetric.
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_EXTRUDE) , LCD_BLOCK;enquecommand("G92 E0");enquecommand("G1 F70 E1");beepshort(); ) ;
lcd menue "move_axis" added
2012-02-07 11:58:05 +00:00
break;
Added pause and retract lcd menu items
2012-07-27 05:38:33 +00:00
case ItemAM_ERetract:
// ErikDB: TODO: this length should be changed for volumetric.
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_RETRACT) , LCD_BLOCK;enquecommand("G92 E0");enquecommand("G1 F700 E-1");beepshort(); ) ;
Added pause and retract lcd menu items
2012-07-27 05:38:33 +00:00
break;
lcd menue "move_axis" added
2012-02-07 11:58:05 +00:00
default:
break;
}
line++;
}
Fixed Retract in LCD Menu
2012-07-27 05:44:03 +00:00
updateActiveLines(ItemAM_ERetract,encoderpos);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
lcd panel bed support advance and ultipanel not any more in default config
2011-12-22 10:45:52 +00:00
enum {ItemT_exit,ItemT_speed,ItemT_flow,ItemT_nozzle,
#if (HEATER_BED_PIN > -1)
ItemT_bed,
#endif
ItemT_fan};
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
void MainMenu::showTune()
{
uint8_t line=0;
clearIfNecessary();
for(int8_t i=lineoffset;i<lineoffset+LCD_HEIGHT;i++)
{
//Serial.println((int)(line-lineoffset));
switch(i)
{
case ItemT_exit:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_MAIN) , LCD_BLOCK;status=Main_Menu;beepshort(); ) ;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
case ItemT_speed:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_SPEED);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(feedmultiply));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED) //AnalogWrite(FAN_PIN, fanpwm);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=feedmultiply;
}
else
{
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if(linechanging)
{
if(encoderpos<1) encoderpos=1;
if(encoderpos>400) encoderpos=400;
feedmultiply = encoderpos;
feedmultiplychanged=true;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
case ItemT_nozzle:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_NOZZLE);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetHotend0())));
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=intround(degTargetHotend0());
}
else
{
setTargetHotend0(encoderpos);
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>260) encoderpos=260;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
lcd panel bed support advance and ultipanel not any more in default config
2011-12-22 10:45:52 +00:00
#if (HEATER_BED_PIN > -1)
case ItemT_bed:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_BED);
lcd panel bed support advance and ultipanel not any more in default config
2011-12-22 10:45:52 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetBed())));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
lcd panel bed support advance and ultipanel not any more in default config
2011-12-22 10:45:52 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=intround(degTargetBed());
}
else
{
setTargetBed(encoderpos);
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
lcd panel bed support advance and ultipanel not any more in default config
2011-12-22 10:45:52 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>260) encoderpos=260;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
#endif
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
case ItemT_fan:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_FAN_SPEED);
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(fanSpeed));
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED) //nalogWrite(FAN_PIN, fanpwm);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
encoderpos=fanSpeed;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>255) encoderpos=255;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
fanSpeed=encoderpos;
analogWrite(FAN_PIN, fanSpeed);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
case ItemT_flow://axis_steps_per_unit[i] = code_value();
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_FLOW);
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
lcd.setCursor(13,line);lcd.print(ftostr52(axis_steps_per_unit[E_AXIS]));
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
encoderpos=(long)(axis_steps_per_unit[E_AXIS]*100.0);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
float factor=float(encoderpos)/100.0/float(axis_steps_per_unit[E_AXIS]);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
position[E_AXIS]=lround(position[E_AXIS]*factor);
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
//current_position[E_AXIS]*=factor;
axis_steps_per_unit[E_AXIS]= encoderpos/100.0;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<5) encoderpos=5;
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
if(encoderpos>999999) encoderpos=999999;
lcd.setCursor(13,line);lcd.print(ftostr52(encoderpos/100.0));
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
}break;
default:
break;
}
line++;
}
updateActiveLines(ItemT_fan,encoderpos);
}
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
/*does not work
#define MENUCHANGEITEM(repaint_action, enter_action, accept_action, change_action) \
{\
if(force_lcd_update) { lcd.setCursor(0,line); repaint_action; } \
if(activeline==line) \
{ \
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED) \
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
{ \
linechanging=!linechanging; \
if(linechanging) {enter_action;} \
else {accept_action;} \
} \
else \
if(linechanging) {change_action};}\
}
*/
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
enum {
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
ItemCT_exit,ItemCT_nozzle0,
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
#ifdef AUTOTEMP
ItemCT_autotempactive,
ItemCT_autotempmin,ItemCT_autotempmax,ItemCT_autotempfact,
#endif
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
#if EXTRUDERS > 1
ItemCT_nozzle1,
#endif
#if EXTRUDERS > 2
ItemCT_nozzle2,
#endif
Fixed AD595 define
2012-06-11 15:33:42 +00:00
#if defined BED_USES_THERMISTOR || defined BED_USES_AD595
lcd panel bed support advance and ultipanel not any more in default config
2011-12-22 10:45:52 +00:00
ItemCT_bed,
#endif
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
ItemCT_fan,
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
ItemCT_PID_P,ItemCT_PID_I,ItemCT_PID_D,ItemCT_PID_C,
ItemCT_PLA_PreHeat_Setting,
ItemCT_ABS_PreHeat_Setting,
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
};
void MainMenu::showControlTemp()
{
uint8_t line=0;
clearIfNecessary();
for(int8_t i=lineoffset;i<lineoffset+LCD_HEIGHT;i++)
{
switch(i)
{
case ItemCT_exit:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_CONTROL) , LCD_BLOCK;status=Main_Control;beepshort(); ) ;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
case ItemCT_nozzle0:
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_NOZZLE);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetHotend0())));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=intround(degTargetHotend0());
}
else
{
setTargetHotend0(encoderpos);
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>260) encoderpos=260;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
#if EXTRUDERS > 1
case ItemCT_nozzle1:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_NOZZLE1);
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetHotend1())));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=intround(degTargetHotend1());
}
else
{
setTargetHotend1(encoderpos);
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>260) encoderpos=260;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
#endif
#if EXTRUDERS > 2
case ItemCT_nozzle2:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_NOZZLE2);
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetHotend2())));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=intround(degTargetHotend2());
}
else
{
Fixed #303
2012-11-12 20:04:07 +00:00
setTargetHotend2(encoderpos);
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>260) encoderpos=260;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
#endif
#ifdef AUTOTEMP
case ItemCT_autotempmin:
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_MIN);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(autotemp_min));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=intround(autotemp_min);
}
else
{
autotemp_min=encoderpos;
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>260) encoderpos=260;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
case ItemCT_autotempmax:
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_MAX);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(autotemp_max));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=intround(autotemp_max);
}
else
{
autotemp_max=encoderpos;
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>260) encoderpos=260;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
case ItemCT_autotempfact:
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_FACTOR);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);lcd.print(ftostr32(autotemp_factor));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=intround(autotemp_factor*100);
}
else
{
autotemp_max=encoderpos;
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>99) encoderpos=99;
lcd.setCursor(13,line);lcd.print(ftostr32(encoderpos/100.));
}
}break;
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
case ItemCT_autotempactive:
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_AUTOTEMP);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);
if(autotemp_enabled)
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
LCD_PRINT_PGM(MSG_ON);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
else
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
LCD_PRINT_PGM(MSG_OFF);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
autotemp_enabled=!autotemp_enabled;
lcd.setCursor(13,line);
if(autotemp_enabled)
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
LCD_PRINT_PGM(MSG_ON);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
else
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
LCD_PRINT_PGM(MSG_OFF);
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
}break;
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
#endif //autotemp
Fixed AD595 define
2012-06-11 15:33:42 +00:00
#if defined BED_USES_THERMISTOR || defined BED_USES_AD595
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
case ItemCT_bed:
lcd panel bed support advance and ultipanel not any more in default config
2011-12-22 10:45:52 +00:00
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_BED);
lcd panel bed support advance and ultipanel not any more in default config
2011-12-22 10:45:52 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(intround(degTargetBed())));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
lcd panel bed support advance and ultipanel not any more in default config
2011-12-22 10:45:52 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=intround(degTargetBed());
}
else
{
setTargetBed(encoderpos);
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
lcd panel bed support advance and ultipanel not any more in default config
2011-12-22 10:45:52 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>260) encoderpos=260;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
#endif
case ItemCT_fan:
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_FAN_SPEED);
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(fanSpeed));
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED) //nalogWrite(FAN_PIN, fanpwm);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
encoderpos=fanSpeed;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>255) encoderpos=255;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
fanSpeed=encoderpos;
analogWrite(FAN_PIN, fanSpeed);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
#ifdef PIDTEMP
case ItemCT_PID_P:
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(" PID-P: ");
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);lcd.print(itostr4(Kp));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
encoderpos=(long)Kp;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
Kp= encoderpos;
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<1) encoderpos=1;
if(encoderpos>9990) encoderpos=9990;
lcd.setCursor(13,line);lcd.print(itostr4(encoderpos));
}
}break;
case ItemCT_PID_I:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_PID_I);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);lcd.print(ftostr51(Ki/PID_dT));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
encoderpos=(long)(Ki*10/PID_dT);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
Ki= encoderpos/10.*PID_dT;
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>9990) encoderpos=9990;
lcd.setCursor(13,line);lcd.print(ftostr51(encoderpos/10.));
}
}break;
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
case ItemCT_PID_D:
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_PID_D);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);lcd.print(itostr4(Kd*PID_dT));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
encoderpos=(long)(Kd/5./PID_dT);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
Kd= encoderpos;
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>9990) encoderpos=9990;
lcd.setCursor(13,line);lcd.print(itostr4(encoderpos));
}
}break;
case ItemCT_PID_C:
#ifdef PID_ADD_EXTRUSION_RATE
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_PID_C);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);lcd.print(itostr3(Kc));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
encoderpos=(long)Kc;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
Kc= encoderpos;
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}
#endif
Added support for 2nd extruder temperature to UltraLCD
2012-04-27 12:51:32 +00:00
#endif
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
case ItemCT_PLA_PreHeat_Setting:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_PREHEAT_PLA_SETTINGS) , LCD_BLOCK;status=Sub_PreheatPLASettings;beepshort(); ) ;
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
break;
case ItemCT_ABS_PreHeat_Setting:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_PREHEAT_ABS_SETTINGS) , LCD_BLOCK;status=Sub_PreheatABSSettings;beepshort(); ) ;
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
break;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
default:
break;
}
line++;
}
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
updateActiveLines(ItemCT_ABS_PreHeat_Setting,encoderpos);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
enum {
ItemCM_exit,
ItemCM_acc, ItemCM_xyjerk,
ItemCM_vmaxx, ItemCM_vmaxy, ItemCM_vmaxz, ItemCM_vmaxe,
ItemCM_vtravmin,ItemCM_vmin,
ItemCM_amaxx, ItemCM_amaxy, ItemCM_amaxz, ItemCM_amaxe,
smaller changes
2012-02-13 11:31:53 +00:00
ItemCM_aret, ItemCM_xsteps,ItemCM_ysteps, ItemCM_zsteps, ItemCM_esteps
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
};
void MainMenu::showControlMotion()
{
uint8_t line=0;
clearIfNecessary();
for(int8_t i=lineoffset;i<lineoffset+LCD_HEIGHT;i++)
{
switch(i)
{
case ItemCM_exit:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_CONTROL) , LCD_BLOCK;status=Main_Control;beepshort(); ) ;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
case ItemCM_acc:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_ACC);
lcd.setCursor(13,line);lcd.print(itostr3(acceleration/100));LCD_PRINT_PGM("00");
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
encoderpos=(long)acceleration/100;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
acceleration= encoderpos*100;
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<5) encoderpos=5;
if(encoderpos>990) encoderpos=990;
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));LCD_PRINT_PGM("00");
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
}break;
case ItemCM_xyjerk: //max_xy_jerk
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_VXY_JERK);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);lcd.print(itostr3(max_xy_jerk));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
encoderpos=(long)max_xy_jerk;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
max_xy_jerk= encoderpos;
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<1) encoderpos=1;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
case ItemCM_vmaxx:
case ItemCM_vmaxy:
case ItemCM_vmaxz:
case ItemCM_vmaxe:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_VMAX);
if(i==ItemCM_vmaxx)LCD_PRINT_PGM(MSG_X);
if(i==ItemCM_vmaxy)LCD_PRINT_PGM(MSG_Y);
if(i==ItemCM_vmaxz)LCD_PRINT_PGM(MSG_Z);
if(i==ItemCM_vmaxe)LCD_PRINT_PGM(MSG_E);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);lcd.print(itostr3(max_feedrate[i-ItemCM_vmaxx]));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
encoderpos=(long)max_feedrate[i-ItemCM_vmaxx];
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
max_feedrate[i-ItemCM_vmaxx]= encoderpos;
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<1) encoderpos=1;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
case ItemCM_vmin:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_VMIN);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);lcd.print(itostr3(minimumfeedrate));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
encoderpos=(long)(minimumfeedrate);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
minimumfeedrate= encoderpos;
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
case ItemCM_vtravmin:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_VTRAV_MIN);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
lcd.setCursor(13,line);lcd.print(itostr3(mintravelfeedrate));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
encoderpos=(long)mintravelfeedrate;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
mintravelfeedrate= encoderpos;
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
case ItemCM_amaxx:
case ItemCM_amaxy:
case ItemCM_amaxz:
case ItemCM_amaxe:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(" Amax ");
if(i==ItemCM_amaxx)LCD_PRINT_PGM(MSG_X);
if(i==ItemCM_amaxy)LCD_PRINT_PGM(MSG_Y);
if(i==ItemCM_amaxz)LCD_PRINT_PGM(MSG_Z);
if(i==ItemCM_amaxe)LCD_PRINT_PGM(MSG_E);
lcd.setCursor(13,line);lcd.print(itostr3(max_acceleration_units_per_sq_second[i-ItemCM_amaxx]/100));LCD_PRINT_PGM("00");
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
encoderpos=(long)max_acceleration_units_per_sq_second[i-ItemCM_amaxx]/100;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
max_acceleration_units_per_sq_second[i-ItemCM_amaxx]= encoderpos*100;
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<1) encoderpos=1;
if(encoderpos>990) encoderpos=990;
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));LCD_PRINT_PGM("00");
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
}break;
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
case ItemCM_aret://float retract_acceleration = 7000;
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_A_RETRACT);
lcd.setCursor(13,line);lcd.print(ftostr3(retract_acceleration/100));LCD_PRINT_PGM("00");
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
encoderpos=(long)retract_acceleration/100;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
retract_acceleration= encoderpos*100;
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<10) encoderpos=10;
if(encoderpos>990) encoderpos=990;
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));LCD_PRINT_PGM("00");
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
}break;
smaller changes
2012-02-13 11:31:53 +00:00
case ItemCM_xsteps://axis_steps_per_unit[i] = code_value();
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_XSTEPS);
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
lcd.setCursor(11,line);lcd.print(ftostr52(axis_steps_per_unit[X_AXIS]));
smaller changes
2012-02-13 11:31:53 +00:00
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
smaller changes
2012-02-13 11:31:53 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
encoderpos=(long)(axis_steps_per_unit[X_AXIS]*100.0);
smaller changes
2012-02-13 11:31:53 +00:00
}
else
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
float factor=float(encoderpos)/100.0/float(axis_steps_per_unit[X_AXIS]);
smaller changes
2012-02-13 11:31:53 +00:00
position[X_AXIS]=lround(position[X_AXIS]*factor);
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
//current_position[X_AXIS]*=factor;
Changed display format for some numbers.
2012-02-21 22:05:43 +00:00
axis_steps_per_unit[X_AXIS]= encoderpos/100.0;
smaller changes
2012-02-13 11:31:53 +00:00
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
smaller changes
2012-02-13 11:31:53 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<5) encoderpos=5;
fixed typo
2012-05-11 13:22:06 +00:00
if(encoderpos>999999) encoderpos=999999;
Changed display format for some numbers.
2012-02-21 22:05:43 +00:00
lcd.setCursor(11,line);lcd.print(ftostr52(encoderpos/100.0));
smaller changes
2012-02-13 11:31:53 +00:00
}
}break;
case ItemCM_ysteps://axis_steps_per_unit[i] = code_value();
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_YSTEPS);
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
lcd.setCursor(11,line);lcd.print(ftostr52(axis_steps_per_unit[Y_AXIS]));
smaller changes
2012-02-13 11:31:53 +00:00
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
smaller changes
2012-02-13 11:31:53 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
encoderpos=(long)(axis_steps_per_unit[Y_AXIS]*100.0);
smaller changes
2012-02-13 11:31:53 +00:00
}
else
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
float factor=float(encoderpos)/100.0/float(axis_steps_per_unit[Y_AXIS]);
smaller changes
2012-02-13 11:31:53 +00:00
position[Y_AXIS]=lround(position[Y_AXIS]*factor);
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
//current_position[Y_AXIS]*=factor;
Added HOME_POS. This adds the posibility to make the center 0 Updated the Xsteps ... settings via the LCD menu
2012-02-22 17:07:56 +00:00
axis_steps_per_unit[Y_AXIS]= encoderpos/100.0;
smaller changes
2012-02-13 11:31:53 +00:00
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
smaller changes
2012-02-13 11:31:53 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<5) encoderpos=5;
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
if(encoderpos>999999) encoderpos=999999;
Added HOME_POS. This adds the posibility to make the center 0 Updated the Xsteps ... settings via the LCD menu
2012-02-22 17:07:56 +00:00
lcd.setCursor(11,line);lcd.print(ftostr52(encoderpos/100.0));
smaller changes
2012-02-13 11:31:53 +00:00
}
}break;
case ItemCM_zsteps://axis_steps_per_unit[i] = code_value();
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_ZSTEPS);
Fix num of digits on LCD for E and Z axis. The number of steps per mm often contains 4 digits before the decimal point and does not require precision greater than 0.1
2012-10-18 13:45:40 +00:00
lcd.setCursor(11,line);lcd.print(ftostr51(axis_steps_per_unit[Z_AXIS]));
smaller changes
2012-02-13 11:31:53 +00:00
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
smaller changes
2012-02-13 11:31:53 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
encoderpos=(long)(axis_steps_per_unit[Z_AXIS]*100.0);
smaller changes
2012-02-13 11:31:53 +00:00
}
else
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
float factor=float(encoderpos)/100.0/float(axis_steps_per_unit[Z_AXIS]);
smaller changes
2012-02-13 11:31:53 +00:00
position[Z_AXIS]=lround(position[Z_AXIS]*factor);
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
//current_position[Z_AXIS]*=factor;
Added HOME_POS. This adds the posibility to make the center 0 Updated the Xsteps ... settings via the LCD menu
2012-02-22 17:07:56 +00:00
axis_steps_per_unit[Z_AXIS]= encoderpos/100.0;
smaller changes
2012-02-13 11:31:53 +00:00
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
smaller changes
2012-02-13 11:31:53 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<5) encoderpos=5;
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
if(encoderpos>999999) encoderpos=999999;
Added HOME_POS. This adds the posibility to make the center 0 Updated the Xsteps ... settings via the LCD menu
2012-02-22 17:07:56 +00:00
lcd.setCursor(11,line);lcd.print(ftostr52(encoderpos/100.0));
smaller changes
2012-02-13 11:31:53 +00:00
}
}break;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
case ItemCM_esteps://axis_steps_per_unit[i] = code_value();
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_ESTEPS);
Fix num of digits on LCD for E and Z axis. The number of steps per mm often contains 4 digits before the decimal point and does not require precision greater than 0.1
2012-10-18 13:45:40 +00:00
lcd.setCursor(11,line);lcd.print(ftostr51(axis_steps_per_unit[E_AXIS]));
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
encoderpos=(long)(axis_steps_per_unit[E_AXIS]*100.0);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
float factor=float(encoderpos)/100.0/float(axis_steps_per_unit[E_AXIS]);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
position[E_AXIS]=lround(position[E_AXIS]*factor);
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
//current_position[E_AXIS]*=factor;
Added HOME_POS. This adds the posibility to make the center 0 Updated the Xsteps ... settings via the LCD menu
2012-02-22 17:07:56 +00:00
axis_steps_per_unit[E_AXIS]= encoderpos/100.0;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<5) encoderpos=5;
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
if(encoderpos>999999) encoderpos=999999;
Added HOME_POS. This adds the posibility to make the center 0 Updated the Xsteps ... settings via the LCD menu
2012-02-22 17:07:56 +00:00
lcd.setCursor(11,line);lcd.print(ftostr52(encoderpos/100.0));
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
}break;
default:
break;
}
line++;
}
updateActiveLines(ItemCM_esteps,encoderpos);
}
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
enum {
ItemR_exit,
ItemR_autoretract,
ItemR_retract_length,ItemR_retract_feedrate,ItemR_retract_zlift,
ItemR_unretract_length,ItemR_unretract_feedrate,
};
void MainMenu::showControlRetract()
{
#ifdef FWRETRACT
uint8_t line=0;
clearIfNecessary();
for(int8_t i=lineoffset;i<lineoffset+LCD_HEIGHT;i++)
{
switch(i)
{
case ItemR_exit:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_CONTROL) , LCD_BLOCK;status=Main_Control;beepshort(); ) ;
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
break;
//float retract_length=2, retract_feedrate=1200, retract_zlift=0.4;
//float retract_recover_length=0, retract_recover_feedrate=500;
case ItemR_autoretract:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_AUTORETRACT);
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
lcd.setCursor(13,line);
if(autoretract_enabled)
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
LCD_PRINT_PGM(MSG_ON);
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
else
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
LCD_PRINT_PGM(MSG_OFF);
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
{
autoretract_enabled=!autoretract_enabled;
lcd.setCursor(13,line);
if(autoretract_enabled)
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
LCD_PRINT_PGM(MSG_ON);
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
else
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
LCD_PRINT_PGM(MSG_OFF);
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
}
}break;
case ItemR_retract_length:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_CONTROL_RETRACT);
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
lcd.setCursor(13,line);lcd.print(ftostr52(retract_length));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=(long)(retract_length*100);
}
else
{
retract_length= encoderpos/100.;
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<1) encoderpos=1;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(ftostr52(encoderpos/100.));
}
}break;
case ItemR_retract_feedrate:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_CONTROL_RETRACTF);
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
lcd.setCursor(13,line);lcd.print(itostr4(retract_feedrate));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=(long)(retract_feedrate/5);
}
else
{
retract_feedrate= encoderpos*5.;
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<1) encoderpos=1;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(itostr4(encoderpos*5));
}
}break;
case ItemR_retract_zlift://float retract_acceleration = 7000;
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_CONTROL_RETRACT_ZLIFT);
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
lcd.setCursor(13,line);lcd.print(ftostr52(retract_zlift));;
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=(long)(retract_zlift*10);
}
else
{
retract_zlift= encoderpos/10.;
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(ftostr52(encoderpos/10.));
}
}break;
case ItemR_unretract_length:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_CONTROL_RETRACT_RECOVER);
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
lcd.setCursor(13,line);lcd.print(ftostr52(retract_recover_length));;
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=(long)(retract_recover_length*100);
}
else
{
retract_recover_length= encoderpos/100.;
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(ftostr52(encoderpos/100.));
}
}break;
case ItemR_unretract_feedrate:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_CONTROL_RETRACT_RECOVERF);
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
lcd.setCursor(13,line);lcd.print(itostr4(retract_recover_feedrate));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=(long)retract_recover_feedrate/5;
}
else
{
retract_recover_feedrate= encoderpos*5.;
encoderpos=activeline*lcdslow;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
beepshort();
}
if(linechanging)
{
if(encoderpos<1) encoderpos=1;
if(encoderpos>990) encoderpos=990;
lcd.setCursor(13,line);lcd.print(itostr4(encoderpos*5));
}
}break;
default:
break;
}
line++;
}
updateActiveLines(ItemR_unretract_feedrate,encoderpos);
#endif
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
enum {
ItemC_exit,ItemC_temp,ItemC_move,
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
#ifdef FWRETRACT
ItemC_rectract,
#endif
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
ItemC_store, ItemC_load,ItemC_failsafe
};
void MainMenu::showControl()
{
uint8_t line=0;
clearIfNecessary();
for(int8_t i=lineoffset;i<lineoffset+LCD_HEIGHT;i++)
{
switch(i)
{
case ItemC_exit:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_MAIN_WIDE) , LCD_BLOCK;status=Main_Menu;beepshort(); ) ;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
case ItemC_temp:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_TEMPERATURE_WIDE) , LCD_BLOCK;status=Sub_TempControl;beepshort(); ) ;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
case ItemC_move:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_MOTION_WIDE) , LCD_BLOCK;status=Sub_MotionControl;beepshort(); ) ;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
#ifdef FWRETRACT
case ItemC_rectract:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_RECTRACT_WIDE) , LCD_BLOCK;status=Sub_RetractControl;beepshort(); ) ;
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
break;
#endif
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
case ItemC_store:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_STORE_EPROM);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if((activeline==line) && LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
//enquecommand("M84");
beepshort();
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.
2012-11-07 09:02:45 +00:00
Config_StoreSettings();
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
}break;
case ItemC_load:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_LOAD_EPROM);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if((activeline==line) && LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
//enquecommand("M84");
beepshort();
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.
2012-11-07 09:02:45 +00:00
Config_RetrieveSettings();
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
}break;
case ItemC_failsafe:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_RESTORE_FAILSAFE);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if((activeline==line) && LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
//enquecommand("M84");
beepshort();
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.
2012-11-07 09:02:45 +00:00
Config_ResetDefault();
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
}break;
default:
break;
}
line++;
}
updateActiveLines(ItemC_failsafe,encoderpos);
}
void MainMenu::showSD()
{
#ifdef SDSUPPORT
uint8_t line=0;
clearIfNecessary();
static uint8_t nrfiles=0;
if(force_lcd_update)
{
if(card.cardOK)
{
nrfiles=card.getnrfilenames();
}
else
{
nrfiles=0;
lineoffset=0;
}
}
bool enforceupdate=false;
for(int8_t i=lineoffset;i<lineoffset+LCD_HEIGHT;i++)
{
switch(i)
{
case 0:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_MAIN) , LCD_BLOCK;status=Main_Menu;beepshort(); ) ;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
// case 1:
// {
// if(force_lcd_update)
// {
// lcd.setCursor(0,line);
// if(CARDINSERTED)
// {
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
// LCD_PRINT_PGM(" \004Refresh");
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
// }
// else
// {
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
// LCD_PRINT_PGM(" \004Insert Card");
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
// }
//
// }
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
// if((activeline==line) && LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
// {
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
// LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
// beepshort();
// card.initsd();
// force_lcd_update=true;
// nrfiles=card.getnrfilenames();
// }
// }break;
case 1:
This is in my opinion a much better way of dealing with SD cards than my previous fix. Instead of adding a momentary switch to fake the insertion of the card I have modified the ultralcd menu item: Card Menu -> Refresh to reinitialise the card providing that the SDCARDDETECT pin has been set to -1 in the pins.h file. This requires one less switch on the front panel and the refresh menu item is in the most relevent place for a user who wishes to inert a card and then print from it. It also means that the "Card inserted" messages do not bother the users of these card readers (they dont make sense for users without SCCARDDETECT)
2012-03-03 16:30:31 +00:00
MENUITEM( lcd.print(" ");card.getWorkDirName();
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
if(card.filename[0]=='/') LCD_PRINT_PGM(MSG_REFRESH);
This is in my opinion a much better way of dealing with SD cards than my previous fix. Instead of adding a momentary switch to fake the insertion of the card I have modified the ultralcd menu item: Card Menu -> Refresh to reinitialise the card providing that the SDCARDDETECT pin has been set to -1 in the pins.h file. This requires one less switch on the front panel and the refresh menu item is in the most relevent place for a user who wishes to inert a card and then print from it. It also means that the "Card inserted" messages do not bother the users of these card readers (they dont make sense for users without SCCARDDETECT)
2012-03-03 16:30:31 +00:00
else {
lcd.print("\005");
lcd.print(card.filename);
lcd.print("/..");
} ,
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
This is in my opinion a much better way of dealing with SD cards than my previous fix. Instead of adding a momentary switch to fake the insertion of the card I have modified the ultralcd menu item: Card Menu -> Refresh to reinitialise the card providing that the SDCARDDETECT pin has been set to -1 in the pins.h file. This requires one less switch on the front panel and the refresh menu item is in the most relevent place for a user who wishes to inert a card and then print from it. It also means that the "Card inserted" messages do not bother the users of these card readers (they dont make sense for users without SCCARDDETECT)
2012-03-03 16:30:31 +00:00
if(SDCARDDETECT == -1) card.initsd();
card.updir();
enforceupdate=true;
lineoffset=0;
beepshort(); ) ;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
default:
{
#define FIRSTITEM 2
if(i-FIRSTITEM<nrfiles)
{
if(force_lcd_update)
{
card.getfilename(i-FIRSTITEM);
//Serial.print("Filenr:");Serial.println(i-2);
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(" ");
if(card.filenameIsDir)
{
lcd.print("\005");
card.longFilename[LCD_WIDTH-2] = '\0';
}
Added long filename support.
2012-08-22 12:49:57 +00:00
if (card.longFilename[0])
{
card.longFilename[LCD_WIDTH-1] = '\0';
lcd.print(card.longFilename);
}
else
{
lcd.print(card.filename);
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if((activeline==line) && LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
card.getfilename(i-FIRSTITEM);
if(card.filenameIsDir)
{
signed/unsigned fixes.
2012-11-06 14:33:49 +00:00
for(uint8_t i=0;i<strlen(card.filename);i++)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
card.filename[i]=tolower(card.filename[i]);
card.chdir(card.filename);
lineoffset=0;
enforceupdate=true;
}
else
{
char cmd[30];
signed/unsigned fixes.
2012-11-06 14:33:49 +00:00
for(uint8_t i=0;i<strlen(card.filename);i++)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
card.filename[i]=tolower(card.filename[i]);
sprintf(cmd,"M23 %s",card.filename);
//sprintf(cmd,"M115");
enquecommand(cmd);
enquecommand("M24");
beep();
status=Main_Status;
Added long filename support.
2012-08-22 12:49:57 +00:00
if (card.longFilename[0])
{
card.longFilename[LCD_WIDTH-1] = '\0';
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
lcd_setstatus(card.longFilename);
Added long filename support.
2012-08-22 12:49:57 +00:00
}
else
{
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
lcd_setstatus(card.filename);
Added long filename support.
2012-08-22 12:49:57 +00:00
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
fixed manual axis movement lcd option
2012-02-21 08:31:28 +00:00
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
}
break;
}
line++;
}
updateActiveLines(FIRSTITEM+nrfiles-1,encoderpos);
if(enforceupdate)
{
force_lcd_update=true;
enforceupdate=false;
}
#endif
}
Fixed compile errors in ultralcd when no ultra_lcd is selected.
2012-03-15 21:29:31 +00:00
Added pause and retract lcd menu items
2012-07-27 05:38:33 +00:00
enum {ItemM_watch, ItemM_prepare, ItemM_control, ItemM_file, ItemM_pause};
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
void MainMenu::showMainMenu()
{
#ifndef ULTIPANEL
force_lcd_update=false;
#endif
if(tune)
{
Fixed general 16x2 LCD build without SD support.
2012-02-29 14:33:23 +00:00
if(!(movesplanned() || IS_SD_PRINTING))
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
force_lcd_update=true;
tune=false;
}
}
else
{
Fixed general 16x2 LCD build without SD support.
2012-02-29 14:33:23 +00:00
if(movesplanned() || IS_SD_PRINTING)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
force_lcd_update=true;
tune=true;
}
}
clearIfNecessary();
bug fix for scrolling of main menu when using SMALL_DISPLAY (2 lines only)
2012-05-11 13:23:10 +00:00
uint8_t line=0;
for(int8_t i=lineoffset;i<lineoffset+LCD_HEIGHT;i++)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
bug fix for scrolling of main menu when using SMALL_DISPLAY (2 lines only)
2012-05-11 13:23:10 +00:00
switch(i)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
case ItemM_watch:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_WATCH) , LCD_BLOCK;status=Main_Status;beepshort(); ) ;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
case ItemM_prepare:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( if(!tune) LCD_PRINT_PGM(MSG_PREPARE);else LCD_PRINT_PGM(MSG_TUNE); , LCD_BLOCK;status=Main_Prepare;beepshort(); ) ;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
case ItemM_control:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_CONTROL_ARROW) , LCD_BLOCK;status=Main_Control;beepshort(); ) ;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
#ifdef SDSUPPORT
case ItemM_file:
{
if(force_lcd_update)
{
lcd.setCursor(0,line);
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(IS_SD_INSERTED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
if(card.sdprinting)
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
LCD_PRINT_PGM(MSG_STOP_PRINT);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
else
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
LCD_PRINT_PGM(MSG_CARD_MENU);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
LCD_PRINT_PGM(MSG_NO_CARD);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(IS_SD_INSERTED&&(activeline==line) && LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
card.printingHasFinished();
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
status=Main_SD;
beepshort();
}
}break;
Added pause and retract lcd menu items
2012-07-27 05:38:33 +00:00
case ItemM_pause:
{
if(force_lcd_update)
{
lcd.setCursor(0,line);
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(IS_SD_INSERTED)
Added pause and retract lcd menu items
2012-07-27 05:38:33 +00:00
{
if(card.sdprinting)
SDCARDINSERTED is always defined, and thus we do not need the #ifdefs.
2012-11-12 08:16:27 +00:00
LCD_PRINT_PGM(MSG_PAUSE_PRINT);
Added pause and retract lcd menu items
2012-07-27 05:38:33 +00:00
else
SDCARDINSERTED is always defined, and thus we do not need the #ifdefs.
2012-11-12 08:16:27 +00:00
LCD_PRINT_PGM(MSG_RESUME_PRINT);
}
else
{
//LCD_PRINT_PGM(MSG_NO_CARD);
}
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(IS_SD_INSERTED && (activeline==line) && LCD_CLICKED)
SDCARDINSERTED is always defined, and thus we do not need the #ifdefs.
2012-11-12 08:16:27 +00:00
{
if(card.sdprinting)
{
card.pauseSDPrint();
beepshort();
status = Main_Status;
Added pause and retract lcd menu items
2012-07-27 05:38:33 +00:00
}
SDCARDINSERTED is always defined, and thus we do not need the #ifdefs.
2012-11-12 08:16:27 +00:00
else
{
card.startFileprint();
starttime=millis();
beepshort();
status = Main_Status;
}
}
Added pause and retract lcd menu items
2012-07-27 05:38:33 +00:00
}break;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
#else
case ItemM_file:
break;
Added pause and retract lcd menu items
2012-07-27 05:38:33 +00:00
case ItemM_pause:
break;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
#endif
Added pause and retract lcd menu items
2012-07-27 05:38:33 +00:00
default:
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
SERIAL_ERROR_START;
Added a structure that will allow easy translations/modifications to the LCD menu. Signed-off-by: Blair Thompson <mail@justblair.co.uk>
2012-02-20 22:22:46 +00:00
SERIAL_ERRORLNPGM(MSG_SERIAL_ERROR_MENU_STRUCTURE);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
break;
}
bug fix for scrolling of main menu when using SMALL_DISPLAY (2 lines only)
2012-05-11 13:23:10 +00:00
line++;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
Added pause and retract lcd menu items
2012-07-27 05:38:33 +00:00
uint8_t numberOfLines = 4;
#ifdef SDSUPPORT
numberOfLines = 4;
#else
numberOfLines = 3;
#endif
updateActiveLines(numberOfLines,encoderpos);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
void MainMenu::update()
{
static MainStatus oldstatus=Main_Menu; //init automatically causes foce_lcd_update=true
signed/unsigned fixes.
2012-11-06 14:33:49 +00:00
static unsigned long timeoutToStatus=0;
SDCARDINSERTED is always defined, and thus we do not need the #ifdefs.
2012-11-12 08:16:27 +00:00
#if (SDCARDDETECT > -1)
//This code is only relivant if you have an SDcard detect pin.
static bool oldcardstatus=false;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if((IS_SD_INSERTED != oldcardstatus))
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
force_lcd_update=true;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
oldcardstatus=IS_SD_INSERTED;
reinitialize the lcd, if the SD card is inserted or removed. It seems that LCDs can confused by electrical discharges from time to time. Since a removal or insert of the sd card takes a long time in firmware, just reinitializing the lcd does not hurt. actually, it solves a problem with the UltiControlle
2012-04-22 19:12:17 +00:00
lcd_init(); // to maybe revive the lcd if static electricty killed it.
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
//Serial.println("echo: SD CHANGE");
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(IS_SD_INSERTED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
card.initsd();
Added a structure that will allow easy translations/modifications to the LCD menu. Signed-off-by: Blair Thompson <mail@justblair.co.uk>
2012-02-20 22:22:46 +00:00
LCD_MESSAGEPGM(MSG_SD_INSERTED);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
else
{
card.release();
Added a structure that will allow easy translations/modifications to the LCD menu. Signed-off-by: Blair Thompson <mail@justblair.co.uk>
2012-02-20 22:22:46 +00:00
LCD_MESSAGEPGM(MSG_SD_REMOVED);
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
}
#endif
if(status!=oldstatus)
{
force_lcd_update=true;
encoderpos=0;
lineoffset=0;
oldstatus=status;
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if( (encoderpos!=lastencoderpos) || LCD_CLICKED)
timeoutToStatus=millis()+LCD_TIMEOUT_TO_STATUS;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
switch(status)
{
case Main_Status:
{
showStatus();
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
{
linechanging=false;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
status=Main_Menu;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
timeoutToStatus=millis()+LCD_TIMEOUT_TO_STATUS;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
}break;
case Main_Menu:
{
showMainMenu();
linechanging=false;
}break;
case Main_Prepare:
{
if(tune)
{
showTune();
}
else
{
showPrepare();
}
}break;
lcd menue "move_axis" added
2012-02-07 11:58:05 +00:00
case Sub_PrepareMove:
{
showAxisMove();
}break;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
case Main_Control:
{
showControl();
}break;
case Sub_MotionControl:
{
showControlMotion();
}break;
added firmware retract. disabled by default
2012-06-02 18:32:28 +00:00
case Sub_RetractControl:
{
showControlRetract();
}break;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
case Sub_TempControl:
{
showControlTemp();
}break;
case Main_SD:
{
showSD();
}break;
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
case Sub_PreheatPLASettings:
{
showPLAsettings();
}break;
case Sub_PreheatABSSettings:
{
showABSsettings();
}break;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
}
if(timeoutToStatus<millis())
status=Main_Status;
//force_lcd_update=false;
lastencoderpos=encoderpos;
}
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
enum {
ItemPLAPreHeat_Exit,
ItemPLAPreHeat_set_PLA_FanSpeed,
ItemPLAPreHeat_set_nozzle,
ItemPLAPreHeat_set_HPB,
ItemPLAPreHeat_Store_Eprom
};
void MainMenu::showPLAsettings()
{
#ifdef ULTIPANEL
uint8_t line=0;
clearIfNecessary();
for(int8_t i=lineoffset;i<lineoffset+LCD_HEIGHT;i++)
{
switch(i)
{
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
case ItemPLAPreHeat_Exit:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_TEMPERATURE_RTN) , LCD_BLOCK;status=Sub_TempControl;beepshort(); ) ;
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
break;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
case ItemPLAPreHeat_set_PLA_FanSpeed:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_FAN_SPEED);
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(plaPreheatFanSpeed));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=plaPreheatFanSpeed;
}
else
{
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>255) encoderpos=255;
plaPreheatFanSpeed=encoderpos;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
case ItemPLAPreHeat_set_nozzle:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_NOZZLE);
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(plaPreheatHotendTemp));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=plaPreheatHotendTemp;
}
else
{
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>260) encoderpos=260;
plaPreheatHotendTemp = encoderpos;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
case ItemPLAPreHeat_set_HPB:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_BED);
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(plaPreheatHPBTemp));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=plaPreheatHPBTemp;
}
else
{
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>250) encoderpos=150;
plaPreheatHPBTemp = encoderpos;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
case ItemPLAPreHeat_Store_Eprom:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_STORE_EPROM);
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if((activeline==line) && LCD_CLICKED)
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
{
//enquecommand("M84");
beepshort();
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.
2012-11-07 09:02:45 +00:00
Config_StoreSettings();
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
}
}break;
default:
break;
}
line++;
}
updateActiveLines(ItemPLAPreHeat_Store_Eprom,encoderpos);
#endif
}
enum {
ItemABSPreHeat_Exit,
ItemABSPreHeat_set_FanSpeed,
ItemABSPreHeat_set_nozzle,
ItemABSPreHeat_set_HPB,
ItemABSPreHeat_Store_Eprom
};
void MainMenu::showABSsettings()
{
#ifdef ULTIPANEL
uint8_t line=0;
clearIfNecessary();
for(int8_t i=lineoffset;i<lineoffset+LCD_HEIGHT;i++)
{
switch(i)
{
case ItemABSPreHeat_Exit:
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
MENUITEM( LCD_PRINT_PGM(MSG_TEMPERATURE_RTN) , LCD_BLOCK;status=Sub_TempControl;beepshort(); ) ;
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
break;
case ItemABSPreHeat_set_FanSpeed:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_FAN_SPEED);
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(absPreheatFanSpeed));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=absPreheatFanSpeed;
}
else
{
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>255) encoderpos=255;
absPreheatFanSpeed=encoderpos;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
case ItemABSPreHeat_set_nozzle:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_NOZZLE);
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(absPreheatHotendTemp));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=absPreheatHotendTemp;
}
else
{
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>260) encoderpos=260;
absPreheatHotendTemp = encoderpos;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
case ItemABSPreHeat_set_HPB:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_BED);
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
lcd.setCursor(13,line);lcd.print(ftostr3(absPreheatHPBTemp));
}
if((activeline!=line) )
break;
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if(LCD_CLICKED)
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
{
linechanging=!linechanging;
if(linechanging)
{
encoderpos=absPreheatHPBTemp;
}
else
{
encoderpos=activeline*lcdslow;
beepshort();
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
}
if(linechanging)
{
if(encoderpos<0) encoderpos=0;
if(encoderpos>250) encoderpos=150;
absPreheatHPBTemp = encoderpos;
lcd.setCursor(13,line);lcd.print(itostr3(encoderpos));
}
}break;
case ItemABSPreHeat_Store_Eprom:
{
if(force_lcd_update)
{
First cleanup. Moved all code to cpp files, so there are no dependencies on pde files. And no more odd requirement to cat files together. (Still need to fix the Makefile). Also cleaned up some defines and made defines upper case as by C coding conventions.
2012-11-06 11:06:41 +00:00
lcd.setCursor(0,line);LCD_PRINT_PGM(MSG_STORE_EPROM);
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
}
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
if((activeline==line) && LCD_CLICKED)
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
{
//enquecommand("M84");
beepshort();
Changed the naming of some LCD functions, so the names match better what the function does. Also moved around some prototypes for general cleanup.
2012-12-03 11:52:00 +00:00
LCD_BLOCK;
Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.
2012-11-07 09:02:45 +00:00
Config_StoreSettings();
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
}
}break;
default:
break;
}
line++;
}
updateActiveLines(ItemABSPreHeat_Store_Eprom,encoderpos);
#endif
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
Added Menu Options to the Main-> Control->Temperature Submenu that allow the user to set new values for the ABS and PLA preheat function. EEPROM updated so that these settings can also be committed to EEPROM memory.
2012-08-21 22:46:10 +00:00
//**********************************************************************************************************
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
// convert float to string with +123.4 format
char *ftostr3(const float &x)
{
//sprintf(conv,"%5.1f",x);
int xx=x;
conv[0]=(xx/100)%10+'0';
conv[1]=(xx/10)%10+'0';
conv[2]=(xx)%10+'0';
conv[3]=0;
return conv;
}
char *itostr2(const uint8_t &x)
{
//sprintf(conv,"%5.1f",x);
int xx=x;
conv[0]=(xx/10)%10+'0';
conv[1]=(xx)%10+'0';
conv[2]=0;
return conv;
}
// convert float to string with +123.4 format
char *ftostr31(const float &x)
{
int xx=x*10;
conv[0]=(xx>=0)?'+':'-';
xx=abs(xx);
conv[1]=(xx/1000)%10+'0';
conv[2]=(xx/100)%10+'0';
conv[3]=(xx/10)%10+'0';
conv[4]='.';
conv[5]=(xx)%10+'0';
conv[6]=0;
return conv;
}
char *ftostr32(const float &x)
{
changed int to long to overcome overflow of number display - related bug reports: Issue #201, Issue #213
2012-08-21 14:47:39 +00:00
long xx=x*100;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
conv[0]=(xx>=0)?'+':'-';
xx=abs(xx);
conv[1]=(xx/100)%10+'0';
conv[2]='.';
conv[3]=(xx/10)%10+'0';
conv[4]=(xx)%10+'0';
conv[6]=0;
return conv;
}
char *itostr31(const int &xx)
{
conv[0]=(xx>=0)?'+':'-';
conv[1]=(xx/1000)%10+'0';
conv[2]=(xx/100)%10+'0';
conv[3]=(xx/10)%10+'0';
conv[4]='.';
conv[5]=(xx)%10+'0';
conv[6]=0;
return conv;
}
char *itostr3(const int &xx)
{
conv[0]=(xx/100)%10+'0';
conv[1]=(xx/10)%10+'0';
conv[2]=(xx)%10+'0';
conv[3]=0;
return conv;
}
char *itostr4(const int &xx)
{
conv[0]=(xx/1000)%10+'0';
conv[1]=(xx/100)%10+'0';
conv[2]=(xx/10)%10+'0';
conv[3]=(xx)%10+'0';
conv[4]=0;
return conv;
}
// convert float to string with +1234.5 format
char *ftostr51(const float &x)
{
changed int to long to overcome overflow of number display - related bug reports: Issue #201, Issue #213
2012-08-21 14:47:39 +00:00
long xx=x*10;
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
conv[0]=(xx>=0)?'+':'-';
xx=abs(xx);
conv[1]=(xx/10000)%10+'0';
conv[2]=(xx/1000)%10+'0';
conv[3]=(xx/100)%10+'0';
conv[4]=(xx/10)%10+'0';
conv[5]='.';
conv[6]=(xx)%10+'0';
conv[7]=0;
return conv;
}
Changed display format for some numbers.
2012-02-21 22:05:43 +00:00
// convert float to string with +123.45 format
char *ftostr52(const float &x)
{
changed int to long to overcome overflow of number display - related bug reports: Issue #201, Issue #213
2012-08-21 14:47:39 +00:00
long xx=x*100;
Changed display format for some numbers.
2012-02-21 22:05:43 +00:00
conv[0]=(xx>=0)?'+':'-';
xx=abs(xx);
conv[1]=(xx/10000)%10+'0';
conv[2]=(xx/1000)%10+'0';
conv[3]=(xx/100)%10+'0';
conv[4]='.';
conv[5]=(xx/10)%10+'0';
conv[6]=(xx)%10+'0';
conv[7]=0;
return conv;
}
Merged multiple extruder support. Soft PWM. (Sanguinololu can also have PID temperature control) Interrupt save WRITE for addresses > 0x0FF
2011-12-12 18:34:37 +00:00
#endif //ULTRA_LCD
changed encoder pos from int to long to fix problems setting x/y/z/e stepps_per_mm using the lcd menu
2012-05-11 13:19:09 +00:00
Reference in a new issue Copy permalink