This is what I think is the correct size?

BB92 (measured from outside of one BB cup to outside of other)

24mm/22mm (measured at bearing openings)

Angular or non-angular? (I have no idea)

Any help would be appreciated. The only thing that I am unable to measure is angular or not. I am not even sure what to look at for that.