Did some more last night.. Got the text working and most of the scope logic... I may have gone a tiny bit overboard as I have tried it with sine, sawtooth, triangle and square wave all worked very well but the screen update gets a tad slow when you reach 7khz. I've included at this point a vertical position pot, a switch for the on screen text, a switch to change ADC rate. I think I need a trigger as the wave doesn't appear to stay in one place (well duh). peak to peak voltage should be relatively easy then it will just be the frequency readout..
Ian