Returned SCurve functions to psi46expert

For simplification reasons.  Should be moved back to firmware at later
date to increase efficiency.  Use only with corresponding psi46expert.