diff --git a/ked/LICENSE b/LICENSE similarity index 100% rename from ked/LICENSE rename to LICENSE diff --git a/ked/README.md b/README.md similarity index 100% rename from ked/README.md rename to README.md diff --git a/ked/CMakeLists.txt b/ked/CMakeLists.txt index cba5ca2..55309ba 100644 --- a/ked/CMakeLists.txt +++ b/ked/CMakeLists.txt @@ -2,19 +2,19 @@ cmake_minimum_required(VERSION 3.5) include(config_files/cmakeProjectConfig.cmake) -set(BSL_DIR ${CMAKE_SOURCE_DIR}/bsl/${BSL_USED}) +set(CSL_DIR ${CMAKE_SOURCE_DIR}/csl/${CSL_USED}) -if(EXISTS ${BSL_DIR}) # Cheking if the directory exists - message("${BoldGreen}Compiling for ${BSL_USED} ${ColourReset}") - set(COMPILER_DEFS ${BSL_DIR}/bslCompiler.cmake) - set(PROJECT_DEFS ${BSL_DIR}/bslConfig.cmake) +if(EXISTS ${CSL_DIR}) # Cheking if the directory exists + message("${BoldGreen}Compiling for ${CSL_USED} ${ColourReset}") + set(COMPILER_DEFS ${CSL_DIR}/compiler.cmake) + set(PROJECT_DEFS ${CSL_DIR}/config.cmake) else() message( FATAL_ERROR "${BoldRed}Please Select a valid BSL, CMake will exit.${ColourReset}" ) endif() include(${COMPILER_DEFS}) -project(${BSL_USED} ASM C CXX) #do this intead sf declaring languages in the beginning it will prevent loop errors. +project(${CSL_USED} ASM C CXX) #do this intead sf declaring languages in the beginning it will prevent loop errors. set(CMAKE_VERBOSE_MAKEFILE off) #Shoul make print everythign ?? set(EXECUTABLE ${PROJECT_NAME}) #Create the executable @@ -22,7 +22,7 @@ set(EXECUTABLE ${PROJECT_NAME}) #Create the executable #################################################################################################### #CONFIG FILE #################################################################################################### -set(INTERFACES_DIR ${CMAKE_SOURCE_DIR}/bsl/csl/interfaces) +set(INTERFACES_DIR ${CMAKE_SOURCE_DIR}/csl/interfaces) set(UTILS_DIR ${CMAKE_SOURCE_DIR}/utils/assert) #################################################################################################### @@ -30,10 +30,7 @@ set(UTILS_DIR ${CMAKE_SOURCE_DIR}/utils/assert) #################################################################################################### include(${PROJECT_DEFS}) add_subdirectory(utils) -add_subdirectory(bsl) - -#set(BSL_HEADER_FILE ${CMAKE_SOURCE_DIR}/bsl/raspberry/bsl_raspberry.hpp) -#set(BSL_HEADER_FILE ${CMAKE_SOURCE_DIR}/bsl/nucleo_f042k6/bsl_nucleo_f042k6.hpp) +add_subdirectory(csl) message("${BoldBlue}Project Info ${ColourReset}") message("${Blue} |--> Exec Name \t: ${EXECUTABLE} ${ColourReset}") diff --git a/ked/bsl/CMakeLists.txt b/ked/bsl/CMakeLists.txt deleted file mode 100644 index f3b7859..0000000 --- a/ked/bsl/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(csl) -add_subdirectory(${BSL_USED}) diff --git a/ked/bsl/csl/CMakeLists.txt b/ked/bsl/csl/CMakeLists.txt deleted file mode 100644 index 899b168..0000000 --- a/ked/bsl/csl/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(${CLS_USED}) diff --git a/ked/bsl/nucleo_f042k6/CMakeLists.txt b/ked/bsl/nucleo_f042k6/CMakeLists.txt deleted file mode 100644 index 3817473..0000000 --- a/ked/bsl/nucleo_f042k6/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ - -add_library(stmTranslator bsl_nucleo_f042k6.cpp) -target_compile_options(stmTranslator PRIVATE ${C_FLAGS}) -target_compile_definitions(stmTranslator PRIVATE ${C_DEFS}) -target_include_directories(stmTranslator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -add_library(sub::translator ALIAS stmTranslator) diff --git a/ked/bsl/nucleo_f042k6/Docs/dm00231744-stm32-nucleo-mb1180.pdf b/ked/bsl/nucleo_f042k6/Docs/dm00231744-stm32-nucleo-mb1180.pdf deleted file mode 100644 index 841338a..0000000 Binary files a/ked/bsl/nucleo_f042k6/Docs/dm00231744-stm32-nucleo-mb1180.pdf and /dev/null differ diff --git a/ked/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cpp b/ked/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cpp deleted file mode 100644 index 463489a..0000000 --- a/ked/bsl/nucleo_f042k6/bsl_nucleo_f042k6.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "bsl_nucleo_f042k6.hpp" - -Nucleo_f042k6::Nucleo_f042k6() -{ -} - -Nucleo_f042k6::~Nucleo_f042k6(){} - -void Nucleo_f042k6::init() -{ - -} - -void Nucleo_f042k6::running() -{ -} - diff --git a/ked/bsl/nucleo_f042k6/bsl_nucleo_f042k6.hpp b/ked/bsl/nucleo_f042k6/bsl_nucleo_f042k6.hpp deleted file mode 100644 index 8d2bf6e..0000000 --- a/ked/bsl/nucleo_f042k6/bsl_nucleo_f042k6.hpp +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef BSL_NUCLEO_F042K6_H -#define BSL_NUCLEO_F042K6_H - -// TODO: implement bsl as singleton! -// https://stackoverflow.com/questions/1008019/c-singleton-design-pattern - -class Nucleo_f042k6 -{ - public: - - Nucleo_f042k6(); - ~Nucleo_f042k6(); - - void init(); - void running(); - - - private : -}; - -#endif /* BSL_NUCLEO_F042K6_H */ diff --git a/ked/bsl/raspberry/CMakeLists.txt b/ked/bsl/raspberry/CMakeLists.txt deleted file mode 100644 index 4933970..0000000 --- a/ked/bsl/raspberry/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_library(rpiTranslator bsl_raspberry.cpp) - -target_compile_options(rpiTranslator PRIVATE ${C_FLAGS}) -target_compile_definitions(rpiTranslator PRIVATE ${C_DEFS}) -target_include_directories(rpiTranslator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) - -add_library(sub::translator ALIAS rpiTranslator) diff --git a/ked/bsl/raspberry/bsl_raspberry.cpp b/ked/bsl/raspberry/bsl_raspberry.cpp deleted file mode 100644 index 04f936a..0000000 --- a/ked/bsl/raspberry/bsl_raspberry.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "bsl_raspberry.hpp" -#include "../csl/interfaces/delay.hpp" -#include "../csl/interfaces/pin.hpp" - -int startBSL() -{ - int i = 0; - Pin pin; - Delay delay; - pin.init(); - pin.setMode(Pin::output); - - for(i=0; i < 5; i++) - { - std::cout << "Hello from raspberry" << std::endl; - pin.write(1); - delay.ms(500); - pin.write(0); - delay.ms(500); - } - return 1; -} - diff --git a/ked/bsl/raspberry/bsl_raspberry.hpp b/ked/bsl/raspberry/bsl_raspberry.hpp deleted file mode 100644 index 9527054..0000000 --- a/ked/bsl/raspberry/bsl_raspberry.hpp +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef BSL_RASPBERRY_HPP -#define BSL_RASPBERRY_HPP - -#include -#include - -int startBSL(); -#endif diff --git a/ked/csl/CMakeLists.txt b/ked/csl/CMakeLists.txt new file mode 100644 index 0000000..02e698b --- /dev/null +++ b/ked/csl/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(${CSL_USED}) diff --git a/ked/bsl/csl/interfaces/ascii.h b/ked/csl/interfaces/ascii.h similarity index 100% rename from ked/bsl/csl/interfaces/ascii.h rename to ked/csl/interfaces/ascii.h diff --git a/ked/bsl/csl/interfaces/delay.h b/ked/csl/interfaces/delay.h similarity index 100% rename from ked/bsl/csl/interfaces/delay.h rename to ked/csl/interfaces/delay.h diff --git a/ked/bsl/csl/interfaces/deviceSetup.h b/ked/csl/interfaces/deviceSetup.h similarity index 100% rename from ked/bsl/csl/interfaces/deviceSetup.h rename to ked/csl/interfaces/deviceSetup.h diff --git a/ked/bsl/csl/interfaces/i2c.hpp.bak b/ked/csl/interfaces/i2c.hpp.bak similarity index 100% rename from ked/bsl/csl/interfaces/i2c.hpp.bak rename to ked/csl/interfaces/i2c.hpp.bak diff --git a/ked/bsl/csl/interfaces/pin.h b/ked/csl/interfaces/pin.h similarity index 100% rename from ked/bsl/csl/interfaces/pin.h rename to ked/csl/interfaces/pin.h diff --git a/ked/bsl/csl/interfaces/spi.hpp.bak b/ked/csl/interfaces/spi.hpp.bak similarity index 100% rename from ked/bsl/csl/interfaces/spi.hpp.bak rename to ked/csl/interfaces/spi.hpp.bak diff --git a/ked/bsl/csl/interfaces/spich.hpp.bak b/ked/csl/interfaces/spich.hpp.bak similarity index 100% rename from ked/bsl/csl/interfaces/spich.hpp.bak rename to ked/csl/interfaces/spich.hpp.bak diff --git a/ked/bsl/csl/interfaces/timer.h b/ked/csl/interfaces/timer.h similarity index 100% rename from ked/bsl/csl/interfaces/timer.h rename to ked/csl/interfaces/timer.h diff --git a/ked/bsl/csl/interfaces/usart.h b/ked/csl/interfaces/usart.h similarity index 100% rename from ked/bsl/csl/interfaces/usart.h rename to ked/csl/interfaces/usart.h diff --git a/ked/bsl/csl/rpi/CMakeLists.txt b/ked/csl/rpi/CMakeLists.txt similarity index 100% rename from ked/bsl/csl/rpi/CMakeLists.txt rename to ked/csl/rpi/CMakeLists.txt diff --git a/ked/bsl/csl/rpi/Inc/systemCall.hpp b/ked/csl/rpi/Inc/systemCall.hpp similarity index 100% rename from ked/bsl/csl/rpi/Inc/systemCall.hpp rename to ked/csl/rpi/Inc/systemCall.hpp diff --git a/ked/bsl/csl/rpi/Src/CMakeLists.txt b/ked/csl/rpi/Src/CMakeLists.txt similarity index 100% rename from ked/bsl/csl/rpi/Src/CMakeLists.txt rename to ked/csl/rpi/Src/CMakeLists.txt diff --git a/ked/bsl/csl/rpi/Src/delay.cpp b/ked/csl/rpi/Src/delay.cpp similarity index 100% rename from ked/bsl/csl/rpi/Src/delay.cpp rename to ked/csl/rpi/Src/delay.cpp diff --git a/ked/bsl/csl/rpi/Src/gpio.cpp b/ked/csl/rpi/Src/gpio.cpp similarity index 100% rename from ked/bsl/csl/rpi/Src/gpio.cpp rename to ked/csl/rpi/Src/gpio.cpp diff --git a/ked/bsl/csl/rpi/Src/systemCall.cpp b/ked/csl/rpi/Src/systemCall.cpp similarity index 100% rename from ked/bsl/csl/rpi/Src/systemCall.cpp rename to ked/csl/rpi/Src/systemCall.cpp diff --git a/ked/bsl/raspberry/bslCompiler.cmake b/ked/csl/rpi/compiler.cmake similarity index 100% rename from ked/bsl/raspberry/bslCompiler.cmake rename to ked/csl/rpi/compiler.cmake diff --git a/ked/bsl/raspberry/bslConfig.cmake b/ked/csl/rpi/config.cmake similarity index 90% rename from ked/bsl/raspberry/bslConfig.cmake rename to ked/csl/rpi/config.cmake index e8a7c13..5668ad5 100644 --- a/ked/bsl/raspberry/bslConfig.cmake +++ b/ked/csl/rpi/config.cmake @@ -6,8 +6,7 @@ #PROJECT & LIBRARIES : defined by user and important that it comes after the VARIABLES otherwise the Set varibale will not be used. #################################################################################################### set(CMAKE_CXX_STANDARD 11) -set(BSL_INC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -set(CLS_USED ${CMAKE_SOURCE_DIR}/bsl/csl/rpi) +set(CSL_USED ${CMAKE_SOURCE_DIR}/csl/rpi) #################################################################################################### #VARIABLES : defined by user #################################################################################################### @@ -25,6 +24,6 @@ set (CPP_INCLUDES ${CMAKE_SOURCE_DIR}) set (CPP_FLAGS ${C_FLAGS}) set (CPP_DEFS ${C_DEFS}) -list(APPEND EXTRA_LIBS sub::translator) +#list(APPEND EXTRA_LIBS sub::translator) list(APPEND EXTRA_LIBS sub::delay) list(APPEND EXTRA_LIBS sub::gpio) diff --git a/ked/bsl/csl/stm32f042/.mxproject b/ked/csl/stm32f042/.mxproject similarity index 100% rename from ked/bsl/csl/stm32f042/.mxproject rename to ked/csl/stm32f042/.mxproject diff --git a/ked/bsl/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/stm32f042x6.h b/ked/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/stm32f042x6.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/stm32f042x6.h rename to ked/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/stm32f042x6.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/stm32f0xx.h b/ked/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/stm32f0xx.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/stm32f0xx.h rename to ked/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/stm32f0xx.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/system_stm32f0xx.h b/ked/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/system_stm32f0xx.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/system_stm32f0xx.h rename to ked/csl/stm32f042/CMSIS/Device/ST/STM32F0xx/Include/system_stm32f0xx.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/cmsis_armcc.h b/ked/csl/stm32f042/CMSIS/Include/cmsis_armcc.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/cmsis_armcc.h rename to ked/csl/stm32f042/CMSIS/Include/cmsis_armcc.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/cmsis_armclang.h b/ked/csl/stm32f042/CMSIS/Include/cmsis_armclang.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/cmsis_armclang.h rename to ked/csl/stm32f042/CMSIS/Include/cmsis_armclang.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/cmsis_compiler.h b/ked/csl/stm32f042/CMSIS/Include/cmsis_compiler.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/cmsis_compiler.h rename to ked/csl/stm32f042/CMSIS/Include/cmsis_compiler.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/cmsis_gcc.h b/ked/csl/stm32f042/CMSIS/Include/cmsis_gcc.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/cmsis_gcc.h rename to ked/csl/stm32f042/CMSIS/Include/cmsis_gcc.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/cmsis_iccarm.h b/ked/csl/stm32f042/CMSIS/Include/cmsis_iccarm.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/cmsis_iccarm.h rename to ked/csl/stm32f042/CMSIS/Include/cmsis_iccarm.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/cmsis_version.h b/ked/csl/stm32f042/CMSIS/Include/cmsis_version.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/cmsis_version.h rename to ked/csl/stm32f042/CMSIS/Include/cmsis_version.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/core_armv8mbl.h b/ked/csl/stm32f042/CMSIS/Include/core_armv8mbl.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/core_armv8mbl.h rename to ked/csl/stm32f042/CMSIS/Include/core_armv8mbl.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/core_armv8mml.h b/ked/csl/stm32f042/CMSIS/Include/core_armv8mml.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/core_armv8mml.h rename to ked/csl/stm32f042/CMSIS/Include/core_armv8mml.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/core_cm0.h b/ked/csl/stm32f042/CMSIS/Include/core_cm0.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/core_cm0.h rename to ked/csl/stm32f042/CMSIS/Include/core_cm0.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/core_cm0plus.h b/ked/csl/stm32f042/CMSIS/Include/core_cm0plus.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/core_cm0plus.h rename to ked/csl/stm32f042/CMSIS/Include/core_cm0plus.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/core_cm1.h b/ked/csl/stm32f042/CMSIS/Include/core_cm1.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/core_cm1.h rename to ked/csl/stm32f042/CMSIS/Include/core_cm1.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/core_cm23.h b/ked/csl/stm32f042/CMSIS/Include/core_cm23.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/core_cm23.h rename to ked/csl/stm32f042/CMSIS/Include/core_cm23.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/core_cm3.h b/ked/csl/stm32f042/CMSIS/Include/core_cm3.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/core_cm3.h rename to ked/csl/stm32f042/CMSIS/Include/core_cm3.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/core_cm33.h b/ked/csl/stm32f042/CMSIS/Include/core_cm33.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/core_cm33.h rename to ked/csl/stm32f042/CMSIS/Include/core_cm33.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/core_cm4.h b/ked/csl/stm32f042/CMSIS/Include/core_cm4.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/core_cm4.h rename to ked/csl/stm32f042/CMSIS/Include/core_cm4.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/core_cm7.h b/ked/csl/stm32f042/CMSIS/Include/core_cm7.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/core_cm7.h rename to ked/csl/stm32f042/CMSIS/Include/core_cm7.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/core_sc000.h b/ked/csl/stm32f042/CMSIS/Include/core_sc000.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/core_sc000.h rename to ked/csl/stm32f042/CMSIS/Include/core_sc000.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/core_sc300.h b/ked/csl/stm32f042/CMSIS/Include/core_sc300.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/core_sc300.h rename to ked/csl/stm32f042/CMSIS/Include/core_sc300.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/mpu_armv7.h b/ked/csl/stm32f042/CMSIS/Include/mpu_armv7.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/mpu_armv7.h rename to ked/csl/stm32f042/CMSIS/Include/mpu_armv7.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/mpu_armv8.h b/ked/csl/stm32f042/CMSIS/Include/mpu_armv8.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/mpu_armv8.h rename to ked/csl/stm32f042/CMSIS/Include/mpu_armv8.h diff --git a/ked/bsl/csl/stm32f042/CMSIS/Include/tz_context.h b/ked/csl/stm32f042/CMSIS/Include/tz_context.h similarity index 100% rename from ked/bsl/csl/stm32f042/CMSIS/Include/tz_context.h rename to ked/csl/stm32f042/CMSIS/Include/tz_context.h diff --git a/ked/bsl/csl/stm32f042/CMakeLists.txt b/ked/csl/stm32f042/CMakeLists.txt similarity index 100% rename from ked/bsl/csl/stm32f042/CMakeLists.txt rename to ked/csl/stm32f042/CMakeLists.txt diff --git a/ked/bsl/csl/stm32f042/Device/hardwareDescription.h b/ked/csl/stm32f042/Device/hardwareDescription.h similarity index 100% rename from ked/bsl/csl/stm32f042/Device/hardwareDescription.h rename to ked/csl/stm32f042/Device/hardwareDescription.h diff --git a/ked/bsl/csl/stm32f042/Device/stm32f042x6.h b/ked/csl/stm32f042/Device/stm32f042x6.h similarity index 100% rename from ked/bsl/csl/stm32f042/Device/stm32f042x6.h rename to ked/csl/stm32f042/Device/stm32f042x6.h diff --git a/ked/bsl/csl/stm32f042/Device/stm32f0xx.h b/ked/csl/stm32f042/Device/stm32f0xx.h similarity index 100% rename from ked/bsl/csl/stm32f042/Device/stm32f0xx.h rename to ked/csl/stm32f042/Device/stm32f0xx.h diff --git a/ked/bsl/csl/stm32f042/Device/system_stm32f0xx.h b/ked/csl/stm32f042/Device/system_stm32f0xx.h similarity index 100% rename from ked/bsl/csl/stm32f042/Device/system_stm32f0xx.h rename to ked/csl/stm32f042/Device/system_stm32f0xx.h diff --git a/ked/bsl/csl/stm32f042/Docs/NXP_UM11126.pdf b/ked/csl/stm32f042/Docs/NXP_UM11126.pdf similarity index 100% rename from ked/bsl/csl/stm32f042/Docs/NXP_UM11126.pdf rename to ked/csl/stm32f042/Docs/NXP_UM11126.pdf diff --git a/ked/bsl/csl/stm32f042/Docs/dm00031936-stm32f0x1stm32f0x2.pdf b/ked/csl/stm32f042/Docs/dm00031936-stm32f0x1stm32f0x2.pdf similarity index 100% rename from ked/bsl/csl/stm32f042/Docs/dm00031936-stm32f0x1stm32f0x2.pdf rename to ked/csl/stm32f042/Docs/dm00031936-stm32f0x1stm32f0x2.pdf diff --git a/ked/bsl/csl/stm32f042/Docs/stm32f042k6.pdf b/ked/csl/stm32f042/Docs/stm32f042k6.pdf similarity index 100% rename from ked/bsl/csl/stm32f042/Docs/stm32f042k6.pdf rename to ked/csl/stm32f042/Docs/stm32f042k6.pdf diff --git a/ked/bsl/csl/stm32f042/Src/CMakeLists.txt b/ked/csl/stm32f042/Src/CMakeLists.txt similarity index 100% rename from ked/bsl/csl/stm32f042/Src/CMakeLists.txt rename to ked/csl/stm32f042/Src/CMakeLists.txt diff --git a/ked/bsl/csl/stm32f042/Src/delay.c b/ked/csl/stm32f042/Src/delay.c similarity index 100% rename from ked/bsl/csl/stm32f042/Src/delay.c rename to ked/csl/stm32f042/Src/delay.c diff --git a/ked/bsl/csl/stm32f042/Src/deviceSetup.c b/ked/csl/stm32f042/Src/deviceSetup.c similarity index 100% rename from ked/bsl/csl/stm32f042/Src/deviceSetup.c rename to ked/csl/stm32f042/Src/deviceSetup.c diff --git a/ked/bsl/csl/stm32f042/Src/pin.c b/ked/csl/stm32f042/Src/pin.c similarity index 100% rename from ked/bsl/csl/stm32f042/Src/pin.c rename to ked/csl/stm32f042/Src/pin.c diff --git a/ked/bsl/csl/stm32f042/Src/timer.c b/ked/csl/stm32f042/Src/timer.c similarity index 100% rename from ked/bsl/csl/stm32f042/Src/timer.c rename to ked/csl/stm32f042/Src/timer.c diff --git a/ked/bsl/csl/stm32f042/Src/usart.c b/ked/csl/stm32f042/Src/usart.c similarity index 100% rename from ked/bsl/csl/stm32f042/Src/usart.c rename to ked/csl/stm32f042/Src/usart.c diff --git a/ked/bsl/nucleo_f042k6/bslCompiler.cmake b/ked/csl/stm32f042/compiler.cmake similarity index 100% rename from ked/bsl/nucleo_f042k6/bslCompiler.cmake rename to ked/csl/stm32f042/compiler.cmake diff --git a/ked/bsl/nucleo_f042k6/bslConfig.cmake b/ked/csl/stm32f042/config.cmake similarity index 82% rename from ked/bsl/nucleo_f042k6/bslConfig.cmake rename to ked/csl/stm32f042/config.cmake index e4c16b0..65a2c36 100644 --- a/ked/bsl/nucleo_f042k6/bslConfig.cmake +++ b/ked/csl/stm32f042/config.cmake @@ -4,9 +4,9 @@ set(CPU_MCU "-mcpu=cortex-m0") -set(IDIR_BIN "${CMAKE_SOURCE_DIR}/bsl/nucleo_f042k6/bin") -set(IDIR_LIB "${CMAKE_SOURCE_DIR}/bsl/nucleo_f042k6/lib") -set(IDIR_INC "${CMAKE_SOURCE_DIR}/bsl/nucleo_f042k6/inc") +#set(IDIR_BIN "${CMAKE_SOURCE_DIR}/bsl/nucleo_f042k6/bin") +#set(IDIR_LIB "${CMAKE_SOURCE_DIR}/bsl/nucleo_f042k6/lib") +#set(IDIR_INC "${CMAKE_SOURCE_DIR}/bsl/nucleo_f042k6/inc") #################################################################################################### #PROJECT & LIBRARIES : defined by user and important that it comes after the VARIABLES otherwise the Set varibale will not be used. @@ -16,17 +16,16 @@ set(CMAKE_SYSTEM_NAME Generic) set(CMAKE_SYSTEM_PROCESSOR arm) set(CMAKE_CROSSCOMPILING TRUE) -set(LINKER ${CMAKE_SOURCE_DIR}/bsl/csl/stm32f042/startup/STM32F042K6Tx_FLASH.ld) -set(BSL_INC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -set(CLS_USED ${CMAKE_SOURCE_DIR}/bsl/csl/stm32f042) +set(LINKER ${CMAKE_SOURCE_DIR}/csl/stm32f042/startup/STM32F042K6Tx_FLASH.ld) +set(CSL_USED ${CMAKE_SOURCE_DIR}/csl/stm32f042) #################################################################################################### #VARIABLES : defined by user #################################################################################################### set(CSL_INCLUDES ${UTILS_DIR} - ${CMAKE_SOURCE_DIR}/bsl/csl/stm32f042/CMSIS/Include - ${CMAKE_SOURCE_DIR}/bsl/csl/stm32f042/Device) + ${CMAKE_SOURCE_DIR}/csl/stm32f042/CMSIS/Include + ${CMAKE_SOURCE_DIR}/csl/stm32f042/Device) # For flags please check https://manned.org/arm-none-eabi-gcc/34fd6095 set(C_FLAGS @@ -72,7 +71,7 @@ set (MAIN_FLAGS ${C_FLAGS}) set (MAIN_DEFS ${C_DEFS}) list(APPEND EXTRA_LIBS sub::startup) -list(APPEND EXTRA_LIBS sub::translator) +#list(APPEND EXTRA_LIBS sub::translator) list(APPEND EXTRA_LIBS sub::delay) list(APPEND EXTRA_LIBS sub::pin) list(APPEND EXTRA_LIBS sub::usart) diff --git a/ked/bsl/csl/stm32f042/oldSTM/Drivers/CMakeLists.txt b/ked/csl/stm32f042/oldSTM/Drivers/CMakeLists.txt similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Drivers/CMakeLists.txt rename to ked/csl/stm32f042/oldSTM/Drivers/CMakeLists.txt diff --git a/ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_bus.h b/ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_bus.h similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_bus.h rename to ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_bus.h diff --git a/ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_cortex.h b/ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_cortex.h similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_cortex.h rename to ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_cortex.h diff --git a/ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_crs.h b/ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_crs.h similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_crs.h rename to ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_crs.h diff --git a/ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_dma.h b/ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_dma.h similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_dma.h rename to ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_dma.h diff --git a/ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_exti.h b/ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_exti.h similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_exti.h rename to ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_exti.h diff --git a/ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_gpio.h b/ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_gpio.h similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_gpio.h rename to ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_gpio.h diff --git a/ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_pwr.h b/ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_pwr.h similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_pwr.h rename to ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_pwr.h diff --git a/ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_rcc.h b/ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_rcc.h similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_rcc.h rename to ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_rcc.h diff --git a/ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_system.h b/ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_system.h similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_system.h rename to ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_system.h diff --git a/ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_utils.h b/ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_utils.h similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_utils.h rename to ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Inc/stm32f0xx_ll_utils.h diff --git a/ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_exti.c b/ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_exti.c similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_exti.c rename to ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_exti.c diff --git a/ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_gpio.c b/ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_gpio.c similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_gpio.c rename to ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_gpio.c diff --git a/ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_pwr.c b/ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_pwr.c similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_pwr.c rename to ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_pwr.c diff --git a/ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_rcc.c b/ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_rcc.c similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_rcc.c rename to ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_rcc.c diff --git a/ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_utils.c b/ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_utils.c similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_utils.c rename to ked/csl/stm32f042/oldSTM/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_ll_utils.c diff --git a/ked/bsl/csl/stm32f042/oldSTM/Inc/stm32_assert.h b/ked/csl/stm32f042/oldSTM/Inc/stm32_assert.h similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Inc/stm32_assert.h rename to ked/csl/stm32f042/oldSTM/Inc/stm32_assert.h diff --git a/ked/bsl/csl/stm32f042/oldSTM/Inc/stm32f0xx_csl.h b/ked/csl/stm32f042/oldSTM/Inc/stm32f0xx_csl.h similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Inc/stm32f0xx_csl.h rename to ked/csl/stm32f042/oldSTM/Inc/stm32f0xx_csl.h diff --git a/ked/bsl/csl/stm32f042/oldSTM/Inc/stm32f0xx_it.h b/ked/csl/stm32f042/oldSTM/Inc/stm32f0xx_it.h similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Inc/stm32f0xx_it.h rename to ked/csl/stm32f042/oldSTM/Inc/stm32f0xx_it.h diff --git a/ked/bsl/csl/stm32f042/oldSTM/Inc/stm_pin.hpp.bak b/ked/csl/stm32f042/oldSTM/Inc/stm_pin.hpp.bak similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/Inc/stm_pin.hpp.bak rename to ked/csl/stm32f042/oldSTM/Inc/stm_pin.hpp.bak diff --git a/ked/bsl/csl/stm32f042/oldSTM/stm32f0xx_csl.c b/ked/csl/stm32f042/oldSTM/stm32f0xx_csl.c similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/stm32f0xx_csl.c rename to ked/csl/stm32f042/oldSTM/stm32f0xx_csl.c diff --git a/ked/bsl/csl/stm32f042/oldSTM/stm32f0xx_it.c b/ked/csl/stm32f042/oldSTM/stm32f0xx_it.c similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/stm32f0xx_it.c rename to ked/csl/stm32f042/oldSTM/stm32f0xx_it.c diff --git a/ked/bsl/csl/stm32f042/oldSTM/system_stm32f0xx.c b/ked/csl/stm32f042/oldSTM/system_stm32f0xx.c similarity index 100% rename from ked/bsl/csl/stm32f042/oldSTM/system_stm32f0xx.c rename to ked/csl/stm32f042/oldSTM/system_stm32f0xx.c diff --git a/ked/bsl/csl/stm32f042/startup/CMakeLists.txt b/ked/csl/stm32f042/startup/CMakeLists.txt similarity index 100% rename from ked/bsl/csl/stm32f042/startup/CMakeLists.txt rename to ked/csl/stm32f042/startup/CMakeLists.txt diff --git a/ked/bsl/csl/stm32f042/startup/STM32F042K6Tx_FLASH.ld b/ked/csl/stm32f042/startup/STM32F042K6Tx_FLASH.ld similarity index 100% rename from ked/bsl/csl/stm32f042/startup/STM32F042K6Tx_FLASH.ld rename to ked/csl/stm32f042/startup/STM32F042K6Tx_FLASH.ld diff --git a/ked/bsl/csl/stm32f042/startup/startup_stm32f042x6.s b/ked/csl/stm32f042/startup/startup_stm32f042x6.s similarity index 100% rename from ked/bsl/csl/stm32f042/startup/startup_stm32f042x6.s rename to ked/csl/stm32f042/startup/startup_stm32f042x6.s diff --git a/ked/run.sh b/ked/run.sh index fff4083..cfe32d3 100755 --- a/ked/run.sh +++ b/ked/run.sh @@ -1,14 +1,14 @@ #!/bin/bash -BSL_TO_USE=$1 -BSL_LIST=$(ls -d -- ./bsl) +CSL_TO_USE=$1 +CSL_LIST=$(ls -d -- ./csl) FILE=build/ -if [ -z "$BSL_TO_USE" ];then - echo "Please enter a BSL" - cd bsl - echo Curretnly awailable BSL are : +if [ -z "$CSL_TO_USE" ];then + echo "Please enter a CSL" + cd csl + echo Curretnly awailable CSL are : for d in */ ; do #Cheking the directroy to print files if [ "$d" != "csl/" ];then #Exept csl/ @@ -20,22 +20,22 @@ else if [ -d "$FILE" ];then rm -r build - cmake -S . -B build/ -DBSL_USED=$BSL_TO_USE + cmake -S . -B build/ -DCSL_USED=$CSL_TO_USE else - cmake -S . -B build/ -DBSL_USED=$BSL_TO_USE + cmake -S . -B build/ -DCSL_USED=$CSL_TO_USE fi cd $FILE make -j4 - if [ "$BSL_TO_USE" == "raspberry" ];then + if [ "$CSL_TO_USE" == "raspberry" ];then echo -e "\e[36m" echo "+--------------------------------------+" - echo -e "\tExecuting $BSL_TO_USE" + echo -e "\tExecuting $CSL_TO_USE" echo "+--------------------------------------+" echo -e "\e[32m" - ./$BSL_TO_USE + ./$CSL_TO_USE echo -e "\e[36m" echo "+--------------------------------------+" @@ -44,14 +44,14 @@ else echo -e "\e[32m" fi - if [ "$BSL_TO_USE" == "nucleo_f042k6" ];then + if [ "$CSL_TO_USE" == "nucleo_f042k6" ];then echo -e "\e[36m" echo "+--------------------------------------+" - echo -e "\tFlashing $BSL_TO_USE" + echo -e "\tFlashing $CSL_TO_USE" echo "+--------------------------------------+" echo -e "\e[32m" - st-flash write $BSL_TO_USE.bin 0x08000000 + st-flash write $CSL_TO_USE.bin 0x08000000 echo -e "\e[36m" echo "+--------------------------------------+" diff --git a/main.h b/main.h index 83f7187..c123fc6 100644 --- a/main.h +++ b/main.h @@ -7,13 +7,6 @@ extern "C" { -#ifdef RASPBERRY - #include "bsl/raspberry/bsl_raspberry.hpp" -#endif - -#ifdef ARM_MCU -// #include "bsl/nucleo_f042k6/bsl_nucleo_f042k6.hpp" -#endif diff --git a/main.hpp b/main.hpp index 295390d..e475f12 100644 --- a/main.hpp +++ b/main.hpp @@ -1,14 +1,6 @@ #ifndef MAIN_H #define MAIN_H -#ifdef RASPBERRY - #include "bsl/raspberry/bsl_raspberry.hpp" -#endif - -#ifdef ARM_MCU - #include "bsl/nucleo_f042k6/bsl_nucleo_f042k6.hpp" -#endif - struct Delay {