diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 6fc78934..8bc57549 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -21,13 +21,13 @@ jobs: - name: Update Modules and Build run: bash scripts/build_linux.sh - - name: Deploy - run: bash scripts/deploy_linux.sh + # - name: Deploy + # run: bash scripts/deploy_linux.sh - - uses: actions/upload-artifact@v7.0.0 - with: - name: modbusscope-linux - path: ModbusScope*.AppImage + # - uses: actions/upload-artifact@v7.0.0 + # with: + # name: modbusscope-linux + # path: ModbusScope*.AppImage windows: runs-on: windows-2022 @@ -50,9 +50,9 @@ jobs: shell: cmd run: scripts\full_build_and_deploy_windows.bat '${{ steps.cache.outputs.cache-hit }}' ${{ github.workspace }}\Qt - - uses: actions/upload-artifact@v7.0.0 - with: - name: modbusscope-windows - path: | - ModbusScope.zip - ModbusScope_setup.exe + # - uses: actions/upload-artifact@v7.0.0 + # with: + # name: modbusscope-windows + # path: | + # ModbusScope.zip + # ModbusScope_setup.exe diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 7aed3e32..4d5f3eca 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -17,7 +17,7 @@ jobs: sh create_doc.sh mv docs/manual/_build/latex/modbusscope.pdf modbusscope-user-manual.pdf - - uses: actions/upload-artifact@v7.0.0 - with: - name: modbusscope-user-manual - path: modbusscope-user-manual.pdf + # - uses: actions/upload-artifact@v7.0.0 + # with: + # name: modbusscope-user-manual + # path: modbusscope-user-manual.pdf diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fa99a10..9315c051 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,3 @@ -The latest *ModbusScope* installer or standalone version can always be downloaded from the [release page](https://github.com/ModbusScope/ModbusScope/releases). ## [Unreleased] @@ -8,385 +7,12 @@ The latest *ModbusScope* installer or standalone version can always be downloade ### Fixed -* Fix incorrect data displayed when polling multiple devices on the same connection (e.g. multiple slave IDs on a serial bus) - -### Changed - -* Rework diagnostic logging to generate fewer logs when extensive logging is disabled -* Improve copying diagnostic logs to the clipboard -* Improve enabling debug logs - -### Removed - * xx -## [v4.2.0](https://github.com/jgeudens/ModbusScope/releases/tag/4.2.0) (09/01/2026) - -### Added - -* Added concept of devices to allow polling multiple devices on a single connection - -### Changed - -* Major rework of settings window - * Combined several settings dialogs into one window - -* Major refactor of documentation and user manual -* Improve note handling (more padding, round values to less decimals) -* Update default colours of graphs - -### Removed - -* Replaced workaround to force light theme with standard function - -## [v4.1.1](https://github.com/jgeudens/ModbusScope/releases/tag/4.1.1) (11/09/2025) - -### Added - -* Warn when registers are selected, but not imported yet when closing import MBC dialog - -### Fixed - -* Always use light mode even when system is configured as dark mode ([Github #372](https://github.com/ModbusScope/ModbusScope/issues/372)) - -## [v4.1.0](https://github.com/jgeudens/ModbusScope/releases/tag/4.1.0) (03/07/2025) - -### Added - -* Add option to highlight graph -* Add option to compare/import changes from mbc with existing mbs ([Github #342](https://github.com/ModbusScope/ModbusScope/issues/342)) - -### Changed - -* Select consistent theme across platforms -* Various UI changes to improve consistency (scale dock, about window, ...) ([Github #349](https://github.com/ModbusScope/ModbusScope/issues/349)) -* Make sure color of register remains visible when register is selected in register window -* Various improvements to importing MBC registers ([Github #344](https://github.com/ModbusScope/ModbusScope/issues/344)) - -## [v4.0.1](https://github.com/jgeudens/ModbusScope/releases/tag/4.0.1) (23/12/2024) - -### Added - -* Diagnostic dialog is opened when stats section in status bar is clicked -* Add most recent project file menu ([Github #222](https://github.com/ModbusScope/ModbusScope/issues/222)) -* Add median poll time of last 50 samples to status bar -* Support other files with "open with" ([Github #329](https://github.com/ModbusScope/ModbusScope/issues/329)) - -### Changed - -* Scaling settings of secondary value axis is now saved in project file - -## [v4.0.0](https://github.com/ModbusScope/ModbusScope/releases/tag/4.0.0) (18/06/2024) - -### Added - -* Add extended register syntax to handle full address range (e.g `${h65535}`) -* Highlight expression syntax error in register dialog -* Implement easier editing of expression in register dialog - -### Fixed - -* Fixed warning when loading mbs file with unsupported datalevel -* Don't deselect axis when Ctrl key is pressed ([Github #304](https://github.com/ModbusScope/ModbusScope/issues/304)) - ### Changed -* Improve formatting of large and small values ([Github #287](https://github.com/ModbusScope/ModbusScope/issues/287)) +* xx ### Removed -* Removed correction of corrupt values (STMStudio) -* Removed support for opening very old mbs files (ModbusScope v2.x.x or earlier) - * Old mbs files can be updated by opening and saving using ModbusScope v3.x.x. - -## [v3.9.0](https://github.com/ModbusScope/ModbusScope/releases/tag/3.9.0) (04/12/2023) - -### Added - -* Add support for other object types (discrete output coils, discrete input contacts, input registers, holding registers) - -## [v3.8.1](https://github.com/ModbusScope/ModbusScope/releases/tag/3.8.1) (12/08/2023) - -### Added - -* Allow in place editing of expressions - -### Changed - -* Allow screenshot during logging ([Github #280](https://github.com/ModbusScope/ModbusScope/issues/280)) - -## [v3.8.0](https://github.com/ModbusScope/ModbusScope/releases/tag/3.8.0) (02/06/2023) - -### Added - -* Improve visibility of errors (highlight curve in legend) - -### Fixed - -* Fixed diagnostic log cleared when "extensive logging" is disabled ([Github #265](https://github.com/ModbusScope/ModbusScope/issues/265)) - -### Changed - -* Change add register dialog (wizard) to drop-down frame -* Keep focus of selected register when filtering during mbc import ([Github #169](https://github.com/ModbusScope/ModbusScope/issues/169)) - -## [v3.7.0](https://github.com/ModbusScope/ModbusScope/releases/tag/3.7.0) (03/02/2023) - -### Changed - -* Rework toolbar (new icons and remove some actions) -* Update notification is now only visible after 14 days since release -* Improve marker indicators (Z-order) -* Select value axis scale options tab on axis selection ([Github #253](https://github.com/ModbusScope/ModbusScope/issues/253)) -* Update dependencies - -### Added - -* Add support for 32-bit floating point type ([Github #250](https://github.com/ModbusScope/ModbusScope/issues/250)) -* Add indicator on axis to indicate value axis configuration of curve - -## [v3.6.3](https://github.com/ModbusScope/ModbusScope/releases/tag/3.6.3) (21/11/2022) - -### Fixed - -* Fix menu on incorrect screen ([Github #248](https://github.com/ModbusScope/ModbusScope/issues/248)) - -## [v3.6.2](https://github.com/ModbusScope/ModbusScope/releases/tag/3.6.2) (06/11/2022) - -### Fixed - -* Fix marker data calculations ([Github #240](https://github.com/ModbusScope/ModbusScope/issues/240)) -* Fix markers in combination with value axis ([Github #240](https://github.com/ModbusScope/ModbusScope/issues/240)) - -## [v3.6.1](https://github.com/ModbusScope/ModbusScope/releases/tag/3.6.1) (04/10/2022) - -### Fixed - -* Fix zooming of axis with mouse wheel ([Github #234](https://github.com/ModbusScope/ModbusScope/issues/234)) - -## [v3.6.0](https://github.com/ModbusScope/ModbusScope/releases/tag/3.6.0) (02/10/2022) - -### Changed - -* When starting only set scaling to auto when it is set to manual ([Github #210](https://github.com/ModbusScope/ModbusScope/issues/210)) -* Improve import/export of csv data (especially when modifying file in Excel) ([Github #220](https://github.com/ModbusScope/ModbusScope/issues/220)) -* Remove unused space in scale dock - -### Added - -* Second Y-axis on right-side ([Github #188](https://github.com/ModbusScope/ModbusScope/issues/188)) -* Add option to quickly add a register - -### Fixed - -* Fix blurry tick labels in Qt6 build -* Fix crash when there is no data and marker is active ([Github #223](https://github.com/ModbusScope/ModbusScope/issues/223)) -* Fix crash when a register is added and data is present ([Github #229](https://github.com/ModbusScope/ModbusScope/issues/229)) - -## [v3.5.1](https://github.com/ModbusScope/ModbusScope/releases/tag/3.5.1) (11/05/2022) - -* Crash on showing tooltip with empty graphs ([Github #208](https://github.com/ModbusScope/ModbusScope/issues/208)) -* Incorrect tab stop order when adding new registers ([Github #209](https://github.com/ModbusScope/ModbusScope/issues/209)) -* Revert Windows build back to Qt5.15.2 to fix blurry tick labels - -## [v3.5.0](https://github.com/ModbusScope/ModbusScope/releases/tag/3.5.0) (04/05/2022) - -* Convert min/max settings of Y axis to floating point ([Github #183](https://github.com/ModbusScope/ModbusScope/issues/183)) -* Add *Save Project* menu item -* Implement changing order of registers by drag and drop ([Github #78](https://github.com/ModbusScope/ModbusScope/issues/78)) -* Allow scrolling to negative times when there is negative time data ([Github #198](https://github.com/ModbusScope/ModbusScope/issues/198)) -* Update to Qt6 - -## [v3.4.0](https://github.com/ModbusScope/ModbusScope/releases/tag/3.4.0) (02/03/2022) - -* Allow full 16-bit addressing of holding registers ([Github #181](https://github.com/ModbusScope/ModbusScope/issues/181)) -* Expand expressions with register definition to provide more flexibility for user ([Github project #6](https://github.com/ModbusScope/ModbusScope/projects/6)) - * This changes adds the ability to combine multiple registers from potential multiple connections in one curve. -* Add syntax highlighting to expressions, including invalid token ([Github #142](https://github.com/ModbusScope/ModbusScope/issues/142)) - -## [v3.3.1](https://github.com/ModbusScope/ModbusScope/releases/tag/3.3.1) (23/12/2021) - -* Select next register row after deletion in register dialog -* Improve note positioning when sliding window ([Github #168](https://github.com/ModbusScope/ModbusScope/issues/168)) -* Hide markers on data load ([Github #171](https://github.com/ModbusScope/ModbusScope/issues/171)) -* Fix opening project file via menu ([Github #173](https://github.com/ModbusScope/ModbusScope/issues/173)) -* Let text filter also work on register number during mbc import ([Github #174](https://github.com/ModbusScope/ModbusScope/issues/174)) - -## [v3.3.0](https://github.com/ModbusScope/ModbusScope/releases/tag/3.3.0) (08/10/2021) - -* Various user experience improvements - * Replace check boxes with radio buttons - * Rename menu items - * Add extra menu items to tool bar -* Reload previous mbc file when import mbc dialog is opened ([Github #156](https://github.com/ModbusScope/ModbusScope/issues/156)) -* Improve documentation (fixed [Github #161](https://github.com/ModbusScope/ModbusScope/issues/161) and open data file chapter) -* Fix that marker points are visible when graph isn't ([Github #157](https://github.com/ModbusScope/ModbusScope/issues/157)) -* Include connection id in duplicate check when opening mbs file ([Github #164](https://github.com/ModbusScope/ModbusScope/issues/164)) -* Updated used libraries and internal improvements - -## [v3.2.1](https://github.com/ModbusScope/ModbusScope/releases/tag/3.2.1) (15/04/2021) - -* Fix crash when starting ModbusScope with project file ([Github #155](https://github.com/ModbusScope/ModbusScope/issues/155)) - -## [v3.2.0](https://github.com/ModbusScope/ModbusScope/releases/tag/3.2.0) (03/04/2021) - -**Improvements** - -* Add more visible update notification -* Make documentation and project page (with issue) more visible ([Github #152](https://github.com/ModbusScope/ModbusScope/issues/152)) - -**Fixes** - -* When data file is loaded, reset value in legend after inspection with `Control` key -* Reset scaling to auto when clearing data - -## [v3.1.0](https://github.com/ModbusScope/ModbusScope/releases/tag/3.1.0) (23/02/2021) - -**Improvements** - -* Add support for modbus RTU (serial port) -* Add options to export diagnostic log - * Copy specific logs to clipboard - * Export complete log to file ([Github #135](https://github.com/ModbusScope/ModbusScope/issues/135)) -* Minor graphical tweaks to markers - -## [v3.0.0](https://github.com/ModbusScope/ModbusScope/releases/tag/3.0.0) (14/11/2020) - -**Improvements** - -* Replace fixed operations (multiply, divide, shift, ...) with custom user-defined expression - * [Link to doc](https://modbusscope.readthedocs.io/en/latest/pages/configuration.html#expressions) - * Fixed operations will be automatically converted to custom expression on project load -* Rework and move the user manual to [ReadTheDocs](https://modbusscope.readthedocs.io/en/stable/) -* Expand information in logs - -* Improve handling of large time periods ([Github #139](https://github.com/ModbusScope/ModbusScope/issues/139)) - * Don't wrap around when period is larger than one day - -**Backward compatibility** -When loading old ModbusScope files (pre v3.x.x), the existing operations (multiply, divide, shift, bitmask, ...) will be converted to a single expression that is used in the new ModbusScope. This conversion makes sure that users won't notice any differences in functionality. - -When exporting the settings (project file), the new expression will be saved. Older ModbusScope versions won't be able to parse this expressions. The operations will be reset to the defaults, but other register info will be loaded correctly. - -## [v2.1.1](https://github.com/ModbusScope/ModbusScope/releases/tag/2.1.1) (03/07/2020) - -* Fix update check (add OpenSSL dll to install) ([Github #136](https://github.com/ModbusScope/ModbusScope/issues/136)) - -## [v2.1.0](https://github.com/ModbusScope/ModbusScope/releases/tag/2.1.0) (15/06/2020) - -**Defects** - -* Fix tooltip - -**Improvements** - -* Add support for 32 bit registers ([Github #129](https://github.com/ModbusScope/ModbusScope/issues/129)) -* Add support for persistent connection (default on) ([Github #18](https://github.com/ModbusScope/ModbusScope/issues/18)) -* Minimize scale dock -* Disable bit mask for signed numbers -* Rework logging to be able improve logging in the future - -## [v2.0.0](https://github.com/ModbusScope/ModbusScope/releases/tag/2.0.0) (03/03/2020) - -**Internal (code changes)** - -* Add more tests -* Fix most issues reported by static code analysis (Coverity) -* Change linking from static to dynamic - * Application changes from one large executable to a smaller executable with extra dll's - -**Features** - -* Added possibility to poll 2 different slaves in the same log -* Added possibility to change graph color from legend -* Added filter (error/info) in diagnostics window -* Added mbc filter based on description / register number -* Toggle markers option -* Rectangle zoom -* Integrated most used features from GraphViewer - * More flexible configuration of parsing settings - * Advanced auto detection of parsed settings - * Presets of parse settings -* Improved file loading/parsing - * Improve file loading windows (keep showing raw data on invalid parse settings) ([Github #120](https://github.com/ModbusScope/ModbusScope/issues/120)) - * Speed up loading large data file ([Github #121](https://github.com/ModbusScope/ModbusScope/issues/121)) - * Add progress bar on file load ([Github #122](https://github.com/ModbusScope/ModbusScope/issues/122)) - -**Bugs** - -* Small bug fixes ([Github #111](https://github.com/ModbusScope/ModbusScope/issues/111)) - -## v1.6.1 (06/04/2019) - -**Bugfixes** - -* Fix error when writing notes to imported data file ([Github #109](https://github.com/ModbusScope/ModbusScope/issues/109)) -* Automatically remove field separator from register names ([Github #106](https://github.com/ModbusScope/ModbusScope/issues/106)) - -**Improvements** - -* When importing a mbc file already selected registers are now disabled dynamically. - -## v1.6.0 (25/01/2019) - -Most of the work in this release isn't visible for the user. A complete rework of the communication module has been done. libmodbus was dropped in favor of Qt Modbus. The communication module has also been completely reworked to be able to implement integration and unit testing. - -## v1.5.0 (02/10/2018) - -**Features** - -* Add support for notes (small texts in graph) - * Editable (even after data load) - * Saved with data in csv -* Update legend component (thanks to @Fornax) -* Add tab filter when importing mbc files (implements [Github #96](https://github.com/ModbusScope/ModbusScope/issues/96)) - -**Bug fixes** - -* Fix slow drag issue ([Github #104](https://github.com/ModbusScope/ModbusScope/issues/104)) -* Keep visibility state when adding/removing graphs ([Github #102](https://github.com/ModbusScope/ModbusScope/issues/102)) -* Absolute time is off by 2 hours ([Github #103](https://github.com/ModbusScope/ModbusScope/issues/103)) - -**Under the hood** - -* Add initial unit tests for some modules -* Add Travis build - -## v1.4.0 (17/02/2018) - -**Features** - -* Rework Modbus communication code -* Update libraries - * QCustomPlot v2.0.0 (final) - * libmodbus to v3.14 -* Improve support for absolute timestamp -* Add option to show/hide all graphs ([Github #99](https://github.com/ModbusScope/ModbusScope/issues/99)) -* Add logging ([Github #71](https://github.com/ModbusScope/ModbusScope/issues/71)) - -**Bugfixes** - -* Fix some minor bugs ([Github #95](https://github.com/ModbusScope/ModbusScope/issues/95)) (thanks to @pluyckx), ([Github #89](https://github.com/ModbusScope/ModbusScope/issues/89)) - -## v1.3.0 (01/04/2017) - -**Features** - -* Rework tooltip (show value under cursor in legend when control key is pressed) ([Github #90](https://github.com/ModbusScope/ModbusScope/issues/90)) -* Import registers from mbc file (drag and drop or button in register dialog) ([Github #91](https://github.com/ModbusScope/ModbusScope/issues/91)) -* Add window auto scale on y-axis ([Github #36](https://github.com/ModbusScope/ModbusScope/issues/36)) -* Add meta data when exporting data (keep color when importing) ([Github #63](https://github.com/ModbusScope/ModbusScope/issues/63)) -* Added extra marker calculations (minimum, maximum, average, median, slope, ...) ([Github #79](https://github.com/ModbusScope/ModbusScope/issues/79)) -* Use delete button to remove registers ([Github #34](https://github.com/ModbusScope/ModbusScope/issues/34)) -* Improve communication (only split Modbus read on specific Modbus exception) -* Update QModbusPlot to v2.0.0 (beta) -* Add command line argument to enable OpenGL (--opengl) - -**Bugs** - -* Make sure legend window (when docked) is present on screenshot ([Github #80](https://github.com/ModbusScope/ModbusScope/issues/80)) -* Small fixes ([Github #82](https://github.com/ModbusScope/ModbusScope/issues/82), [Github #83](https://github.com/ModbusScope/ModbusScope/issues/83), [Github #85](https://github.com/ModbusScope/ModbusScope/issues/85), [Github #88](https://github.com/ModbusScope/ModbusScope/issues/88)) - -## Older releases - -Older releases can be found on [Github](https://github.com/ModbusScope/ModbusScope/releases) +* xx diff --git a/CMakeLists.txt b/CMakeLists.txt index baa78bed..e7b4b7c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.19) -project(modbusscope +project(notonlymodbusscope LANGUAGES CXX DESCRIPTION "Create logs from value read via Modbus" - VERSION 4.2.1 + VERSION 0.0.1 ) add_definitions("-DDEBUG") diff --git a/ModbusScope.code-workspace b/NotOnlyModbusScope.code-workspace similarity index 96% rename from ModbusScope.code-workspace rename to NotOnlyModbusScope.code-workspace index 045b6fc2..c39c5f98 100644 --- a/ModbusScope.code-workspace +++ b/NotOnlyModbusScope.code-workspace @@ -27,7 +27,7 @@ "request": "launch", "program": "${command:cmake.launchTargetPath}", "stopAtEntry": false, - "cwd": "${workspaceFolder:ModbusScope}", + "cwd": "${workspaceFolder:NotOnlyModbusScope}", "visualizerFile": "${command:qt-cpp.natvis}", "showDisplayString": true, "linux": { diff --git a/scripts/full_build_and_deploy_windows.bat b/scripts/full_build_and_deploy_windows.bat index 17b403e0..b7cda95b 100644 --- a/scripts/full_build_and_deploy_windows.bat +++ b/scripts/full_build_and_deploy_windows.bat @@ -6,4 +6,4 @@ REM No cache: scripts\full_build_and_deploy_windows.bat '' [path] call scripts\setup_windows.bat %1 %2 call scripts\build_windows.bat -call scripts\deploy_windows.bat +REM call scripts\deploy_windows.bat diff --git a/sonar-project.properties b/sonar-project.properties deleted file mode 100644 index 62a889d2..00000000 --- a/sonar-project.properties +++ /dev/null @@ -1,10 +0,0 @@ -sonar.projectKey = ModbusScope_ModbusScope -sonar.organization = modbusscope - -# This is the name and version displayed in the SonarCloud UI. -sonar.projectName = ModbusScope - -# relative paths to source directories. More details and properties are described -# in https://sonarcloud.io/documentation/project-administration/narrowing-the-focus/ -sonar.sources = src/ -sonar.tests = tests/ \ No newline at end of file