Added scale selections.
Merge branch 'oscilloscope_scale_change' into develop