From 4f0cfaeabe67a1c2a5c1c2102c32ab48695a1105 Mon Sep 17 00:00:00 2001 From: dreamsourcelabTAI Date: Wed, 24 Aug 2022 16:19:43 +0800 Subject: [PATCH 1/3] fix: U3Pro32 can't supports 32 channels in buffer mode --- libsigrok4DSL/hardware/DSL/dsl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsigrok4DSL/hardware/DSL/dsl.h b/libsigrok4DSL/hardware/DSL/dsl.h index 89e2663c..0581c025 100644 --- a/libsigrok4DSL/hardware/DSL/dsl.h +++ b/libsigrok4DSL/hardware/DSL/dsl.h @@ -697,7 +697,7 @@ static const struct DSL_profile supported_DSLogic[] = { {CAPS_MODE_LOGIC, CAPS_FEATURE_VTH | CAPS_FEATURE_BUF | CAPS_FEATURE_USB30 | CAPS_FEATURE_ADF4360 | CAPS_FEATURE_LA_CH32, (1 << DSL_STREAM10x32_32_3DN2) | (1 << DSL_STREAM20x16_32_3DN2) | (1 << DSL_STREAM25x12_32_3DN2) | (1 << DSL_STREAM50x6_32_3DN2) | (1 << DSL_STREAM100x3_32_3DN2) | - (1 << DSL_BUFFER500x16) | (1 << DSL_BUFFER1000x8), + (1 << DSL_BUFFER250x32) | (1 << DSL_BUFFER500x16) | (1 << DSL_BUFFER1000x8), 32, SR_GB(2), 0, From 6279c713df1e49d4c277205882c65cb3a1e59a80 Mon Sep 17 00:00:00 2001 From: dreamsourcelabTAI Date: Fri, 26 Aug 2022 13:52:16 +0800 Subject: [PATCH 2/3] update: language resource --- DSView/languages/my_25.qm | Bin 32753 -> 32901 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/DSView/languages/my_25.qm b/DSView/languages/my_25.qm index 304660c35c909c35d55c58e5fa82d9b97057839a..a8bf2642a2c8164f51ef92488bc6e68533b06faa 100644 GIT binary patch delta 3396 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 aLQbJZ$6+C7L0)# Date: Fri, 26 Aug 2022 14:18:40 +0800 Subject: [PATCH 3/3] update: version config file --- CMakeLists.txt | 2 +- DSView/config.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac544076..eb9be42b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ set(DS_DESCRIPTION "A GUI for instruments of DreamSourceLab") set(DS_VERSION_MAJOR 1) set(DS_VERSION_MINOR 2) -set(DS_VERSION_MICRO 0) +set(DS_VERSION_MICRO 1) set(DS_VERSION_STRING ${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO} ) configure_file ( diff --git a/DSView/config.h b/DSView/config.h index 115c0215..063d4fb4 100644 --- a/DSView/config.h +++ b/DSView/config.h @@ -29,7 +29,7 @@ /* DSView version information */ #define DS_VERSION_MAJOR 1 #define DS_VERSION_MINOR 2 -#define DS_VERSION_MICRO 0 -#define DS_VERSION_STRING "1.2.0" +#define DS_VERSION_MICRO 1 +#define DS_VERSION_STRING "1.2.1" #endif