josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

final edits to fit changes on upstream

This commit is contained in:
PavelSindler 2018-07-23 09:14:22 +02:00
parent 565a6db3e4
commit efd03b426f
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/lcd.cpp
View File

@ -662,7 +662,6 @@ int8_t lcd_encoder_diff = 0;
uint8_t lcd_buttons = 0; uint8_t lcd_buttons = 0;
uint8_t lcd_button_pressed = 0; uint8_t lcd_button_pressed = 0;
uint8_t lcd_update_enabled = 1; uint8_t lcd_update_enabled = 1;
LongTimer lcd_timeoutToStatus;
uint32_t lcd_next_update_millis = 0; uint32_t lcd_next_update_millis = 0;
uint8_t lcd_status_update_delay = 0; uint8_t lcd_status_update_delay = 0;
@ -677,6 +676,7 @@ lcd_lcdupdate_func_t lcd_lcdupdate_func = 0;
static ShortTimer buttonBlanking; static ShortTimer buttonBlanking;
ShortTimer longPressTimer; ShortTimer longPressTimer;
LongTimer lcd_timeoutToStatus;
uint8_t lcd_clicked(void) uint8_t lcd_clicked(void)

3
Firmware/lcd.h
View File

@ -4,6 +4,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include "Timer.h"
@ -108,7 +109,7 @@ extern uint8_t lcd_button_pressed;
extern uint8_t lcd_update_enabled; extern uint8_t lcd_update_enabled;
extern uint32_t lcd_timeoutToStatus; extern LongTimer lcd_timeoutToStatus;
extern uint32_t lcd_next_update_millis; extern uint32_t lcd_next_update_millis;

10
Firmware/ultralcd.cpp
View File

@ -2840,7 +2840,7 @@ static void _lcd_babystep(int axis, const char *msg)
//SERIAL_ECHO("Z baby step: "); //SERIAL_ECHO("Z baby step: ");
//SERIAL_ECHO(menuData.babyStep.babystepMem[2]); //SERIAL_ECHO(menuData.babyStep.babystepMem[2]);
// Wait 90 seconds before closing the live adjust dialog. // Wait 90 seconds before closing the live adjust dialog.
lcd_timeoutToStatus = millis() + 90000; lcd_timeoutToStatus.start();
} }
if (lcd_encoder != 0) if (lcd_encoder != 0)
@ -7533,18 +7533,18 @@ void menu_lcd_charsetup_func(void)
static inline bool z_menu_expired() static inline bool z_menu_expired()
{ {
return (currentMenu == lcd_babystep_z return (menu_menu == lcd_babystep_z
&& lcd_timeoutToStatus.expired(LCD_TIMEOUT_TO_STATUS_BABYSTEP_Z)); && lcd_timeoutToStatus.expired(LCD_TIMEOUT_TO_STATUS_BABYSTEP_Z));
} }
static inline bool other_menu_expired() static inline bool other_menu_expired()
{ {
return (currentMenu != lcd_status_screen return (menu_menu != lcd_status_screen
&& currentMenu != lcd_babystep_z && menu_menu != lcd_babystep_z
&& lcd_timeoutToStatus.expired(LCD_TIMEOUT_TO_STATUS)); && lcd_timeoutToStatus.expired(LCD_TIMEOUT_TO_STATUS));
} }
static inline bool forced_menu_expire() static inline bool forced_menu_expire()
{ {
bool retval = (currentMenu != lcd_status_screen bool retval = (menu_menu != lcd_status_screen
&& forceMenuExpire); && forceMenuExpire);
forceMenuExpire = false; forceMenuExpire = false;
return retval; return retval;

2
Firmware/ultralcd.h
View File

@ -4,7 +4,6 @@
#include "Marlin.h" #include "Marlin.h"
#include "lcd.h" #include "lcd.h"
#include "conv2str.h" #include "conv2str.h"
#include "Timer.h"
extern int lcd_puts_P(const char* str); extern int lcd_puts_P(const char* str);
extern int lcd_printf_P(const char* format, ...); extern int lcd_printf_P(const char* format, ...);
@ -104,7 +103,6 @@ extern void menu_lcd_lcdupdate_func(void);
#define LCD_COMMAND_PID_EXTRUDER 7 #define LCD_COMMAND_PID_EXTRUDER 7
#define LCD_COMMAND_V2_CAL 8 #define LCD_COMMAND_V2_CAL 8
extern unsigned long lcd_timeoutToStatus;
extern int lcd_commands_type; extern int lcd_commands_type;
extern uint8_t farm_mode; extern uint8_t farm_mode;