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

Fixup after rebase

This commit is contained in:
D.R.racer 2023-04-05 17:45:36 +02:00 committed by DRracer
parent c16db4e607
commit dfe6ea6470
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/lcd.cpp
View File

@ -633,8 +633,7 @@ void lcd_printNumber(unsigned long n, uint8_t base)
uint8_t lcd_draw_update = 2; uint8_t lcd_draw_update = 2;
int16_t lcd_encoder = 0; int16_t lcd_encoder = 0;
uint8_t lcd_encoder_bits = 0; static int8_t lcd_encoder_diff = 0;
int8_t lcd_encoder_diff = 0;
uint8_t lcd_buttons = 0; uint8_t lcd_buttons = 0;
uint8_t lcd_update_enabled = 1; uint8_t lcd_update_enabled = 1;

2
Firmware/menu.cpp
View File

@ -45,7 +45,7 @@ void menu_data_reset(void)
memset(&menu_data, 0, sizeof(menu_data)); memset(&menu_data, 0, sizeof(menu_data));
} }
void menu_goto(menu_func_t menu, const int16_t encoder, const bool feedback, bool reset_menu_state) void menu_goto(menu_func_t menu, const int16_t encoder, bool reset_menu_state, const bool feedback)
{ {
CRITICAL_SECTION_START; CRITICAL_SECTION_START;
if (menu_menu != menu) if (menu_menu != menu)

2
Firmware/menu.h
View File

@ -65,7 +65,7 @@ extern menu_func_t menu_menu;
extern void menu_data_reset(void); extern void menu_data_reset(void);
extern void menu_goto(menu_func_t menu, const int16_t encoder, const bool feedback, bool reset_menu_state); extern void menu_goto(menu_func_t menu, const int16_t encoder, bool reset_menu_state, const bool feedback=false);
#define MENU_BEGIN() menu_start(); for(menu_row = 0; menu_row < LCD_HEIGHT; menu_row++, menu_line++) { menu_item = 0; #define MENU_BEGIN() menu_start(); for(menu_row = 0; menu_row < LCD_HEIGHT; menu_row++, menu_line++) { menu_item = 0;
void menu_start(void); void menu_start(void);

2
Firmware/ultralcd.cpp
View File

@ -2825,7 +2825,7 @@ bool lcd_calibrate_z_end_stop_manual(bool only_z)
_delay(50); _delay(50);
if (! planner_queue_full()) { if (! planner_queue_full()) {
// Only move up, whatever direction the user rotates the encoder. // Only move up, whatever direction the user rotates the encoder.
current_position[Z_AXIS] += lcd_encoder; current_position[Z_AXIS] += abs(lcd_encoder);
lcd_encoder = 0; lcd_encoder = 0;
plan_buffer_line_curposXYZE(manual_feedrate[Z_AXIS] / 60); plan_buffer_line_curposXYZE(manual_feedrate[Z_AXIS] / 60);
} }