diff --git a/DSView/pv/data/decoderstack.cpp b/DSView/pv/data/decoderstack.cpp index 1df0abb0953980d2eafbcb798f8e2f2802235e57..6d9442bf1acd25b3621a1d8c97f57ad0c8643fd6 100644 --- a/DSView/pv/data/decoderstack.cpp +++ b/DSView/pv/data/decoderstack.cpp @@ -409,7 +409,7 @@ void DecoderStack::decode_proc() prev_di = di; } - // Get the intial sample count + // Get the initial sample count { unique_lock<mutex> input_lock(_input_mutex); sample_count = _sample_count = _snapshot->get_sample_count(); diff --git a/DSView/pv/data/decoderstack.h b/DSView/pv/data/decoderstack.h index b2cd65f8e38c0d7bd266a0428b5298f977fa207e..24713e05bcdf04742ae841c0692c71bba9f47491 100644 --- a/DSView/pv/data/decoderstack.h +++ b/DSView/pv/data/decoderstack.h @@ -148,7 +148,7 @@ private: pv::SigSession &_session; /** - * This mutex prevents more than one decode operation occuring + * This mutex prevents more than one decode operation occurring * concurrently. * @todo A proper solution should be implemented to allow multiple * decode operations. diff --git a/NEWS b/NEWS index 7dd920f8768d88b47b61841c3d47f2f64c2ec04d..d13ac34fcf168cc6d9b23934865336201e260bd7 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 a31467a5bb4b3d8a61f6d2b107fecb380e1e51c7..03a0f0ceccdf1fbc28b8a983ec4eaa77df6eb232 100644 --- a/libsigrok4DSL/hardware/demo/demo.c +++ b/libsigrok4DSL/hardware/demo/demo.c @@ -1052,7 +1052,7 @@ static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) (void)cb_data; - sr_dbg("Stopping aquisition."); + sr_dbg("Stopping acquisition."); devc->stop = TRUE; sr_session_source_remove_channel(devc->channel);