Skip to content

Commit 423127c

Browse files
sanny32sanny32
committed
Merge remote-tracking branch 'origin/release/1.x'
2 parents 1a8783f + 0da8ff6 commit 423127c

26 files changed

Lines changed: 531 additions & 204 deletions

‎.github/workflows/build-deb-qt5-amd64.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,12 +243,12 @@ jobs:
243243

244244
- name: Create or update GitHub Release and upload DEB
245245
if: success() && github.event_name == 'push' && github.ref_type == 'tag'
246-
uses: softprops/action-gh-release@v2
246+
uses: softprops/action-gh-release@v3
247247
with:
248248
draft: true
249249
tag_name: ${{ github.ref_name }}
250250
name: Open ModScan ${{ env.APP_VERSION }}
251251
files: |
252252
${{ env.BUILD_DEB_DIR }}/${{ env.DEB_PACKAGE_NAME }}_${{ env.APP_VERSION }}-${{ env.DEB_REVISION }}_${{ env.DEB_ARCH }}.deb
253253
env:
254-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
254+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/build-deb-qt6-amd64.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,12 +269,12 @@ jobs:
269269

270270
- name: Create or update GitHub Release and upload DEB
271271
if: success() && github.event_name == 'push' && github.ref_type == 'tag'
272-
uses: softprops/action-gh-release@v2
272+
uses: softprops/action-gh-release@v3
273273
with:
274274
draft: true
275275
tag_name: ${{ github.ref_name }}
276276
name: Open ModScan ${{ env.APP_VERSION }}
277277
files: |
278278
${{ env.BUILD_DEB_DIR }}/${{ env.DEB_PACKAGE_NAME }}_${{ env.APP_VERSION }}-${{ env.DEB_REVISION }}_${{ env.DEB_ARCH }}.deb
279279
env:
280-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
280+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/build-flatpak-x86_64.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,12 @@ jobs:
133133
134134
- name: Create or update GitHub Release and upload FLATPAK
135135
if: success() && github.event_name == 'push' && github.ref_type == 'tag'
136-
uses: softprops/action-gh-release@v2
136+
uses: softprops/action-gh-release@v3
137137
with:
138138
draft: true
139139
tag_name: ${{ github.ref_name }}
140140
name: Open ModScan ${{ env.APP_VERSION }}
141141
files: |
142142
.github/linux/flatpak/io.github.sanny32.omodscan.flatpak
143143
env:
144-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
144+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/build-installer-qt5-win32.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ env:
3838
jobs:
3939
build-omodscan:
4040
name: Build OpenModScan installer version '${{ github.event.inputs.tag || github.event.inputs.branch || github.ref_name }}' with Qt5 on Windows x86
41-
runs-on: windows-latest
41+
runs-on: windows-2022
4242

4343
steps:
4444
- name: Checkout repository
@@ -218,12 +218,12 @@ jobs:
218218

219219
- name: Create or update GitHub Release and upload EXE
220220
if: success() && github.event_name == 'push' && github.ref_type == 'tag'
221-
uses: softprops/action-gh-release@v2
221+
uses: softprops/action-gh-release@v3
222222
with:
223223
draft: true
224224
tag_name: ${{ github.ref_name }}
225225
name: Open ModScan ${{ env.APP_VERSION }}
226226
files: |
227227
qt5-omodscan-${{ env.APP_VERSION }}_${{ env.ARCH }}.exe
228228
env:
229-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
229+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/build-installer-qt5-win64.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ env:
3737
jobs:
3838
build-omodscan:
3939
name: Build OpenModScan installer version '${{ github.event.inputs.tag || github.event.inputs.branch || github.ref_name }}' with Qt5 on Windows x64
40-
runs-on: windows-latest
40+
runs-on: windows-2022
4141

4242
steps:
4343
- name: Checkout repository
@@ -217,12 +217,12 @@ jobs:
217217

218218
- name: Create or update GitHub Release and upload EXE
219219
if: success() && github.event_name == 'push' && github.ref_type == 'tag'
220-
uses: softprops/action-gh-release@v2
220+
uses: softprops/action-gh-release@v3
221221
with:
222222
draft: true
223223
tag_name: ${{ github.ref_name }}
224224
name: Open ModScan ${{ env.APP_VERSION }}
225225
files: |
226226
qt5-omodscan-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}.exe
227227
env:
228-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
228+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/build-installer-qt6-win64.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ env:
3737
jobs:
3838
build-omodscan:
3939
name: Build OpenModScan installer version '${{ github.event.inputs.tag || github.event.inputs.branch || github.ref_name }}' with Qt6
40-
runs-on: windows-latest
40+
runs-on: windows-2022
4141

4242
steps:
4343
- name: Checkout repository
@@ -213,12 +213,12 @@ jobs:
213213

214214
- name: Create or update GitHub Release and upload EXE
215215
if: success() && github.event_name == 'push' && github.ref_type == 'tag'
216-
uses: softprops/action-gh-release@v2
216+
uses: softprops/action-gh-release@v3
217217
with:
218218
draft: true
219219
tag_name: ${{ github.ref_name }}
220220
name: Open ModScan ${{ env.APP_VERSION }}
221221
files: |
222222
qt6-omodscan-${{ env.APP_VERSION }}_${{ env.CMAKE_ARCH }}.exe
223223
env:
224-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
224+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/build-rpm-qt6-x86_64.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ jobs:
275275

276276
- name: Create or update GitHub Release and upload RPM
277277
if: success() && github.event_name == 'push' && github.ref_type == 'tag'
278-
uses: softprops/action-gh-release@v2
278+
uses: softprops/action-gh-release@v3
279279
with:
280280
draft: true
281281
tag_name: ${{ github.ref_name }}
@@ -284,4 +284,4 @@ jobs:
284284
${{ env.BUILD_RPM_DIR }}/RPMS/${{ env.RPM_ARCH }}/${{ env.RPM_PACKAGE_NAME }}-${{ env.APP_VERSION }}-${{ env.RPM_REVISION }}.${{ env.RPM_ARCH }}.rpm
285285
${{ env.RPM_PACKAGE_NAME }}.rpm.pubkey
286286
env:
287-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
287+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,19 +122,19 @@ Below are the methods for installing the OpenModScan for different OS
122122
## <img src="docs/icons/logo_windows.svg" width="16" height="16"> Microsoft Windows
123123
Run the installer:
124124

125-
- For 32-bit Windows: `qt5-omodscan_1.15.0_x86.exe`
126-
- For 64-bit Windows: `qt5-omodscan_1.15.0_x64.exe` or `qt6-omodscan_1.15.0_x64.exe`
125+
- For 32-bit Windows: `qt5-omodscan_1.15.1_x86.exe`
126+
- For 64-bit Windows: `qt5-omodscan_1.15.1_x64.exe` or `qt6-omodscan_1.15.1_x64.exe`
127127

128128

129129
## <img src="docs/icons/logo_debian.svg" width="20" height="20"> Debian • <img src="docs/icons/logo_ubuntu.svg" width="20" height="20"> Ubuntu • <img width="20" height="20" src="docs/icons/logo_mint.png" /> Mint • <img src="docs/icons/logo_zorin.png" width="20" height="20"> Zorin • <img width="22" height="22" src="docs/icons/logo_astra.png" /> Astra Linux
130130
### Install
131131
Install the DEB package from the command line:
132132
```bash
133-
sudo apt install ./qt6-omodscan_1.15.0-1_amd64.deb
133+
sudo apt install ./qt6-omodscan_1.15.1-1_amd64.deb
134134
```
135135
or if you want to use Qt5 libraries:
136136
```bash
137-
sudo apt install ./qt5-omodscan_1.15.0-1_amd64.deb
137+
sudo apt install ./qt5-omodscan_1.15.1-1_amd64.deb
138138
```
139139

140140
### Remove
@@ -151,7 +151,7 @@ sudo apt remove qt5-omodscan
151151
### Install
152152
Install the RPM package from the command line:
153153
```bash
154-
sudo dnf install ./qt6-omodscan_1.15.0-1.x86_64.rpm
154+
sudo dnf install ./qt6-omodscan_1.15.1-1.x86_64.rpm
155155
```
156156

157157
### Remove
@@ -164,7 +164,7 @@ sudo dnf remove qt6-omodscan
164164
### Install
165165
Install the RPM package from the command line as root user:
166166
```bash
167-
apt-get install ./qt6-omodscan_1.15.0-1.x86_64.rpm
167+
apt-get install ./qt6-omodscan_1.15.1-1.x86_64.rpm
168168
```
169169

170170
### Remove
@@ -181,7 +181,7 @@ sudo rpm --import qt6-omodscan.rpm.pubkey
181181
```
182182
Install the RPM package using Zypper:
183183
```bash
184-
sudo zypper install ./qt6-omodscan_1.15.0-1.x86_64.rpm
184+
sudo zypper install ./qt6-omodscan_1.15.1-1.x86_64.rpm
185185
```
186186

187187
### Remove

‎src/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.16)
22

33
project(omodscan
4-
VERSION 1.15.0
4+
VERSION 1.15.1
55
DESCRIPTION "An Open Source Modbus Master (Client) Utility"
66
LANGUAGES CXX)
77

‎src/dialogs/dialogaddressscan.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,8 @@ DialogAddressScan::DialogAddressScan(const DisplayDefinition& dd, DataDisplayMod
426426
ui->info->setShowTimestamp(false);
427427
ui->logView->setFont(defaultMonospaceFont());
428428

429-
auto dispatcher = QAbstractEventDispatcher::instance();
430-
connect(dispatcher, &QAbstractEventDispatcher::awake, this, &DialogAddressScan::on_awake);
429+
connect(&_updateTimer, &QTimer::timeout, this, &DialogAddressScan::on_awake);
430+
_updateTimer.start(100);
431431

432432
connect(&_scanTimer, &QTimer::timeout, this, &DialogAddressScan::on_timeout);
433433
connect(&_modbusClient, &ModbusClient::modbusReply, this, &DialogAddressScan::on_modbusReply);

0 commit comments

Comments
 (0)