From ae42206500874d633dbcfe073978d1c011e54d42 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 10 Apr 2019 17:43:08 -0500
Subject: [PATCH] Fix SD_REPRINT_LAST_SELECTED_FILE
---
Marlin/src/lcd/menu/menu_sdcard.cpp | 6 +++---
buildroot/share/tests/megaatmega2560-tests | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Marlin/src/lcd/menu/menu_sdcard.cpp b/Marlin/src/lcd/menu/menu_sdcard.cpp
index 79d88b6ec9..274643841f 100644
--- a/Marlin/src/lcd/menu/menu_sdcard.cpp
+++ b/Marlin/src/lcd/menu/menu_sdcard.cpp
@@ -102,8 +102,8 @@ class MenuItem_sdfile {
#if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
// Save menu state for the selected file
sd_encoder_position = ui.encoderPosition;
- sd_top_line = ui.encoderTopLine;
- sd_items = ui.screen_items;
+ sd_top_line = encoderTopLine;
+ sd_items = screen_items;
#endif
#if ENABLED(SD_MENU_CONFIRM_START)
do_print_file = false;
@@ -119,7 +119,7 @@ class MenuItem_sdfolder {
static void action(CardReader &theCard) {
card.chdir(theCard.filename);
encoderTopLine = 0;
- ui.encoderPosition = 2 * ENCODER_STEPS_PER_MENU_ITEM;
+ ui.encoderPosition = 2 * (ENCODER_STEPS_PER_MENU_ITEM);
screen_changed = true;
#if HAS_GRAPHICAL_LCD
ui.drawing_screen = false;
diff --git a/buildroot/share/tests/megaatmega2560-tests b/buildroot/share/tests/megaatmega2560-tests
index b769193e06..e207f3cd74 100755
--- a/buildroot/share/tests/megaatmega2560-tests
+++ b/buildroot/share/tests/megaatmega2560-tests
@@ -31,7 +31,7 @@ opt_set POWER_SUPPLY 1
opt_set GRID_MAX_POINTS_X 16
opt_set FANMUX0_PIN 53
opt_enable PIDTEMPBED FIX_MOUNTED_PROBE Z_SAFE_HOMING EEPROM_SETTINGS \
- REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT BINARY_FILE_TRANSFER \
+ REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \
NEOPIXEL_LED BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN \
NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \
AUTO_BED_LEVELING_LINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
--
GitLab