mirror of https://github.com/ARMmbed/mbed-os.git
				
				
				
			Move mbed-trace into platform
							parent
							
								
									9073a48667
								
							
						
					
					
						commit
						a88438ce04
					
				| 
						 | 
				
			
			@ -114,6 +114,7 @@ set(unittest-includes-base
 | 
			
		|||
  "${PROJECT_SOURCE_DIR}/../features"
 | 
			
		||||
  "${PROJECT_SOURCE_DIR}/../platform/include"
 | 
			
		||||
  "${PROJECT_SOURCE_DIR}/../platform/include/platform"
 | 
			
		||||
  "${PROJECT_SOURCE_DIR}/../platform/mbed-trace/include"
 | 
			
		||||
  "${PROJECT_SOURCE_DIR}/../storage/filesystem/littlefs/include"
 | 
			
		||||
  "${PROJECT_SOURCE_DIR}/../storage/filesystem/fat/include"
 | 
			
		||||
  "${PROJECT_SOURCE_DIR}/../storage/blockdevice/include"
 | 
			
		||||
| 
						 | 
				
			
			@ -132,7 +133,6 @@ set(unittest-includes-base
 | 
			
		|||
  "${PROJECT_SOURCE_DIR}/../events/source"
 | 
			
		||||
  "${PROJECT_SOURCE_DIR}/../rtos/include"
 | 
			
		||||
  "${PROJECT_SOURCE_DIR}/../features/frameworks"
 | 
			
		||||
  "${PROJECT_SOURCE_DIR}/../features/frameworks/mbed-trace"
 | 
			
		||||
  "${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice"
 | 
			
		||||
  "${PROJECT_SOURCE_DIR}/../connectivity/libraries/nanostack-libservice/mbed-client-libservice"
 | 
			
		||||
  "${PROJECT_SOURCE_DIR}/../connectivity/netsocket/include"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,7 +8,7 @@ set(unittest-includes ${unittest-includes}
 | 
			
		|||
  ..
 | 
			
		||||
  ../connectivity/mbedtls/include/mbedtls/
 | 
			
		||||
  ../connectivity/mbedtls/platform/inc/
 | 
			
		||||
  ../features/frameworks/mbed-trace/mbed-trace/
 | 
			
		||||
  ../platform/mbed-trace/mbed-trace/
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
set(unittest-test-sources
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -13,7 +13,7 @@ The STMOD+ Connector specification can be found [here](https://www.st.com/conten
 | 
			
		|||
 | 
			
		||||
## Debug print
 | 
			
		||||
 | 
			
		||||
mbed_trace feature is used: https://github.com/ARMmbed/mbed-os/blob/master/features/frameworks/mbed-trace/README.md
 | 
			
		||||
mbed_trace feature is used: https://github.com/ARMmbed/mbed-os/blob/master/platform/mbed-trace/README.md
 | 
			
		||||
 | 
			
		||||
Enable it in your mbed_app.json file:
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -26,7 +26,7 @@
 | 
			
		|||
 | 
			
		||||
#if (DEVICE_SPI || DEVICE_QSPI)
 | 
			
		||||
 | 
			
		||||
#include "features/frameworks/mbed-trace/mbed-trace/mbed_trace.h"
 | 
			
		||||
#include "platform/mbed-trace/mbed-trace/mbed_trace.h"
 | 
			
		||||
#define TRACE_GROUP "SFDP"
 | 
			
		||||
 | 
			
		||||
namespace {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,4 +15,3 @@ set (MBED_TRACE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/source/mbed_trace.c)
 | 
			
		|||
 | 
			
		||||
 | 
			
		||||
CREATE_LIBRARY(mbedTrace "${MBED_TRACE_SRC}" "")
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -82,7 +82,7 @@ def morpheusBuildStep(target, compilerLabel, toolchain) {
 | 
			
		|||
            execute("mbed --version")
 | 
			
		||||
            execute("echo https://github.com/armmbed/mbed-os/#6a0a86538c0b9b2bfcc4583b1e2b7fea8f4e71e9 > mbed-os.lib")
 | 
			
		||||
            execute("mbed deploy")
 | 
			
		||||
            execute("rm -rf ./mbed-os/features/frameworks/mbed-trace")
 | 
			
		||||
            execute("rm -rf ./mbed-os/platform/mbed-trace")
 | 
			
		||||
            execute("mbed compile -m ${target} -t ${toolchain} --library")
 | 
			
		||||
            setBuildStatus('SUCCESS', "build ${buildName}", "build done")
 | 
			
		||||
          } catch (err) {
 | 
			
		||||
| 
						 | 
				
			
			@ -102,7 +102,7 @@ def morpheusBuildStep(target, compilerLabel, toolchain) {
 | 
			
		|||
              execute("echo \"https://github.com/ARMmbed/mbed-trace#${env.GIT_COMMIT_HASH}\" > mbed-trace.lib")
 | 
			
		||||
              execute("mbed new .")
 | 
			
		||||
              execute("mbed deploy")
 | 
			
		||||
              execute("rm -rf ./mbed-os/features/frameworks/mbed-trace")
 | 
			
		||||
              execute("rm -rf ./mbed-os/platform/mbed-trace")
 | 
			
		||||
              execute("rm -rf ./mbed-trace/example")
 | 
			
		||||
              execute("rm -rf ./mbed-trace/test")
 | 
			
		||||
              execute("mbed compile -t ${toolchain} -m ${target}")
 | 
			
		||||
| 
						 | 
				
			
			@ -26,7 +26,7 @@
 | 
			
		|||
#include <stdio.h>
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
 | 
			
		||||
#include "mbed_trace.h"
 | 
			
		||||
#include "mbed-trace/mbed_trace.h"
 | 
			
		||||
#define TRACE_GROUP "FSST"
 | 
			
		||||
 | 
			
		||||
#define FSST_REVISION 1
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,7 +5,7 @@
 | 
			
		|||
set(unittest-includes ${unittest-includes}
 | 
			
		||||
  .
 | 
			
		||||
  ..
 | 
			
		||||
  ../features/frameworks/mbed-trace/mbed-trace
 | 
			
		||||
  ../platform/mbed-trace/mbed-trace
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
set(unittest-sources
 | 
			
		||||
| 
						 | 
				
			
			@ -15,7 +15,7 @@ set(unittest-sources
 | 
			
		|||
  ../storage/filesystem/source/Dir.cpp
 | 
			
		||||
  ../storage/filesystem/source/File.cpp
 | 
			
		||||
  ../storage/filesystem/source/FileSystem.cpp
 | 
			
		||||
  ../features/frameworks/mbed-trace/source/mbed_trace.c
 | 
			
		||||
  ../platform/mbed-trace/source/mbed_trace.c
 | 
			
		||||
  ../storage/filesystem/littlefs/littlefs/lfs_util.c
 | 
			
		||||
  ../storage/filesystem/littlefs/littlefs/lfs.c
 | 
			
		||||
  ../platform/source/FileBase.cpp
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6,7 +6,7 @@
 | 
			
		|||
set(unittest-includes ${unittest-includes}
 | 
			
		||||
  .
 | 
			
		||||
  ..
 | 
			
		||||
  ../features/frameworks/mbed-trace/mbed-trace
 | 
			
		||||
  ../platform/mbed-trace/mbed-trace
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
set(unittest-sources
 | 
			
		||||
| 
						 | 
				
			
			@ -14,7 +14,7 @@ set(unittest-sources
 | 
			
		|||
  ../storage/blockdevice/source/HeapBlockDevice.cpp
 | 
			
		||||
  ../storage/blockdevice/source/BufferedBlockDevice.cpp
 | 
			
		||||
  ../storage/kvstore/source/TDBStore.cpp
 | 
			
		||||
  ../features/frameworks/mbed-trace/source/mbed_trace.c
 | 
			
		||||
  ../platform/mbed-trace/source/mbed_trace.c
 | 
			
		||||
  stubs/mbed_atomic_stub.c
 | 
			
		||||
  stubs/mbed_assert_stub.cpp
 | 
			
		||||
  stubs/mbed_error.c
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue