Merge pull request #362 from Paciente8159/361-fr-move-configuration-o…

…verrides-to-project-root moved override files to root dir
Paciente8159 · Apr 7, 2023 · 8516bab · 8516bab
2 parents d2aee86 + 6beb54a
commit 8516bab
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/uCNC/src/hal/boards/boardmap_overrides.h → uCNC/boardmap_overrides.h b/uCNC/src/hal/boards/boardmap_overrides.h → uCNC/boardmap_overrides.h
diff --git a/uCNC/src/cnc_hal_overrides.h → uCNC/cnc_hal_overrides.h b/uCNC/src/cnc_hal_overrides.h → uCNC/cnc_hal_overrides.h
diff --git a/uCNC/src/cnc.h b/uCNC/src/cnc.h
@@ -139,7 +139,7 @@ extern "C"
 #include "hal/tools/tool.h" //configures the kinematics for the cnc machine
 // final HAL configurations
 #include "../cnc_hal_config.h" //inicializes the HAL hardcoded connections
-#include "cnc_hal_overrides.h" //config override file
+#include "../cnc_hal_overrides.h" //config override file
 // fill remaining HAL configurations and sanity checks
 #include "cnc_hal_config_helper.h"
 // initializes core utilities (like fast math functions)

diff --git a/uCNC/src/hal/boards/boarddefs.h b/uCNC/src/hal/boards/boarddefs.h
@@ -163,7 +163,7 @@ extern "C"
 #error Undefined board
 #endif
 
-#include "boardmap_overrides.h"
+#include "../../../boardmap_overrides.h"
 #include "../mcus/mcudefs.h" //configures the MCU for the selected board
 
 #ifdef __cplusplus