Commit Graph

8 Commits

Author SHA1 Message Date
Chris Esposito 8cc740c6e1 Revert "Simplify the waveform reading code (#194)"
This reverts commit 591940b225.

Revert "Whitespace cleanup (#192)"

This reverts commit 1b45b0d112.
2021-11-16 14:30:10 +11:00
turboencabulator 591940b225
Simplify the waveform reading code (#194)
Combine the Android and non-Android implementations.  Only difference
now is the path to the waveform data.

Remove arbitrarily-sized buffers and most C-style string handling
function calls.  Use native Qt string methods instead; this should
improve memory safety.
2021-11-10 09:44:16 +11:00
turboencabulator 1b45b0d112
Whitespace cleanup (#192)
* Fix whitespace at EOL and EOF; replace tabs

* Normalize line endings
2021-11-08 10:44:12 +11:00
Sebastián Mestre e6f0e24a28 'Functiongencontrol refactor - part 3 (#74)
* move ChannelID to outside of functionGenControl

* move ChannelData out of functionGenControl

* make the genericUsbDriver fGenPtrs into an array

* Make genericUsbDriver store pointers to ChannelData instead of to functionGenControl

* split genericUsbDriver::setFunctionGen into two parts. Stop reassigning the fGen pointers

* Big functionGenControl refactor

- Create functionGen namespace
- Rename functionGenControl to DualChannelController
- Create a SingleChannelController class that holds all the
functionality of a single channel (i.e. almost all of it).
This class acts as a Qt wrapper over the actual data, it
gives it the ability to emit and recieve signals while
keeping the actual data copiable.
- Add an alias functionGenControl = DualChannelController
2019-03-26 10:12:08 +11:00
Chris Esposito 681ef5cb13
length cast to double 2019-03-07 20:00:40 +11:00
Sebastián Mestre c149063452 Functiongencontrol refactor - part 2 (#69)
* use an enum instead of int to identify function generator channels

* Use local 8 bit encoding instead of utf8 for file paths

* use static_cast instead of function-style casts

* remove length member from channelData struct. use reference captures on some lambdas
2019-03-07 19:58:52 +11:00
Sebastián Mestre a144105b23 Functiongencontrol refactor (#68)
* Add struct definition for functionGenControl channel data

* Add member variables for channel data to functionGenControl, deprecate old variables

* fix a typo

* Transition to new functionGenControl cahnnel data variables. Remove old ones.

* refactor genericUsbDriver::setFunctionGen to use the new ChannelData struct.

* functionGenControl: free(NULL) is safe

* Eliminate duplication of functionGenControl::waveformName_CH* fuctions by putting common things into a private template function

* get rid of comments added during refactor

* Move function gen channel data to use std::vector. algorithmify some code on genericUsbDriver::setFunctionGen

* various formatting changes, remove irrelevant comments

* functionGenControl::waveformName: always use utf8 and 16 byte buffers. Remove template

* fix typo introduced by last-second indentation change

* genericUsbDrive::setFunctionGen: shrink samples to fit

* functionGenControl::waveformName: clean up file path manipulation, clean up formatting

* change the two channel objects to an array of two elements. Add common implementations for all methods of functionGenControl. Fix a massive bug introduced earlier in the refactor. Formatting.
2019-03-04 20:02:18 +11:00
EspoTek ca2406b2db Cleaned junk out of repo.
Still need to edit history


Former-commit-id: e2061432d4b3d2bbb1f9621f3cce34d43b682b2a
Former-commit-id: aeeed8aa2af692f92b7ea7ec8cc042d49c679ce5
2017-10-21 16:11:49 +11:00