Revision 124:fdbe15825dde, committed 2016-09-08

Comitter:

IanBenzMaxim

Date:

Thu Sep 08 16:25:59 2016 -0500

Parent:

123:4de2506bf162

Child:

125:8310407baa13

Commit message:

Removed development files.

Changed in this revision

--- a/CMakeLists.txt	Thu Sep 08 21:19:01 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-# /CMakeLists.txt
-cmake_minimum_required(VERSION 3.4)
-project(OneWire)
-enable_language(ASM)
-
-# Add mbed dependency.
-# Must set variable: mbed_SOURCE_DIR
-set(mbed_DIR .)
-find_package(mbed CONFIG REQUIRED)
-
-# Build the library.
-add_definitions(${mbed_DEFINITIONS})
-include_directories(${mbed_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR})
-set(SUBDIRECTORIES Masters RomId Slaves Utilities)
-foreach (SUBDIRECTORY ${SUBDIRECTORIES})
-    add_subdirectory(${SUBDIRECTORY})
-    set(SUBDIRECTORY_OBJECTS ${SUBDIRECTORY_OBJECTS} "${${SUBDIRECTORY}_OBJECTS}")
-endforeach (SUBDIRECTORY)
-add_library(${PROJECT_NAME} ${SUBDIRECTORY_OBJECTS})
-
-# Create package config file.
-set(PACKAGE_CONFIG_FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake")
-file(WRITE ${PACKAGE_CONFIG_FILE} "# Sets the following variable for the ${PROJECT_NAME} environment: ${PROJECT_NAME}_INCLUDE_DIRS, ${PROJECT_NAME}_LIBRARIES\n")
-file(APPEND ${PACKAGE_CONFIG_FILE} "# Also sets variables for the mbed environment\n\n")
-file(APPEND ${PACKAGE_CONFIG_FILE} "set(${PROJECT_NAME}_INCLUDE_DIRS ${PROJECT_SOURCE_DIR})\n")
-file(APPEND ${PACKAGE_CONFIG_FILE} "set(${PROJECT_NAME}_LIBRARIES ${PROJECT_BINARY_DIR}/lib${PROJECT_NAME}.a)\n")
-# Also include mbed configuration for ease of use.
-file(APPEND ${PACKAGE_CONFIG_FILE} "set(mbed_DEFINITIONS ${mbed_DEFINITIONS})\n")
-file(APPEND ${PACKAGE_CONFIG_FILE} "set(mbed_INCLUDE_DIRS ${mbed_INCLUDE_DIRS})\n")
-file(APPEND ${PACKAGE_CONFIG_FILE} "set(mbed_LIBRARIES ${mbed_LIBRARIES})\n")
-file(APPEND ${PACKAGE_CONFIG_FILE} "set(mbed_OBJECTS ${mbed_OBJECTS})\n")
-file(APPEND ${PACKAGE_CONFIG_FILE} "set(mbed_LINKER_FLAGS ${mbed_LINKER_FLAGS})\n")

--- a/Slaves/CMakeLists.txt	Thu Sep 08 21:19:01 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-# /Slaves/CMakeLists.txt
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-set(SUBDIRECTORIES Authenticators Bridges Memory Sensors Switches)
-foreach (SUBDIRECTORY ${SUBDIRECTORIES})
-    add_subdirectory(${SUBDIRECTORY})
-    set(SUBDIRECTORY_OBJECTS ${SUBDIRECTORY_OBJECTS} "${${SUBDIRECTORY}_OBJECTS}")
-endforeach (SUBDIRECTORY)
-set(Slaves_OBJECTS ${SUBDIRECTORY_OBJECTS} PARENT_SCOPE)

--- a/Slaves/Sensors/CMakeLists.txt	Thu Sep 08 21:19:01 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-# /Slaves/Sensors/CMakeLists.txt
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} "DS1920" "DS18B20")
-add_library(Sensors OBJECT "DS1920/DS1920.cpp" "DS18B20/DS18B20.cpp")
-set(Sensors_OBJECTS $<TARGET_OBJECTS:Sensors> PARENT_SCOPE)
\ No newline at end of file

--- a/mbedConfig.cmake	Thu Sep 08 21:19:01 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-# Sets the following variable for the mbed environment:
-# mbed_DEFINITIONS
-# mbed_INCLUDE_DIRS
-# mbed_LIBRARIES
-# mbed_OBJECTS
-# mbed_LINKER_FLAGS
-
-set(mbed_SOURCE_DIR ${mbed_SOURCE_DIR} CACHE PATH "mbed Source Directory")
-set(mbed_TARGET "TARGET_MAX32600MBED" CACHE STRING "mbed Target")
-set(mbed_VENDOR "TARGET_Maxim" CACHE STRING "mbed Vendor")
-set(mbed_PROC "TARGET_MAX32600" CACHE STRING "mbed Processor")
-set(mbed_BOARD "TARGET_MAX32600MBED" CACHE STRING "mbed Board")
-set(mbed_PROC_CORE "TARGET_M3" CACHE STRING "mbed Processor Core")
-set(mbed_PROC_CORE_FAMILY "TARGET_CORTEX_M" CACHE STRING "mbed Processor Core Family")
-
-set(mbed_TARGET_SOURCE_DIR "${mbed_SOURCE_DIR}/${mbed_TARGET}")
-set(mbed_PROC_SOURCE_DIR "${mbed_TARGET_SOURCE_DIR}/${mbed_VENDOR}/${mbed_PROC}")
-set(mbed_BOARD_SOURCE_DIR "${mbed_PROC_SOURCE_DIR}/${mbed_BOARD}")
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "IAR")
-	set(mbed_TOOLCHAIN "TOOLCHAIN_IAR")
-	set(mbed_TARGET_BIN_DIR "${mbed_TARGET_SOURCE_DIR}/${mbed_TOOLCHAIN}")
-	set	(mbed_LIBRARIES "${mbed_TARGET_BIN_DIR}/mbed.a")
-	set	(
-			mbed_OBJECTS
-			"${mbed_TARGET_BIN_DIR}/cmain.o"
-			"${mbed_TARGET_BIN_DIR}/cmsis_nvic.o"
-			"${mbed_TARGET_BIN_DIR}/mbed_board.o"
-			"${mbed_TARGET_BIN_DIR}/retarget.o"
-			"${mbed_TARGET_BIN_DIR}/startup_MAX32600.o"
-			"${mbed_TARGET_BIN_DIR}/system_max32600.o"
-		)
-	set(mbed_LINKER_CONFIG "${mbed_TARGET_BIN_DIR}/MAX32600.icf")
-	set(mbed_LINKER_FLAGS "--config \"${mbed_LINKER_CONFIG}\" --skip_dynamic_initialization")
-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-	set(mbed_TOOLCHAIN "TOOLCHAIN_GCC_ARM")
-	set(mbed_TARGET_BIN_DIR "${mbed_TARGET_SOURCE_DIR}/${mbed_TOOLCHAIN}")
-	set	(mbed_LIBRARIES "${mbed_TARGET_BIN_DIR}/libmbed.a")
-	set	(
-			mbed_OBJECTS
-			"${mbed_TARGET_BIN_DIR}/cmsis_nvic.o"
-			"${mbed_TARGET_BIN_DIR}/mbed_board.o"
-			"${mbed_TARGET_BIN_DIR}/retarget.o"
-			"${mbed_TARGET_BIN_DIR}/startup_max32600.o"
-			"${mbed_TARGET_BIN_DIR}/system_max32600.o"
-		)
-	set(mbed_LINKER_CONFIG "${mbed_TARGET_BIN_DIR}/max32600.ld")
-	set(mbed_LINKER_FLAGS "-T \"${mbed_LINKER_CONFIG}\" -Wl,--gc-sections --specs=nano.specs -Wl,--wrap,main")
-else ()
-	set(mbed_TOOLCHAIN "TOOLCHAIN_ARM_STD")
-	# TODO
-endif ()
-set(mbed_INCLUDE_DIRS ${mbed_SOURCE_DIR} ${mbed_TARGET_SOURCE_DIR} ${mbed_PROC_SOURCE_DIR} ${mbed_BOARD_SOURCE_DIR})
-set(mbed_DEFINITIONS -D${mbed_TARGET} -D${mbed_VENDOR} -D${mbed_PROC} -D${mbed_BOARD} -D${mbed_PROC_CORE} -D${mbed_PROC_CORE_FAMILY} -D${mbed_TOOLCHAIN} -D__SYSTEM_HFX=24000000)
\ No newline at end of file