Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CSV export in columns, math channel iterator fix #69

Merged
merged 1 commit into from
Aug 8, 2017

Conversation

dendvz
Copy link
Contributor

@dendvz dendvz commented Aug 6, 2017

  1. CSV export into long lines looks pretty useless, e.g. they make LibreOffice Calc fail with message "The data could not be loaded completely because the maximum number of columns per sheet was exceeded". Changed CSV export to columns. X-axis (time/frequency) values are printed in each line, thus making import into plot tools easier.
  2. Fixed bug in MATH channel (double-increment of iterator), changed postfix iterator increments to prefix increments.
  3. Improved DSO6022BE Software trigger stability by increasing dropped sample count to 1040 (0x410). Most likely the same buffer truncation needs to be applied to 6022BL. Still have to dive into jhoenicke's firmware, fast sample rates might require different approach to data acquisition.

@davidgraeff
Copy link
Member

Could you please squash the pull request to one commit? Command line:
git rebase -i HEAD~20
And follow the instructions.

2) Removed double-increment of math channel iterator, post-increment changed to pre-increment
3) CSV export in columns
@dendvz
Copy link
Contributor Author

dendvz commented Aug 7, 2017

Squashed commits as requested.

@davidgraeff
Copy link
Member

I reviewed the code and 2. and 3. looks good to me.
For 1.: Can you add a generated csv file here in the comments area, so that I can see the effect of your changes? @dendvz

@dendvz
Copy link
Contributor Author

dendvz commented Aug 8, 2017

before.csv and after.csv renamed into *.txt.
before.txt
after.txt

LibreOffice Calc error message:
csv_import_issue

@davidgraeff
Copy link
Member

Thanks, LGTM

@davidgraeff davidgraeff merged commit 9db3622 into OpenHantek:master Aug 8, 2017
@dendvz dendvz deleted the math_channel_iterator_fix branch January 7, 2018 10:49
GCarneiroA pushed a commit to GCarneiroA/openhantek that referenced this pull request Oct 29, 2020
Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants