From ee148cc3145356c297b34892d5359108d0f18e50 Mon Sep 17 00:00:00 2001 From: DreamSourceLab Date: Sat, 22 Feb 2020 18:41:08 +0800 Subject: [PATCH] Bump version to v1.10 --- DSView/CMakeLists.txt | 4 ++-- DSView/res/DSCope1.def25.dsc | 2 +- DSView/res/DSCope1.def31.dsc | 2 +- DSView/res/DSLogic1.def25.dsc | 2 +- DSView/res/DSLogic1.def31.dsc | 2 +- NEWS25 | 38 +++++++++++++++++++++++++++++++++++ NEWS31 | 38 +++++++++++++++++++++++++++++++++++ 7 files changed, 82 insertions(+), 6 deletions(-) diff --git a/DSView/CMakeLists.txt b/DSView/CMakeLists.txt index 16ef4069..04227a1a 100755 --- a/DSView/CMakeLists.txt +++ b/DSView/CMakeLists.txt @@ -106,8 +106,8 @@ set(DS_TITLE DSView) set(DS_DESCRIPTION "A GUI for instruments of DreamSourceLab") set(DS_VERSION_MAJOR 1) -set(DS_VERSION_MINOR 0) -set(DS_VERSION_MICRO 1) +set(DS_VERSION_MINOR 1) +set(DS_VERSION_MICRO 0) set(DS_VERSION_STRING ${DS_VERSION_MAJOR}.${DS_VERSION_MINOR}.${DS_VERSION_MICRO} ) diff --git a/DSView/res/DSCope1.def25.dsc b/DSView/res/DSCope1.def25.dsc index 8a9a0bcc..91cbb821 100755 --- a/DSView/res/DSCope1.def25.dsc +++ b/DSView/res/DSCope1.def25.dsc @@ -1,7 +1,7 @@ { "Device": "DSCope", "DeviceMode": 1, - "Horizontal trigger position": "0", + "Horizontal trigger position": "50", "Language": 25, "Operation Mode": "正常", "Time base": "10000", diff --git a/DSView/res/DSCope1.def31.dsc b/DSView/res/DSCope1.def31.dsc index 96b53b73..3fcb5e4c 100755 --- a/DSView/res/DSCope1.def31.dsc +++ b/DSView/res/DSCope1.def31.dsc @@ -1,7 +1,7 @@ { "Device": "DSCope", "DeviceMode": 1, - "Horizontal trigger position": "0", + "Horizontal trigger position": "50", "Language": 31, "Operation Mode": "Normal", "Time base": "10000", diff --git a/DSView/res/DSLogic1.def25.dsc b/DSView/res/DSLogic1.def25.dsc index 13f166cf..2e60149a 100755 --- a/DSView/res/DSLogic1.def25.dsc +++ b/DSView/res/DSLogic1.def25.dsc @@ -4,7 +4,7 @@ "DeviceMode": 1, "Enable RLE Compress": 1, "Filter Targets": "无", - "Horizontal trigger position": "0", + "Horizontal trigger position": "50", "Language": 25, "Max Height": "1X", "Operation Mode": "Stream模式", diff --git a/DSView/res/DSLogic1.def31.dsc b/DSView/res/DSLogic1.def31.dsc index 35595213..6e5fdc1a 100755 --- a/DSView/res/DSLogic1.def31.dsc +++ b/DSView/res/DSLogic1.def31.dsc @@ -4,7 +4,7 @@ "DeviceMode": 1, "Enable RLE Compress": 1, "Filter Targets": "None", - "Horizontal trigger position": "0", + "Horizontal trigger position": "50", "Language": 31, "Max Height": "1X", "Operation Mode": "Stream Mode", diff --git a/NEWS25 b/NEWS25 index 67252229..de9b887c 100755 --- a/NEWS25 +++ b/NEWS25 @@ -1,3 +1,41 @@ +1.10 -- (2020-02-22) +----------------- + （通用） + *增加DSCope U3P100设备（100M带宽/1G采样率/USB3.0示波器）的支持 + *增加DSLogic U3Pro32设备（32通道/1G采样率/USB3.0逻辑分析仪）的支持 + *增加DSCope U2B100设备（100M带宽/1G采样率/USB2.0示波器）的支持 + *增加DSLogic U3Pro16设备（16通道/1G采样率/USB3.0逻辑分析仪）的支持 + *增加设备类型的显示(USB 2.0 / USB 3.0 / 演示设备 / 文件) + *增加FPGA固件版本check + *改进文件保存的默认名称和路径记忆 + *修复一些显示和界面语言问题 + + （逻辑分析仪） + *扩展触发通道，支持到最高32通道 + *修复PS/2协议的解析问题（#239） + *修复cec协议的解析问题（#235） + *修复解码文件导出的ID问题（#237） + *修复高级触发的取反逻辑无法正常工作的问题 + *修复其它显示问题 + + （示波器） + *改进高频信号触发的波形抖动问题 + *修复降采样时，采样点选取错误的问题 + *增加20M带宽限制选项（仅DSCope U2B100和DSCope U3P100设备） + *改进数据捕获和波形显示的同步方式 + *修复stop条件下，改变垂直灵敏度和偏移可能导致波形显示和测量结果不正确的问题 + *修复roll模式下，改变垂直偏移导致波形重头开始采集的问题 + *修复在等待触发的条件下，math通道的水平分辨率无法改变的问题 + *修复在等待触发的条件下，已采集的波形无法改变垂直偏移的问题 + *修复自动测量的参数未自动清除，以及显示的抖动问题 + *修复光标和鼠标跟随测量，在某些条件下显示不正确的问题 + *修复某些条件下切换触发源，可能导致波形无法正常触发的问题 + + （数据记录仪） + *修复垂直偏移没有和硬件设置同步的问题 + *修复某些极端情况下，大量波形压缩显示时可能出现的问题 + *增加波形结果的鼠标跟随测量 + 1.01 -- (2019-09-15) ----------------- （通用） diff --git a/NEWS31 b/NEWS31 index fef12982..3c85495a 100755 --- a/NEWS31 +++ b/NEWS31 @@ -1,3 +1,41 @@ +1.10 -- (2020-02-22) +----------------- + --common + *add support for DSCope U3P100 device (100M bandwidth/1G samplerate/USB3.0 oscilloscope) + *add support for DSLogic U3Pro32 device (32 channels/1G samplerate/USB3.0 logic analyzer) + *add support for DSCope U2B100 device (100M bandwidth/1G samplerate/USB2.0 oscilloscope) + *add support for DSLogic U3Pro16 device (16 channels/1G samplerate/USB3.0 logic analyzer) + *add display of device type (USB 2.0 / USB 3.0 / Demo / File) + *add version check for FPGA firmware + *improve the default file name when saving/exporting files + *fix other display and language issue + + --for logic analyzer + *extend channel support for trigger up to 32 channels + *fix issue of ps/2 decoder (#239) + *fix issue of cec decoder (#235) + *fix ID issue when export results of decoder (#237) + *fix "not" logic don't work in advance trigger + *fix other display issues + + --for oscilloscope + *improve wave shake issue when trig high freqency signals + *fix sampling point selection issue of downsampling + *add 20M bandwidth limitation for DSCope U2B100 / DSCope U3P100 devices + *improve synchronism between data acquisition and wave dispaly + *fix wave display and measurement issue when change vdiv and offset after stop + *fix capture restart issue when change offset in roll mode + *fix issue of timebase of math channel can't be changed when waiting trigger + *fix issue of offset can't be changed when waiting trigger + *fix clear and flicker issue of auto measurements + *fix cursor and mouse measurements issue after change samplerate when waiting trigger + *fix trigger issue when toggle between different trigger source + + --for data acquisiton + *fix hardware offset setting issue + *fix mipmap issue of long time data at some case + *add cursor and mouse measurements + 1.01 -- (2019-09-15) ----------------- --common