Skip to content

Commit cb48e85

Browse files
rokathrokath
committed
Issue #519 fix
1 parent 6639175 commit cb48e85

File tree

104 files changed

+15709
-2410
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+15709
-2410
lines changed

β€Ž_test/_ERROR_dblB_di_cobs_rtt32__de_xtea_cobs_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
// trice l -p jlink -args "-Device STM32F030R8 -if SWD -Speed 4000 -RTTChannel 0" -showID "deb:%04x" -hs off -pf cobs -d16=true
1515
#define TRICE_DIRECT_OUTPUT 1

β€Ž_test/_ERROR_ringB_di_cobs_rtt32__de_xtea_cobs_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_RING_BUFFER
1515

β€Ž_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_cobs_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_RING_BUFFER
1515

β€Ž_test/_ERROR_ringB_di_xtea_cobs_rtt32__de_tcobs_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_RING_BUFFER
1515

β€Ž_test/_ringB_de_multi_cobs_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_RING_BUFFER
1515
#define TRICE_DEFERRED_TRANSFER_MODE TRICE_MULTI_PACK_MODE

β€Ž_test/_ringB_protect_de_tcobs_ua/TargetActivity.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
// Needed safety space is TRICE_DATA_OFFSET + (2*TRICE_SINGLE_MAX_SIZE)-4) = 208
55
// TRICE_DEFERRED_BUFFER_SIZE == 324
66
char* TargetActivity(void) { // -4 bytes TRICE_DATA_OFFSET = 320 bytes space
7-
TRice("Hello "); // -8 bytes = 312 bytes space
8-
TRice("World!\n"); // -8 bytes = 304 bytes space
9-
TRice64("msg:Twelve 64-bit values: %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\n", -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12); // -104 bytes = 200 bytes space
7+
TRice(iD(15214), "Hello "); // -8 bytes = 312 bytes space
8+
TRice(iD(15215), "World!\n"); // -8 bytes = 304 bytes space
9+
TRice64(iD(15216), "msg:Twelve 64-bit values: %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\n", -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12); // -104 bytes = 200 bytes space
1010
// so the next Trice does not fit
11-
trice("Hello again\n"); // -4 bytes -> no fit!
11+
trice(iD(15217), "Hello again\n"); // -4 bytes -> no fit!
1212
return "feed3322 Hello World!\nfeed3322 Twelve 64-bit values: -1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11,-12";
1313
}

β€Ž_test/_ringB_protect_de_tcobs_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_RING_BUFFER
1515

β€Ž_test/_special_dblB_de_tcobs_ua/TargetActivity.c

+17-17
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ void TriceCheckSpecial( int n ) {
88
static int64_t b64[4] = { 0, -1, -2, 0x3344555566666666 };
99

1010
switch(n){
11-
case __LINE__: TRice("Hello World!\n"); //exp: feed3322 Hello World!
12-
break; case __LINE__: TRICE8_F(ID(0), "info:FunctionNameWa", b8, sizeof(b8) /sizeof(int8_t) ); //exp: feed3322 FunctionNameWa(00)(ff)(fe)(33)(04)(05)(06)(07)(08)(09)(0a)(0b)(00)(ff)(fe)(33)(04)(05)(06)(07)(08)(09)(0a)(0b)
13-
break; case __LINE__: TRice8F("info:FunctionNameWb", b8, sizeof(b8) /sizeof(int8_t) ); //exp: feed3322 FunctionNameWb(00)(ff)(fe)(33)(04)(05)(06)(07)(08)(09)(0a)(0b)(00)(ff)(fe)(33)(04)(05)(06)(07)(08)(09)(0a)(0b)
14-
break; case __LINE__: Trice8F("info:FunctionNameWc", b8, sizeof(b8) /sizeof(int8_t) ); //exp: be16 FunctionNameWc(00)(ff)(fe)(33)(04)(05)(06)(07)(08)(09)(0a)(0b)(00)(ff)(fe)(33)(04)(05)(06)(07)(08)(09)(0a)(0b)
15-
break; case __LINE__: trice8F("info:FunctionNameWd", b8, sizeof(b8) /sizeof(int8_t) ); //exp: FunctionNameWd(00)(ff)(fe)(33)(04)(05)(06)(07)(08)(09)(0a)(0b)(00)(ff)(fe)(33)(04)(05)(06)(07)(08)(09)(0a)(0b)
16-
break; case __LINE__: TRICE16_F(ID(0), "info:FunctionNameXa", b16, sizeof(b16)/sizeof(int16_t) ); //exp: feed3322 FunctionNameXa(0000)(ffff)(fffe)(3344)
17-
break; case __LINE__: TRice16F("info:FunctionNameXb", b16, sizeof(b16)/sizeof(int16_t) ); //exp: feed3322 FunctionNameXb(0000)(ffff)(fffe)(3344)
18-
break; case __LINE__: Trice16F("info:FunctionNameXc", b16, sizeof(b16)/sizeof(int16_t) ); //exp: be16 FunctionNameXc(0000)(ffff)(fffe)(3344)
19-
break; case __LINE__: trice16F("info:FunctionNameXd", b16, sizeof(b16)/sizeof(int16_t) ); //exp: FunctionNameXd(0000)(ffff)(fffe)(3344)
20-
break; case __LINE__: TRICE32_F(ID(0), "info:FunctionNameYa", b32, sizeof(b32)/sizeof(int32_t) ); //exp: feed3322 FunctionNameYa(00000000)(ffffffff)(fffffffe)(33445555)
21-
break; case __LINE__: TRice32F("rpc:FunctionNameYb", b32, sizeof(b32)/sizeof(int32_t) ); //exp: feed3322 FunctionNameYb(00000000)(ffffffff)(fffffffe)(33445555)
22-
break; case __LINE__: Trice32F("rpc:FunctionNameYc", b32, sizeof(b32)/sizeof(int32_t) ); //exp: be16 FunctionNameYc(00000000)(ffffffff)(fffffffe)(33445555)
23-
break; case __LINE__: trice32F("call:FunctionNameYd", b32, sizeof(b32)/sizeof(int32_t) ); //exp: call:FunctionNameYd(00000000)(ffffffff)(fffffffe)(33445555)
24-
break; case __LINE__: TRICE64_F(ID(0), "info:FunctionNameZa", b64, sizeof(b64)/sizeof(int64_t) ); //exp: feed3322 FunctionNameZa(0000000000000000)(ffffffffffffffff)(fffffffffffffffe)(3344555566666666)
25-
break; case __LINE__: TRice64F("call:FunctionNameZb", b64, sizeof(b64)/sizeof(int64_t) ); //exp: feed3322 call FunctionNameZb(0000000000000000)(ffffffffffffffff)(fffffffffffffffe)(3344555566666666)
26-
break; case __LINE__: Trice64F("RPC:FunctionNameZc", b64, sizeof(b64)/sizeof(int64_t) ); //exp: be16 RPC:FunctionNameZc(0000000000000000)(ffffffffffffffff)(fffffffffffffffe)(3344555566666666)
27-
break; case __LINE__: trice64F("Rpc:FunctionNameZd", b64, sizeof(b64)/sizeof(int64_t) ); //exp: Rpc:FunctionNameZd(0000000000000000)(ffffffffffffffff)(fffffffffffffffe)(3344555566666666)
11+
case __LINE__: TRice(iD(15197), "Hello World!\n"); //exp: feed3322 Hello World!
12+
break; case __LINE__: TRICE8_F(ID(15198), "info:FunctionNameWa", b8, sizeof(b8) /sizeof(int8_t) ); //exp: feed3322 FunctionNameWa(00)(ff)(fe)(33)(04)(05)(06)(07)(08)(09)(0a)(0b)(00)(ff)(fe)(33)(04)(05)(06)(07)(08)(09)(0a)(0b)
13+
break; case __LINE__: TRice8F(iD(15199), "info:FunctionNameWb", b8, sizeof(b8) /sizeof(int8_t) ); //exp: feed3322 FunctionNameWb(00)(ff)(fe)(33)(04)(05)(06)(07)(08)(09)(0a)(0b)(00)(ff)(fe)(33)(04)(05)(06)(07)(08)(09)(0a)(0b)
14+
break; case __LINE__: Trice8F(iD(15200), "info:FunctionNameWc", b8, sizeof(b8) /sizeof(int8_t) ); //exp: be16 FunctionNameWc(00)(ff)(fe)(33)(04)(05)(06)(07)(08)(09)(0a)(0b)(00)(ff)(fe)(33)(04)(05)(06)(07)(08)(09)(0a)(0b)
15+
break; case __LINE__: trice8F(iD(15201), "info:FunctionNameWd", b8, sizeof(b8) /sizeof(int8_t) ); //exp: FunctionNameWd(00)(ff)(fe)(33)(04)(05)(06)(07)(08)(09)(0a)(0b)(00)(ff)(fe)(33)(04)(05)(06)(07)(08)(09)(0a)(0b)
16+
break; case __LINE__: TRICE16_F(ID(15202), "info:FunctionNameXa", b16, sizeof(b16)/sizeof(int16_t) ); //exp: feed3322 FunctionNameXa(0000)(ffff)(fffe)(3344)
17+
break; case __LINE__: TRice16F(iD(15203), "info:FunctionNameXb", b16, sizeof(b16)/sizeof(int16_t) ); //exp: feed3322 FunctionNameXb(0000)(ffff)(fffe)(3344)
18+
break; case __LINE__: Trice16F(iD(15204), "info:FunctionNameXc", b16, sizeof(b16)/sizeof(int16_t) ); //exp: be16 FunctionNameXc(0000)(ffff)(fffe)(3344)
19+
break; case __LINE__: trice16F(iD(15205), "info:FunctionNameXd", b16, sizeof(b16)/sizeof(int16_t) ); //exp: FunctionNameXd(0000)(ffff)(fffe)(3344)
20+
break; case __LINE__: TRICE32_F(ID(15206), "info:FunctionNameYa", b32, sizeof(b32)/sizeof(int32_t) ); //exp: feed3322 FunctionNameYa(00000000)(ffffffff)(fffffffe)(33445555)
21+
break; case __LINE__: TRice32F(iD(15207), "rpc:FunctionNameYb", b32, sizeof(b32)/sizeof(int32_t) ); //exp: feed3322 FunctionNameYb(00000000)(ffffffff)(fffffffe)(33445555)
22+
break; case __LINE__: Trice32F(iD(15208), "rpc:FunctionNameYc", b32, sizeof(b32)/sizeof(int32_t) ); //exp: be16 FunctionNameYc(00000000)(ffffffff)(fffffffe)(33445555)
23+
break; case __LINE__: trice32F(iD(15209), "call:FunctionNameYd", b32, sizeof(b32)/sizeof(int32_t) ); //exp: call:FunctionNameYd(00000000)(ffffffff)(fffffffe)(33445555)
24+
break; case __LINE__: TRICE64_F(ID(15210), "info:FunctionNameZa", b64, sizeof(b64)/sizeof(int64_t) ); //exp: feed3322 FunctionNameZa(0000000000000000)(ffffffffffffffff)(fffffffffffffffe)(3344555566666666)
25+
break; case __LINE__: TRice64F(iD(15211), "call:FunctionNameZb", b64, sizeof(b64)/sizeof(int64_t) ); //exp: feed3322 call FunctionNameZb(0000000000000000)(ffffffffffffffff)(fffffffffffffffe)(3344555566666666)
26+
break; case __LINE__: Trice64F(iD(15212), "RPC:FunctionNameZc", b64, sizeof(b64)/sizeof(int64_t) ); //exp: be16 RPC:FunctionNameZc(0000000000000000)(ffffffffffffffff)(fffffffffffffffe)(3344555566666666)
27+
break; case __LINE__: trice64F(iD(15213), "Rpc:FunctionNameZd", b64, sizeof(b64)/sizeof(int64_t) ); //exp: Rpc:FunctionNameZd(0000000000000000)(ffffffffffffffff)(fffffffffffffffe)(3344555566666666)
2828
}
2929
}

β€Ž_test/_special_dblB_de_tcobs_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_STACK_BUFFER
1515
#define TRICE_DIRECT_OUTPUT 1

β€Ž_test/be_dblB_de_tcobs_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_DOUBLE_BUFFER
1515

β€Žsrc/SEGGER_RTT_Conf.h β€Ž_test/be_staticB_di_xtea_cobs_rtt32/SEGGER_RTT_Conf.h

File renamed without changes.

β€Ž_test/be_staticB_di_xtea_cobs_rtt32/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_TRANSFER_ORDER_IS_BIG_ENDIAN 1
1515
#define TRICE_BUFFER TRICE_STATIC_BUFFER

β€Ž_test/dblB_de_cobs_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_DOUBLE_BUFFER
1515

β€Ž_test/dblB_de_multi_cobs_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_DOUBLE_BUFFER
1515

β€Ž_test/dblB_de_multi_nopf_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_DOUBLE_BUFFER
1515

β€Ž_test/dblB_de_multi_tcobs_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_DOUBLE_BUFFER
1515

β€Ž_test/dblB_de_multi_xtea_cobs_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_DOUBLE_BUFFER
1515

β€Ž_test/dblB_de_multi_xtea_tcobs_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_DOUBLE_BUFFER
1515

β€Ž_test/dblB_de_nopf_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_DOUBLE_BUFFER
1515

β€Ž_test/dblB_de_tcobs_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_DOUBLE_BUFFER
1515

β€Ž_test/dblB_de_xtea_cobs_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_DOUBLE_BUFFER
1515

β€Ž_test/dblB_de_xtea_tcobs_ua/triceConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
extern "C" {
1010
#endif
1111

12-
#define TRICE_CLEAN 1
12+
#define TRICE_CLEAN 0
1313

1414
#define TRICE_BUFFER TRICE_DOUBLE_BUFFER
1515

0 commit comments

Comments
Β (0)