File tree Expand file tree Collapse file tree 4 files changed +16
-9
lines changed Expand file tree Collapse file tree 4 files changed +16
-9
lines changed Original file line number Diff line number Diff line change 2
2
<project >
3
3
<configuration id =" cdt.managedbuild.config.gnu.cross.lib.release.388924090.1536021794.652448319.1742192579.1428311154.1531651903" name =" build_release_link" >
4
4
<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" />
7
5
<provider-reference id =" org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref =" shared-provider" />
8
6
<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 " ${INPUTS}" " prefer-non-shared =" true" >
9
7
<language-scope id =" org.eclipse.cdt.core.gcc" />
10
8
<language-scope id =" org.eclipse.cdt.core.g++" />
11
9
</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" />
12
11
</extension >
13
12
</configuration >
14
13
<configuration id =" cdt.managedbuild.config.gnu.cross.lib.release.388924090.1536021794.652448319.1742192579.1095616799.1131086887.1296985718.27667365.799598744" name =" build_release_armv7m" >
Original file line number Diff line number Diff line change @@ -45,6 +45,7 @@ class LpcIsp : public Isp {
45
45
int prog_shutdown ();
46
46
47
47
sys::Trace m_trace;
48
+
48
49
};
49
50
50
51
};
Original file line number Diff line number Diff line change 5
5
6
6
#include " ../hal/Uart.hpp"
7
7
#include " ../hal/Pin.hpp"
8
+
8
9
#include " ../sys/Trace.hpp"
9
10
10
11
#define LPC_ISP_UNLOCK_CODE " 23130"
@@ -104,7 +105,6 @@ class LpcPhy {
104
105
bool is_return_code_newline (){ return m_is_return_code_newline; }
105
106
void set_return_code_newline (bool enabled = true ){ m_is_return_code_newline = enabled; }
106
107
107
-
108
108
sys::Trace m_trace;
109
109
int flush ();
110
110
Original file line number Diff line number Diff line change 8
8
#ifndef TRACE_HPP_
9
9
#define TRACE_HPP_
10
10
11
- #ifndef __link
12
-
13
11
14
12
#include < mcu/types.h>
15
13
#include < iface/link.h>
14
+
15
+ #if !defined __link
16
16
#include < iface/stratify_link_transport_usb.h>
17
+ #endif
17
18
18
19
#include " ../var/String.hpp"
19
20
20
21
namespace sys {
21
22
23
+ #if defined __link
24
+ class Trace {
25
+ #else
22
26
class Trace : public var ::String {
27
+ #endif
23
28
public:
24
29
Trace (){}
25
30
31
+ #if !defined __link
26
32
Trace& operator =(const char * a){ var::String::operator =(a); return *this ; }
27
33
Trace& operator =(const var::String & a){ var::String::operator =(a); return *this ; }
28
-
29
- #if !defined __link
30
34
inline void message () MCU_ALWAYS_INLINE { stratify_trace_event (POSIX_TRACE_MESSAGE, c_str (), size ()); }
31
35
inline void warning () MCU_ALWAYS_INLINE { stratify_trace_event (POSIX_TRACE_WARNING, c_str (), size ()); }
32
36
inline void error () MCU_ALWAYS_INLINE { stratify_trace_event (POSIX_TRACE_ERROR, c_str (), size ()); }
33
37
inline void critical () MCU_ALWAYS_INLINE { stratify_trace_event (POSIX_TRACE_CRITICAL, c_str (), size ()); }
34
38
inline void fatal () MCU_ALWAYS_INLINE { stratify_trace_event (POSIX_TRACE_FATAL, c_str (), size ()); }
35
39
#else
40
+ Trace& operator =(const char * a){ return *this ; }
41
+ char * cdata (){ return m_cdata; }
42
+ void assign (const char * str){}
36
43
inline void message (){}
37
44
inline void warning (){}
38
45
inline void error (){}
39
46
inline void critical (){}
40
47
inline void fatal (){}
48
+ private:
49
+ char m_cdata[256 ];
41
50
#endif
42
51
43
52
};
44
53
45
54
};
46
55
47
- #endif
48
-
49
56
#endif /* TRACE_HPP_ */
You can’t perform that action at this time.
0 commit comments