New Teff and [Fe/H] spectroscopic calibration for FGK dwarfs and GK giants