The one-dimensional spin-1/2 ANNNI model in two magnetic fields