Dihedral f-tilings of the sphere by rhombi and triangles