[Nevyn]

I think you have a typo.

 }else{
    x -= s;     //otherwise subtract settling time from the pulse width
  }

Should be

 }else{
    x - s;     //otherwise subtract settling time from the pulse width
  }