REFACTOR

.gitignore

@@ -1,7 +1,7 @@
 build/
 docs/
 
-tests/testing_tmp/
+test/testing_tmp/
-tests/testing_bak/
+test/testing_bak/
 
 include/migrations/*.sql.h

CMakeLists.txt

@@ -1,26 +1,25 @@
 cmake_minimum_required (VERSION 3.7)
 project(core)
 
-add_executable(core main.c)
+add_executable(core src/main.c)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wpedantic -Werror -Wall -Wextra -luuid -lsqlite3 -ffile-prefix-map=${CMAKE_SOURCE_DIR}/=/")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wpedantic -Werror -Wall -Wextra -luuid -lsqlite3 -ffile-prefix-map=${CMAKE_SOURCE_DIR}/src/=")
 
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -fprofile-arcs -ftest-coverage")
 
 add_definitions("-DMG_ENABLE_EXTRA_ERRORS_DESC")
 
-aux_source_directory(vendor VENDOR_SRC) # vendor first to put their warnings on top
+aux_source_directory(src/ SRC_DIR)
-aux_source_directory(. SRC_DIR)
+aux_source_directory(src/models MODELS_SRC)
-aux_source_directory(models MODELS_SRC)
+aux_source_directory(src/helpers HELPERS_SRC)
-aux_source_directory(helpers HELPERS_SRC)
+aux_source_directory(src/handlers HANDLERS_SRC)
-aux_source_directory(handlers HANDLERS_SRC)
+aux_source_directory(src/endpoints ENDPOINTS_SRC)
-aux_source_directory(endpoints ENDPOINTS_SRC)
 
 configure_file("core.ini" "core.ini" COPYONLY)
 
 add_dependencies(core migrations)
 
-target_sources(core PRIVATE ${VENDOR_SRC} ${SRC_DIR} ${HANDLERS_SRC} ${HELPERS_SRC} ${MODELS_SRC} ${ENDPOINTS_SRC})
+target_sources(core PRIVATE ${SRC_DIR} ${HANDLERS_SRC} ${HELPERS_SRC} ${MODELS_SRC} ${ENDPOINTS_SRC})
 target_include_directories(core PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_include_directories(core PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/vendor)
 
@@ -53,7 +52,7 @@ add_custom_target(docs
 add_custom_target(test
     COMMAND ./run_tests.sh ${CMAKE_BINARY_DIR}/core "dev"
     DEPENDS core
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test
 )
 add_custom_target(coverage
     COMMAND gcovr -s --root ${CMAKE_SOURCE_DIR} -e ${CMAKE_SOURCE_DIR}/vendor --html-details ${CMAKE_BINARY_DIR}/coverage.html --html-title "Emgauwa Core Coverage" ${CMAKE_BINARY_DIR}/CMakeFiles/core.dir

enums.h

@@ -1,15 +0,0 @@
-#ifndef CORE_ENUM_H
-#define CORE_ENUM_H
-
-enum control_mapping
-{
-    COMMAND_MAPPING_CODE = 0,
-    COMMAND_MAPPING_NAME = 1,
-    COMMAND_MAPPING_RELAY_NUM = 2,
-    COMMAND_MAPPING_SCHEDULES_ARRAY = 3,
-    COMMAND_MAPPING_SCHEDULE_ID = 4,
-    COMMAND_MAPPING_PERIODS_COUNT = 5,
-    COMMAND_MAPPING_PERIODS_BLOB = 6,
-};
-
-#endif /* CORE_ENUM_H */

toolchain-rpi.cmake

@@ -1,18 +0,0 @@
-set(CMAKE_C_COMPILER /usr/bin/arm-none-eabi-gcc)
-set(CMAKE_C_COMPILER_WORKS 1)
-
-set(ARM-SYSROOT /usr/arm-none-eabi)
-
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -marm")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=vfp")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv6zk+fp")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=arm1176jzf-s")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mtune=arm1176jzf-s")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --sysroot=${ARM-SYSROOT}" CACHE INTERNAL "" FORCE)
-
-set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} --sysroot=${ARM-SYSROOT}" CACHE INTERNAL "" FORCE)
-
-set(CMAKE_FIND_ROOT_PATH ${ARM-SYSROOT})
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)