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

Remove unused parameters of function _lcd_babystep(int axis, chonst char *msg). 

Saves 24B of flash memory.
This commit is contained in:
Marek Bel 2019-06-25 19:43:10 +02:00
parent ebdeb99134
commit 20dd1110f6
1 changed files with 23 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Firmware/ultralcd.cpp
View File

@ -3068,13 +3068,13 @@ static void lcd_move_z() {
* other value leads to storing Z_AXIS * other value leads to storing Z_AXIS
* @param msg text to be displayed * @param msg text to be displayed
*/ */
static void _lcd_babystep(int axis, const char *msg) static void lcd_babystep_z()
{ {
typedef struct typedef struct
{ // 19bytes total {
int8_t status; // 1byte int8_t status;
int babystepMem[3]; // 6bytes int babystepMemZ;
float babystepMemMM[3]; // 12bytes float babystepMemMMZ;
} _menu_data_t; } _menu_data_t;
static_assert(sizeof(menu_data)>= sizeof(_menu_data_t),"_menu_data_t doesn't fit into menu_data"); static_assert(sizeof(menu_data)>= sizeof(_menu_data_t),"_menu_data_t doesn't fit into menu_data");
_menu_data_t* _md = (_menu_data_t*)&(menu_data[0]); _menu_data_t* _md = (_menu_data_t*)&(menu_data[0]);
@ -3085,17 +3085,13 @@ static void _lcd_babystep(int axis, const char *msg)
_md->status = 1; _md->status = 1;
check_babystep(); check_babystep();
EEPROM_read_B(EEPROM_BABYSTEP_X, &_md->babystepMem[0]); EEPROM_read_B(EEPROM_BABYSTEP_Z, &_md->babystepMemZ);
EEPROM_read_B(EEPROM_BABYSTEP_Y, &_md->babystepMem[1]);
EEPROM_read_B(EEPROM_BABYSTEP_Z, &_md->babystepMem[2]);
// same logic as in babystep_load // same logic as in babystep_load
if (calibration_status() >= CALIBRATION_STATUS_LIVE_ADJUST) if (calibration_status() >= CALIBRATION_STATUS_LIVE_ADJUST)
_md->babystepMem[2] = 0; _md->babystepMemZ = 0;
_md->babystepMemMM[0] = _md->babystepMem[0]/cs.axis_steps_per_unit[X_AXIS]; _md->babystepMemMMZ = _md->babystepMemZ/cs.axis_steps_per_unit[Z_AXIS];
_md->babystepMemMM[1] = _md->babystepMem[1]/cs.axis_steps_per_unit[Y_AXIS];
_md->babystepMemMM[2] = _md->babystepMem[2]/cs.axis_steps_per_unit[Z_AXIS];
lcd_draw_update = 1; lcd_draw_update = 1;
//SERIAL_ECHO("Z baby step: "); //SERIAL_ECHO("Z baby step: ");
//SERIAL_ECHO(_md->babystepMem[2]); //SERIAL_ECHO(_md->babystepMem[2]);
@ -3106,19 +3102,18 @@ static void _lcd_babystep(int axis, const char *msg)
if (lcd_encoder != 0) if (lcd_encoder != 0)
{ {
if (homing_flag) lcd_encoder = 0; if (homing_flag) lcd_encoder = 0;
_md->babystepMem[axis] += (int)lcd_encoder; _md->babystepMemZ += (int)lcd_encoder;
if (axis == 2)
{ if (_md->babystepMemZ < Z_BABYSTEP_MIN) _md->babystepMemZ = Z_BABYSTEP_MIN; //-3999 -> -9.99 mm
if (_md->babystepMem[axis] < Z_BABYSTEP_MIN) _md->babystepMem[axis] = Z_BABYSTEP_MIN; //-3999 -> -9.99 mm else if (_md->babystepMemZ > Z_BABYSTEP_MAX) _md->babystepMemZ = Z_BABYSTEP_MAX; //0
else if (_md->babystepMem[axis] > Z_BABYSTEP_MAX) _md->babystepMem[axis] = Z_BABYSTEP_MAX; //0 else
else {
{ CRITICAL_SECTION_START
CRITICAL_SECTION_START babystepsTodo[Z_AXIS] += (int)lcd_encoder;
babystepsTodo[axis] += (int)lcd_encoder; CRITICAL_SECTION_END
CRITICAL_SECTION_END }
}
} _md->babystepMemMMZ = _md->babystepMemZ/cs.axis_steps_per_unit[Z_AXIS];
_md->babystepMemMM[axis] = _md->babystepMem[axis]/cs.axis_steps_per_unit[axis];
_delay(50); _delay(50);
lcd_encoder = 0; lcd_encoder = 0;
lcd_draw_update = 1; lcd_draw_update = 1;
@ -3126,26 +3121,18 @@ static void _lcd_babystep(int axis, const char *msg)
if (lcd_draw_update) if (lcd_draw_update)
{ {
lcd_set_cursor(0, 1); lcd_set_cursor(0, 1);
menu_draw_float13(msg, _md->babystepMemMM[axis]); menu_draw_float13(_i("Adjusting Z:"), _md->babystepMemMMZ); ////MSG_BABYSTEPPING_Z c=15 Beware: must include the ':' as its last character
} }
if (LCD_CLICKED || menu_leaving) if (LCD_CLICKED || menu_leaving)
{ {
// Only update the EEPROM when leaving the menu. // Only update the EEPROM when leaving the menu.
EEPROM_save_B( EEPROM_save_B(EEPROM_BABYSTEP_Z, &_md->babystepMemZ);
(axis == X_AXIS) ? EEPROM_BABYSTEP_X : ((axis == Y_AXIS) ? EEPROM_BABYSTEP_Y : EEPROM_BABYSTEP_Z), calibration_status_store(CALIBRATION_STATUS_CALIBRATED);
&_md->babystepMem[axis]);
if(Z_AXIS == axis) calibration_status_store(CALIBRATION_STATUS_CALIBRATED);
} }
if (LCD_CLICKED) menu_back(); if (LCD_CLICKED) menu_back();
} }
static void lcd_babystep_z()
{
_lcd_babystep(Z_AXIS, (_i("Adjusting Z:")));////MSG_BABYSTEPPING_Z c=15 Beware: must include the ':' as its last character
}
typedef struct typedef struct
{ // 12bytes + 9bytes = 21bytes total { // 12bytes + 9bytes = 21bytes total
menu_data_edit_t reserved; //12 bytes reserved for number editing functions menu_data_edit_t reserved; //12 bytes reserved for number editing functions