3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-24 12:35:51 +00:00
Code Issues Releases Wiki Activity
6fb9573157
MarlinFirmware/Marlin/ultralcd.h

102 lines
2.9 KiB
C
Raw Normal View History

__ header file replace
2012-06-02 18:44:17 +00:00
#ifndef ULTRALCD_H
#define ULTRALCD_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
solved some compiler warnings that are now visible in arduino 1.0. Found a couple of unused variables, that I commented. Tried to solve the program memory warning message, and failed.
2011-12-04 11:40:18 +00:00
#include "Marlin.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
and changed ultipanel to have the mm/sec and not mm/min Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Conflicts: Marlin/Marlin.pde Marlin/ultralcd.h
2011-11-15 21:50:43 +00:00
#ifdef ULTRA_LCD
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();
void lcd_init();
void lcd_setstatus(const char* message);
void lcd_setstatuspgm(const char* message);
void lcd_setalertstatuspgm(const char* message);
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
void lcd_reset_alert_level();
Add variable for animated fan, add float conversion w/o sign A new variable was introduced to allow fan animation on the GLCD. Add additional float to string conversion routine without sign character. This is used for the coordinates visualisation on the GLCD.
2013-03-19 19:13:23 +00:00
static unsigned char blink = 0; // Variable for visualisation of fan rotation in GLCD
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
#define LCD_MESSAGEPGM(x) lcd_setstatuspgm(PSTR(x))
#define LCD_ALERTMESSAGEPGM(x) lcd_setalertstatuspgm(PSTR(x))
#define LCD_UPDATE_INTERVAL 100
#define LCD_TIMEOUT_TO_STATUS 15000
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
#ifdef ULTIPANEL
void lcd_buttons_update();
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
extern volatile uint8_t buttons; //the last checked buttons in a bit array.
added support for the reprapworld keypad
2013-05-10 19:57:17 +00:00
#ifdef KEYPAD
extern volatile uint8_t buttons_keypad; // to store the keypad shiftregister values
#endif
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
#else
FORCE_INLINE void lcd_buttons_update() {}
#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
extern int plaPreheatHotendTemp;
extern int plaPreheatHPBTemp;
extern int plaPreheatFanSpeed;
extern int absPreheatHotendTemp;
extern int absPreheatHPBTemp;
extern int absPreheatFanSpeed;
#ifdef NEWPANEL
and changed ultipanel to have the mm/sec and not mm/min Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Conflicts: Marlin/Marlin.pde Marlin/ultralcd.h
2011-11-15 21:50:43 +00:00
#define EN_C (1<<BLEN_C)
#define EN_B (1<<BLEN_B)
#define EN_A (1<<BLEN_A)
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
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
#define LCD_CLICKED (buttons&EN_C)
added support for the reprapworld keypad
2013-05-10 19:57:17 +00:00
#ifdef KEYPAD
#define EN_KEYPAD_F3 (1<<BLEN_KEYPAD_F3)
#define EN_KEYPAD_F2 (1<<BLEN_KEYPAD_F2)
#define EN_KEYPAD_F1 (1<<BLEN_KEYPAD_F1)
#define EN_KEYPAD_UP (1<<BLEN_KEYPAD_UP)
#define EN_KEYPAD_RIGHT (1<<BLEN_KEYPAD_RIGHT)
#define EN_KEYPAD_MIDDLE (1<<BLEN_KEYPAD_MIDDLE)
#define EN_KEYPAD_DOWN (1<<BLEN_KEYPAD_DOWN)
#define EN_KEYPAD_LEFT (1<<BLEN_KEYPAD_LEFT)
#define LCD_CLICKED ((buttons&EN_C) || (buttons_keypad&EN_KEYPAD_F1))
#define KEYPAD_MOVE_Y_DOWN (buttons_keypad&EN_KEYPAD_DOWN)
#define KEYPAD_MOVE_Y_UP (buttons_keypad&EN_KEYPAD_UP)
#define KEYPAD_MOVE_HOME (buttons_keypad&EN_KEYPAD_MIDDLE)
#endif //KEYPAD
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
#else
and changed ultipanel to have the mm/sec and not mm/min Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Conflicts: Marlin/Marlin.pde Marlin/ultralcd.h
2011-11-15 21:50:43 +00:00
//atomatic, do not change
#define B_LE (1<<BL_LE)
#define B_UP (1<<BL_UP)
#define B_MI (1<<BL_MI)
#define B_DW (1<<BL_DW)
#define B_RI (1<<BL_RI)
#define B_ST (1<<BL_ST)
#define EN_B (1<<BLEN_B)
#define EN_A (1<<BLEN_A)
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
#define LCD_CLICKED ((buttons&B_MI)||(buttons&B_ST))
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
#endif//NEWPANEL
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
and changed ultipanel to have the mm/sec and not mm/min Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Conflicts: Marlin/Marlin.pde Marlin/ultralcd.h
2011-11-15 21:50:43 +00:00
#else //no lcd
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
FORCE_INLINE void lcd_update() {}
FORCE_INLINE void lcd_init() {}
FORCE_INLINE void lcd_setstatus(const char* message) {}
FORCE_INLINE void lcd_buttons_update() {}
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
FORCE_INLINE void lcd_reset_alert_level() {}
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
#define LCD_MESSAGEPGM(x)
#define LCD_ALERTMESSAGEPGM(x)
and changed ultipanel to have the mm/sec and not mm/min Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Conflicts: Marlin/Marlin.pde Marlin/ultralcd.h
2011-11-15 21:50:43 +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
one step closer to a functional makefile..
2011-12-22 15:43:28 +00:00
char *itostr2(const uint8_t &x);
char *itostr31(const int &xx);
char *itostr3(const int &xx);
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
char *itostr3left(const int &xx);
one step closer to a functional makefile..
2011-12-22 15:43:28 +00:00
char *itostr4(const int &xx);
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
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
char *ftostr3(const float &x);
Add variable for animated fan, add float conversion w/o sign A new variable was introduced to allow fan animation on the GLCD. Add additional float to string conversion routine without sign character. This is used for the coordinates visualisation on the GLCD.
2013-03-19 19:13:23 +00:00
char *ftostr31ns(const float &x); // float to string without sign character
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
char *ftostr31(const float &x);
char *ftostr32(const float &x);
The big LCD code update. This splits the display and menu implementation. Paving the way for future different displays. It also makes it easier to modify the menu structures while keeping everything consistant. Note that this most likely breaks the translations, which need to be updated.
2012-12-12 10:47:03 +00:00
char *ftostr5(const float &x);
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
char *ftostr51(const float &x);
char *ftostr52(const float &x);
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
and changed ultipanel to have the mm/sec and not mm/min Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1 Conflicts: Marlin/Marlin.pde Marlin/ultralcd.h
2011-11-15 21:50:43 +00:00
#endif //ULTRALCD
Reference in New Issue Copy Permalink