Compare commits
4 commits
691057a163
...
a88fae412e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a88fae412e | ||
|
|
91edc72f38 | ||
|
|
0ad78b2671 | ||
|
|
2c78ea4130 |
4 changed files with 21 additions and 22 deletions
|
|
@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20)
|
|||
|
||||
# Use the fancy version substitution
|
||||
project(main
|
||||
VERSION 0.1.1
|
||||
VERSION 0.1.2
|
||||
DESCRIPTION "template for cmake + cpputest"
|
||||
LANGUAGES C CXX
|
||||
)
|
||||
|
|
|
|||
8
otto.sh
8
otto.sh
|
|
@ -180,7 +180,7 @@ cross_compile () {
|
|||
|
||||
build_release() {
|
||||
clear_cmake_cache
|
||||
cmake -DCAM_HANDLER_LIB=ON -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE} ../
|
||||
cmake -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE} ../
|
||||
make
|
||||
}
|
||||
|
||||
|
|
@ -197,7 +197,7 @@ build_hex () {
|
|||
CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${AVR_TC}"
|
||||
|
||||
cmake ${CMAKE_ARGS} ../
|
||||
make all
|
||||
make main
|
||||
make hex
|
||||
}
|
||||
|
||||
|
|
@ -208,7 +208,7 @@ build_hex_optimized () {
|
|||
CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${AVR_TC}"
|
||||
|
||||
cmake ${CMAKE_ARGS} ../
|
||||
make all
|
||||
make main
|
||||
make hex-release
|
||||
}
|
||||
|
||||
|
|
@ -229,7 +229,7 @@ print_menu () {
|
|||
echo "0. Add Mock Module"
|
||||
echo "1. Run Tests"
|
||||
echo "2. Build Project(hex)"
|
||||
echo "3. Build for release(hex)"
|
||||
echo "3. User Option"
|
||||
echo "4. Flash to AVR"
|
||||
echo "5. Add new module to project"
|
||||
echo "6. Delete module from project"
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".elf")
|
|||
if(NOT TARGET size)
|
||||
# Set the size utility to display the size of the final binary
|
||||
add_custom_target(size ALL
|
||||
COMMAND ${CMAKE_SIZE} --format=avr --mcu=${AVR_MCU} ${CMAKE_PROJECT_NAME}.elf
|
||||
COMMAND ${CMAKE_SIZE} -G --target=elf32-avr ${CMAKE_PROJECT_NAME}.elf
|
||||
DEPENDS ${CMAKE_PROJECT_NAME}.elf
|
||||
)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -244,8 +244,7 @@ static void UpdateButtonOutput(btn_state *b) {
|
|||
else if (!b->is_long_pressed) {
|
||||
if (b->is_active) {
|
||||
MotorMoveTo(MotorGetSavedPos());
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
MotorCoast();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue