mirror
/
Repetier-Firmware-4-Davinci
kopia lustrzana https://github.com/luc-github/Repetier-Firmware-4-Davinci
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Add Visual for Endstop 

Add visual status of end stop state Square open = endstop not reached,
square closed = endstop reached
pull/71/head
Luc 2015-04-29 09:38:19 +08:00
rodzic 09092146c1
commit 255e5be77e
2 zmienionych plików z 10 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
src/ArduinoDUE/Repetier/ui.cpp
Wyświetl plik

@ -1781,7 +1781,8 @@ case 'P':
if(c2 == 'x')
{
#if (X_MIN_PIN > -1) && MIN_HARDWARE_ENDSTOP_X
addStringOnOff(Printer::isXMinEndstopHit());
//addStringOnOff(Printer::isXMinEndstopHit());
addStringP(Printer::isXMinEndstopHit()?"\003":"\004");
#else
addStringP(ui_text_na);
#endif
@ -1794,7 +1795,8 @@ case 'P':
#endif
if(c2 == 'y')
#if (Y_MIN_PIN > -1)&& MIN_HARDWARE_ENDSTOP_Y
addStringOnOff(Printer::isYMinEndstopHit());
//addStringOnOff(Printer::isYMinEndstopHit());
addStringP(Printer::isYMinEndstopHit()?"\003":"\004");
#else
addStringP(ui_text_na);
#endif
@ -1806,7 +1808,8 @@ case 'P':
#endif
if(c2 == 'z')
#if (Z_MIN_PIN > -1) && MIN_HARDWARE_ENDSTOP_Z
addStringOnOff(Printer::isZMinEndstopHit());
//addStringOnOff(Printer::isZMinEndstopHit());
addStringP(Printer::isZMinEndstopHit()?"\003":"\004");
#else
addStringP(ui_text_na);
#endif

8
src/ArduinoDUE/Repetier/uimenu.h
Wyświetl plik

@ -260,7 +260,7 @@ for 2 row displays. You can add additional pages or change the default pages lik
#endif
#endif
//page 2
UI_PAGE4(ui_page2,"X:%x0 mm","Y:%x1 mm","Z:%x2 mm","%os", ALL_MODE)
UI_PAGE4(ui_page2,"X:%x0 mm %sx","Y:%x1 mm %sy","Z:%x2 mm %sz","%os", ALL_MODE)
//page 3
UI_PAGE4(ui_page3,UI_TEXT_SPEED_MULTIPLY,UI_TEXT_FLOW_MULTIPLY,UI_TEXT_PAGE_BUFFER,"%os", ALL_MODE)
//printing time
@ -1033,7 +1033,7 @@ UI_MENU_ACTIONCOMMAND(ui_menu_home_z,UI_TEXT_HOME_Z,UI_ACTION_HOME_Z, ADVANCED_M
UI_MENU_CHANGEACTION(ui_menu_x_1," 1mm",UI_ACTION_X_1, ALL_MODE)
UI_MENU_CHANGEACTION(ui_menu_x_10," 10mm",UI_ACTION_X_10, ALL_MODE)
UI_MENU_CHANGEACTION(ui_menu_x_100,"100mm",UI_ACTION_X_100, ALL_MODE)
UI_MENU_ACTIONCOMMAND(ui_menu_x_pos,"X: %x0mm ",UI_ACTION_DUMMY, ALL_MODE)
UI_MENU_ACTIONCOMMAND(ui_menu_x_pos,"X:%x0mm %sx",UI_ACTION_DUMMY, ALL_MODE)
#define UI_MENU_X_POS_VALUE {UI_MENU_ADDCONDBACK &ui_menu_x_1,&ui_menu_x_10,&ui_menu_x_100,&ui_menu_x_pos}
UI_MENU_WITH_STATUS(ui_menu_pos_x_value,UI_MENU_X_POS_VALUE,4+UI_MENU_BACKCNT);//BUG without this ; compilation crash
UI_MENU_SUBMENU(ui_menu_X_pos, UI_TEXT_X_POSITION, ui_menu_pos_x_value, ALL_MODE)
@ -1041,7 +1041,7 @@ UI_MENU_SUBMENU(ui_menu_X_pos, UI_TEXT_X_POSITION, ui_menu_pos_x_value, ALL_MODE
UI_MENU_CHANGEACTION(ui_menu_y_1," 1mm",UI_ACTION_Y_1, ALL_MODE)
UI_MENU_CHANGEACTION(ui_menu_y_10," 10mm",UI_ACTION_Y_10, ALL_MODE)
UI_MENU_CHANGEACTION(ui_menu_y_100,"100mm",UI_ACTION_Y_100, ALL_MODE)
UI_MENU_ACTIONCOMMAND(ui_menu_y_pos,"Y: %x1mm ",UI_ACTION_DUMMY, ALL_MODE)
UI_MENU_ACTIONCOMMAND(ui_menu_y_pos,"Y:%x1mm %sy",UI_ACTION_DUMMY, ALL_MODE)
#define UI_MENU_Y_POS_VALUE {UI_MENU_ADDCONDBACK &ui_menu_y_1,&ui_menu_y_10,&ui_menu_y_100,&ui_menu_y_pos}
UI_MENU_WITH_STATUS(ui_menu_pos_y_value,UI_MENU_Y_POS_VALUE,4+UI_MENU_BACKCNT);//BUG without this ; compilation crash
UI_MENU_SUBMENU(ui_menu_Y_pos, UI_TEXT_Y_POSITION, ui_menu_pos_y_value, ALL_MODE)
@ -1050,7 +1050,7 @@ UI_MENU_CHANGEACTION(ui_menu_z_0_1,"0.1mm",UI_ACTION_Z_0_1, ALL_MODE)
UI_MENU_CHANGEACTION(ui_menu_z_1," 1mm",UI_ACTION_Z_1, ALL_MODE)
UI_MENU_CHANGEACTION(ui_menu_z_10," 10mm",UI_ACTION_Z_10, ALL_MODE)
UI_MENU_CHANGEACTION(ui_menu_z_100,"100mm",UI_ACTION_Z_100, ALL_MODE)
UI_MENU_ACTIONCOMMAND(ui_menu_z_pos,"Z: %x2mm ",UI_ACTION_DUMMY, ALL_MODE)
UI_MENU_ACTIONCOMMAND(ui_menu_z_pos,"Z:%x2mm %sz",UI_ACTION_DUMMY, ALL_MODE)
#define UI_MENU_Z_POS_VALUE {UI_MENU_ADDCONDBACK &ui_menu_z_0_1,&ui_menu_z_1,&ui_menu_z_10,&ui_menu_z_100,&ui_menu_z_pos}
UI_MENU_WITH_STATUS(ui_menu_pos_z_value,UI_MENU_Z_POS_VALUE,5+UI_MENU_BACKCNT);//BUG without this ; compilation crash
UI_MENU_SUBMENU(ui_menu_Z_pos, UI_TEXT_Z_POSITION, ui_menu_pos_z_value, ALL_MODE)