relocate

MarlinFirmware · Feb 19, 2023 · 5c84b24 · 5c84b24
1 parent d10ecec
commit 5c84b24
Show file tree

Hide file tree

Showing 15 changed files with 74 additions and 75 deletions.
diff --git a/...ic_dgus/lib/anycubic_dgus/DGUSDisplay.cpp → ...c/lcd/extui/anycubic_dgus/DGUSDisplay.cpp b/...ic_dgus/lib/anycubic_dgus/DGUSDisplay.cpp → ...c/lcd/extui/anycubic_dgus/DGUSDisplay.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -22,25 +22,25 @@
 
 /* DGUS implementation written by coldtobi in 2019 for Marlin */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_DGUS)
 
 #if HOTENDS > 2
   #error "More than 2 hotends not implemented on the Display UI design."
 #endif
 
-#include "../../../ui_api.h"
+#include "../ui_api.h"
 
-#include "../../../../../MarlinCore.h"
-#include "../../../../../module/motion.h"
-#include "../../../../../gcode/queue.h"
-#include "../../../../../module/planner.h"
-#include "../../../../../libs/duration_t.h"
-#include "../../../../../module/printcounter.h"
-#include "../../../../../core/debug_out.h"
+#include "../../../MarlinCore.h"
+#include "../../../module/motion.h"
+#include "../../../gcode/queue.h"
+#include "../../../module/planner.h"
+#include "../../../libs/duration_t.h"
+#include "../../../module/printcounter.h"
+#include "../../../core/debug_out.h"
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 #include "DGUSDisplay.h"

diff --git a/...ubic_dgus/lib/anycubic_dgus/DGUSDisplay.h → ...src/lcd/extui/anycubic_dgus/DGUSDisplay.h b/...ubic_dgus/lib/anycubic_dgus/DGUSDisplay.h → ...src/lcd/extui/anycubic_dgus/DGUSDisplay.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -23,18 +23,18 @@
 
 /* DGUS implementation written by coldtobi in 2019 for Marlin */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
-#include "../../../../../MarlinCore.h"
+#include "../../../MarlinCore.h"
 #if HAS_BED_PROBE
-  #include "../../../../../module/probe.h"
+  #include "../../../module/probe.h"
 #endif
 #include "DGUSVPVariable.h"
 
 enum DGUSLCD_Screens : uint8_t;
 
 #define DEBUG_OUT ENABLED(DEBUG_DGUSLCD)
-#include "../../../../../core/debug_out.h"
+#include "../../../core/debug_out.h"
 
 typedef enum : uint8_t {
   DGUS_IDLE,           //< waiting for DGUS_HEADER1.

diff --git a/...c_dgus/lib/anycubic_dgus/DGUSDisplayDef.h → .../lcd/extui/anycubic_dgus/DGUSDisplayDef.h b/...c_dgus/lib/anycubic_dgus/DGUSDisplayDef.h → .../lcd/extui/anycubic_dgus/DGUSDisplayDef.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -43,7 +43,7 @@ extern const struct VPMapping VPMap[];
 // List of VPs handled by Marlin / The Display.
 extern const struct DGUS_VP_Variable ListOfVP[];
 
-#include "../../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 // copied from C:\Users\bobku\Documents\GitHub\Marlin-Bob-2\Marlin\src\lcd\extui\dgus\fysetc\DGUSDisplayDef.h
 

diff --git a/...s/lib/anycubic_dgus/DGUSScreenHandler.cpp → ...extui/anycubic_dgus/DGUSScreenHandler.cpp b/...s/lib/anycubic_dgus/DGUSScreenHandler.cpp → ...extui/anycubic_dgus/DGUSScreenHandler.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -20,7 +20,7 @@
  *
  */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_DGUS)
 
@@ -29,18 +29,18 @@
 #include "DGUSVPVariable.h"
 #include "DGUSDisplayDef.h"
 
-#include "../../../ui_api.h"
-#include "../../../../../MarlinCore.h"
-#include "../../../../../module/temperature.h"
-#include "../../../../../module/motion.h"
-#include "../../../../../gcode/queue.h"
-#include "../../../../../module/planner.h"
-#include "../../../../../sd/cardreader.h"
-#include "../../../../../libs/duration_t.h"
-#include "../../../../../module/printcounter.h"
+#include "../ui_api.h"
+#include "../../../MarlinCore.h"
+#include "../../../module/temperature.h"
+#include "../../../module/motion.h"
+#include "../../../gcode/queue.h"
+#include "../../../module/planner.h"
+#include "../../../sd/cardreader.h"
+#include "../../../libs/duration_t.h"
+#include "../../../module/printcounter.h"
 
 #if ENABLED(POWER_LOSS_RECOVERY)
-  #include "../../../../../feature/powerloss.h"
+  #include "../../../feature/powerloss.h"
 #endif
 
 uint16_t DGUSScreenHandler::ConfirmVP;

diff --git a/...gus/lib/anycubic_dgus/DGUSScreenHandler.h → ...d/extui/anycubic_dgus/DGUSScreenHandler.h b/...gus/lib/anycubic_dgus/DGUSScreenHandler.h → ...d/extui/anycubic_dgus/DGUSScreenHandler.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -24,7 +24,7 @@
 #include "DGUSDisplay.h"
 #include "DGUSVPVariable.h"
 
-#include "../../../../../inc/MarlinConfig.h"
+#include "../../../inc/MarlinConfig.h"
 
 enum DGUSLCD_Screens : uint8_t;
 

diff --git a/...c_dgus/lib/anycubic_dgus/DGUSVPVariable.h → .../lcd/extui/anycubic_dgus/DGUSVPVariable.h b/...c_dgus/lib/anycubic_dgus/DGUSVPVariable.h → .../lcd/extui/anycubic_dgus/DGUSVPVariable.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm

diff --git a/.../lib/anycubic_dgus/dgus_FileNavigator.cpp → ...lcd/extui/anycubic_dgus/FileNavigator.cpp b/.../lib/anycubic_dgus/dgus_FileNavigator.cpp → ...lcd/extui/anycubic_dgus/FileNavigator.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -21,7 +21,7 @@
  */
 
 /**
- * lcd/extui/lib/FileNavigator.cpp
+ * lcd/extui/anycubic_dgus/FileNavigator.cpp
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@@ -33,11 +33,11 @@
  * This library allows full folder traversal.                              *
  ***************************************************************************/
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_DGUS)
 
-#include "dgus_FileNavigator.h"
+#include "FileNavigator.h"
 #include "dgus_tft.h"
 
 using namespace ExtUI;

diff --git a/...us/lib/anycubic_dgus/dgus_FileNavigator.h → ...c/lcd/extui/anycubic_dgus/FileNavigator.h b/...us/lib/anycubic_dgus/dgus_FileNavigator.h → ...c/lcd/extui/anycubic_dgus/FileNavigator.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -22,15 +22,15 @@
 #pragma once
 
 /**
- * lcd/extui/lib/FileNavigator.h
+ * lcd/extui/anycubic_dgus/FileNavigator.h
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
  *  (not affiliated with Anycubic, Ltd.)
  */
 
 #include "dgus_tft_defs.h"
-#include "../../../ui_api.h"
+#include "../ui_api.h"
 
 using namespace ExtUI;
 

diff --git a/...bic_dgus/lib/anycubic_dgus/dgus_Tunes.cpp → Marlin/src/lcd/extui/anycubic_dgus/Tunes.cpp b/...bic_dgus/lib/anycubic_dgus/dgus_Tunes.cpp → Marlin/src/lcd/extui/anycubic_dgus/Tunes.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -21,7 +21,7 @@
  */
 
 /**
- * lcd/extui/lib/Tunes.cpp
+ * lcd/extui/anycubic_dgus/Tunes.cpp
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
@@ -33,12 +33,12 @@
  * See Tunes.h for note and tune definitions.                          *
  ***********************************************************************/
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_DGUS)
 
-#include "dgus_Tunes.h"
-#include "../../../ui_api.h"
+#include "Tunes.h"
+#include "../ui_api.h"
 
 namespace Anycubic {
 

diff --git a/...cubic_dgus/lib/anycubic_dgus/dgus_Tunes.h → Marlin/src/lcd/extui/anycubic_dgus/Tunes.h b/...cubic_dgus/lib/anycubic_dgus/dgus_Tunes.h → Marlin/src/lcd/extui/anycubic_dgus/Tunes.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * lcd/extui/lib/Tunes.h
+ * lcd/extui/anycubic_dgus/Tunes.h
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]

diff --git a/...extui/anycubic_dgus/anycubic_dgus_lcd.cpp → ...rc/lcd/extui/anycubic_dgus/dgus_extui.cpp b/...extui/anycubic_dgus/anycubic_dgus_lcd.cpp → ...rc/lcd/extui/anycubic_dgus/dgus_extui.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * lcd/extui/anycubic_dgus_lcd.cpp
+ * lcd/extui/anycubic_dgus/dgus_extui.cpp
  *
  * Anycubic Dgus TFT support for Marlin
  */
@@ -31,7 +31,7 @@
 #if ENABLED(ANYCUBIC_LCD_DGUS)
 
 #include "../ui_api.h"
-#include "lib/anycubic_dgus/dgus_tft.h"
+#include "dgus_tft.h"
 
 using namespace Anycubic;
 

diff --git a/Marlin/src/lcd/extui/anycubic_dgus/dgus_lcd.cpp b/Marlin/src/lcd/extui/anycubic_dgus/dgus_lcd.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -31,9 +31,9 @@
 #if ENABLED(ANYCUBIC_LCD_DGUS)
 
 #include "../ui_api.h"
-#include "lib/anycubic_dgus/DGUSDisplay.h"
-#include "lib/anycubic_dgus/DGUSDisplayDef.h"
-#include "lib/anycubic_dgus/DGUSScreenHandler.h"
+#include "DGUSDisplay.h"
+#include "DGUSDisplayDef.h"
+#include "DGUSScreenHandler.h"
 
 extern const char NUL_STR[];
 
@@ -160,4 +160,4 @@ namespace ExtUI {
 }
 
 #endif // HAS_DGUS_LCD
-#endif
+#endif
diff --git a/...cubic_dgus/lib/anycubic_dgus/dgus_tft.cpp → .../src/lcd/extui/anycubic_dgus/dgus_tft.cpp b/...cubic_dgus/lib/anycubic_dgus/dgus_tft.cpp → .../src/lcd/extui/anycubic_dgus/dgus_tft.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -21,29 +21,28 @@
  */
 
 /**
- * lcd/extui/lib/dgus_tft.cpp
+ * lcd/extui/anycubic_dgus/dgus_tft.cpp
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
  *  (not affiliated with Anycubic, Ltd.)
  */
 
-#include "../../../../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #if ENABLED(ANYCUBIC_LCD_DGUS)
 
 #include "dgus_tft.h"
-#include "dgus_Tunes.h"
-#include "dgus_FileNavigator.h"
-
-#include "../../../../../gcode/queue.h"
-#include "../../../../../sd/cardreader.h"
-#include "../../../../../libs/numtostr.h"
-//#include "../../../../libs/build_date.h"
-#include "../../../../../MarlinCore.h"
-#include "../../../../../feature/powerloss.h"
-#include "../../../../../core/serial.h"
-#include "../../../../../module/stepper.h"
+#include "Tunes.h"
+#include "FileNavigator.h"
+
+#include "../../../gcode/queue.h"
+#include "../../../sd/cardreader.h"
+#include "../../../libs/numtostr.h"
+#include "../../../MarlinCore.h"
+#include "../../../feature/powerloss.h"
+#include "../../../core/serial.h"
+#include "../../../module/stepper.h"
 
 #include <string>
 

diff --git a/...nycubic_dgus/lib/anycubic_dgus/dgus_tft.h → ...in/src/lcd/extui/anycubic_dgus/dgus_tft.h b/...nycubic_dgus/lib/anycubic_dgus/dgus_tft.h → ...in/src/lcd/extui/anycubic_dgus/dgus_tft.h
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -22,16 +22,16 @@
 #pragma once
 
 /**
- * lcd/extui/lib/dgus_tft.h
+ * lcd/extui/anycubic_dgus/dgus_tft.h
  *
  * Extensible_UI implementation for Anycubic Chiron
  * Written By Nick Wells, 2020 [https://github.com/SwiftNick]
  *  (not affiliated with Anycubic, Ltd.)
  */
 
 #include "dgus_tft_defs.h"
-#include "../../../../../inc/MarlinConfigPre.h"
-#include "../../../ui_api.h"
+#include "../../../inc/MarlinConfigPre.h"
+#include "../ui_api.h"
 
 #define MAIN_BOARD_FIRMWARE_VER "V2.4.5"