S- and P-wave effective range parameters for the nucleon-nucleon interaction