From f7f0df4afa8c0b4b4cf062431638710de19e46b4 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 24 Aug 2021 17:37:59 +0200 Subject: [PATCH] Move hal/avr/tmc2130 into hal/ directly There are no dependencies on AVR in TMC2130, so move into the main tree --- src/hal/CMakeLists.txt | 2 +- src/hal/{avr => }/tmc2130.cpp | 4 ++-- tests/unit/modules/motion/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/hal/{avr => }/tmc2130.cpp (99%) diff --git a/src/hal/CMakeLists.txt b/src/hal/CMakeLists.txt index 04c4602..77c7d99 100644 --- a/src/hal/CMakeLists.txt +++ b/src/hal/CMakeLists.txt @@ -5,7 +5,7 @@ target_sources( avr/shr16.cpp avr/eeprom.cpp avr/timers.cpp - avr/tmc2130.cpp + tmc2130.cpp adc.cpp avr/spi.cpp ) diff --git a/src/hal/avr/tmc2130.cpp b/src/hal/tmc2130.cpp similarity index 99% rename from src/hal/avr/tmc2130.cpp rename to src/hal/tmc2130.cpp index 8c17e85..a08e0e3 100644 --- a/src/hal/avr/tmc2130.cpp +++ b/src/hal/tmc2130.cpp @@ -1,5 +1,5 @@ -#include "../tmc2130.h" -#include "../../config/config.h" +#include "tmc2130.h" +#include "../config/config.h" namespace hal { namespace tmc2130 { diff --git a/tests/unit/modules/motion/CMakeLists.txt b/tests/unit/modules/motion/CMakeLists.txt index ce17dff..fb7be25 100644 --- a/tests/unit/modules/motion/CMakeLists.txt +++ b/tests/unit/modules/motion/CMakeLists.txt @@ -5,7 +5,7 @@ set(source_common ${CMAKE_SOURCE_DIR}/src/modules/speed_table.cpp ${CMAKE_SOURCE_DIR}/src/modules/pulse_gen.cpp ${MODULES_STUBS_DIR}/stub_gpio.cpp - ${CMAKE_SOURCE_DIR}/src/hal/avr/tmc2130.cpp + ${CMAKE_SOURCE_DIR}/src/hal/tmc2130.cpp ${MODULES_STUBS_DIR}/stub_shr16.cpp ${MODULES_STUBS_DIR}/stub_spi.cpp )