Hi ! (I know it's been a while ;p)
I did the same thing, I take the offset and add it to the calculation.
One more thing, I tried to build the project on Windows and Android, but when using those the autopilot fonctionnality doesn't work. I supposed that the autopilot code is based on specific...