diff --git a/bsl/csl/interfaces/delay.hpp b/bsl/csl/interfaces/delay.hpp index 6e81ac1..165a27b 100644 --- a/bsl/csl/interfaces/delay.hpp +++ b/bsl/csl/interfaces/delay.hpp @@ -8,7 +8,7 @@ class Delay public: Delay(); ~Delay(); - void us(uint16_t delay); + void ms(uint16_t delay); private: }; diff --git a/bsl/csl/rpi/CMakeLists.txt b/bsl/csl/rpi/CMakeLists.txt index 6963876..fb78d6c 100644 --- a/bsl/csl/rpi/CMakeLists.txt +++ b/bsl/csl/rpi/CMakeLists.txt @@ -1,4 +1,4 @@ #################################################################################################### #SUBDIRECTORIES #################################################################################################### -#add_subdirectory(Src) +add_subdirectory(Src) diff --git a/bsl/csl/rpi/Src/CMakeLists.txt b/bsl/csl/rpi/Src/CMakeLists.txt index 1eeb63d..14c745f 100644 --- a/bsl/csl/rpi/Src/CMakeLists.txt +++ b/bsl/csl/rpi/Src/CMakeLists.txt @@ -1,6 +1,13 @@ -add_library(rpiGpio gpio.cpp) +#add_library(rpiGpio gpio.cpp) -target_compile_options(rpiGpio PRIVATE ${C_FLAGS}) -target_compile_definitions(rpiGpio PRIVATE ${C_DEFS}) -target_include_directories(rpiGpio PRIVATE ${INTERFACES_DIR} ../Inc) -add_library(sub::gpio ALIAS rpiGpio) +#target_compile_options(rpiGpio PRIVATE ${C_FLAGS}) +#target_compile_definitions(rpiGpio PRIVATE ${C_DEFS}) +#target_include_directories(rpiGpio PRIVATE ${INTERFACES_DIR} ../Inc) +#add_library(sub::gpio ALIAS rpiGpio) + +add_library(rpiDelay delay.cpp) + +target_compile_options(rpiDelay PRIVATE ${C_FLAGS}) +target_compile_definitions(rpiDelay PRIVATE ${C_DEFS}) +target_include_directories(rpiDelay PRIVATE ${INTERFACES_DIR} ../Inc) +add_library(sub::delay ALIAS rpiDelay) diff --git a/bsl/csl/rpi/Src/delay.cpp b/bsl/csl/rpi/Src/delay.cpp new file mode 100644 index 0000000..e13a60d --- /dev/null +++ b/bsl/csl/rpi/Src/delay.cpp @@ -0,0 +1,17 @@ +#include "delay.hpp" +#include + +Delay::Delay() +{ + +} + +Delay::~Delay() +{ + +} + +void Delay::ms(uint16_t delay) +{ + usleep(1000*delay); +} diff --git a/bsl/csl/stm32f042/Src/delay.cpp b/bsl/csl/stm32f042/Src/delay.cpp index aabf707..74b4745 100644 --- a/bsl/csl/stm32f042/Src/delay.cpp +++ b/bsl/csl/stm32f042/Src/delay.cpp @@ -13,7 +13,7 @@ Delay::~Delay() } -void Delay::us(uint16_t delay) +void Delay::ms(uint16_t delay) { LL_mDelay(delay); } diff --git a/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cpp b/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cpp index 0a41826..bffa639 100644 --- a/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cpp +++ b/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cpp @@ -11,9 +11,9 @@ int startBSL() while(1) { - delay.us(500); + delay.ms(50); pin.write(true); - delay.us(500); + delay.ms(50); pin.write(false); } diff --git a/bsl/raspberry/bslConfig.cmake b/bsl/raspberry/bslConfig.cmake index e062ff7..c5882ce 100644 --- a/bsl/raspberry/bslConfig.cmake +++ b/bsl/raspberry/bslConfig.cmake @@ -26,3 +26,4 @@ set (CPP_FLAGS ${C_FLAGS}) set (CPP_DEFS ${C_DEFS}) list(APPEND EXTRA_LIBS sub::translator) +list(APPEND EXTRA_LIBS sub::delay) diff --git a/bsl/raspberry/bsl_raspberry.cpp b/bsl/raspberry/bsl_raspberry.cpp index a12470c..c4c97d0 100644 --- a/bsl/raspberry/bsl_raspberry.cpp +++ b/bsl/raspberry/bsl_raspberry.cpp @@ -1,8 +1,17 @@ #include "bsl_raspberry.hpp" +#include "../csl/interfaces/delay.hpp" int startBSL() { - std::cout << "Hello from raspberry" << std::endl; + int i = 0; + + Delay delay; + + for(i=0; i < 5; i++) + { + std::cout << "Hello from raspberry" << std::endl; + delay.ms(500); + } return 1; }