From f5c5c1f7717affebd012c4b84afb2bc51afb262c Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 5 Apr 2017 19:25:36 -0500 Subject: [PATCH] Rename all UBL files with a ubl_ prefix --- Marlin/G26_Mesh_Validation_Tool.cpp | 3 +-- Marlin/Marlin_main.cpp | 2 +- Marlin/configuration_store.cpp | 2 +- Marlin/{UBL_Bed_Leveling.cpp => ubl.cpp} | 2 +- Marlin/{UBL.h => ubl.h} | 0 Marlin/{UBL_G29.cpp => ubl_G29.cpp} | 2 +- Marlin/{UBL_line_to_destination.cpp => ubl_motion.cpp} | 2 +- Marlin/ultralcd.cpp | 2 +- 8 files changed, 7 insertions(+), 8 deletions(-) rename Marlin/{UBL_Bed_Leveling.cpp => ubl.cpp} (99%) rename Marlin/{UBL.h => ubl.h} (100%) rename Marlin/{UBL_G29.cpp => ubl_G29.cpp} (99%) rename Marlin/{UBL_line_to_destination.cpp => ubl_motion.cpp} (99%) diff --git a/Marlin/G26_Mesh_Validation_Tool.cpp b/Marlin/G26_Mesh_Validation_Tool.cpp index fc64eb3cb4..12042a5de7 100644 --- a/Marlin/G26_Mesh_Validation_Tool.cpp +++ b/Marlin/G26_Mesh_Validation_Tool.cpp @@ -28,12 +28,11 @@ #if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(UBL_G26_MESH_EDITING) + #include "ubl.h" #include "Marlin.h" - #include "Configuration.h" #include "planner.h" #include "stepper.h" #include "temperature.h" - #include "UBL.h" #include "ultralcd.h" #define EXTRUSION_MULTIPLIER 1.0 diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 6f73300b45..1c610e0b52 100755 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -297,7 +297,7 @@ #endif #if ENABLED(AUTO_BED_LEVELING_UBL) - #include "UBL.h" + #include "ubl.h" unified_bed_leveling ubl; #define UBL_MESH_VALID !( ( ubl.z_values[0][0] == ubl.z_values[0][1] && ubl.z_values[0][1] == ubl.z_values[0][2] \ && ubl.z_values[1][0] == ubl.z_values[1][1] && ubl.z_values[1][1] == ubl.z_values[1][2] \ diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp index 42228b8b38..eddf51b538 100644 --- a/Marlin/configuration_store.cpp +++ b/Marlin/configuration_store.cpp @@ -165,7 +165,7 @@ #endif #if ENABLED(AUTO_BED_LEVELING_UBL) - #include "UBL.h" + #include "ubl.h" #endif #if ENABLED(ABL_BILINEAR_SUBDIVISION) diff --git a/Marlin/UBL_Bed_Leveling.cpp b/Marlin/ubl.cpp similarity index 99% rename from Marlin/UBL_Bed_Leveling.cpp rename to Marlin/ubl.cpp index 330d2c2e52..48db524c68 100644 --- a/Marlin/UBL_Bed_Leveling.cpp +++ b/Marlin/ubl.cpp @@ -25,7 +25,7 @@ #if ENABLED(AUTO_BED_LEVELING_UBL) - #include "UBL.h" + #include "ubl.h" #include "hex_print_routines.h" /** diff --git a/Marlin/UBL.h b/Marlin/ubl.h similarity index 100% rename from Marlin/UBL.h rename to Marlin/ubl.h diff --git a/Marlin/UBL_G29.cpp b/Marlin/ubl_G29.cpp similarity index 99% rename from Marlin/UBL_G29.cpp rename to Marlin/ubl_G29.cpp index 5cb982e3de..9273b6e6ef 100644 --- a/Marlin/UBL_G29.cpp +++ b/Marlin/ubl_G29.cpp @@ -26,7 +26,7 @@ //#include "vector_3.h" //#include "qr_solve.h" - #include "UBL.h" + #include "ubl.h" #include "Marlin.h" #include "hex_print_routines.h" #include "configuration_store.h" diff --git a/Marlin/UBL_line_to_destination.cpp b/Marlin/ubl_motion.cpp similarity index 99% rename from Marlin/UBL_line_to_destination.cpp rename to Marlin/ubl_motion.cpp index b3a5f73af7..4bd34dd313 100644 --- a/Marlin/UBL_line_to_destination.cpp +++ b/Marlin/ubl_motion.cpp @@ -24,7 +24,7 @@ #if ENABLED(AUTO_BED_LEVELING_UBL) #include "Marlin.h" - #include "UBL.h" + #include "ubl.h" #include "planner.h" #include #include diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index e74f09c8dc..9e59705d5b 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -122,7 +122,7 @@ uint16_t max_display_update_time = 0; int32_t lastEncoderMovementMillis; #if ENABLED(AUTO_BED_LEVELING_UBL) - #include "UBL.h" + #include "ubl.h" #endif #if HAS_POWER_SWITCH