HCoop
/
clinton
/
Smoothieware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/edge' into upstream-master
[clinton/Smoothieware.git]
/
src
/
modules
/
utils
/
panel
/
screens
/
ExtruderScreen.cpp
diff --git
a/src/modules/utils/panel/screens/ExtruderScreen.cpp
b/src/modules/utils/panel/screens/ExtruderScreen.cpp
index
c4f9b8f
..
5b5cf58
100644
(file)
--- a/
src/modules/utils/panel/screens/ExtruderScreen.cpp
+++ b/
src/modules/utils/panel/screens/ExtruderScreen.cpp
@@
-25,7
+25,6
@@
using namespace std;
ExtruderScreen::ExtruderScreen()
{
ExtruderScreen::ExtruderScreen()
{
- this->command= nullptr;
}
void ExtruderScreen::on_enter()
}
void ExtruderScreen::on_enter()
@@
-59,20
+58,12
@@
void ExtruderScreen::clicked_menu_entry(uint16_t line)
{
switch ( line ) {
case 0: THEPANEL->enter_screen(this->parent); return;
{
switch ( line ) {
case 0: THEPANEL->enter_screen(this->parent); return;
- case 1:
command = "G91\nG1 E5 F100\nG90"
; break;
- case 2:
command = "G91\nG1 E-5 F100\nG90"
; break;
+ case 1:
send_command("M120\nG91\nG1 E5 F100\nM121")
; break;
+ case 2:
send_command("M120\nG91\nG1 E-5 F100\nM121")
; break;
case 3: setupConfigSettings(); break; // lazy load
}
}
case 3: setupConfigSettings(); break; // lazy load
}
}
-// queuing commands needs to be done from main loop
-void ExtruderScreen::on_main_loop()
-{
- if (this->command == nullptr) return;
- send_command(this->command);
- this->command= nullptr;
-}
-
void ExtruderScreen::setupConfigSettings()
{
auto mvs= new ModifyValuesScreen(true); // self delete on exit
void ExtruderScreen::setupConfigSettings()
{
auto mvs= new ModifyValuesScreen(true); // self delete on exit