I messed up the merge, so pushing it over to another repo so I don't lose it. Will tidy up and remove later
Dependencies: BufferedSerial FatFileSystemCpp mbed
Diff: position.cpp
- Revision:
- 3:14d241e29be3
- Parent:
- 2:a79201e302d7
- Child:
- 8:961bb15570a1
--- a/position.cpp Mon Jan 18 09:15:04 2021 +0000 +++ b/position.cpp Thu Jan 28 15:13:05 2021 +0000 @@ -65,6 +65,9 @@ output->pitch = position::interpAngle(pos1->pitch,pos1Weight,pos2->pitch,pos2Weight); output->yaw =position::interpAngle(pos1->yaw,pos1Weight,pos2->yaw,pos2Weight); output->ID = pos1->ID; +output->focus = pos1->focus*pos1Weight + pos2->focus*pos2Weight +0.5f; +output->iris = pos1->iris*pos1Weight + pos2->iris*pos2Weight +0.5f; +output->zoom = pos1->zoom*pos1Weight + pos2->zoom*pos2Weight +0.5f; return true; }