Daniel/ir tester (#7)

* some changes * Some fixes and changes for compression * Added some suppressions for valgrind run * fixes * Added defaultmodes files * test
StoneOrbits · Nov 30, 2022 · 5a5e990 · 5a5e990
1 parent deaf294
commit 5a5e990
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 13 deletions.
diff --git a/VortexTestingFramework/Makefile b/VortexTestingFramework/Makefile
@@ -98,6 +98,7 @@ valgrind: vortex_framework
 	  --show-leak-kinds=all \
 	  --track-origins=yes \
 	  --suppressions=valgrind_ncurses_suppressions.supp \
+	  --gen-suppressions=all \
 	  --log-file=valg.out \
 	  ./vortex_framework
 	cat valg.out

diff --git a/VortexTestingFramework/TestFramework.cpp b/VortexTestingFramework/TestFramework.cpp
@@ -52,6 +52,7 @@ TestFramework::TestFramework() :
   m_hwndClickButton(nullptr),
   m_hwndTickrateSlider(nullptr),
   m_hwndTickOffsetSlider(nullptr),
+  m_hwndLoadButton(nullptr),
   m_hwnd(nullptr),
   m_wc(),
   m_brightness(255),
@@ -288,7 +289,7 @@ void TestFramework::paint(HWND hwnd)
       RECT stripPos = { (LONG)i, 230, (LONG)i + 1, 250 };
       RGBColor col = m_patternStrip[i];
       HSVColor hsvCol = col;
-      uint32_t val = hsvCol.val;
+      uint32_t val = 255; //hsvCol.val;
       // if drawing a color with non full value
       if (!col.empty() && val < 255) {
         // fill black background
@@ -297,9 +298,6 @@ void TestFramework::paint(HWND hwnd)
         uint32_t offset = (uint32_t)(8 - ((val / 255.0) * 8));
         stripPos.top += offset;
         stripPos.bottom -= offset;
-        // replace original color with full value color
-        hsvCol.val = 255;
-        col = hsvCol;
       }
       FillRect(hdc, &stripPos, getBrushCol(col));
     }
@@ -308,12 +306,7 @@ void TestFramework::paint(HWND hwnd)
     for (uint32_t i = 0; i < MAX_COLOR_SLOTS; ++i) {
       RGBColor curCol = Modes::curMode()->getColorset()->get(i);
       HSVColor hsvCol = curCol;
-      uint32_t val = hsvCol.val;
-      if (!curCol.empty()) {
-        hsvCol.val = 255;
-      }
-      curCol = hsvCol;
-      uint32_t offset = (uint32_t)(8 - ((val / 255.0) * 8));
+      uint32_t offset = (uint32_t)(8 - ((hsvCol.val / 255.0) * 8));
       RECT colPos = { 50 + (LONG)(i * 40) , 265, 50 + (LONG)(i * 40) + 20, 285 };
       RECT bordPos = colPos;
       colPos.left += offset;

diff --git a/VortexTestingFramework/VortexEngine b/VortexTestingFramework/VortexEngine
diff --git a/VortexTestingFramework/VortexTestingFramework.vcxproj b/VortexTestingFramework/VortexTestingFramework.vcxproj
@@ -151,6 +151,7 @@
     <ClCompile Include="TestFramework.cpp" />
     <ClCompile Include="VortexEngine\VortexEngine\src\Infrared\IRSender.cpp" />
     <ClCompile Include="VortexEngine\VortexEngine\src\Leds\LedStash.cpp" />
+    <ClCompile Include="VortexEngine\VortexEngine\src\Modes\DefaultModes.cpp" />
     <ClCompile Include="VortexEngine\VortexEngine\src\Patterns\Multi\MateriaPattern.cpp" />
     <ClCompile Include="VortexEngine\VortexEngine\src\Patterns\Multi\Sequencer\ChaserPattern.cpp" />
     <ClCompile Include="VortexEngine\VortexEngine\src\Patterns\Single\DashDopsPattern.cpp" />
@@ -214,6 +215,7 @@
     <ClCompile Include="VortexEngine\VortexEngine\src\Patterns\Single\TracerPattern.cpp" />
     <ClCompile Include="VortexEngine\VortexEngine\src\Patterns\Multi\Sequencer\Sequence.cpp" />
     <ClCompile Include="VortexEngine\VortexEngine\src\Serial\ByteStream.cpp" />
+    <ClCompile Include="VortexEngine\VortexEngine\src\Serial\Compression.cpp" />
     <ClCompile Include="VortexEngine\VortexEngine\src\Serial\Serial.cpp" />
     <ClCompile Include="VortexEngine\VortexEngine\src\Storage\Storage.cpp" />
     <ClCompile Include="VortexEngine\VortexEngine\src\Time\TimeControl.cpp" />
@@ -232,6 +234,7 @@
     <ClInclude Include="VortexEngine\VortexEngine\src\Infrared\IRSender.h" />
     <ClInclude Include="VortexEngine\VortexEngine\src\Leds\LedStash.h" />
     <ClInclude Include="VortexEngine\VortexEngine\src\Leds\LedTypes.h" />
+    <ClInclude Include="VortexEngine\VortexEngine\src\Modes\DefaultModes.h" />
     <ClInclude Include="VortexEngine\VortexEngine\src\Patterns\Multi\MateriaPattern.h" />
     <ClInclude Include="VortexEngine\VortexEngine\src\Patterns\Multi\Sequencer\ChaserPattern.h" />
     <ClInclude Include="VortexEngine\VortexEngine\src\Patterns\Single\DashDopsPattern.h" />
@@ -296,6 +299,7 @@
     <ClInclude Include="VortexEngine\VortexEngine\src\Patterns\Single\TracerPattern.h" />
     <ClInclude Include="VortexEngine\VortexEngine\src\Patterns\Multi\Sequencer\Sequence.h" />
     <ClInclude Include="VortexEngine\VortexEngine\src\Serial\ByteStream.h" />
+    <ClInclude Include="VortexEngine\VortexEngine\src\Serial\Compression.h" />
     <ClInclude Include="VortexEngine\VortexEngine\src\Serial\Serial.h" />
     <ClInclude Include="VortexEngine\VortexEngine\src\Storage\Storage.h" />
     <ClInclude Include="VortexEngine\VortexEngine\src\Time\TimeControl.h" />
@@ -308,4 +312,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/VortexTestingFramework/VortexTestingFramework.vcxproj.filters b/VortexTestingFramework/VortexTestingFramework.vcxproj.filters
@@ -348,6 +348,12 @@
     <ClCompile Include="VortexEngine\VortexEngine\src\Patterns\Single\DashDopsPattern.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="VortexEngine\VortexEngine\src\Serial\Compression.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="VortexEngine\VortexEngine\src\Modes\DefaultModes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="VortexEngine\VortexEngine\src\Patterns\Pattern.h">
@@ -596,5 +602,11 @@
     <ClInclude Include="VortexEngine\VortexEngine\src\Patterns\Single\DashDopsPattern.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="VortexEngine\VortexEngine\src\Serial\Compression.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="VortexEngine\VortexEngine\src\Modes\DefaultModes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/VortexTestingFramework/valgrind_ncurses_suppressions.supp b/VortexTestingFramework/valgrind_ncurses_suppressions.supp
@@ -460,3 +460,54 @@
    fun:_ZN13TestFramework4initEv
    fun:main
 }
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:realloc
+   fun:_nc_doalloc
+   fun:_nc_read_termtype
+   obj:/usr/lib/x86_64-linux-gnu/libtinfo.so.6.2
+   obj:/usr/lib/x86_64-linux-gnu/libtinfo.so.6.2
+   fun:_nc_read_entry2
+   obj:/usr/lib/x86_64-linux-gnu/libtinfo.so.6.2
+   fun:_nc_setupterm
+   fun:newterm_sp
+   fun:newterm
+   fun:initscr
+   fun:_ZN13TestFramework4initEv
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:realloc
+   fun:_nc_doalloc
+   fun:_nc_read_termtype
+   obj:/usr/lib/x86_64-linux-gnu/libtinfo.so.6.2
+   obj:/usr/lib/x86_64-linux-gnu/libtinfo.so.6.2
+   fun:_nc_read_entry2
+   obj:/usr/lib/x86_64-linux-gnu/libtinfo.so.6.2
+   fun:_nc_setupterm
+   fun:newterm_sp
+   fun:newterm
+   fun:initscr
+   fun:_ZN13TestFramework4initEv
+}
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:realloc
+   fun:_nc_doalloc
+   fun:_nc_read_termtype
+   obj:/usr/lib/x86_64-linux-gnu/libtinfo.so.6.2
+   obj:/usr/lib/x86_64-linux-gnu/libtinfo.so.6.2
+   fun:_nc_read_entry2
+   obj:/usr/lib/x86_64-linux-gnu/libtinfo.so.6.2
+   fun:_nc_setupterm
+   fun:newterm_sp
+   fun:newterm
+   fun:initscr
+   fun:_ZN13TestFramework4initEv
+}