Skip to content

Add simulator #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 15, 2019
Merged

Add simulator #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3783b6
Add achow101 pgp key
achow101 Jan 13, 2019
f9864d9
Add a simulator program
achow101 Jan 13, 2019
a3cb77e
Simulator must have the directory for sd card files be specified
achow101 Jan 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ cmake_minimum_required(VERSION 2.8.5)
if(BUILD_TYPE STREQUAL "firmware")
elseif(BUILD_TYPE STREQUAL "bootloader")
elseif(BUILD_TYPE STREQUAL "test")
elseif(BUILD_TYPE STREQUAL "simulator")
else()
message(FATAL_ERROR "Invalid build type: ${BUILD_TYPE}. Build with:
cmake .. -DBUILD_TYPE=type # 'type' can be 'test', 'firmware', or 'bootloader'
cmake .. -DBUILD_TYPE=type # 'type' can be 'test', 'firmware', 'bootloader', or 'simulator'
")
endif()

Expand All @@ -33,7 +34,7 @@ option(BUILD_DOCUMENTATION "Build the Doxygen documentation." OFF)
option(CMAKE_VERBOSE_MAKEFILE "Verbose build." OFF)


if(NOT BUILD_TYPE STREQUAL "test")
if(NOT BUILD_TYPE STREQUAL "test" AND NOT BUILD_TYPE STREQUAL "simulator")
set(ELF ${MYPROJECT}.elf)
set(CMAKE_TOOLCHAIN_FILE arm.cmake)
include(${CMAKE_TOOLCHAIN_FILE})
Expand Down Expand Up @@ -103,10 +104,14 @@ if(CONTINUOUS_INTEGRATION)
add_definitions(-DCONTINUOUS_INTEGRATION)
endif()

if(BUILD_TYPE STREQUAL "test")
if(BUILD_TYPE STREQUAL "test" OR BUILD_TYPE STREQUAL "simulator")
add_definitions(-DTESTING)
endif()

if(BUILD_TYPE STREQUAL "simulator")
add_definitions(-DSIMULATOR)
endif()

if(BUILD_TYPE STREQUAL "bootloader")
add_definitions(-DBOOTLOADER)
endif()
Expand Down Expand Up @@ -187,7 +192,7 @@ if(BUILD_TYPE STREQUAL "test")
endif()
endif()

if(NOT BUILD_TYPE STREQUAL "test")
if(NOT BUILD_TYPE STREQUAL "test" AND NOT BUILD_TYPE STREQUAL "simulator")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb -fdata-sections -fomit-frame-pointer -ffunction-sections -mlong-calls -mcpu=cortex-m4 -pipe -fno-strict-aliasing --param max-inline-insns-single=500 -D__SAM4S4A__ -DNDEBUG -DBOARD=USER_BOARD -DARM_MATH_CM4=true -DUDD_ENABLE -D_QTOUCH_ -Dscanf=iscanf -Dprintf=iprintf")
endif()

Expand Down Expand Up @@ -245,7 +250,7 @@ if(BUILD_TYPE STREQUAL "test")
endif()
enable_testing()

else()
elseif(NOT BUILD_TYPE STREQUAL "simulator")
add_custom_command(
OUTPUT ${MYPROJECT}.bin
COMMAND ${CMAKE_SIZE} ${ELF}
Expand Down
Loading