From 85c4d5d2b58963b4533c4656c2c39939404d0879 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 8 Aug 2016 19:41:51 -0700
Subject: [PATCH 1/3] Include DELTA_CALIBRATION_MENU in DELTA travis test
---
.travis.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.travis.yml b/.travis.yml
index 8408ecf40fd..728281e5ac5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -349,6 +349,7 @@ script:
# Delta Config (generic)
- restore_configs
- use_example_configs delta/generic
+ - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU
- build_marlin
#
# Delta Config (generic) + ABL + ALLEN_KEY
From b16ea0949880bb46df4889c21ba6af7678b66817 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 8 Aug 2016 19:35:26 -0700
Subject: [PATCH 2/3] Make DELTA_CALIBRATION_MENU more universal
---
Marlin/ultralcd.cpp | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 97a21c4be58..f232155b599 100755
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -1260,14 +1260,25 @@ void kill_screen(const char* lcd_msg) {
#if ENABLED(DELTA_CALIBRATION_MENU)
+ static void _goto_tower_pos(const float &a) {
+ char cmd[20];
+ sprintf_P(cmd, PSTR("G1 X%i Y%i"), int(-(DELTA_PRINTABLE_RADIUS) * sin(a)), int((DELTA_PRINTABLE_RADIUS) * cos(a)));
+ enqueue_and_echo_commands_P(PSTR("G1 F8000 Z4\nG1 F4000"));
+ enqueue_and_echo_command(cmd);
+ }
+
+ static void _goto_tower_x() { _goto_tower_pos(RADIANS(120)); }
+ static void _goto_tower_y() { _goto_tower_pos(RADIANS(240)); }
+ static void _goto_tower_z() { _goto_tower_pos(0); }
+
static void lcd_delta_calibrate_menu() {
START_MENU();
MENU_ITEM(back, MSG_MAIN);
MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
- MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_X, PSTR("G0 F8000 X-77.94 Y-45 Z0"));
- MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_Y, PSTR("G0 F8000 X77.94 Y-45 Z0"));
- MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_Z, PSTR("G0 F8000 X0 Y90 Z0"));
- MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_CENTER, PSTR("G0 F8000 X0 Y0 Z0"));
+ MENU_ITEM(function, MSG_DELTA_CALIBRATE_X, _goto_tower_x);
+ MENU_ITEM(function, MSG_DELTA_CALIBRATE_Y, _goto_tower_y);
+ MENU_ITEM(function, MSG_DELTA_CALIBRATE_Z, _goto_tower_z);
+ MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_CENTER, PSTR("G1 F8000 Z4\nG1 F4000 X0 Y0"));
END_MENU();
}
From 88540d8ecfe0c0e624a9070835dfb2264f2b7b44 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 8 Aug 2016 20:53:18 -0700
Subject: [PATCH 3/3] Fix: LCD displays SD status at startup
---
Marlin/ultralcd.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index f232155b599..391c84bb9fa 100755
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -2550,7 +2550,6 @@ void lcd_update() {
bool sd_status = IS_SD_INSERTED;
if (sd_status != lcd_sd_status && lcd_detected()) {
- lcd_sd_status = sd_status;
if (sd_status) {
card.initsd();
@@ -2561,6 +2560,7 @@ void lcd_update() {
if (lcd_sd_status != 2) LCD_MESSAGEPGM(MSG_SD_REMOVED);
}
+ lcd_sd_status = sd_status;
lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW;
lcd_implementation_init( // to maybe revive the LCD if static electricity killed it.
#if ENABLED(LCD_PROGRESS_BAR)