Merge branch 'master' into 12864-full

Fix for Travis CI and adjust tests
Add optional endstop beeps
2019-03-28 12:05:17 +01:00 · 2019-03-28 11:12:57 +01:00 · 2019-03-28 00:59:25 +01:00 · 2019-03-28 00:59:25 +01:00 · 2019-03-28 00:57:09 +01:00 · 2019-03-27 16:12:07 +01:00
11 changed files with 7304 additions and 361 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,315 +75,26 @@ script:
  #
  - cp Marlin/Configuration.h Marlin/Configuration.h.backup
  - cp Marlin/Configuration_adv.h Marlin/Configuration_adv.h.backup
-  - cp Marlin/pins_RAMPS.h Marlin/pins_RAMPS.h.backup
+  - cp Marlin/pins_TRIGORILLA_14.h Marlin/pins_TRIGORILLA_14.h.backup
  #
  # Build with the default configurations
  #
  - build_marlin
  #
-  # Test 2 extruders (one MAX6675) and heated bed on basic RAMPS 1.4
-  # Test a "Fix Mounted" Probe with Safe Homing, some arc options,
-  # linear bed leveling, M48, leveling debug, and firmware retraction.
-  #
-  - opt_set MOTHERBOARD BOARD_RAMPS_14_EEB
-  - opt_set EXTRUDERS 2
-  - opt_set TEMP_SENSOR_0 -2
-  - opt_set TEMP_SENSOR_1 1
-  - opt_set TEMP_SENSOR_BED 1
-  - opt_set POWER_SUPPLY 1
-  - opt_enable PIDTEMPBED FIX_MOUNTED_PROBE Z_SAFE_HOMING
-  - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS PINS_DEBUGGING
-  - opt_enable BLINKM PCA9632 RGB_LED NEOPIXEL_LED AUTO_POWER_CONTROL NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR
-  - opt_enable AUTO_BED_LEVELING_LINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE
-  - opt_enable_adv ARC_P_CIRCLES ADVANCED_PAUSE_FEATURE CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE
-  - opt_enable_adv FWRETRACT MAX7219_DEBUG LED_CONTROL_MENU CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CODEPENDENT_XY_HOMING
-  - opt_set GRID_MAX_POINTS_X 16
-  - opt_set_adv FANMUX0_PIN 53
-  - build_marlin
-  #
-  # Test a probeless build of AUTO_BED_LEVELING_UBL, with lots of extruders
-  #
-  - restore_configs
-  - opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO
-  - opt_set EXTRUDERS 5
-  - opt_set TEMP_SENSOR_1 1
-  - opt_set TEMP_SENSOR_2 5
-  - opt_set TEMP_SENSOR_3 20
-  - opt_set TEMP_SENSOR_4 999
-  - opt_set TEMP_SENSOR_BED 1
-  - opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATURE G26_MESH_EDITING ENABLE_LEVELING_FADE_HEIGHT SKEW_CORRECTION
-  - opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-  - opt_enable_adv CUSTOM_USER_MENUS I2C_POSITION_ENCODERS BABYSTEPPING BABYSTEP_XY LIN_ADVANCE NANODLP_Z_SYNC QUICK_HOME JUNCTION_DEVIATION MAX7219_DEBUG
-  - opt_set_adv MAX7219_ROTATE 270
-  - build_marlin
-  #
-  # Add a Sled Z Probe, use UBL Cartesian moves, use Japanese language
-  #
-  - opt_enable Z_PROBE_SLED SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE S_CURVE_ACCELERATION
-  - opt_set LCD_LANGUAGE kana_utf8
-  - opt_disable SEGMENT_LEVELED_MOVES
-  - opt_enable_adv BABYSTEP_ZPROBE_OFFSET DOUBLECLICK_FOR_Z_BABYSTEPPING
-  - build_marlin
-  #
-  # Test a Servo Probe
-  # ...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES
-  #
-  - restore_configs
-  - opt_enable NUM_SERVOS Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
-  - opt_set NUM_SERVOS 1
-  - opt_enable AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT
-  - opt_enable_adv NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET
-  - build_marlin
-  #
-  # Test MESH_BED_LEVELING feature, with LCD
-  #
-  - restore_configs
-  - opt_enable MESH_BED_LEVELING G26_MESH_EDITING MESH_G28_REST_ORIGIN LCD_BED_LEVELING ULTIMAKERCONTROLLER
-  - build_marlin
-  #
-  # Test MINIRAMBO for PWM_MOTOR_CURRENT
-  #      PROBE_MANUALLY feature, with LCD support,
-  #      ULTIMAKERCONTROLLER, FILAMENT_LCD_DISPLAY, FILAMENT_WIDTH_SENSOR,
-  #      PRINTCOUNTER, NOZZLE_PARK_FEATURE, NOZZLE_CLEAN_FEATURE, PCA9632,
-  #      Z_DUAL_ENDSTOPS, BEZIER_CURVE_SUPPORT, EXPERIMENTAL_I2CBUS,
-  #      ADVANCED_PAUSE_FEATURE, ADVANCED_PAUSE_CONTINUOUS_PURGE, PARK_HEAD_ON_PAUSE, LCD_INFO_MENU, M114_DETAIL
-  #      EEPROM_SETTINGS, EEPROM_CHITCHAT, M100_FREE_MEMORY_WATCHER,
-  #      INCH_MODE_SUPPORT, TEMPERATURE_UNITS_SUPPORT
-  #
-  - restore_configs
-  - opt_set MOTHERBOARD BOARD_MINIRAMBO
-  - opt_enable PROBE_MANUALLY AUTO_BED_LEVELING_BILINEAR G26_MESH_EDITING LCD_BED_LEVELING ULTIMAKERCONTROLLER
-  - opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT M100_FREE_MEMORY_WATCHER M100_FREE_MEMORY_DUMPER M100_FREE_MEMORY_CORRUPTOR INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT
-  - opt_enable ULTIMAKERCONTROLLER SDSUPPORT
-  - opt_enable PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE PCA9632
-  - opt_enable_adv BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS
-  - opt_enable_adv ADVANCED_PAUSE_FEATURE ADVANCED_PAUSE_CONTINUOUS_PURGE FILAMENT_LOAD_UNLOAD_GCODES PARK_HEAD_ON_PAUSE LCD_INFO_MENU M114_DETAIL
-  - opt_set_adv PWM_MOTOR_CURRENT {1300,1300,1250}
-  - opt_set_adv I2C_SLAVE_ADDRESS 63
-  - build_marlin
-  #
-  # Mixing Extruder with 5 steppers, Cyrillic
-  #
-  - restore_configs
-  - opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO
-  - opt_enable MIXING_EXTRUDER CR10_STOCKDISPLAY
-  - opt_set MIXING_STEPPERS 5
-  - opt_set LCD_LANGUAGE ru
-  - build_marlin
-  #
-  # Test DUAL_X_CARRIAGE
-  #
-  - restore_configs
-  - opt_set MOTHERBOARD BOARD_RUMBA
-  - opt_set EXTRUDERS 2
-  - opt_set TEMP_SENSOR_1 1
-  - opt_enable USE_XMAX_PLUG
-  - opt_enable_adv DUAL_X_CARRIAGE
-  - build_marlin
-  #
-  # Test SPEAKER with BOARD_BQ_ZUM_MEGA_3D and BQ_LCD_SMART_CONTROLLER
-  #
-  #- restore_configs
-  #- opt_set MOTHERBOARD BOARD_BQ_ZUM_MEGA_3D
-  #- opt_set LCD_FEEDBACK_FREQUENCY_DURATION_MS 10
-  #- opt_set LCD_FEEDBACK_FREQUENCY_HZ 100
-  #- opt_enable BQ_LCD_SMART_CONTROLLER SPEAKER
-  #
-  # Test SWITCHING_EXTRUDER
-  #
-  - restore_configs
-  - opt_set MOTHERBOARD BOARD_RUMBA
-  - opt_set EXTRUDERS 2
-  - opt_enable NUM_SERVOS
-  - opt_set NUM_SERVOS 1
-  - opt_enable SWITCHING_EXTRUDER ULTIMAKERCONTROLLER
-  - build_marlin
-  #
-  # Enable COREXY
-  #
-  #- restore_configs
-  #- opt_enable COREXY
-  #- build_marlin
-  #
-  # Test many less common options
-  #
-  - restore_configs
-  - opt_enable COREYX
-  - opt_set_adv FAN_MIN_PWM 50
-  - opt_set_adv FAN_KICKSTART_TIME 100
-  - opt_set_adv XY_FREQUENCY_LIMIT  15
-  - opt_enable_adv SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER FAN_KICKSTART_TIME
-  - opt_enable_adv ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED ADVANCED_OK
-  - opt_enable_adv VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS ACTION_ON_KILL
-  - opt_enable_adv EXTRA_FAN_SPEED FWERETRACT Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS
-  - opt_enable_adv MENU_ADDAUTOSTART SDCARD_SORT_ALPHA
-  - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER BABYSTEPPING DAC_MOTOR_CURRENT_DEFAULT
-  - opt_enable FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR
-  - opt_enable ENDSTOP_INTERRUPTS_FEATURE FAN_SOFT_PWM SDSUPPORT
-  - opt_enable USE_XMAX_PLUG
-  - build_marlin
-  #
-  ######## Other Standard LCD/Panels ##############
-  #
-  # ULTRA_LCD
-  #
-  #- restore_configs
-  #- opt_enable ULTRA_LCD
-  #- build_marlin
-  #
-  # DOGLCD
-  #
-  #- restore_configs
-  #- opt_enable DOGLCD
-  #- build_marlin
-  #
-  # MAKRPANEL
-  # Needs to use Melzi and Sanguino hardware
-  #
-  #- restore_configs
-  #- opt_enable MAKRPANEL
-  #- build_marlin
-  #
-  # REPRAP_DISCOUNT_SMART_CONTROLLER, SDSUPPORT, BABYSTEPPING, RIGIDBOARD_V2, and DAC_MOTOR_CURRENT_DEFAULT
-  #
-  #- restore_configs
-  #- opt_set MOTHERBOARD BOARD_RIGIDBOARD_V2
-  #- opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT BABYSTEPPING DAC_MOTOR_CURRENT_DEFAULT
-  #- build_marlin
-  # #
-  # G3D_PANEL with SDCARD_SORT_ALPHA and STATUS_MESSAGE_SCROLLING
-  #
-  #- restore_configs
-  #- opt_enable G3D_PANEL SDSUPPORT
-  #- opt_enable_adv SDCARD_SORT_ALPHA STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES
-  #- opt_set_adv SDSORT_GCODE true
-  #- opt_set_adv SDSORT_USES_RAM true
-  #- opt_set_adv SDSORT_USES_STACK true
-  #- opt_set_adv SDSORT_CACHE_NAMES true
-  #- build_marlin
-  #
-  # REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER with LIGHTWEIGHT_UI
-  #
-  - restore_configs
-  - opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT
-  - opt_enable_adv SDCARD_SORT_ALPHA STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES LIGHTWEIGHT_UI
-  - opt_set_adv SDSORT_GCODE true
-  - opt_set_adv SDSORT_USES_RAM true
-  - opt_set_adv SDSORT_USES_STACK true
-  - opt_set_adv SDSORT_CACHE_NAMES true
-  - build_marlin
-  #
-  # REPRAPWORLD_KEYPAD
-  #
-  # Cant find configuration details to get it to compile
-  #- restore_configs
-  #- opt_enable ULTRA_LCD REPRAPWORLD_KEYPAD REPRAPWORLD_KEYPAD_MOVE_STEP
-  #- build_marlin
-  #
-  # RA_CONTROL_PANEL
-  #
-  #- restore_configs
-  #- opt_enable RA_CONTROL_PANEL PINS_DEBUGGING
-  #- build_marlin
-  #
-  ######## I2C LCD/PANELS ##############
-  #
-  # !!!ATTENTION!!!
-  # Most I2C configurations are failing at the moment because they require
-  # a different Liquid Crystal library "LiquidTWI2".
-  #
-  # LCD_SAINSMART_I2C_1602
-  #
-  #- restore_configs
-  #- opt_enable LCD_SAINSMART_I2C_1602
-  #- build_marlin
-  #
-  # LCD_I2C_PANELOLU2
-  #
-  #- restore_configs
-  #- opt_enable LCD_I2C_PANELOLU2
-  #- build_marlin
-  #
-  # LCD_I2C_VIKI
-  #
-  #- restore_configs
-  #- opt_enable LCD_I2C_VIKI
-  #- build_marlin
-  #
-  # LCM1602
-  #
-  #- restore_configs
-  #- opt_enable LCM1602
-  #- build_marlin
-  #
-  # Language files test with REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-  #
-  #- restore_configs
-  #- opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT
-  #- for lang in an bg ca zh_CN zh_TW cz da de el el-gr en es eu fi fr gl hr it jp-kana nl pl pt pt-br ru sk tr uk test; do opt_set LCD_LANGUAGE $lang; echo "compile with language $lang ..."; build_marlin
-  #
-  #- restore_configs
-  #- opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT
-  #- for lang in an bg ca zh_CN zh_TW cz da de el el-gr en es eu fi fr gl hr it jp-kana nl pl pt pt-br ru sk tr uk test; do opt_set LCD_LANGUAGE $lang; echo "compile with language $lang ..."; build_marlin
-  #
-  #
+
  ######## Example Configurations ##############
  #
-  # BQ Hephestos 2
-  #- restore_configs
-  #- use_example_configs Hephestos_2
-  #- build_marlin
+  # Anycubic i3 Mega with BLtouch
  #
-  # Delta Config (generic) + ABL bilinear + PROBE_MANUALLY
-  - use_example_configs delta/generic
-  - opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY
+  #- Test compatibility to https://github.com/MNieddu91/Marlin-AI3M-BLTouch
+  #
+  - use_example_configs Anycubic/Ai3MBLtouch
  - build_marlin
  #
-  # Delta Config (generic) + UBL + ALLEN_KEY + OLED_PANEL_TINYBOY2 + EEPROM_SETTINGS
+  # Anycubic i3 Mega with 12864 display
  #
-  - use_example_configs delta/generic
-  - opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 Z_PROBE_ALLEN_KEY EEPROM_SETTINGS EEPROM_CHITCHAT
-  - opt_enable OLED_PANEL_TINYBOY2 MESH_EDIT_GFX_OVERLAY
+  #- Test compatibility to RepRapDiscount FULL GRAPHIC Smart Controller
+  #
+  - use_example_configs Anycubic/Ai3M12864
  - build_marlin
  #
-  # Delta Config (FLSUN AC because it's complex)
-  #
-  - use_example_configs delta/FLSUN/auto_calibrate
-  - build_marlin
-  #
-  # Makibox Config  need to check board type for Teensy++ 2.0
-  #
-  #- use_example_configs makibox
-  #- build_marlin
-  #
-  # SCARA with TMC2130
-  #
-  - use_example_configs SCARA
-  - opt_enable AUTO_BED_LEVELING_BILINEAR FIX_MOUNTED_PROBE USE_ZMIN_PLUG EEPROM_SETTINGS EEPROM_CHITCHAT ULTIMAKERCONTROLLER
-  - opt_set X_DRIVER_TYPE TMC2130
-  - opt_set Y_DRIVER_TYPE TMC2130
-  - opt_set Z_DRIVER_TYPE TMC2130
-  - opt_set E0_DRIVER_TYPE TMC2130
-  - opt_enable_adv MONITOR_DRIVER_STATUS STEALTHCHOP HYBRID_THRESHOLD SENSORLESS_HOMING
-  - build_marlin
-  #
-  # TMC2208 Config
-  #
-  - restore_configs
-  - opt_set X_DRIVER_TYPE TMC2208
-  - opt_set Y_DRIVER_TYPE TMC2208
-  - opt_set Z_DRIVER_TYPE TMC2208
-  - opt_set E0_DRIVER_TYPE TMC2208
-  - opt_enable_adv MONITOR_DRIVER_STATUS STEALTHCHOP HYBRID_THRESHOLD TMC_DEBUG
-  - build_marlin
-  #
-  # tvrrug Config need to check board type for sanguino atmega644p
-  #
-  #- use_example_configs tvrrug/Round2
-  #- build_marlin
-  #
-  #
-  ######## Board Types #############
-  #
-  # To be added in nightly test branch
-  #
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1,3 +1,5 @@
+#include <U8glib.h>
+
 /**
 * Marlin 3D Printer Firmware
 * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
@@ -1108,7 +1110,7 @@
 * Add a bed leveling sub-menu for ABL or MBL.
 * Include a guided procedure if manual probing is enabled.
 */
-//#define LCD_BED_LEVELING
+#define LCD_BED_LEVELING

 #if ENABLED(LCD_BED_LEVELING)
  #define MBL_Z_STEP 0.025    // Step size while manually probing Z axis.
@@ -1403,7 +1405,7 @@
 *
 * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cn':'Chinese', 'cz':'Czech', 'cz_utf8':'Czech (UTF8)', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'es_utf8':'Spanish (UTF8)', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'fr_utf8':'French (UTF8)', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'kana':'Japanese', 'kana_utf8':'Japanese (UTF8)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'pt-br_utf8':'Portuguese (Brazilian UTF8)', 'pt_utf8':'Portuguese (UTF8)', 'ru':'Russian', 'sk_utf8':'Slovak (UTF8)', 'tr':'Turkish', 'uk':'Ukrainian', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Taiwan)', 'test':'TEST' }
 */
-//#define LCD_LANGUAGE en
+#define LCD_LANGUAGE en

 /**
 * LCD Character Set
@@ -1470,13 +1472,13 @@
 // This option overrides the default number of encoder pulses needed to
 // produce one step. Should be increased for high-resolution encoders.
 //
-//#define ENCODER_PULSES_PER_STEP 4
+#define ENCODER_PULSES_PER_STEP 4

 //
 // Use this option to override the number of step signals required to
 // move between next/prev menu items.
 //
-//#define ENCODER_STEPS_PER_MENU_ITEM 1
+#define ENCODER_STEPS_PER_MENU_ITEM 1

 /**
 * Encoder Direction Options
@@ -1681,7 +1683,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
+#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER

 //
 // ReprapWorld Graphical LCD
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -524,13 +524,13 @@
 // @section lcd

 // Include a page of printer information in the LCD Main Menu
-//#define LCD_INFO_MENU
+#define LCD_INFO_MENU

 // Scroll a longer status message into view
 //#define STATUS_MESSAGE_SCROLLING

 // On the Info Screen, display XY with one decimal place when possible
-//#define LCD_DECIMAL_SMALL_XY
+#define LCD_DECIMAL_SMALL_XY

 // The timeout (in ms) to return to the status screen from sub-menus
 //#define LCD_TIMEOUT_TO_STATUS 15000
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -11015,21 +11015,22 @@ inline void gcode_M502() {
   *  Default values are used for omitted arguments.
   */
  inline void gcode_M600() {
-
-    #ifdef SDSUPPORT
-      if (card.sdprinting) { // are we printing from sd?
-        #ifdef ANYCUBIC_TFT_DEBUG
-            SERIAL_ECHOLNPGM("DEBUG: Enter M600 TFTstate routine");
-        #endif
-        AnycubicTFT.TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ; // enter correct display state to show resume button
-        #ifdef ANYCUBIC_TFT_DEBUG
-            SERIAL_ECHOLNPGM("DEBUG: Set TFTstate to SDPAUSE_REQ");
-        #endif
-        AnycubicTFT.PausedByFilamentChange=true; // set flag to ensure correct resume routine gets executed
-        #ifdef ANYCUBIC_TFT_DEBUG
-            SERIAL_ECHOLNPGM("DEBUG: Set filament change flag");
-        #endif
-      }
+    #ifdef ANYCUBIC_TFT_MODEL
+      #ifdef SDSUPPORT
+        if (card.sdprinting) { // are we printing from sd?
+          #ifdef ANYCUBIC_TFT_DEBUG
+              SERIAL_ECHOLNPGM("DEBUG: Enter M600 TFTstate routine");
+          #endif
+          AnycubicTFT.TFTstate=ANYCUBIC_TFT_STATE_SDPAUSE_REQ; // enter correct display state to show resume button
+          #ifdef ANYCUBIC_TFT_DEBUG
+              SERIAL_ECHOLNPGM("DEBUG: Set TFTstate to SDPAUSE_REQ");
+          #endif
+          AnycubicTFT.PausedByFilamentChange=true; // set flag to ensure correct resume routine gets executed
+          #ifdef ANYCUBIC_TFT_DEBUG
+              SERIAL_ECHOLNPGM("DEBUG: Set filament change flag");
+          #endif
+        }
+      #endif
    #endif

    point_t park_point = NOZZLE_PARK_POINT;
--- a/Marlin/example_configurations/Anycubic/Ai3M12864/Configuration.h
+++ b/Marlin/example_configurations/Anycubic/Ai3M12864/Configuration.h
--- a/Marlin/example_configurations/Anycubic/Ai3M12864/Configuration_adv.h
+++ b/Marlin/example_configurations/Anycubic/Ai3M12864/Configuration_adv.h
--- a/Marlin/example_configurations/Anycubic/Ai3MBLtouch/Configuration.h
+++ b/Marlin/example_configurations/Anycubic/Ai3MBLtouch/Configuration.h
--- a/Marlin/example_configurations/Anycubic/Ai3MBLtouch/Configuration_adv.h
+++ b/Marlin/example_configurations/Anycubic/Ai3MBLtouch/Configuration_adv.h
--- a/Marlin/language_el-gr.h
+++ b/Marlin/language_el-gr.h
@@ -34,26 +34,26 @@
 #define DISPLAY_CHARSET_ISO10646_GREEK
 #define CHARSIZE 2

-#define WELCOME_MSG                         MACHINE_NAME _UxGT(" έτοιμο.")
-#define MSG_SD_INSERTED                     _UxGT("Εισαγωγή κάρτας")
-#define MSG_SD_REMOVED                      _UxGT("Αφαίρεση κάρτας")
+#define WELCOME_MSG                         MACHINE_NAME _UxGT(" πανέτοιμος.")
+#define MSG_SD_INSERTED                     _UxGT("Έχω καρτούλα")
+#define MSG_SD_REMOVED                      _UxGT("Ωχ! Δεν εχω καρτα")
 #define MSG_LCD_ENDSTOPS                    _UxGT("Endstops") // Max length 8 characters
 #define MSG_MAIN                            _UxGT("Βασική Οθόνη")
 #define MSG_AUTOSTART                       _UxGT("Αυτόματη εκκίνηση")
-#define MSG_DISABLE_STEPPERS                _UxGT("Απενεργοποίηση βηματιστή")
-#define MSG_AUTO_HOME                       _UxGT("Αυτομ. επαναφορά στο αρχικό σημείο")
-#define MSG_AUTO_HOME_X                     _UxGT("Αρχικό σημείο X")
-#define MSG_AUTO_HOME_Y                     _UxGT("Αρχικό σημείο Y")
-#define MSG_AUTO_HOME_Z                     _UxGT("Αρχικό σημείο Z")
+#define MSG_DISABLE_STEPPERS                _UxGT("Ελευθέρωσέ με")
+#define MSG_AUTO_HOME                       _UxGT("Πάω σπίτι")
+#define MSG_AUTO_HOME_X                     _UxGT("Αρχικό X")
+#define MSG_AUTO_HOME_Y                     _UxGT("Αρχικό Y")
+#define MSG_AUTO_HOME_Z                     _UxGT("Αρχικό Z")
 #define MSG_TMC_Z_CALIBRATION               _UxGT("Βαθμονόμηση Z")
 #define MSG_LEVEL_BED_HOMING                _UxGT("Επαναφορά στο αρχικό σημείο ΧΥΖ")
-#define MSG_LEVEL_BED_WAITING               _UxGT("Κάντε κλικ για να ξεκινήσετε")
-#define MSG_LEVEL_BED_NEXT_POINT            _UxGT("Επόμενο σημείο")
-#define MSG_LEVEL_BED_DONE                  _UxGT("Ολοκλήρωση επιπεδοποίησης!")
+#define MSG_LEVEL_BED_WAITING               _UxGT("Πάτα το κουμπί και ΦΥΓΑΜΕ!!!")
+#define MSG_LEVEL_BED_NEXT_POINT            _UxGT("Πιο πέρα")
+#define MSG_LEVEL_BED_DONE                  _UxGT("Τελείωσα, αδερφέ")
 #define MSG_SET_HOME_OFFSETS                _UxGT("Ορισμός βασικών μετατοπίσεων")
 #define MSG_HOME_OFFSETS_APPLIED            _UxGT("Εφαρμόστηκαν οι μετατοπίσεις")
 #define MSG_SET_ORIGIN                      _UxGT("Ορισμός προέλευσης")
-#define MSG_PREHEAT_1                       _UxGT("Προθέρμανση PLA")
+#define MSG_PREHEAT_1                       _UxGT("Ζεσταίνω PLA")
 #define MSG_PREHEAT_1_N                     MSG_PREHEAT_1 _UxGT(" ")
 #define MSG_PREHEAT_1_ALL                   MSG_PREHEAT_1 _UxGT(" όλα")
 #define MSG_PREHEAT_1_BEDONLY               MSG_PREHEAT_1 _UxGT(" κλίνη")
@@ -69,19 +69,19 @@
 #define MSG_EXTRUDE                         _UxGT("Εξώθηση")
 #define MSG_RETRACT                         _UxGT("Ανάσυρση")
 #define MSG_MOVE_AXIS                       _UxGT("Μετακίνηση άξονα")
-#define MSG_BED_LEVELING                    _UxGT("Επιπεδοποίηση κλίνης")
-#define MSG_LEVEL_BED                       _UxGT("Επιπεδοποίηση κλίνης")
+#define MSG_BED_LEVELING                    _UxGT("Σου ισιώνω κρεβάτι")
+#define MSG_LEVEL_BED                       _UxGT("Εδω το καλό κρεβάτι")
 #define MSG_MOVE_X                          _UxGT("Μετακίνηση X")
 #define MSG_MOVE_Y                          _UxGT("Μετακίνηση Y")
 #define MSG_MOVE_Z                          _UxGT("Μετακίνηση Z")
 #define MSG_MOVE_E                          _UxGT("Εξωθητήρας")
-#define MSG_MOVE_01MM                       _UxGT("Μετακίνηση 0,1 μμ")
-#define MSG_MOVE_1MM                        _UxGT("Μετακίνηση 1 μμ")
-#define MSG_MOVE_10MM                       _UxGT("Μετακίνηση 10 μμ")
+#define MSG_MOVE_01MM                       _UxGT("Μετακίνηση 0,1μμ")
+#define MSG_MOVE_1MM                        _UxGT("Μετακίνηση 1μμ")
+#define MSG_MOVE_10MM                       _UxGT("Μετακίνηση 10μμ")
 #define MSG_SPEED                           _UxGT("Ταχύτητα")
-#define MSG_BED_Z                           _UxGT("Κλίνη Z")
-#define MSG_NOZZLE                          _UxGT("Ακροφύσιο")
-#define MSG_BED                             _UxGT("Κλίνη")
+#define MSG_BED_Z                           _UxGT("Κρεβάτι Z")
+#define MSG_NOZZLE                          _UxGT("Μύτη")
+#define MSG_BED                             _UxGT("Κρεβάτι")
 #define MSG_FAN_SPEED                       _UxGT("Ταχύτητα ανεμιστήρα")
 #define MSG_FLOW                            _UxGT("Ροή")
 #define MSG_CONTROL                         _UxGT("Έλεγχος")
@@ -132,9 +132,9 @@
 #define MSG_E5STEPS                         _UxGT("Bήματα Ε5 ανά μμ")
 #define MSG_TEMPERATURE                     _UxGT("Θερμοκρασία")
 #define MSG_MOTION                          _UxGT("Κίνηση")
-#define MSG_FILAMENT                        _UxGT("Νήμα")
+#define MSG_FILAMENT                        _UxGT("Φιλαμεντ")
 #define MSG_VOLUMETRIC_ENABLED              _UxGT("Ε σε μμ3")
-#define MSG_FILAMENT_DIAM                   _UxGT("Διάμετρος νήματος")
+#define MSG_FILAMENT_DIAM                   _UxGT("Διάμετρος φιλαμεντ")
 #define MSG_CONTRAST                        _UxGT("Κοντράστ LCD")
 #define MSG_STORE_EEPROM                    _UxGT("Αποθήκευση")
 #define MSG_LOAD_EEPROM                     _UxGT("Φόρτωση")
@@ -142,15 +142,15 @@
 #define MSG_REFRESH                         _UxGT("Ανανέωση")
 #define MSG_WATCH                           _UxGT("Οθόνη πληροφόρησης")
 #define MSG_PREPARE                         _UxGT("Προετοιμασία")
-#define MSG_TUNE                            _UxGT("Συντονισμός")
-#define MSG_PAUSE_PRINT                     _UxGT("Παύση εκτύπωσης")
-#define MSG_RESUME_PRINT                    _UxGT("Συνέχιση εκτύπωσης")
-#define MSG_STOP_PRINT                      _UxGT("Διακοπή εκτύπωσης")
-#define MSG_CARD_MENU                       _UxGT("Εκτύπωση από SD")
-#define MSG_NO_CARD                         _UxGT("Δεν βρέθηκε SD")
+#define MSG_TUNE                            _UxGT("Ρύθμιση OTF")
+#define MSG_PAUSE_PRINT                     _UxGT("Διάλειμα")
+#define MSG_RESUME_PRINT                    _UxGT("Συνεχίζω")
+#define MSG_STOP_PRINT                      _UxGT("ΑΝΤΕ ΓΕΙΑ!!!")
+#define MSG_CARD_MENU                       _UxGT("φτιάχνω από κάρτα")
+#define MSG_NO_CARD                         _UxGT("Αδερφέ, δεν έχω κάρτα")
 #define MSG_DWELL                           _UxGT("Αναστολή λειτουργίας…")
 #define MSG_USERWAIT                        _UxGT("Αναμονή για χρήστη…")
-#define MSG_PRINT_ABORTED                   _UxGT("Διακόπτεται η εκτύπωση")
+#define MSG_PRINT_ABORTED                   _UxGT("Ως εδώ με έχεις φέρει!!")
 #define MSG_NO_MOVE                         _UxGT("Καμία κίνηση.")
 #define MSG_KILLED                          _UxGT("ΤΕΡΜΑΤΙΣΜΟΣ. ")
 #define MSG_STOPPED                         _UxGT("ΔΙΑΚΟΠΗ. ")
@@ -174,14 +174,14 @@
 #define MSG_BABYSTEP_Z                      _UxGT("Μικρό βήμα Ζ")
 #define MSG_ENDSTOP_ABORT                   _UxGT("Ματαίωση endstop ")
 #define MSG_HEATING_FAILED_LCD              _UxGT("Ανεπιτυχής θέρμανση")
-#define MSG_ERR_REDUNDANT_TEMP              _UxGT("Λάθος: ΠΛΕΟΝΑΖΟΥΣΑ ΘΕΡΜΟΤΗΤΑ")
+#define MSG_ERR_REDUNDANT_TEMP              _UxGT("Λάθος: ΘΑ ΜΕ ΚΑΨΕΙΣ ΗΛΗΘΙΕ")
 #define MSG_THERMAL_RUNAWAY                 _UxGT("ΔΙΑΦΥΓΗ ΘΕΡΜΟΤΗΤΑΣ")
 #define MSG_ERR_MAXTEMP                     _UxGT("Λάθος: ΜΕΓΙΣΤΗ ΘΕΡΜΟΤΗΤΑ")
 #define MSG_ERR_MINTEMP                     _UxGT("Λάθος: ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΤΗΤΑ")
-#define MSG_ERR_MAXTEMP_BED                 _UxGT("Λάθος: ΜΕΓΙΣΤΗ ΘΕΡΜΟΤΗΤΑ ΚΛΙΝΗΣ")
-#define MSG_ERR_MINTEMP_BED                 _UxGT("Λάθος: ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΤΗΤΑ ΚΛΙΝΗΣ")
-#define MSG_HEATING                         _UxGT("Θερμαίνεται…")
-#define MSG_BED_HEATING                     _UxGT("Θέρμανση κλίνης…")
+#define MSG_ERR_MAXTEMP_BED                 _UxGT("Λάθος: ΜΕΓΙΣΤΗ ΘΕΡΜΟΤΗΤΑ ΚΡΕΒΑΤΙΟΥ")
+#define MSG_ERR_MINTEMP_BED                 _UxGT("Λάθος: ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΤΗΤΑ ΚΡΕΒΑΤΙΟΥ")
+#define MSG_HEATING                         _UxGT("Ανάβω…")
+#define MSG_BED_HEATING                     _UxGT("Ανάβω το κρεβάτι…")
 #define MSG_DELTA_CALIBRATE                 _UxGT("Βαθμονόμηση Delta")
 #define MSG_DELTA_CALIBRATE_X               _UxGT("Βαθμονόμηση X")
 #define MSG_DELTA_CALIBRATE_Y               _UxGT("Βαθμονόμηση Y")
--- a/Marlin/pins_TRIGORILLA_14.h
+++ b/Marlin/pins_TRIGORILLA_14.h
@@ -111,9 +111,12 @@
 	#endif
 #endif

-#if defined(ANYCUBIC_TFT_MODEL)
+#if defined(ANYCUBIC_TFT_MODEL) || defined(REPRAP_DISCOUNT_SMART_CONTROLLER)
  #define BEEPER_PIN       31
  #define SD_DETECT_PIN    49
+#else
+  #define BEEPER_PIN       31
+  #define SD_DETECT_PIN    -1
 #endif

 // LCD
@@ -133,13 +136,11 @@
 		#define LCD_PINS_D7 29

 		#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
-			#define BEEPER_PIN 37

-			#define BTN_EN1 31
-			#define BTN_EN2 33
+			#define BTN_EN1 33
+			#define BTN_EN2 31
 			#define BTN_ENC 35

-			#define SD_DETECT_PIN 49
 			#elif defined(LCD_I2C_PANELOLU2)
 				#define BTN_EN1 47  //reverse if the encoder turns the wrong way.
 				#define BTN_EN2 43
--- a/README.md
+++ b/README.md
@@ -1,9 +1,13 @@
 # Anycubic i3 Mega / Mega-S Marlin 1.1.9 by davidramiro

-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3MFT8QMP5ZRCE&source=url) [![Downloads](https://img.shields.io/github/downloads/davidramiro/Marlin-AI3M/total.svg?style=flat)](https://github.com/davidramiro/Marlin-AI3M/releases) [![Open Issues](https://img.shields.io/github/issues-raw/davidramiro/Marlin-AI3M.svg?style=flat)](https://github.com/davidramiro/Marlin-AI3M/issues?q=is%3Aopen+is%3Aissue) [![Closed Issues](https://img.shields.io/github/issues-closed-raw/davidramiro/Marlin-AI3M.svg?style=flat)](https://github.com/davidramiro/Marlin-AI3M/issues?q=is%3Aissue+is%3Aclosed) [![License](https://img.shields.io/github/license/davidramiro/Marlin-AI3M.svg?style=flat)](https://github.com/davidramiro/Marlin-AI3M/blob/master/LICENSE) [![Latest Release](https://img.shields.io/github/release/davidramiro/Marlin-AI3m.svg?style=flat)](https://github.com/davidramiro/Marlin-AI3M/releases/latest/) ![](https://img.shields.io/github/last-commit/davidramiro/Marlin-AI3m.svg?style=flat)
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3MFT8QMP5ZRCE&source=url) [![Downloads](https://img.shields.io/github/downloads/davidramiro/Marlin-AI3M/total.svg?style=flat)](https://github.com/davidramiro/Marlin-AI3M/releases) [![Open Issues](https://img.shields.io/github/issues-raw/davidramiro/Marlin-AI3M.svg?style=flat)](https://github.com/davidramiro/Marlin-AI3M/issues?q=is%3Aopen+is%3Aissue) [![License](https://img.shields.io/github/license/davidramiro/Marlin-AI3M.svg?style=flat)](https://github.com/davidramiro/Marlin-AI3M/blob/master/LICENSE) [![Latest Release](https://img.shields.io/github/release/davidramiro/Marlin-AI3m.svg?style=flat)](https://github.com/davidramiro/Marlin-AI3M/releases/latest/) [![Last commit](https://img.shields.io/github/last-commit/davidramiro/Marlin-AI3m.svg?style=flat)](https://github.com/davidramiro/Marlin-Ai3M/commits/)  [![Travis CI](https://api.travis-ci.org/davidramiro/Marlin-Ai3M.svg?branch=master)](https://travis-ci.org/davidramiro/Marlin-Ai3M)  

 This is a custom version of the [Marlin Firmware](https://github.com/MarlinFirmware/Marlin) for the i3 Mega/Mega-S, gratefully based on [derhopp's repo](https://github.com/derhopp/Marlin-with-Anycubic-i3-Mega-TFT) with his remarkable efforts to get the Anycubic TFT screen to work with the latest versions of Marlin.

+## RepRapDiscount Full Graphic Smart Controller branch
+**This branch is prepared to be used with a 12864 display like the [RepRapDiscount Full Graphic Smart Controller](https://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller).**
+
+
 Looking for a **BLtouch firmware**? Head [this way](https://github.com/MNieddu91/Marlin-AI3M-BLTouch)! Mounting and configuration instructions are included.

 #### Make sure to take a look at the [Wiki](https://github.com/davidramiro/Marlin-AI3M/wiki/), especially the [FAQ](https://github.com/davidramiro/Marlin-AI3M/wiki/Frequently-Asked-Questions).
Author	SHA1	Message	Date
David Ramiro	d5a5a05462	Merge branch 'master' into 12864-full	2019-03-28 12:05:17 +01:00
David Ramiro	625e264dfc	Fix for Travis CI and adjust tests	2019-03-28 11:12:57 +01:00
David Ramiro	6deb88102b	Add optional endstop beeps Enable ENDSTOP_BEEP in Configuration.h to enable a 2KHz beep when endstops are hit. Disabled by default.	2019-03-28 00:59:25 +01:00
David Ramiro	3f19385e03	Add unretraction parameter to G26 G26 Gcode: - Change Q parameter to only specify retraction length - Add Z parameter for unretraction length - Preserve fixed multiplier of 1.2 if Z isn't specified - Add check to avoid implausible retract/unretract ratios - Change default config values Referencing #31. Thanks to @BlackMulch for the feedback!	2019-03-28 00:59:25 +01:00
David Ramiro	589e972102	Raise PWM frequency Adjusting PWM frequencies to better match FDD8780, WSK220N04 and VS40200ATD MOSFET spec. - Heater PWM frequency increased from 7.6294 Hz to 30.5176 Hz – Referencing the Forward Bias Safe Area from the MOSFET's datasheets, this value should be safer. - Use software PWM for fans to reduce whine – The higher PWM frequency works well with the stock parts cooling fan and might allow for better control of third party fans	2019-03-28 00:57:09 +01:00
David Ramiro	17635865ca	Merge branch 'master' into 12864-full	2019-03-27 16:12:07 +01:00
David Ramiro	0ca58ca7a6	Merge branch 'master' into 12864-full	2019-03-13 17:09:00 +01:00
David Ramiro	223d925160	Merge branch 'master' into 12864-full	2019-02-27 20:55:32 +01:00
David Ramiro	cd9751af41	Enable 12864 display	2019-02-22 17:06:23 +01:00