Add missing screens/ for screens files

CMakeLists.txt

@@ -39,9 +39,9 @@ OPTION(HARDWARE_MOD_EXT_PSRAM "Hardware Mod: External PSRAM" OFF)
 # #######################################
 # Select the targeted firmware
 # #######################################
-OPTION(TARGET_FW_MARLIN "Marlin firmware" ON)
+OPTION(TARGET_FW_MARLIN "Marlin firmware" OFF)
 OPTION(TARGET_FW_REPETIER "Repetier firmware" OFF)
-OPTION(TARGET_FW_SMOOTHIEWARE "Smoothieware firmware" OFF)
+OPTION(TARGET_FW_SMOOTHIEWARE "Smoothieware firmware" ON)
 OPTION(TARGET_FW_GRBL "GRBL firmware" OFF)
 
 

main/display/3dprinter/marlin/screens/main_screen.cpp

@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "main_screen.h"
+#include "screens/main_screen.h"
 
 #include <lvgl.h>
 
@@ -31,7 +31,7 @@
 #include "screens/fan_screen.h"
 
 #if ESP3D_SD_CARD_FEATURE
-#include "files_screen.h"
+#include "screens/files_screen.h"
 #endif  // ESP3D_SD_CARD_FEATURE
 #include "components/menu_button_component.h"
 #include "components/message_box_component.h"
@@ -42,7 +42,7 @@
 #include "gcode_host/esp3d_gcode_host_service.h"
 #include "screens/menu_screen.h"
 #include "screens/positions_screen.h"
-#include "speed_screen.h"
+#include "screens/speed_screen.h"
 #include "screens/temperatures_screen.h"
 #include "translations/esp3d_translation_service.h"
 

main/display/3dprinter/marlin/screens/speed_screen.cpp

@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "speed_screen.h"
+#include "screens/speed_screen.h"
 
 #include <lvgl.h>
 
@@ -28,7 +28,7 @@
 #include "esp3d_string.h"
 #include "esp3d_styles.h"
 #include "esp3d_tft_ui.h"
-#include "main_screen.h"
+#include "screens/main_screen.h"
 #include "rendering/esp3d_rendering_client.h"
 
 /**********************

main/display/3dprinter/marlin/screens/temperatures_screen.cpp

@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "temperatures_screen.h"
+#include "screens/temperatures_screen.h"
 
 #include <lvgl.h>
 
@@ -28,8 +28,8 @@
 #include "esp3d_string.h"
 #include "esp3d_styles.h"
 #include "esp3d_tft_ui.h"
-#include "filament_screen.h"
-#include "main_screen.h"
+#include "screens/filament_screen.h"
+#include "screens/main_screen.h"
 #include "rendering/esp3d_rendering_client.h"
 #include "translations/esp3d_translation_service.h"
 

main/display/3dprinter/repetier/screens/leveling_screen.cpp

@@ -17,11 +17,11 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#include "leveling_screen.h"
+#include "screens/leveling_screen.h"
 
 #include <lvgl.h>
 
-#include "auto_leveling_screen.h"
+#include "screens/auto_leveling_screen.h"
 #include "components/back_button_component.h"
 #include "components/main_container_component.h"
 #include "components/spinner_component.h"
@@ -31,8 +31,8 @@
 #include "esp3d_string.h"
 #include "esp3d_styles.h"
 #include "esp3d_tft_ui.h"
-#include "manual_leveling_screen.h"
-#include "menu_screen.h"
+#include "screens/manual_leveling_screen.h"
+#include "screens/menu_screen.h"
 #include "translations/esp3d_translation_service.h"
 
 /**********************

main/display/3dprinter/repetier/screens/main_screen.cpp

@@ -18,32 +18,32 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "main_screen.h"
+#include "screens/main_screen.h"
 
 #include <lvgl.h>
 
-#include "empty_screen.h"
+#include "screens/empty_screen.h"
 #include "esp3d_hal.h"
 #include "esp3d_log.h"
 #include "esp3d_string.h"
 #include "esp3d_styles.h"
 #include "esp3d_tft_ui.h"
-#include "fan_screen.h"
+#include "screens/fan_screen.h"
 
 #if ESP3D_SD_CARD_FEATURE
-#include "files_screen.h"
+#include "screens/files_screen.h"
 #endif  // ESP3D_SD_CARD_FEATURE
 #include "components/menu_button_component.h"
 #include "components/message_box_component.h"
 #include "components/status_bar_component.h"
 #include "components/symbol_button_component.h"
 #include "esp3d_json_settings.h"
-#include "filament_screen.h"
+#include "screens/filament_screen.h"
 #include "gcode_host/esp3d_gcode_host_service.h"
-#include "menu_screen.h"
-#include "positions_screen.h"
-#include "speed_screen.h"
-#include "temperatures_screen.h"
+#include "screens/menu_screen.h"
+#include "screens/positions_screen.h"
+#include "screens/speed_screen.h"
+#include "screens/temperatures_screen.h"
 #include "translations/esp3d_translation_service.h"
 
 /**********************

main/display/3dprinter/repetier/screens/manual_leveling_screen.cpp

@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "manual_leveling_screen.h"
+#include "screens/manual_leveling_screen.h"
 
 #include <lvgl.h>
 
@@ -28,8 +28,8 @@
 #include "esp3d_log.h"
 #include "esp3d_styles.h"
 #include "esp3d_tft_ui.h"
-#include "leveling_screen.h"
-#include "menu_screen.h"
+#include "screens/leveling_screen.h"
+#include "screens/menu_screen.h"
 #include "rendering/esp3d_rendering_client.h"
 #include "translations/esp3d_translation_service.h"
 

main/display/3dprinter/repetier/screens/menu_screen.cpp

@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "menu_screen.h"
+#include "screens/menu_screen.h"
 
 #include <lvgl.h>
 
@@ -32,18 +32,18 @@
 #include "esp3d_styles.h"
 #include "esp3d_tft_ui.h"
 #include "esp3d_values.h"
-#include "filament_screen.h"
-#include "informations_screen.h"
-#include "leveling_screen.h"
-#include "main_screen.h"
-#include "manual_leveling_screen.h"
-#include "menu_screen.h"
+#include "screens/filament_screen.h"
+#include "screens/informations_screen.h"
+#include "screens/leveling_screen.h"
+#include "screens/main_screen.h"
+#include "screens/manual_leveling_screen.h"
+#include "screens/menu_screen.h"
 #include "rendering/esp3d_rendering_client.h"
-#include "settings_screen.h"
+#include "screens/settings_screen.h"
 #include "translations/esp3d_translation_service.h"
 
 #if ESP3D_WIFI_FEATURE
-#include "wifi_screen.h"
+#include "screens/wifi_screen.h"
 #endif  // ESP3D_WIFI_FEATURE
 
 /**********************

main/display/3dprinter/repetier/screens/positions_screen.cpp

@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "positions_screen.h"
+#include "screens/positions_screen.h"
 
 #include <lvgl.h>
 
@@ -29,7 +29,7 @@
 #include "esp3d_string.h"
 #include "esp3d_styles.h"
 #include "esp3d_tft_ui.h"
-#include "main_screen.h"
+#include "screens/main_screen.h"
 #include "rendering/esp3d_rendering_client.h"
 #include "translations/esp3d_translation_service.h"
 

main/display/3dprinter/repetier/screens/settings_screen.cpp

@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "settings_screen.h"
+#include "screens/settings_screen.h"
 
 #include <lvgl.h>
 
@@ -39,9 +39,9 @@
 #include "filesystem/esp3d_flash.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "main_screen.h"
-#include "manual_leveling_screen.h"
-#include "menu_screen.h"
+#include "screens/main_screen.h"
+#include "screens/manual_leveling_screen.h"
+#include "screens/menu_screen.h"
 #include "rendering/esp3d_rendering_client.h"
 #include "tasks_def.h"
 #include "translations/esp3d_translation_service.h"

main/display/3dprinter/repetier/screens/speed_screen.cpp

@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "speed_screen.h"
+#include "screens/speed_screen.h"
 
 #include <lvgl.h>
 
@@ -28,7 +28,7 @@
 #include "esp3d_string.h"
 #include "esp3d_styles.h"
 #include "esp3d_tft_ui.h"
-#include "main_screen.h"
+#include "screens/main_screen.h"
 #include "rendering/esp3d_rendering_client.h"
 
 /**********************

main/display/3dprinter/repetier/screens/temperatures_screen.cpp

@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "temperatures_screen.h"
+#include "screens/temperatures_screen.h"
 
 #include <lvgl.h>
 
@@ -28,8 +28,8 @@
 #include "esp3d_string.h"
 #include "esp3d_styles.h"
 #include "esp3d_tft_ui.h"
-#include "filament_screen.h"
-#include "main_screen.h"
+#include "screens/filament_screen.h"
+#include "screens/main_screen.h"
 #include "rendering/esp3d_rendering_client.h"
 #include "translations/esp3d_translation_service.h"
 

main/display/3dprinter/smoothieware/screens/auto_leveling_screen.cpp

@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "auto_leveling_screen.h"
+#include "screens/auto_leveling_screen.h"
 
 #include <lvgl.h>
 
@@ -28,7 +28,7 @@
 #include "esp3d_string.h"
 #include "esp3d_styles.h"
 #include "esp3d_tft_ui.h"
-#include "leveling_screen.h"
+#include "screens/leveling_screen.h"
 #include "rendering/esp3d_rendering_client.h"
 #include "translations/esp3d_translation_service.h"
 

main/display/3dprinter/smoothieware/screens/fan_screen.cpp

@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "fan_screen.h"
+#include "screens/fan_screen.h"
 
 #include <lvgl.h>
 
@@ -28,7 +28,7 @@
 #include "esp3d_string.h"
 #include "esp3d_styles.h"
 #include "esp3d_tft_ui.h"
-#include "main_screen.h"
+#include "screens/main_screen.h"
 #include "rendering/esp3d_rendering_client.h"
 
 /**********************

main/display/3dprinter/smoothieware/screens/filament_screen.cpp

@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "filament_screen.h"
+#include "screens/filament_screen.h"
 
 #include <lvgl.h>
 
@@ -28,9 +28,9 @@
 #include "esp3d_string.h"
 #include "esp3d_styles.h"
 #include "esp3d_tft_ui.h"
-#include "menu_screen.h"
+#include "screens/menu_screen.h"
 #include "rendering/esp3d_rendering_client.h"
-#include "temperatures_screen.h"
+#include "screens/temperatures_screen.h"
 #include "translations/esp3d_translation_service.h"
 
 /**********************

main/display/3dprinter/smoothieware/screens/informations_screen.cpp

@@ -18,7 +18,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "informations_screen.h"
+#include "screens/informations_screen.h"
 
 #include <lvgl.h>
 
@@ -34,7 +34,7 @@
 #include "esp_heap_caps.h"
 #include "esp_system.h"
 #include "filesystem/esp3d_flash.h"
-#include "menu_screen.h"
+#include "screens/menu_screen.h"
 #include "rom/ets_sys.h"
 #include "sdkconfig.h"
 #include "spi_flash_mmap.h"

main/display/3dprinter/smoothieware/screens/leveling_screen.cpp

@@ -17,11 +17,11 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#include "leveling_screen.h"
+#include "screens/leveling_screen.h"
 
 #include <lvgl.h>
 
-#include "auto_leveling_screen.h"
+#include "screens/auto_leveling_screen.h"
 #include "components/back_button_component.h"
 #include "components/main_container_component.h"
 #include "components/spinner_component.h"
@@ -31,8 +31,8 @@
 #include "esp3d_string.h"
 #include "esp3d_styles.h"
 #include "esp3d_tft_ui.h"
-#include "manual_leveling_screen.h"
-#include "menu_screen.h"
+#include "screens/manual_leveling_screen.h"
+#include "screens/menu_screen.h"
 #include "translations/esp3d_translation_service.h"
 
 /**********************