Skip to content

Commit

Permalink
Update version; update github runner (ubuntu-20.04 -> ubuntu-22.04)
Browse files Browse the repository at this point in the history
Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
  • Loading branch information
Ho-Ro committed Jul 27, 2023
1 parent 8021a1a commit c692226
Show file tree
Hide file tree
Showing 8 changed files with 1,008 additions and 1,008 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
# This workflow contains a single job called "build_check"
build_check:
# The type of runner that the job will run on - needs ubuntu-20.04 to get a recent sdcc
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2023-07-27: Merge pull request #21 from f1rmb/fix_python_version_usage [8021a1a]
2023-07-27: Make it work when 'python' is not available, but python3 is (like Ubuntu/Mint). [a36eade]
2023-03-06: correct version [479c738]
2023-03-06: correct ini file offset sign (same value as in EEPROM), fix comments [d25822d]
2022-10-18: update build process, create OpenHantek6022 header file with FW version [01b82fd]
2022-07-29: update README, add status badges [00a965f]
Expand Down
519 changes: 259 additions & 260 deletions PyHT6022/Firmware/DDS120/dds120-firmware.hex

Large diffs are not rendered by default.

494 changes: 247 additions & 247 deletions PyHT6022/Firmware/DSO6021/dso6021-firmware.hex

Large diffs are not rendered by default.

495 changes: 247 additions & 248 deletions PyHT6022/Firmware/DSO6022BE/dso6022be-firmware.hex

Large diffs are not rendered by default.

493 changes: 246 additions & 247 deletions PyHT6022/Firmware/DSO6022BL/dso6022bl-firmware.hex

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion PyHT6022/Firmware/dso602x_fw_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

const uint16_t DSO602x_FW_VER = 0x0210;

// setup.py: __version__ = '2.10.4'
// setup.py: __version__ = '2.10.6'
// PyHT6022/LibUsbScope.py: FIRMWARE_VERSION = 0x0210
// PyHT6022/Firmware/DSO6022BE/descriptor.inc: FIRMWARE_VERSION = 0x1002

8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Version is X.Y.Z = major.minor.update
#
# Keep major.minor in sync:
# Keep major.minor in sync, ignore patch (used for deb version only):
# - PyHT6022/Firmware/DSO6022BE/descriptor.inc
# Format: X.Y -> "FIRMWARE_VERSION = 0xYYXX"
# Format: XX.YY.ZZ -> "FIRMWARE_VERSION = 0xYYXX"
# - PyHT6022/LibUsbScope.py
# Format: X.Y -> "FIRMWARE_VERSION = 0xXXYY"
# Format: XX.YY.ZZ -> "FIRMWARE_VERSION = 0xXXYY"
#
# Update also "const uint16_t DSO602x_FW_VER = 0xXXYY" in "OpenHantek6022/openhantek/res/firmware/dso602x_fw_version.h"

__version__ = '2.10.5'
__version__ = '2.10.6'


from setuptools import setup
Expand Down

0 comments on commit c692226

Please sign in to comment.