Skip to content

Commit 6afbdb3

Browse files
committed
Trace on Link
1 parent a6b5a3e commit 6afbdb3

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

.settings/language.settings.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
<project>
33
<configuration id="cdt.managedbuild.config.gnu.cross.lib.release.388924090.1536021794.652448319.1742192579.1428311154.1531651903" name="build_release_link">
44
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
5-
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
6-
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
75
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
86
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-83408358531918538" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
97
<language-scope id="org.eclipse.cdt.core.gcc"/>
108
<language-scope id="org.eclipse.cdt.core.g++"/>
119
</provider>
10+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="(g?cc)|([gc]\+\+)|(clang)" prefer-non-shared="true" resource-scope="per-project"/>
1211
</extension>
1312
</configuration>
1413
<configuration id="cdt.managedbuild.config.gnu.cross.lib.release.388924090.1536021794.652448319.1742192579.1095616799.1131086887.1296985718.27667365.799598744" name="build_release_armv7m">

include/isp/LpcIsp.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class LpcIsp : public Isp {
4545
int prog_shutdown();
4646

4747
sys::Trace m_trace;
48+
4849
};
4950

5051
};

include/isp/LpcPhy.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include "../hal/Uart.hpp"
77
#include "../hal/Pin.hpp"
8+
89
#include "../sys/Trace.hpp"
910

1011
#define LPC_ISP_UNLOCK_CODE "23130"
@@ -104,7 +105,6 @@ class LpcPhy {
104105
bool is_return_code_newline(){ return m_is_return_code_newline; }
105106
void set_return_code_newline(bool enabled = true){ m_is_return_code_newline = enabled; }
106107

107-
108108
sys::Trace m_trace;
109109
int flush();
110110

include/sys/Trace.hpp

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,49 @@
88
#ifndef TRACE_HPP_
99
#define TRACE_HPP_
1010

11-
#ifndef __link
12-
1311

1412
#include <mcu/types.h>
1513
#include <iface/link.h>
14+
15+
#if !defined __link
1616
#include <iface/stratify_link_transport_usb.h>
17+
#endif
1718

1819
#include "../var/String.hpp"
1920

2021
namespace sys {
2122

23+
#if defined __link
24+
class Trace {
25+
#else
2226
class Trace : public var::String {
27+
#endif
2328
public:
2429
Trace(){}
2530

31+
#if !defined __link
2632
Trace& operator=(const char * a){ var::String::operator=(a); return *this; }
2733
Trace& operator=(const var::String & a){ var::String::operator=(a); return *this; }
28-
29-
#if !defined __link
3034
inline void message() MCU_ALWAYS_INLINE { stratify_trace_event(POSIX_TRACE_MESSAGE, c_str(), size()); }
3135
inline void warning() MCU_ALWAYS_INLINE { stratify_trace_event(POSIX_TRACE_WARNING, c_str(), size()); }
3236
inline void error() MCU_ALWAYS_INLINE { stratify_trace_event(POSIX_TRACE_ERROR, c_str(), size()); }
3337
inline void critical() MCU_ALWAYS_INLINE { stratify_trace_event(POSIX_TRACE_CRITICAL, c_str(), size()); }
3438
inline void fatal() MCU_ALWAYS_INLINE { stratify_trace_event(POSIX_TRACE_FATAL, c_str(), size()); }
3539
#else
40+
Trace& operator=(const char * a){ return *this; }
41+
char * cdata(){ return m_cdata; }
42+
void assign(const char * str){}
3643
inline void message(){}
3744
inline void warning(){}
3845
inline void error(){}
3946
inline void critical(){}
4047
inline void fatal(){}
48+
private:
49+
char m_cdata[256];
4150
#endif
4251

4352
};
4453

4554
};
4655

47-
#endif
48-
4956
#endif /* TRACE_HPP_ */

0 commit comments

Comments
 (0)