Skip to content

Commit dd5828f

Browse files
rokathrokath
committed
SeveraL Minor improvements
- Handling of unused parameters with TRICE_OFF=1 improved. - Typos corrected - common demoTIL.json and demoLI.json for all examples and tests - separate buildAllTargets scripts for TRICE_OFF=0|1 - Some shell scripts improved / renamed - CLI switch -liPath relative now with path option - Verbose log output for trice insert improved
1 parent 6fd091d commit dd5828f

42 files changed

Lines changed: 19360 additions & 212 deletions

Some content is hidden

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

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ Used git log command: `git log --oneline` and less important lines removed
687687
| `1024170a` | Similar projects extended with postform |
688688
| `b8f63c38` | G0B1_inst example SEGGER_RTT_Conf.h finetuned to needs |
689689
| `74b026fd` | TRICE_DEFERRED_OUTPUT and TRICE_DIRECT_OUTPUT switches added to diagnostic code |
690-
| `2be95fd6` | Build scripts reworked for G01B_inst example |
690+
| `2be95fd6` | Build scripts reworked for G0B1_inst example |
691691
| `784e2da9` | TriceUserGuide.md updted |
692692
| `6c47db08` | obsolete code removed |
693693
| `5ac9ec50` | Update TriceColor.md |

‎_test/testdata/triceCheck.c‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,16 @@ void TriceCheck(int n) {
3434
TRice("\rTriceCheck %4d", n);
3535
#else // #ifdef TRICE_CHECK_MIN
3636
char* sABCDE = "abcde 12345";
37-
#if !TRICE_OFF
3837
uint32_t lenABCDE = strlen(sABCDE);
39-
float x = (float)1089.6082763671875; // 0x44883377
40-
double y = 518.0547492508867; // 0x4080307020601050
41-
#if TRICE_CGO == 1 || defined(TRICE_FULL_CHECK)
38+
float x = (float)1089.6082763671875; // 0x44883377
39+
double y = 518.0547492508867; // 0x4080307020601050
40+
#if TRICE_OFF
41+
TRICE_UNUSED(x)
42+
TRICE_UNUSED(y)
43+
#endif
44+
#if TRICE_CGO == 1 || defined(TRICE_FULL_CHECK)
4245
char* A = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
43-
#endif
44-
#endif // #if !TRICE_OFF
46+
#endif
4547
char* s = "AAAAAAAAAAAA";
4648
char * five = "five";
4749
static int8_t b8[24] = { 0, -1, -2, 0x33, 4, 5, 6, 7, 8, 9, 10, 11, 0, -1, -2, 0x33, 4, 5, 6, 7, 8, 9, 10, 11 };
@@ -2721,6 +2723,8 @@ static void exampleOfManualSerialization(void) {
27212723
////////////////////////////////////////////////////////
27222724
#if !TRICE_OFF
27232725
int len = serializeTryout(dst, &tx); // serialized byte count
2726+
#else
2727+
int len = 0;
27242728
#endif
27252729
TRICE(Id(0), "inf: Tryout tx struct:");
27262730
TRICE8_B(Id(0), " %02x ", &tx, sizeof(tx));

0 commit comments

Comments
 (0)