diff --git a/.gitignore b/.gitignore index caa12f24..2b0f916e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ *.lo CMakeFiles CMakeCache.txt +*.cxx_parameters autom4te.cache *.cmake !cmake_modules diff --git a/NEWS b/NEWS index 7dd920f8..d13ac34f 100644 --- a/NEWS +++ b/NEWS @@ -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 diff --git a/libsigrok4DSL/hardware/demo/demo.c b/libsigrok4DSL/hardware/demo/demo.c index f575db7f..03e8d2cf 100644 --- a/libsigrok4DSL/hardware/demo/demo.c +++ b/libsigrok4DSL/hardware/demo/demo.c @@ -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;