Skip to content
Snippets Groups Projects
Commit b26ea0d8 authored by Zhaoliang Zheng's avatar Zhaoliang Zheng
Browse files

Merge remote-tracking branch 'origin/main' into main

parents 2d16d6e9 186f0a4e
No related merge requests found
......@@ -72,7 +72,7 @@ bool Camera::exe_color_detection_biggestblob(int8_t l_min, int8_t l_max, int8_t
bool Camera::exe_goalfinder(int8_t goal1, int8_t goal2, int8_t goal3, int&id, int&tx, int&ty, int&tz, int&rx, int&ry, int&rz){
int8_t goalid[3] = {goal1, goal2, goal3};
struct { uint16_t cid, ctx, cty, ctz, crx, cry, crz; } goalfinder_result;
struct { int16_t cid, ctx, cty, ctz, crx, cry, crz; } goalfinder_result;
if(interface->call(F("goalfinder"), goalid, sizeof(goalid), &goalfinder_result, sizeof(goalfinder_result))){
}
......
......@@ -198,8 +198,8 @@ void loop()
Sent_ry = ry;
Sent_rz = rz;
}else{
Sent_tx = 0;
Sent_ty = 0;
Sent_tx = 100000;
Sent_ty = 100000;
Sent_tz = 0; // cm
Sent_rx = 0;
Sent_ry = 0;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment