Skip to content

Commit 0413679

Browse files
committed
sound sync: shown "v2+" when framecounter is used
v2+ = improved format (MM fork only) including sequence frameCounter.
1 parent cf2f378 commit 0413679

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

usermods/audioreactive/audio_reactive.h

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1569,6 +1569,10 @@ class AudioReactive : public Usermod {
15691569

15701570
// validate sequence, discard out-of-sequence packets
15711571
static uint8_t lastFrameCounter = 0;
1572+
// add info for UI
1573+
if ((receivedPacket->frameCounter > 0) && (lastFrameCounter > 0)) receivedFormat = 3; // v2+
1574+
else receivedFormat = 2; // v2
1575+
// check sequence
15721576
bool sequenceOK = false;
15731577
if(receivedPacket->frameCounter > lastFrameCounter) sequenceOK = true; // sequence OK
15741578
if((lastFrameCounter < 12) && (receivedPacket->frameCounter > 248)) sequenceOK = false; // prevent sequence "roll-back" due to late packets (1->254)
@@ -1668,15 +1672,15 @@ class AudioReactive : public Usermod {
16681672

16691673
// VERIFY THAT THIS IS A COMPATIBLE PACKET
16701674
if (packetSize == sizeof(audioSyncPacket) && (isValidUdpSyncVersion((const char *)fftUdpBuffer))) {
1675+
receivedFormat = 2;
16711676
haveFreshData = decodeAudioData(packetSize, fftUdpBuffer);
16721677
//DEBUGSR_PRINTLN("Finished parsing UDP Sync Packet v2");
1673-
receivedFormat = 2;
16741678
} else {
16751679
if (packetSize == sizeof(audioSyncPacket_v1) && (isValidUdpSyncVersion_v1((const char *)fftUdpBuffer))) {
16761680
decodeAudioData_v1(packetSize, fftUdpBuffer);
1681+
receivedFormat = 1;
16771682
//DEBUGSR_PRINTLN("Finished parsing UDP Sync Packet v1");
16781683
haveFreshData = true;
1679-
receivedFormat = 1;
16801684
} else receivedFormat = 0; // unknown format
16811685
}
16821686
}
@@ -2399,7 +2403,7 @@ class AudioReactive : public Usermod {
23992403
if (audioSyncEnabled) {
24002404
if (audioSyncEnabled & AUDIOSYNC_SEND) {
24012405
infoArr.add(F("send mode"));
2402-
if ((udpSyncConnected) && (millis() - lastTime < AUDIOSYNC_IDLE_MS)) infoArr.add(F(" v2"));
2406+
if ((udpSyncConnected) && (millis() - lastTime < AUDIOSYNC_IDLE_MS)) infoArr.add(F(" v2+"));
24032407
} else if (audioSyncEnabled == AUDIOSYNC_REC) {
24042408
infoArr.add(F("receive mode"));
24052409
} else if (audioSyncEnabled == AUDIOSYNC_REC_PLUS) {
@@ -2411,6 +2415,7 @@ class AudioReactive : public Usermod {
24112415
if (audioSyncEnabled && udpSyncConnected && (millis() - last_UDPTime < AUDIOSYNC_IDLE_MS)) {
24122416
if (receivedFormat == 1) infoArr.add(F(" v1"));
24132417
if (receivedFormat == 2) infoArr.add(F(" v2"));
2418+
if (receivedFormat == 3) infoArr.add(F(" v2+"));
24142419
}
24152420

24162421
#if defined(WLED_DEBUG) || defined(SR_DEBUG) || defined(SR_STATS)

0 commit comments

Comments
 (0)