So many features!
Account for errors in data collection

If collecting data from the oscilloscope fails, the loop counter will
not increase, so it will keep looping. This will happen until an
additional 25% of repeats are completed, then will finish.
Merge branch 'oscilloscope_extension' into develop