SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

Merge branch 'develop' of https://github.com/DreamSourceLab/DSView into develop

Browse Source 
Conflicts:
	DSView/pv/data/decoderstack.cpp
	DSView/pv/data/dsosnapshot.cpp
	DSView/pv/dock/protocoldock.cpp
This commit is contained in:
DreamSourceLab
2016-08-10 17:28:19 +08:00
parent b15bf26843 aad5257fd2
commit f03d707d99
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -8,6 +8,7 @@
*.lo
CMakeFiles
CMakeCache.txt
*.cxx_parameters
autom4te.cache
*.cmake
!cmake_modules

8
NEWS
View File

@@ -50,14 +50,14 @@
* Improve measure function @ LA mode
* Add duty cycle measure @ LA mode
* Fix out of range issue @ LA mode
* Add export funtion, support csv/vcd/gnuplot/zip @ LA mode; and csv @ DSO mode
* Add export function, support csv/vcd/gnuplot/zip @ LA mode; and csv @ DSO mode
* Add x1/x10/x100 probe options @ DSO mode
* Add measure function @ DSO mode
* Add voltage display of trigger value @ DSO mode
* Fix wave disappear issue @ DSO mode
* Fix trigger issue @ DSO stream mode
* Fix data repeat when set trigger @ LA stream mode
* Keep channel settings when reload occured @ LA mode
* Keep channel settings when reload occurred @ LA mode
* Fix decoder issue when capture part of data @ LA mode
* Fix stack decoder add issue @ LA mode
* Fix other bugs
@@ -84,14 +84,14 @@
* Improve measure function @ LA mode
* Add duty cycle measure @ LA mode
* Fix out of range issue @ LA mode
* Add export funtion, support csv/vcd/gnuplot/zip @ LA mode; and csv @ DSO mode
* Add export function, support csv/vcd/gnuplot/zip @ LA mode; and csv @ DSO mode
* Add x1/x10/x100 probe options @ DSO mode
* Add measure function @ DSO mode
* Add voltage display of trigger value @ DSO mode
* Fix wave disappear issue @ DSO mode
* Fix trigger issue @ DSO stream mode
* Fix data repeat when set trigger @ LA stream mode
* Keep channel settings when reload occured @ LA mode
* Keep channel settings when reload occurred @ LA mode
* Fix decoder issue when capture part of data @ LA mode
* Fix stack decoder add issue @ LA mode
* Fix other bugsnalyzer mode

2
libsigrok4DSL/hardware/demo/demo.c
View File

@@ -1134,7 +1134,7 @@ static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
if (devc->stop)
return SR_OK;
sr_dbg("Stopping aquisition.");
sr_dbg("Stopping acquisition.");
devc->stop = TRUE;