Updaing to latest SoftWire library, with renamed functions.