Move ExtUI subfolders up a level (#21820)

This commit is contained in:
Scott Lahteine 2021-05-06 04:17:59 -05:00 committed by Scott Lahteine
parent 0b3420a012
commit d3e902af76
422 changed files with 722 additions and 659 deletions

View File

@ -68,9 +68,9 @@
#endif #endif
#if HAS_TFT_LVGL_UI #if HAS_TFT_LVGL_UI
#include "lcd/extui/lib/mks_ui/tft_lvgl_configuration.h" #include "lcd/extui/mks_ui/tft_lvgl_configuration.h"
#include "lcd/extui/lib/mks_ui/draw_ui.h" #include "lcd/extui/mks_ui/draw_ui.h"
#include "lcd/extui/lib/mks_ui/mks_hardware_test.h" #include "lcd/extui/mks_ui/mks_hardware_test.h"
#include <lvgl.h> #include <lvgl.h>
#endif #endif
@ -229,7 +229,7 @@
#endif #endif
#if ENABLED(DGUS_LCD_UI_MKS) #if ENABLED(DGUS_LCD_UI_MKS)
#include "lcd/extui/lib/dgus/DGUSScreenHandler.h" #include "lcd/extui/dgus/DGUSScreenHandler.h"
#endif #endif
#if HAS_DRIVER_SAFE_POWER_PROTECT #if HAS_DRIVER_SAFE_POWER_PROTECT

View File

@ -27,7 +27,7 @@
#include "../gcode.h" #include "../gcode.h"
#if ENABLED(TFT_LVGL_UI) #if ENABLED(TFT_LVGL_UI)
#include "../../lcd/extui/lib/mks_ui/draw_touch_calibration.h" #include "../../lcd/extui/mks_ui/draw_touch_calibration.h"
#else #else
#include "../../lcd/menu/menu.h" #include "../../lcd/menu/menu.h"
#endif #endif

View File

@ -42,7 +42,7 @@
#endif #endif
#if ENABLED(DGUS_LCD_UI_MKS) #if ENABLED(DGUS_LCD_UI_MKS)
#include "../../lcd/extui/lib/dgus/DGUSDisplayDef.h" #include "../../lcd/extui/dgus/DGUSDisplayDef.h"
#endif #endif
#include "../../MarlinCore.h" // for startOrResumeJob #include "../../MarlinCore.h" // for startOrResumeJob

View File

@ -21,7 +21,7 @@
*/ */
/** /**
* lcd/extui/lib/FileNavigator.cpp * lcd/extui/anycubic_chiron/FileNavigator.cpp
* *
* Extensible_UI implementation for Anycubic Chiron * Extensible_UI implementation for Anycubic Chiron
* Written By Nick Wells, 2020 [https://github.com/SwiftNick] * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@ -31,22 +31,22 @@
* This library allows full folder traversal or flat file display and supports both standerd and new style panels. * This library allows full folder traversal or flat file display and supports both standerd and new style panels.
* *
* ## Old Style TFT panel * ## Old Style TFT panel
* Supported chars {}[]-+=_"$%^&*()~<>| * Supported chars {}[]-+=_"$%^&*()~<>|
* Max display length 22 chars * Max display length 22 chars
* Max path len 29 chars * Max path len 29 chars
* (DOS 8.3 filepath max 29chars) * (DOS 8.3 filepath max 29chars)
* (long filepath Max 22) * (long filepath Max 22)
* *
* ## New TFT Panel Format file display format * ## New TFT Panel Format file display format
* Supported chars {}[]-+=_!"$%^&*()~<>\| * Supported chars {}[]-+=_!"$%^&*()~<>\|
* Max display length 26 chars * Max display length 26 chars
* Max path len 29 chars * Max path len 29 chars
* (DOS 8.3 filepath must end '.GCO') * (DOS 8.3 filepath must end '.GCO')
* (long filepath must end '.gcode') * (long filepath must end '.gcode')
* *
*/ */
#include "../../../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
#if ENABLED(ANYCUBIC_LCD_CHIRON) #if ENABLED(ANYCUBIC_LCD_CHIRON)
#include "FileNavigator.h" #include "FileNavigator.h"
@ -55,7 +55,7 @@
using namespace ExtUI; using namespace ExtUI;
#define DEBUG_OUT ACDEBUG(AC_FILE) #define DEBUG_OUT ACDEBUG(AC_FILE)
#include "../../../../core/debug_out.h" #include "../../../core/debug_out.h"
namespace Anycubic { namespace Anycubic {

View File

@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* lcd/extui/lib/FileNavigator.h * lcd/extui/anycubic_chiron/FileNavigator.h
* *
* Extensible_UI implementation for Anycubic Chiron * Extensible_UI implementation for Anycubic Chiron
* Written By Nick Wells, 2020 [https://github.com/SwiftNick] * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@ -30,7 +30,7 @@
*/ */
#include "chiron_tft_defs.h" #include "chiron_tft_defs.h"
#include "../../ui_api.h" #include "../ui_api.h"
using namespace ExtUI; using namespace ExtUI;

View File

@ -21,7 +21,7 @@
*/ */
/** /**
* lcd/extui/lib/Tunes.cpp * lcd/extui/anycubic_chiron/Tunes.cpp
* *
* Extensible_UI implementation for Anycubic Chiron * Extensible_UI implementation for Anycubic Chiron
* Written By Nick Wells, 2020 [https://github.com/SwiftNick] * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@ -33,12 +33,12 @@
* See Tunes.h for note and tune definitions. * * See Tunes.h for note and tune definitions. *
***********************************************************************/ ***********************************************************************/
#include "../../../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
#if ENABLED(ANYCUBIC_LCD_CHIRON) #if ENABLED(ANYCUBIC_LCD_CHIRON)
#include "Tunes.h" #include "Tunes.h"
#include "../../ui_api.h" #include "../ui_api.h"
namespace Anycubic { namespace Anycubic {

View File

@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* lcd/extui/lib/Tunes.h * lcd/extui/anycubic_chiron/Tunes.h
* *
* Extensible_UI implementation for Anycubic Chiron * Extensible_UI implementation for Anycubic Chiron
* Written By Nick Wells, 2020 [https://github.com/SwiftNick] * Written By Nick Wells, 2020 [https://github.com/SwiftNick]

View File

@ -21,17 +21,17 @@
*/ */
/** /**
* lcd/extui/anycubic_chiron_lcd.cpp * lcd/extui/anycubic_chiron/chiron_extui.cpp
* *
* Anycubic Chiron TFT support for Marlin * Anycubic Chiron TFT support for Marlin
*/ */
#include "../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
#if ENABLED(ANYCUBIC_LCD_CHIRON) #if ENABLED(ANYCUBIC_LCD_CHIRON)
#include "ui_api.h" #include "../ui_api.h"
#include "lib/anycubic_chiron/chiron_tft.h" #include "chiron_tft.h"
using namespace Anycubic; using namespace Anycubic;

View File

@ -21,14 +21,14 @@
*/ */
/** /**
* lcd/extui/lib/chiron_tft.cpp * lcd/extui/anycubic_chiron/chiron_tft.cpp
* *
* Extensible_UI implementation for Anycubic Chiron * Extensible_UI implementation for Anycubic Chiron
* Written By Nick Wells, 2020 [https://github.com/SwiftNick] * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
* (not affiliated with Anycubic, Ltd.) * (not affiliated with Anycubic, Ltd.)
*/ */
#include "../../../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
#if ENABLED(ANYCUBIC_LCD_CHIRON) #if ENABLED(ANYCUBIC_LCD_CHIRON)
@ -36,10 +36,10 @@
#include "Tunes.h" #include "Tunes.h"
#include "FileNavigator.h" #include "FileNavigator.h"
#include "../../../../gcode/queue.h" #include "../../../gcode/queue.h"
#include "../../../../sd/cardreader.h" #include "../../../sd/cardreader.h"
#include "../../../../libs/numtostr.h" #include "../../../libs/numtostr.h"
#include "../../../../MarlinCore.h" #include "../../../MarlinCore.h"
namespace Anycubic { namespace Anycubic {

View File

@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* lcd/extui/lib/chiron_tft.h * lcd/extui/anycubic_chiron/chiron_tft.h
* *
* Extensible_UI implementation for Anycubic Chiron * Extensible_UI implementation for Anycubic Chiron
* Written By Nick Wells, 2020 [https://github.com/SwiftNick] * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@ -30,8 +30,8 @@
*/ */
#include "chiron_tft_defs.h" #include "chiron_tft_defs.h"
#include "../../../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
#include "../../ui_api.h" #include "../ui_api.h"
#if NONE(CHIRON_TFT_STANDARD, CHIRON_TFT_NEW) #if NONE(CHIRON_TFT_STANDARD, CHIRON_TFT_NEW)
#define AUTO_DETECT_CHIRON_TFT 1 #define AUTO_DETECT_CHIRON_TFT 1

View File

@ -21,7 +21,7 @@
*/ */
/** /**
* lcd/extui/lib/chiron_defs.h * lcd/extui/anycubic_chiron/chiron_defs.h
* *
* Extensible_UI implementation for Anycubic Chiron * Extensible_UI implementation for Anycubic Chiron
* Written By Nick Wells, 2020 [https://github.com/SwiftNick] * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@ -29,7 +29,7 @@
*/ */
#pragma once #pragma once
#include "../../../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
//#define ACDEBUGLEVEL 4 //#define ACDEBUGLEVEL 4
#if ACDEBUGLEVEL #if ACDEBUGLEVEL

View File

@ -21,15 +21,15 @@
*/ */
/** /**
* anycubic_i3mega_lcd.cpp * lcd/extui/anycubic_i3mega/anycubic_extui.cpp
*/ */
#include "../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
#if ENABLED(ANYCUBIC_LCD_I3MEGA) #if ENABLED(ANYCUBIC_LCD_I3MEGA)
#include "lib/anycubic_i3mega/anycubic_i3mega_lcd.h" #include "anycubic_i3mega_lcd.h"
#include "ui_api.h" #include "../ui_api.h"
#include <Arduino.h> // for the ::tone() call #include <Arduino.h> // for the ::tone() call

View File

@ -19,17 +19,17 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../../../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
#if ENABLED(ANYCUBIC_LCD_I3MEGA) #if ENABLED(ANYCUBIC_LCD_I3MEGA)
#include "anycubic_i3mega_lcd.h" #include "anycubic_i3mega_lcd.h"
#include "../../ui_api.h" #include "../ui_api.h"
#include "../../../../libs/numtostr.h" #include "../../../libs/numtostr.h"
#include "../../../../module/motion.h" // for quickstop_stepper, A20 read printing speed, feedrate_percentage #include "../../../module/motion.h" // for quickstop_stepper, A20 read printing speed, feedrate_percentage
#include "../../../../MarlinCore.h" // for disable_steppers #include "../../../MarlinCore.h" // for disable_steppers
#include "../../../../inc/MarlinConfig.h" #include "../../../inc/MarlinConfig.h"
// command sending macro's with debugging capability // command sending macro's with debugging capability
#define SEND_PGM(x) send_P(PSTR(x)) #define SEND_PGM(x) send_P(PSTR(x))

View File

@ -20,8 +20,8 @@
*/ */
#pragma once #pragma once
#include "../../../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
#include "../../../../sd/SdFatConfig.h" // for the FILENAME_LENGTH macro #include "../../../sd/SdFatConfig.h" // for the FILENAME_LENGTH macro
#define TFTBUFSIZE 4 #define TFTBUFSIZE 4
#define TFT_MAX_CMD_SIZE 96 #define TFT_MAX_CMD_SIZE 96

View File

@ -20,7 +20,7 @@
* *
*/ */
#include "../../../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
#if HAS_DGUS_LCD #if HAS_DGUS_LCD
@ -28,16 +28,16 @@
#warning "More than 2 hotends not implemented on DGUS Display UI." #warning "More than 2 hotends not implemented on DGUS Display UI."
#endif #endif
#include "../../ui_api.h" #include "../ui_api.h"
#include "../../../../MarlinCore.h" #include "../../../MarlinCore.h"
#include "../../../../module/motion.h" #include "../../../module/motion.h"
#include "../../../../gcode/queue.h" #include "../../../gcode/queue.h"
#include "../../../../module/planner.h" #include "../../../module/planner.h"
#include "../../../../libs/duration_t.h" #include "../../../libs/duration_t.h"
#include "../../../../module/printcounter.h" #include "../../../module/printcounter.h"
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
#include "../../../../feature/powerloss.h" #include "../../../feature/powerloss.h"
#endif #endif
#include "DGUSDisplay.h" #include "DGUSDisplay.h"

View File

@ -22,15 +22,15 @@
#pragma once #pragma once
/** /**
* lcd/extui/lib/dgus/DGUSDisplay.h * lcd/extui/dgus/DGUSDisplay.h
*/ */
#include "../../../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
#include <stdlib.h> // size_t #include <stdlib.h> // size_t
#if HAS_BED_PROBE #if HAS_BED_PROBE
#include "../../../../module/probe.h" #include "../../../module/probe.h"
#endif #endif
#include "DGUSVPVariable.h" #include "DGUSVPVariable.h"
@ -38,7 +38,7 @@ enum DGUSLCD_Screens : uint8_t;
//#define DEBUG_DGUSLCD //#define DEBUG_DGUSLCD
#define DEBUG_OUT ENABLED(DEBUG_DGUSLCD) #define DEBUG_OUT ENABLED(DEBUG_DGUSLCD)
#include "../../../../core/debug_out.h" #include "../../../core/debug_out.h"
typedef enum : uint8_t { typedef enum : uint8_t {
DGUS_IDLE, //< waiting for DGUS_HEADER1. DGUS_IDLE, //< waiting for DGUS_HEADER1.

View File

@ -22,7 +22,7 @@
#pragma once #pragma once
/** /**
* lcd/extui/lib/dgus/DGUSDisplayDef.h * lcd/extui/dgus/DGUSDisplayDef.h
* Defines the interaction between Marlin and the display firmware * Defines the interaction between Marlin and the display firmware
*/ */
@ -44,7 +44,7 @@ extern const struct VPMapping VPMap[];
// List of VPs handled by Marlin / The Display. // List of VPs handled by Marlin / The Display.
extern const struct DGUS_VP_Variable ListOfVP[]; extern const struct DGUS_VP_Variable ListOfVP[];
#include "../../../../inc/MarlinConfig.h" #include "../../../inc/MarlinConfig.h"
#if ENABLED(DGUS_LCD_UI_ORIGIN) #if ENABLED(DGUS_LCD_UI_ORIGIN)
#include "origin/DGUSDisplayDef.h" #include "origin/DGUSDisplayDef.h"

View File

@ -20,24 +20,24 @@
* *
*/ */
#include "../../../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
#if HAS_DGUS_LCD #if HAS_DGUS_LCD
#include "DGUSScreenHandler.h" #include "DGUSScreenHandler.h"
#include "../../../../MarlinCore.h" #include "../../../MarlinCore.h"
#include "../../../../gcode/queue.h" #include "../../../gcode/queue.h"
#include "../../../../libs/duration_t.h" #include "../../../libs/duration_t.h"
#include "../../../../module/settings.h" #include "../../../module/settings.h"
#include "../../../../module/temperature.h" #include "../../../module/temperature.h"
#include "../../../../module/motion.h" #include "../../../module/motion.h"
#include "../../../../module/planner.h" #include "../../../module/planner.h"
#include "../../../../module/printcounter.h" #include "../../../module/printcounter.h"
#include "../../../../sd/cardreader.h" #include "../../../sd/cardreader.h"
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
#include "../../../../feature/powerloss.h" #include "../../../feature/powerloss.h"
#endif #endif
DGUSScreenHandler ScreenHandler; DGUSScreenHandler ScreenHandler;

View File

@ -22,12 +22,12 @@
#pragma once #pragma once
/** /**
* lcd/extui/lib/dgus/DGUSScreenHandler.h * lcd/extui/dgus/DGUSScreenHandler.h
*/ */
#include "../../../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
#include "../../ui_api.h" #include "../ui_api.h"
#if ENABLED(DGUS_FILAMENT_LOADUNLOAD) #if ENABLED(DGUS_FILAMENT_LOADUNLOAD)

View File

@ -21,17 +21,17 @@
*/ */
/** /**
* lcd/extui/dgus_lcd.cpp * lcd/extui/dgus/dgus_extui.cpp
*/ */
#include "../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
#if HAS_DGUS_LCD #if HAS_DGUS_LCD
#include "ui_api.h" #include "../ui_api.h"
#include "lib/dgus/DGUSDisplay.h" #include "DGUSDisplay.h"
#include "lib/dgus/DGUSDisplayDef.h" #include "DGUSDisplayDef.h"
#include "lib/dgus/DGUSScreenHandler.h" #include "DGUSScreenHandler.h"
namespace ExtUI { namespace ExtUI {

View File

@ -22,7 +22,7 @@
/* DGUS VPs changed by George Fu in 2019 for Marlin */ /* DGUS VPs changed by George Fu in 2019 for Marlin */
#include "../../../../../inc/MarlinConfigPre.h" #include "../../../../inc/MarlinConfigPre.h"
#if ENABLED(DGUS_LCD_UI_FYSETC) #if ENABLED(DGUS_LCD_UI_FYSETC)
@ -30,12 +30,12 @@
#include "../DGUSDisplay.h" #include "../DGUSDisplay.h"
#include "../DGUSScreenHandler.h" #include "../DGUSScreenHandler.h"
#include "../../../../../module/temperature.h" #include "../../../../module/temperature.h"
#include "../../../../../module/motion.h" #include "../../../../module/motion.h"
#include "../../../../../module/planner.h" #include "../../../../module/planner.h"
#include "../../../ui_api.h" #include "../../ui_api.h"
#include "../../../../marlinui.h" #include "../../../marlinui.h"
#if ENABLED(DGUS_UI_MOVE_DIS_OPTION) #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
uint16_t distanceToMove = 10; uint16_t distanceToMove = 10;

View File

@ -20,24 +20,24 @@
* *
*/ */
#include "../../../../../inc/MarlinConfigPre.h" #include "../../../../inc/MarlinConfigPre.h"
#if ENABLED(DGUS_LCD_UI_FYSETC) #if ENABLED(DGUS_LCD_UI_FYSETC)
#include "../DGUSScreenHandler.h" #include "../DGUSScreenHandler.h"
#include "../../../../../MarlinCore.h" #include "../../../../MarlinCore.h"
#include "../../../../../gcode/queue.h" #include "../../../../gcode/queue.h"
#include "../../../../../libs/duration_t.h" #include "../../../../libs/duration_t.h"
#include "../../../../../module/settings.h" #include "../../../../module/settings.h"
#include "../../../../../module/temperature.h" #include "../../../../module/temperature.h"
#include "../../../../../module/motion.h" #include "../../../../module/motion.h"
#include "../../../../../module/planner.h" #include "../../../../module/planner.h"
#include "../../../../../module/printcounter.h" #include "../../../../module/printcounter.h"
#include "../../../../../sd/cardreader.h" #include "../../../../sd/cardreader.h"
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
#include "../../../../../feature/powerloss.h" #include "../../../../feature/powerloss.h"
#endif #endif
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)

View File

@ -25,7 +25,7 @@
#include "../DGUSVPVariable.h" #include "../DGUSVPVariable.h"
#include "../DGUSDisplayDef.h" #include "../DGUSDisplayDef.h"
#include "../../../../../inc/MarlinConfig.h" #include "../../../../inc/MarlinConfig.h"
enum DGUSLCD_Screens : uint8_t; enum DGUSLCD_Screens : uint8_t;

View File

@ -22,7 +22,7 @@
/* DGUS VPs changed by George Fu in 2019 for Marlin */ /* DGUS VPs changed by George Fu in 2019 for Marlin */
#include "../../../../../inc/MarlinConfigPre.h" #include "../../../../inc/MarlinConfigPre.h"
#if ENABLED(DGUS_LCD_UI_HIPRECY) #if ENABLED(DGUS_LCD_UI_HIPRECY)
@ -30,12 +30,12 @@
#include "../DGUSDisplay.h" #include "../DGUSDisplay.h"
#include "../DGUSScreenHandler.h" #include "../DGUSScreenHandler.h"
#include "../../../../../module/temperature.h" #include "../../../../module/temperature.h"
#include "../../../../../module/motion.h" #include "../../../../module/motion.h"
#include "../../../../../module/planner.h" #include "../../../../module/planner.h"
#include "../../../ui_api.h" #include "../../ui_api.h"
#include "../../../../marlinui.h" #include "../../../marlinui.h"
#if ENABLED(DGUS_UI_MOVE_DIS_OPTION) #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
uint16_t distanceToMove = 10; uint16_t distanceToMove = 10;

View File

@ -20,24 +20,24 @@
* *
*/ */
#include "../../../../../inc/MarlinConfigPre.h" #include "../../../../inc/MarlinConfigPre.h"
#if ENABLED(DGUS_LCD_UI_HYPRECY) #if ENABLED(DGUS_LCD_UI_HYPRECY)
#include "../DGUSScreenHandler.h" #include "../DGUSScreenHandler.h"
#include "../../../../../MarlinCore.h" #include "../../../../MarlinCore.h"
#include "../../../../../gcode/queue.h" #include "../../../../gcode/queue.h"
#include "../../../../../libs/duration_t.h" #include "../../../../libs/duration_t.h"
#include "../../../../../module/settings.h" #include "../../../../module/settings.h"
#include "../../../../../module/temperature.h" #include "../../../../module/temperature.h"
#include "../../../../../module/motion.h" #include "../../../../module/motion.h"
#include "../../../../../module/planner.h" #include "../../../../module/planner.h"
#include "../../../../../module/printcounter.h" #include "../../../../module/printcounter.h"
#include "../../../../../sd/cardreader.h" #include "../../../../sd/cardreader.h"
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
#include "../../../../../feature/powerloss.h" #include "../../../../feature/powerloss.h"
#endif #endif
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)

View File

@ -25,7 +25,7 @@
#include "../DGUSVPVariable.h" #include "../DGUSVPVariable.h"
#include "../DGUSDisplayDef.h" #include "../DGUSDisplayDef.h"
#include "../../../../../inc/MarlinConfig.h" #include "../../../../inc/MarlinConfig.h"
enum DGUSLCD_Screens : uint8_t; enum DGUSLCD_Screens : uint8_t;

View File

@ -20,7 +20,7 @@
* *
*/ */
#include "../../../../../inc/MarlinConfigPre.h" #include "../../../../inc/MarlinConfigPre.h"
#if ENABLED(DGUS_LCD_UI_MKS) #if ENABLED(DGUS_LCD_UI_MKS)
@ -28,15 +28,15 @@
#include "../DGUSDisplay.h" #include "../DGUSDisplay.h"
#include "../DGUSScreenHandler.h" #include "../DGUSScreenHandler.h"
#include "../../../../../module/temperature.h" #include "../../../../module/temperature.h"
#include "../../../../../module/motion.h" #include "../../../../module/motion.h"
#include "../../../../../module/planner.h" #include "../../../../module/planner.h"
#include "../../../ui_api.h" #include "../../ui_api.h"
#include "../../../../marlinui.h" #include "../../../marlinui.h"
#if ENABLED(HAS_STEALTHCHOP) #if ENABLED(HAS_STEALTHCHOP)
#include "../../../../../module/stepper/trinamic.h" #include "../../../../module/stepper/trinamic.h"
#endif #endif
#if ENABLED(DGUS_UI_MOVE_DIS_OPTION) #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)

View File

@ -20,31 +20,31 @@
* *
*/ */
#include "../../../../../inc/MarlinConfigPre.h" #include "../../../../inc/MarlinConfigPre.h"
#if ENABLED(DGUS_LCD_UI_MKS) #if ENABLED(DGUS_LCD_UI_MKS)
#include "../DGUSScreenHandler.h" #include "../DGUSScreenHandler.h"
#include "../../../../../inc/MarlinConfig.h" #include "../../../../inc/MarlinConfig.h"
#include "../../../../../MarlinCore.h" #include "../../../../MarlinCore.h"
#include "../../../../../module/settings.h" #include "../../../../module/settings.h"
#include "../../../../../module/temperature.h" #include "../../../../module/temperature.h"
#include "../../../../../module/motion.h" #include "../../../../module/motion.h"
#include "../../../../../module/planner.h" #include "../../../../module/planner.h"
#include "../../../../../module/printcounter.h" #include "../../../../module/printcounter.h"
#include "../../../../../gcode/gcode.h" #include "../../../../gcode/gcode.h"
#if ENABLED(HAS_STEALTHCHOP) #if ENABLED(HAS_STEALTHCHOP)
#include "../../../../../module/stepper/trinamic.h" #include "../../../../module/stepper/trinamic.h"
#include "../../../../../module/stepper/indirection.h" #include "../../../../module/stepper/indirection.h"
#endif #endif
#include "../../../../../module/probe.h" #include "../../../../module/probe.h"
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
#include "../../../../../feature/powerloss.h" #include "../../../../feature/powerloss.h"
#endif #endif
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)

View File

@ -25,7 +25,7 @@
#include "../DGUSVPVariable.h" #include "../DGUSVPVariable.h"
#include "../DGUSDisplayDef.h" #include "../DGUSDisplayDef.h"
#include "../../../../../inc/MarlinConfig.h" #include "../../../../inc/MarlinConfig.h"
enum DGUSLCD_Screens : uint8_t; enum DGUSLCD_Screens : uint8_t;

View File

@ -21,10 +21,10 @@
*/ */
/** /**
* lcd/extui/lib/dgus/origin/DGUSDisplayDef.cpp * lcd/extui/dgus/origin/DGUSDisplayDef.cpp
*/ */
#include "../../../../../inc/MarlinConfigPre.h" #include "../../../../inc/MarlinConfigPre.h"
#if ENABLED(DGUS_LCD_UI_ORIGIN) #if ENABLED(DGUS_LCD_UI_ORIGIN)
@ -32,12 +32,12 @@
#include "../DGUSDisplay.h" #include "../DGUSDisplay.h"
#include "../DGUSScreenHandler.h" #include "../DGUSScreenHandler.h"
#include "../../../../../module/temperature.h" #include "../../../../module/temperature.h"
#include "../../../../../module/motion.h" #include "../../../../module/motion.h"
#include "../../../../../module/planner.h" #include "../../../../module/planner.h"
#include "../../../../marlinui.h" #include "../../../marlinui.h"
#include "../../../ui_api.h" #include "../../ui_api.h"
#if ENABLED(DGUS_UI_MOVE_DIS_OPTION) #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
uint16_t distanceToMove = 10; uint16_t distanceToMove = 10;

View File

@ -20,24 +20,24 @@
* *
*/ */
#include "../../../../../inc/MarlinConfigPre.h" #include "../../../../inc/MarlinConfigPre.h"
#if ENABLED(DGUS_LCD_UI_ORIGIN) #if ENABLED(DGUS_LCD_UI_ORIGIN)
#include "../DGUSScreenHandler.h" #include "../DGUSScreenHandler.h"
#include "../../../../../MarlinCore.h" #include "../../../../MarlinCore.h"
#include "../../../../../gcode/queue.h" #include "../../../../gcode/queue.h"
#include "../../../../../libs/duration_t.h" #include "../../../../libs/duration_t.h"
#include "../../../../../module/settings.h" #include "../../../../module/settings.h"
#include "../../../../../module/temperature.h" #include "../../../../module/temperature.h"
#include "../../../../../module/motion.h" #include "../../../../module/motion.h"
#include "../../../../../module/planner.h" #include "../../../../module/planner.h"
#include "../../../../../module/printcounter.h" #include "../../../../module/printcounter.h"
#include "../../../../../sd/cardreader.h" #include "../../../../sd/cardreader.h"
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
#include "../../../../../feature/powerloss.h" #include "../../../../feature/powerloss.h"
#endif #endif
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)

View File

@ -25,7 +25,7 @@
#include "../DGUSVPVariable.h" #include "../DGUSVPVariable.h"
#include "../DGUSDisplayDef.h" #include "../DGUSDisplayDef.h"
#include "../../../../../inc/MarlinConfig.h" #include "../../../../inc/MarlinConfig.h"
enum DGUSLCD_Screens : uint8_t; enum DGUSLCD_Screens : uint8_t;

View File

@ -19,11 +19,11 @@
* location: <https://www.gnu.org/licenses/>. * * location: <https://www.gnu.org/licenses/>. *
****************************************************************************/ ****************************************************************************/
#include "../../inc/MarlinConfigPre.h" #include "../../../inc/MarlinConfigPre.h"
#if BOTH(EXTUI_EXAMPLE, EXTENSIBLE_UI) #if BOTH(EXTUI_EXAMPLE, EXTENSIBLE_UI)
#include "ui_api.h" #include "../ui_api.h"
// To implement a new UI, complete the functions below and // To implement a new UI, complete the functions below and
// read or update Marlin's state using the methods in the // read or update Marlin's state using the methods in the

View File

@ -22,11 +22,11 @@
#pragma once #pragma once
#include "../../../../../inc/MarlinConfigPre.h" #include "../../../../inc/MarlinConfigPre.h"
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
#include "../../../../../sd/SdFile.h" #include "../../../../sd/SdFile.h"
#include "../../../../../sd/cardreader.h" #include "../../../../sd/cardreader.h"
#endif #endif
class MediaFileReader { class MediaFileReader {

View File

@ -27,11 +27,11 @@
*/ */
#ifdef __has_include #ifdef __has_include
#if __has_include("../../ui_api.h") #if __has_include("../ui_api.h")
#include "../../ui_api.h" #include "../ui_api.h"
#endif #endif
#else #else
#include "../../ui_api.h" #include "../ui_api.h"
#endif #endif
#ifdef __MARLIN_FIRMWARE__ #ifdef __MARLIN_FIRMWARE__

View File

@ -1,26 +1,30 @@
/********************* /**
* marlin_events.cpp * * Marlin 3D Printer Firmware
*********************/ * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
/**************************************************************************** /**
* Written By Mark Pelletier 2017 - Aleph Objects, Inc. * * lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
* Written By Marcio Teixeira 2018 - Aleph Objects, Inc. * */
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* To view a copy of the GNU General Public License, go to the following *
* location: <https://www.gnu.org/licenses/>. *
****************************************************************************/
#include "compat.h" #include "../../../inc/MarlinConfigPre.h"
#if ENABLED(TOUCH_UI_FTDI_EVE) #if ENABLED(TOUCH_UI_FTDI_EVE)
@ -30,13 +34,9 @@ namespace ExtUI {
using namespace Theme; using namespace Theme;
using namespace FTDI; using namespace FTDI;
void onStartup() { void onStartup() { EventLoop::setup(); }
EventLoop::setup();
}
void onIdle() { void onIdle() { EventLoop::loop(); }
EventLoop::loop();
}
void onPrinterKilled(PGM_P const error, PGM_P const component) { void onPrinterKilled(PGM_P const error, PGM_P const component) {
char str[strlen_P(error) + strlen_P(component) + 3]; char str[strlen_P(error) + strlen_P(component) + 3];
@ -71,24 +71,17 @@ namespace ExtUI {
AlertDialogBox::showError(F("Unable to read media.")); AlertDialogBox::showError(F("Unable to read media."));
} }
void onStatusChanged(const char *lcd_msg) { void onStatusChanged(const char *lcd_msg) { StatusScreen::setStatusMessage(lcd_msg); }
StatusScreen::setStatusMessage(lcd_msg); void onStatusChanged(progmem_str lcd_msg) { StatusScreen::setStatusMessage(lcd_msg); }
}
void onStatusChanged(progmem_str lcd_msg) {
StatusScreen::setStatusMessage(lcd_msg);
}
void onPrintTimerStarted() { void onPrintTimerStarted() {
InterfaceSoundsScreen::playEventSound(InterfaceSoundsScreen::PRINTING_STARTED); InterfaceSoundsScreen::playEventSound(InterfaceSoundsScreen::PRINTING_STARTED);
} }
void onPrintTimerStopped() { void onPrintTimerStopped() {
InterfaceSoundsScreen::playEventSound(InterfaceSoundsScreen::PRINTING_FINISHED); InterfaceSoundsScreen::playEventSound(InterfaceSoundsScreen::PRINTING_FINISHED);
} }
void onPrintTimerPaused() {} void onPrintTimerPaused() {}
void onPrintFinished() {} void onPrintFinished() {}
void onFilamentRunout(const extruder_t extruder) { void onFilamentRunout(const extruder_t extruder) {
@ -101,38 +94,23 @@ namespace ExtUI {
void onHomingStart() {} void onHomingStart() {}
void onHomingComplete() {} void onHomingComplete() {}
void onFactoryReset() { void onFactoryReset() { InterfaceSettingsScreen::defaultSettings(); }
InterfaceSettingsScreen::defaultSettings(); void onStoreSettings(char *buff) { InterfaceSettingsScreen::saveSettings(buff); }
} void onLoadSettings(const char *buff) { InterfaceSettingsScreen::loadSettings(buff); }
void onPostprocessSettings() {} // Called after loading or resetting stored settings
void onStoreSettings(char *buff) {
InterfaceSettingsScreen::saveSettings(buff);
}
void onLoadSettings(const char *buff) {
InterfaceSettingsScreen::loadSettings(buff);
}
void onPostprocessSettings() {
// Called after loading or resetting stored settings
}
void onConfigurationStoreWritten(bool success) { void onConfigurationStoreWritten(bool success) {
#ifdef ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE #ifdef ARCHIM2_SPI_FLASH_EEPROM_BACKUP_SIZE
if (success && InterfaceSettingsScreen::backupEEPROM()) { if (success && InterfaceSettingsScreen::backupEEPROM()) {
SERIAL_ECHOLNPGM("Made backup of EEPROM to SPI Flash"); SERIAL_ECHOLNPGM("EEPROM backed up to SPI Flash");
} }
#else #else
UNUSED(success); UNUSED(success);
#endif #endif
} }
void onConfigurationStoreRead(bool) {}
void onConfigurationStoreRead(bool) { void onPlayTone(const uint16_t frequency, const uint16_t duration) { sound.play_tone(frequency, duration); }
}
void onPlayTone(const uint16_t frequency, const uint16_t duration) {
sound.play_tone(frequency, duration);
}
void onUserConfirmRequired(const char * const msg) { void onUserConfirmRequired(const char * const msg) {
if (msg) if (msg)
@ -143,20 +121,12 @@ namespace ExtUI {
#if HAS_LEVELING && HAS_MESH #if HAS_LEVELING && HAS_MESH
void onMeshLevelingStart() {} void onMeshLevelingStart() {}
void onMeshUpdate(const int8_t x, const int8_t y, const_float_t val) { BedMeshViewScreen::onMeshUpdate(x, y, val); }
void onMeshUpdate(const int8_t x, const int8_t y, const_float_t val) { void onMeshUpdate(const int8_t x, const int8_t y, const ExtUI::probe_state_t state) { BedMeshViewScreen::onMeshUpdate(x, y, state); }
BedMeshViewScreen::onMeshUpdate(x, y, val);
}
void onMeshUpdate(const int8_t x, const int8_t y, const ExtUI::probe_state_t state) {
BedMeshViewScreen::onMeshUpdate(x, y, state);
}
#endif #endif
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
void onPowerLossResume() { void onPowerLossResume() {} // Called on resume from power-loss
// Called on resume from power-loss
}
#endif #endif
#if HAS_PID_HEATING #if HAS_PID_HEATING

Some files were not shown because too many files have changed in this diff Show More