Consolidate Rigol DC power supply base classes