Commit cb3f4e98 authored by Oldřich Pecák's avatar Oldřich Pecák
Browse files

move files around a bit

parent 0f7fad1d

CMakeLists.txt

+4 −5
Original line number Diff line number Diff line
@@ -87,9 +87,8 @@ include_directories(${ProjDirPath}/source/tiny_printf) 
include_directories(${ProjDirPath}/source/MLX90393)

include_directories(${ProjDirPath}/source/protobuf)

include_directories(${ProjDirPath}/source/protocols)

include_directories(${ProjDirPath}/source/serial)

include_directories(${ProjDirPath}/source/common)

include_directories(${ProjDirPath}/source/motion)

include_directories(${ProjDirPath}/source/core/serial)

include_directories(${ProjDirPath}/source/core)



add_executable(Cube_FW.elf 

"${ProjDirPath}/sdk/board/board.c"
@@ -119,8 +118,8 @@ add_executable(Cube_FW.elf 
"${ProjDirPath}/source/protobuf/pb_encode.c"

"${ProjDirPath}/source/protobuf/pb_decode.c"

"${ProjDirPath}/source/protocols/protocols.pb.c"

"${ProjDirPath}/source/serial/serial_decoder.cpp"

"${ProjDirPath}/source/motion/planner.cpp"

"${ProjDirPath}/source/core/serial/serial_decoder.cpp"

"${ProjDirPath}/source/core/planner.cpp"

)



set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -T${ProjDirPath}/sdk/MK64FN1M0xxx12_flash.ld -static")

README.md

+1 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ Before first build, you need to edit few paths in the scripts. In `armgcc.cmake` 


Launch `build_all.sh`, `build_debug.sh` or `build_release.sh`. 



`build_proto.sh` re-generates the Protocol Buffers `.h` and `.c` files. You can launch it separately to update them during code changes, it also is run everytime you run any of the other build scripts.

`build_proto.sh` re-generates the Protocol Buffers `.h` and `.c` files. Unless you are building with `build_all.sh`, you need to launch it separately after you editing protocols.



## Making changes to MCU configuration
@@ -37,7 +37,6 @@ To make changes in MCU configuration(pins, peripherals, clocks), please use [MCU 
 - add second UART output(UART3, PTB10, PTB11) for debug

 - MLX90393 - fix temperature compensation

 - TMC429-LI - write driver

 - Write motion planner

 - Write reactor code

 - properly fix the CmakeLists.txt, not just visual fixes

 - Add all missing sdk components, drivers, for possible future use
 
 No newline at end of file

build_debug.sh

+0 −1
Original line number Diff line number Diff line 
#!/bin/sh

./build_proto.sh

cmake -DCMAKE_TOOLCHAIN_FILE="armgcc.cmake" -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=debug  .

make -j4

build_release.sh

+0 −1
Original line number Diff line number Diff line 
#!/bin/sh

./build_proto.sh

cmake -DCMAKE_TOOLCHAIN_FILE="armgcc.cmake" -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=release  .

make -j4

source/TMC429/TMC429.hpp

+3 −7
Original line number Diff line number Diff line
@@ -2,13 +2,9 @@ 


#include <stdint.h>



namespace TMC429_Driver {

#include "cube_common.hpp"



struct Steps_t {

    int32_t a;

    int32_t b;

    int32_t z;

};

namespace TMC429_Driver {



enum class Errors {

    FUCKY,
@@ -18,7 +14,7 @@ enum class Errors { 
class TMC429 {



public:

    Errors doSteps(Steps_t& steps);

    Errors doSteps(Cube_Common::Steps_t& steps);

};



} // TMC429_Driver
 
 No newline at end of file