Skip to content

Commit 7a37648

Browse files
committed
Merge branch 'main' into tsdelta
2 parents 85d5f72 + 16c0d93 commit 7a37648

File tree

2 files changed

+2
-106
lines changed

2 files changed

+2
-106
lines changed

examples/G0B1_inst/help.txt

Lines changed: 0 additions & 105 deletions
This file was deleted.

src/trice.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ extern uint32_t* TriceBufferWritePosition;
280280
#if TRICE_CYCLE_COUNTER == 1
281281

282282
#define TRICE_CYCLE (TriceCycle++ & 0xFF) //!< TRICE_CYCLE is the trice cycle counter as 8 bit count 0-255.
283+
#define TRICE_CYCLE_INCREMENT (TriceCycle++)
283284

284285
#else // #if TRICE_CYCLE_COUNTER == 1
285286

@@ -757,7 +758,7 @@ void TRiceS(int tid, const char* fmt, const char* runtimeGeneratedString);
757758
//! TRICE_LCNT writes 1 as most significant bit and 15-bit byte count. It does not write the cycle counter but increments the cycle counter.
758759
#define TRICE_LCNT(count) \
759760
TRICE_PUT16((0x8000 | (count))); \
760-
TRICE_CYCLE // increment TRICE_CYCLE but do not transmit it
761+
TRICE_CYCLE_INCREMENT // increment TRICE_CYCLE but do not transmit it
761762

762763
#else
763764

0 commit comments

Comments
 (0)