diff --git a/CMakeLists.txt b/CMakeLists.txt index da3a60b..4672e03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,8 @@ set(EXECUTABLE ${PROJECT_NAME}.out) #CONFIG FILE #################################################################################################### +set(INTERFACES_DIR ${CMAKE_SOURCE_DIR}/bsl/csl/interfaces) + include(${CMAKE_SOURCE_DIR}/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cmake) #################################################################################################### diff --git a/periferals/gpio/gpio.hpp b/bsl/csl/interfaces/gpio.hpp similarity index 100% rename from periferals/gpio/gpio.hpp rename to bsl/csl/interfaces/gpio.hpp diff --git a/interfaces/i2c.hpp b/bsl/csl/interfaces/i2c.hpp similarity index 100% rename from interfaces/i2c.hpp rename to bsl/csl/interfaces/i2c.hpp diff --git a/interfaces/pin.hpp b/bsl/csl/interfaces/pin.hpp similarity index 100% rename from interfaces/pin.hpp rename to bsl/csl/interfaces/pin.hpp diff --git a/interfaces/spi.hpp b/bsl/csl/interfaces/spi.hpp similarity index 100% rename from interfaces/spi.hpp rename to bsl/csl/interfaces/spi.hpp diff --git a/interfaces/spich.hpp b/bsl/csl/interfaces/spich.hpp similarity index 100% rename from interfaces/spich.hpp rename to bsl/csl/interfaces/spich.hpp diff --git a/bsl/nucleo_f042k6/periferals/gpio/CMakeLists.txt b/bsl/nucleo_f042k6/periferals/gpio/CMakeLists.txt index 4c6f552..7c94c87 100644 --- a/bsl/nucleo_f042k6/periferals/gpio/CMakeLists.txt +++ b/bsl/nucleo_f042k6/periferals/gpio/CMakeLists.txt @@ -2,5 +2,5 @@ add_library(stmGpio gpio.cpp) target_compile_options(stmGpio PRIVATE ${C_FLAGS}) target_compile_definitions(stmGpio PRIVATE ${C_DEFS}) -target_include_directories(stmGpio PUBLIC ${CMAKE_SOURCE_DIR}/periferals/gpio ${CSL_INCLUDES}) +target_include_directories(stmGpio PUBLIC ${INTERFACES_DIR} ${CSL_INCLUDES}) add_library(sub::gpio ALIAS stmGpio) diff --git a/bsl/nucleo_f042k6/periferals/gpio/gpio.cpp b/bsl/nucleo_f042k6/periferals/gpio/gpio.cpp index 392ac9a..2a97e46 100644 --- a/bsl/nucleo_f042k6/periferals/gpio/gpio.cpp +++ b/bsl/nucleo_f042k6/periferals/gpio/gpio.cpp @@ -1,34 +1,9 @@ #include "gpio.hpp" #include "../../bsl_nucleo_f042k6.h" -//#include "/home/key/git/ked/bsl/csl/stm32f042/Drivers/CMSIS/Device/ST/STM32F0xx/Include/stm32f042x6.h" #include "./../../../csl/stm32f042/Drivers/CMSIS/Device/ST/STM32F0xx/Include/stm32f042x6.h" -//#include "gpioMap.hpp" #define PIN_COUNT 20 -#define D0 0 -#define D1 1 -#define D2 2 -#define D3 3 -#define D4 4 -#define D5 5 -#define D6 6 -#define D7 7 -#define D8 8 -#define D9 9 -#define D10 10 -#define D11 11 -#define D12 12 -#define A0 13 -#define A1 14 -#define A2 15 -#define A3 16 -#define A4 17 -#define A5 18 -#define A6 19 -#define A7 20 - - class Gpio::gpioImpl { diff --git a/main.cpp b/main.cpp index e62feaa..638263c 100644 --- a/main.cpp +++ b/main.cpp @@ -1,5 +1,5 @@ #include"main.hpp" -#include "periferals/gpio/gpio.hpp" +#include "bsl/csl/interfaces/gpio.hpp" int main(int argc, char *argv[]) { @@ -8,9 +8,9 @@ int main(int argc, char *argv[]) while(1) { - LL_mDelay(100); + LL_mDelay(500); gpio.writePin(1,1); - LL_mDelay(100); + LL_mDelay(500); gpio.writePin(1,0); } return 1;