Merge branch 'master' into gloves

StoneOrbits · Dec 12, 2023 · d97bb31 · d97bb31
2 parents aae0bec + 8d2b1fb
commit d97bb31
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/VortexEngine/src/Menus/MenuList/ModeSharing.cpp b/VortexEngine/src/Menus/MenuList/ModeSharing.cpp
@@ -145,7 +145,7 @@ void ModeSharing::receiveMode()
     ERROR_LOG("Failed to receive mode");
     return;
   }
-  DEBUG_LOGF("Success receiving mode: %u", Modes::curMode()->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
@@ -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
@@ -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
@@ -122,7 +122,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
@@ -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);