From 8d2b1fbcc0907291393c66e7330713c3d30a9f3a Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 11 Dec 2023 21:56:37 -0800 Subject: [PATCH] minor semantic fixes in log messages --- VortexEngine/src/Menus/MenuList/ModeSharing.cpp | 2 +- VortexEngine/src/Menus/MenuList/Randomizer.cpp | 8 ++++---- VortexEngine/src/Modes/Modes.cpp | 2 +- VortexEngine/src/Wireless/IRSender.cpp | 2 +- VortexEngine/src/Wireless/VLSender.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/VortexEngine/src/Menus/MenuList/ModeSharing.cpp b/VortexEngine/src/Menus/MenuList/ModeSharing.cpp index 1cdc3e026f..e3391c1df2 100644 --- a/VortexEngine/src/Menus/MenuList/ModeSharing.cpp +++ b/VortexEngine/src/Menus/MenuList/ModeSharing.cpp @@ -176,7 +176,7 @@ void ModeSharing::receiveModeIR() ERROR_LOG("Failed to receive mode"); return; } - DEBUG_LOGF("Success receiving mode: %u", m_pCurMode->getPatternID()); + DEBUG_LOGF("Success receiving mode: %u", m_previewMode.getPatternID()); if (!m_advanced) { Modes::updateCurMode(&m_previewMode); // leave menu and save settings, even if the mode was the same whatever diff --git a/VortexEngine/src/Menus/MenuList/Randomizer.cpp b/VortexEngine/src/Menus/MenuList/Randomizer.cpp index 41050076af..b3101cc33a 100644 --- a/VortexEngine/src/Menus/MenuList/Randomizer.cpp +++ b/VortexEngine/src/Menus/MenuList/Randomizer.cpp @@ -363,10 +363,10 @@ void Randomizer::dashPattern(Random &ctx, PatternArgs &outArgs) void Randomizer::crushPattern(Random &ctx, PatternArgs &outArgs) { // call next8 explicitly in this order because the order they - // are called is undefined when called as parameters to another function. - // ex: f(a,b,c) may call in the order a,b,c or c,b,a depending on compiler. - // So different compilers may produce different results, - // but like this it is explicit + // are called is undefined when called as parameters to another function. + // ex: f(a,b,c) may call in the order a,b,c or c,b,a depending on compiler. + // So different compilers may produce different results, + // but like this it is explicit uint8_t group = ctx.next8(0, 8); // groupsize 0 to 8 uint8_t dash = 0; // dash 0 uint8_t gap = ctx.next8(20, 40); // need gap 20 -> 40 diff --git a/VortexEngine/src/Modes/Modes.cpp b/VortexEngine/src/Modes/Modes.cpp index 48f69077a0..43af2e21ff 100644 --- a/VortexEngine/src/Modes/Modes.cpp +++ b/VortexEngine/src/Modes/Modes.cpp @@ -90,7 +90,7 @@ bool Modes::serializeSaveHeader(ByteStream &saveBuffer) if (!saveBuffer.serialize((uint8_t)Leds::getBrightness())) { return false; } - DEBUG_LOGF("Serialized all modes, uncompressed size: %u", modesBuffer.size()); + DEBUG_LOGF("Serialized all modes, uncompressed size: %u", saveBuffer.size()); return true; } diff --git a/VortexEngine/src/Wireless/IRSender.cpp b/VortexEngine/src/Wireless/IRSender.cpp index d01ec58de9..61fda5d769 100644 --- a/VortexEngine/src/Wireless/IRSender.cpp +++ b/VortexEngine/src/Wireless/IRSender.cpp @@ -118,7 +118,7 @@ void IRSender::beginSend() { m_isSending = true; DEBUG_LOGF("[%zu] Beginning send size %u (blocks: %u remainder: %u blocksize: %u)", - microseconds(), m_size, m_numBlocks, m_remainder, m_blockSize); + Time::microseconds(), m_size, m_numBlocks, m_remainder, m_blockSize); // init sender before writing, is this necessary here? I think so initPWM(); // wakeup the other receiver with a very quick mark/space diff --git a/VortexEngine/src/Wireless/VLSender.cpp b/VortexEngine/src/Wireless/VLSender.cpp index 3077b26c4c..2a4e29557f 100644 --- a/VortexEngine/src/Wireless/VLSender.cpp +++ b/VortexEngine/src/Wireless/VLSender.cpp @@ -115,7 +115,7 @@ void VLSender::beginSend() { m_isSending = true; DEBUG_LOGF("[%zu] Beginning send size %u (blocks: %u remainder: %u blocksize: %u)", - microseconds(), m_size, m_numBlocks, m_remainder, m_blockSize); + Time::microseconds(), m_size, m_numBlocks, m_remainder, m_blockSize); // wakeup the other receiver with a very quick mark/space sendMark(50); sendSpace(100);