Skip to content

Commit 3650ed7

Browse files
klonyyyklonyyy
authored
Merge pull request #99 from klonyyy/devel
v1.1.0
2 parents 352e8f4 + 7012fec commit 3650ed7

File tree

174 files changed

+6451
-4136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+6451
-4136
lines changed

‎.vscode/settings.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@
8686
"coroutine": "cpp",
8787
"resumable": "cpp",
8888
"future": "cpp",
89-
"codecvt": "cpp"
89+
"codecvt": "cpp",
90+
"complex": "cpp",
91+
"queue": "cpp"
9092
},
9193
"docwriter.style": "Doxygen"
9294
}

‎CMakeLists.txt‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ endif()
1818

1919
project(MCUViewer)
2020

21-
set(MCUVIEWER_VERSION 1.0.1)
21+
set(MCUVIEWER_VERSION 1.1.0)
2222
set(CMAKE_CXX_STANDARD 20)
2323
set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
2424

@@ -77,7 +77,7 @@ if(UNIX)
7777
find_package(libusb REQUIRED)
7878
find_package(glfw3 REQUIRED)
7979
set(STLINK_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/third_party/stlink/lib/linux/libstlink.a)
80-
set(JLINK_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/third_party/jlink/lib/linux/libjlinkarm.so.7)
80+
set(JLINK_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/third_party/jlink/lib/linux/libjlinkarm.so.8)
8181
set(INSTALL_PATH /usr/local/MCUViewer)
8282
set(LIB_INSTALL_PATH /usr/local/lib)
8383
set(DESKTOP_FILE_PATH /usr/share/applications)
@@ -117,9 +117,8 @@ set(PROJECT_SOURCES
117117
${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/GuiSwoPlots.cpp
118118
${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/GuiSwoControl.cpp
119119
${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/GuiAbout.cpp
120-
${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/GuiImportVariables.cpp
121120
${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/GuiAcqusition.cpp
122-
${CMAKE_CURRENT_SOURCE_DIR}/src/MemoryReader/MemoryReader.cpp
121+
${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/GuiHelper.cpp
123122
${CMAKE_CURRENT_SOURCE_DIR}/src/MemoryReader/StlinkDebugProbe.cpp
124123
${CMAKE_CURRENT_SOURCE_DIR}/src/MemoryReader/JlinkDebugProbe.cpp
125124
${CMAKE_CURRENT_SOURCE_DIR}/src/Plot/Plot.cpp
@@ -129,14 +128,15 @@ set(PROJECT_SOURCES
129128
${CMAKE_CURRENT_SOURCE_DIR}/src/FileHandler/NFDFileHandler.cpp
130129
${CMAKE_CURRENT_SOURCE_DIR}/src/ImguiPlugins/ImguiPlugins.cpp
131130
${CMAKE_CURRENT_SOURCE_DIR}/third_party/stlink/inc/spdlogWrapper.cpp
132-
${CMAKE_CURRENT_SOURCE_DIR}/src/PlotHandler/PlotHandlerBase.cpp
133131
${CMAKE_CURRENT_SOURCE_DIR}/src/PlotHandler/PlotHandler.cpp
134-
${CMAKE_CURRENT_SOURCE_DIR}/src/PlotHandler/TracePlotHandler.cpp
135132
${CMAKE_CURRENT_SOURCE_DIR}/src/TraceReader/TraceReader.cpp
136133
${CMAKE_CURRENT_SOURCE_DIR}/src/TraceReader/StlinkTraceProbe.cpp
137134
${CMAKE_CURRENT_SOURCE_DIR}/src/TraceReader/JlinkTraceProbe.cpp
138135
${CMAKE_CURRENT_SOURCE_DIR}/src/GdbParser/GdbParser.cpp
139-
${CMAKE_CURRENT_SOURCE_DIR}/src/CSVStreamer/CSVStreamer.cpp)
136+
${CMAKE_CURRENT_SOURCE_DIR}/src/CSVStreamer/CSVStreamer.cpp
137+
${CMAKE_CURRENT_SOURCE_DIR}/src/VariableHandler/VariableHandler.cpp
138+
${CMAKE_CURRENT_SOURCE_DIR}/src/DataHandler/ViewerDataHandler.cpp
139+
${CMAKE_CURRENT_SOURCE_DIR}/src/DataHandler/TraceDataHandler.cpp)
140140

141141
set(IMGUI_SOURCES
142142
${CMAKE_CURRENT_SOURCE_DIR}/third_party/imgui/imgui.cpp
@@ -201,7 +201,10 @@ target_include_directories(${EXECUTABLE} PRIVATE
201201
${CMAKE_CURRENT_SOURCE_DIR}/src/RingBuffer
202202
${CMAKE_CURRENT_SOURCE_DIR}/src/Statistics
203203
${CMAKE_CURRENT_SOURCE_DIR}/src/GdbParser
204-
${CMAKE_CURRENT_SOURCE_DIR}/src/CSVStreamer)
204+
${CMAKE_CURRENT_SOURCE_DIR}/src/PlotGroupHandler
205+
${CMAKE_CURRENT_SOURCE_DIR}/src/CSVStreamer
206+
${CMAKE_CURRENT_SOURCE_DIR}/src/VariableHandler
207+
${CMAKE_CURRENT_SOURCE_DIR}/src/DataHandler)
205208

206209
target_include_directories(${EXECUTABLE} SYSTEM PRIVATE
207210
${CMAKE_CURRENT_SOURCE_DIR}/third_party/stlink/inc/

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ TraceViewer is not influenced by optimizations, which means it is a great tool t
3535
All dependencies should be installed and you should be ready to go.
3636

3737
Stlink users:
38-
- in case your STLink is not detected, please copy the `/launch/udevrules/` folder contents to your `/etc/udev/rules.d/` directory.
38+
- in case your STLink is not detected, please copy the `launch/install/Unix/udevrules/` folder contents to your `/etc/udev/rules.d/` directory.
3939

4040
### Windows:
4141
1. Download and run the MCUViewer installer from the releases page (right hand side menu of the main repo page).

‎example/STMViewer_test/.cproject‎ renamed to ‎example/MCUViewer_test/.cproject‎

Lines changed: 93 additions & 103 deletions
Large diffs are not rendered by default.

‎example/STMViewer_test/.mxproject‎ renamed to ‎example/MCUViewer_test/.mxproject‎

Lines changed: 8 additions & 8 deletions
Large diffs are not rendered by default.

‎example/STMViewer_test/.project‎ renamed to ‎example/MCUViewer_test/.project‎

File renamed without changes.

‎example/STMViewer_test/.settings/language.settings.xml‎ renamed to ‎example/MCUViewer_test/.settings/language.settings.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<project>
3-
<configuration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.234318883" name="Debug">
3+
<configuration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1710865587" name="Debug">
44
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
8-
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-690955499330090190" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1371419899404254478" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>
1212
</extension>
1313
</configuration>
14-
<configuration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.857087973" name="Release">
14+
<configuration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1900443092" name="Release">
1515
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
1616
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
1717
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
1818
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
19-
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-690955499330090190" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
19+
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1371419899404254478" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
2020
<language-scope id="org.eclipse.cdt.core.gcc"/>
2121
<language-scope id="org.eclipse.cdt.core.g++"/>
2222
</provider>

‎example/MCUViewer_test/.settings/stm32cubeide.project.prefs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
635E684B79701B039C64EA45C3F84D30=9AB01335C7D9AD93FC9CCF6DC64E7459
2+
66BE74F758C12D739921AEA421D593D3=0
3+
8DF89ED150041C4CBC7CB9A9CAA90856=4055E183FFA96263B32827A7F84797DE
4+
DC22A860405A8BF2F2C095E5B6529F12=4055E183FFA96263B32827A7F84797DE
5+
eclipse.preferences.version=1

‎example/STMViewer_test/Core/App/main.cpp‎ renamed to ‎example/MCUViewer_test/Core/App/main.cpp‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,24 @@
99
#include "stm32g4xx_ll_gpio.h"
1010
#include "testClass.hpp"
1111
#include "testClass2.hpp"
12+
#include <cmath>
1213

1314
TestClass test;
1415
TemplateTest<uint32_t, bool> templateTest;
1516
volatile float sinTest = 0.0f;
1617
volatile float cosTest = 0.0f;
18+
volatile float LissajousX = 0.0f;
19+
volatile float LissajousY1 = 0.0f;
20+
volatile float LissajousY2 = 0.0f;
21+
volatile float LissajousY3 = 0.0f;
22+
23+
volatile float roseX = 0.0f;
24+
volatile float roseY = 0.0f;
25+
26+
volatile float smallRoseX = 0.0f;
27+
volatile float smallRoseY = 0.0f;
28+
29+
volatile float petalsNumber = 8.0f;
1730

1831
void maincpp()
1932
{
@@ -35,7 +48,17 @@ void maincpp()
3548
{
3649
sinTest = test.getSin(x);
3750
cosTest = test.getCos(x);
38-
x += 0.001f;
51+
LissajousX = test.getLissajousX(x);
52+
LissajousY1 = test.getLissajousY1(x);
53+
LissajousY2 = test.getLissajousY2(x);
54+
LissajousY3 = test.getLissajousY3(x);
55+
56+
float r = cosf(petalsNumber / 2.0f * x);
57+
roseX = r * cosf(x);
58+
roseY = r * sinf(x);
59+
smallRoseY = 0.4f * r * sinf(x);
60+
61+
x += 0.01f;
3962

4063
if (x > 6.28f)
4164
{

‎example/STMViewer_test/Core/App/main.hpp‎ renamed to ‎example/MCUViewer_test/Core/App/main.hpp‎

File renamed without changes.

0 commit comments

Comments
 (0)