3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

...

Browse source
This commit is contained in:
Robert Pelnar 2017-11-16 20:52:13 +01:00
parent ee2f927148
commit ef3e06da30
2 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Firmware/fsensor.cpp
View file

@ -35,6 +35,7 @@ bool fsensor_enabled = true;
bool fsensor_M600 = false; bool fsensor_M600 = false;
uint8_t fsensor_err_cnt = 0; uint8_t fsensor_err_cnt = 0;
int16_t fsensor_st_cnt = 0; int16_t fsensor_st_cnt = 0;
uint8_t fsensor_log = 0;
void fsensor_enable() void fsensor_enable()
@ -86,35 +87,46 @@ ISR(PCINT2_vect)
if (st_cnt != 0) if (st_cnt != 0)
{ {
#ifdef DEBUG_FSENSOR_LOG #ifdef DEBUG_FSENSOR_LOG
MYSERIAL.print("cnt="); if (fsensor_log)
MYSERIAL.print(st_cnt, DEC); {
MYSERIAL.print(" dy="); MYSERIAL.print("cnt=");
MYSERIAL.print(pat9125_y, DEC); MYSERIAL.print(st_cnt, DEC);
MYSERIAL.print(" dy=");
MYSERIAL.print(pat9125_y, DEC);
}
#endif //DEBUG_FSENSOR_LOG #endif //DEBUG_FSENSOR_LOG
if (st_cnt != 0) if (st_cnt != 0)
{ {
if( (pat9125_y == 0) || ((pat9125_y > 0) && (st_cnt < 0)) || ((pat9125_y < 0) && (st_cnt > 0))) if( (pat9125_y == 0) || ((pat9125_y > 0) && (st_cnt < 0)) || ((pat9125_y < 0) && (st_cnt > 0)))
{ //invalid movement { //invalid movement
fsensor_err_cnt++; if (st_cnt > 0) //only positive movements
fsensor_err_cnt++;
#ifdef DEBUG_FSENSOR_LOG #ifdef DEBUG_FSENSOR_LOG
if (fsensor_log)
{
MYSERIAL.print("\tNG ! err="); MYSERIAL.print("\tNG ! err=");
MYSERIAL.println(fsensor_err_cnt, DEC); MYSERIAL.println(fsensor_err_cnt, DEC);
}
#endif //DEBUG_FSENSOR_LOG #endif //DEBUG_FSENSOR_LOG
} }
else else
{ //propper movement { //propper movement
// if (fsensor_err_cnt > 0) if (fsensor_err_cnt > 0)
// fsensor_err_cnt--; fsensor_err_cnt--;
fsensor_err_cnt = 0; // fsensor_err_cnt = 0;
#ifdef DEBUG_FSENSOR_LOG #ifdef DEBUG_FSENSOR_LOG
MYSERIAL.print("\tOK err="); if (fsensor_log)
MYSERIAL.println(fsensor_err_cnt, DEC); {
MYSERIAL.print("\tOK err=");
MYSERIAL.println(fsensor_err_cnt, DEC);
}
#endif //DEBUG_FSENSOR_LOG #endif //DEBUG_FSENSOR_LOG
} }
} }
else else
{ //no movement { //no movement
#ifdef DEBUG_FSENSOR_LOG #ifdef DEBUG_FSENSOR_LOG
if (fsensor_log)
MYSERIAL.println("\tOK 0"); MYSERIAL.println("\tOK 0");
#endif //DEBUG_FSENSOR_LOG #endif //DEBUG_FSENSOR_LOG
} }

11
Firmware/ultralcd.cpp
View file

@ -3043,7 +3043,7 @@ static void prusa_stat_printinfo()
SERIAL_ECHO("]"); SERIAL_ECHO("]");
} }
/*
void lcd_pick_babystep(){ void lcd_pick_babystep(){
int enc_dif = 0; int enc_dif = 0;
int cursor_pos = 1; int cursor_pos = 1;
@ -3145,7 +3145,7 @@ void lcd_pick_babystep(){
lcd_implementation_clear(); lcd_implementation_clear();
lcd_return_to_status(); lcd_return_to_status();
} }
*/
void lcd_move_menu_axis() void lcd_move_menu_axis()
{ {
START_MENU(); START_MENU();
@ -3664,6 +3664,11 @@ static void lcd_settings_menu()
END_MENU(); END_MENU();
} }
static void lcd_selftest_()
{
lcd_selftest();
}
static void lcd_calibration_menu() static void lcd_calibration_menu()
{ {
START_MENU(); START_MENU();
@ -3671,7 +3676,7 @@ static void lcd_calibration_menu()
if (!isPrintPaused) if (!isPrintPaused)
{ {
MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28 W")); MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28 W"));
MENU_ITEM(function, MSG_SELFTEST, lcd_selftest); MENU_ITEM(function, MSG_SELFTEST, lcd_selftest_);
#ifdef MK1BP #ifdef MK1BP
// MK1 // MK1
// "Calibrate Z" // "Calibrate Z"