From 55c9bb2d2df0e8fb8ad547be78880c19d9c29843 Mon Sep 17 00:00:00 2001 From: Fyor Klein Gunnewiek Date: Sun, 25 Jun 2023 19:53:52 +0200 Subject: [PATCH 1/5] Better? --- etc/configuration/default.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/etc/configuration/default.json b/etc/configuration/default.json index 6995a2f8..c9d31d22 100644 --- a/etc/configuration/default.json +++ b/etc/configuration/default.json @@ -10,8 +10,8 @@ }, "wee_sound": { "timeout": { - "nanos": 0, - "secs": 3 + "nanos": 0, + "secs": 3 } }, "ball_detection": { @@ -521,24 +521,24 @@ "initial_hypothesis_score": 10.0, "initial_poses": { "one": { - "center_line_offset_x": -3.0, + "center_line_offset_x": -3.5, "side": "Left" }, "two": { - "center_line_offset_x": -2.0, + "center_line_offset_x": -3.0, "side": "Left" }, "three": { - "center_line_offset_x": -2.0, + "center_line_offset_x": -3.0, "side": "Right" }, "four": { "center_line_offset_x": -1.0, - "side": "Left" + "side": "Right" }, "five": { "center_line_offset_x": -1.0, - "side": "Right" + "side": "Left" } }, "line_length_acceptance_factor": 1.5, From 631ae2f98fc1491a9cc4efb4dad26428934e81b1 Mon Sep 17 00:00:00 2001 From: Fyor Klein Gunnewiek Date: Wed, 5 Jul 2023 15:16:02 +0200 Subject: [PATCH 2/5] New starting positions --- etc/configuration/default.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/etc/configuration/default.json b/etc/configuration/default.json index c9d31d22..32c55a19 100644 --- a/etc/configuration/default.json +++ b/etc/configuration/default.json @@ -520,24 +520,24 @@ ], "initial_hypothesis_score": 10.0, "initial_poses": { - "one": { - "center_line_offset_x": -3.5, + "five": { + "center_line_offset_x": -0.75, "side": "Left" }, - "two": { - "center_line_offset_x": -3.0, + "four": { + "center_line_offset_x": -0.75, + "side": "Right" + }, + "one": { + "center_line_offset_x": -3.5, "side": "Left" }, "three": { - "center_line_offset_x": -3.0, + "center_line_offset_x": -2.8499999046325684, "side": "Right" }, - "four": { - "center_line_offset_x": -1.0, - "side": "Right" - }, - "five": { - "center_line_offset_x": -1.0, + "two": { + "center_line_offset_x": -2.8499999046325684, "side": "Left" } }, From 01e11a19f38d6dfa1a58be1295246eaf606141af Mon Sep 17 00:00:00 2001 From: Fyor Klein Gunnewiek Date: Wed, 5 Jul 2023 15:21:29 +0200 Subject: [PATCH 3/5] Order correct --- etc/configuration/default.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/etc/configuration/default.json b/etc/configuration/default.json index 32c55a19..23e26b24 100644 --- a/etc/configuration/default.json +++ b/etc/configuration/default.json @@ -520,24 +520,24 @@ ], "initial_hypothesis_score": 10.0, "initial_poses": { - "five": { - "center_line_offset_x": -0.75, - "side": "Left" - }, - "four": { - "center_line_offset_x": -0.75, - "side": "Right" - }, "one": { "center_line_offset_x": -3.5, "side": "Left" }, + "two": { + "center_line_offset_x": -2.8499999046325684, + "side": "Left" + }, "three": { "center_line_offset_x": -2.8499999046325684, "side": "Right" }, - "two": { - "center_line_offset_x": -2.8499999046325684, + "four": { + "center_line_offset_x": -0.75, + "side": "Right" + }, + "five": { + "center_line_offset_x": -0.75, "side": "Left" } }, From d63fa5dfbda349c530b4b1e41642355f8b949a3a Mon Sep 17 00:00:00 2001 From: Fyor Klein Gunnewiek Date: Wed, 5 Jul 2023 15:45:29 +0200 Subject: [PATCH 4/5] Fix one --- .../head.P0000074A04S8C700011.json | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/etc/configuration/head.P0000074A04S8C700011.json b/etc/configuration/head.P0000074A04S8C700011.json index 54005541..a2522ba7 100644 --- a/etc/configuration/head.P0000074A04S8C700011.json +++ b/etc/configuration/head.P0000074A04S8C700011.json @@ -2,9 +2,36 @@ "camera_matrix_parameters": { "vision_top": { "extrinsic_rotations": [ - 0.03999999910593033, -3.009999990463257, 1.2999999523162842 + 0.03999999910593033, + -3.009999990463257, + 1.2999999523162842 ] } }, - "player_number": "Two" + "disable_communication_acceptor": true, + "localization": { + "initial_poses": { + "five": { + "center_line_offset_x": -0.75, + "side": "Left" + }, + "four": { + "center_line_offset_x": -0.75, + "side": "Right" + }, + "one": { + "center_line_offset_x": -3.900000095367432, + "side": "Left" + }, + "three": { + "center_line_offset_x": -2.8499999046325684, + "side": "Right" + }, + "two": { + "center_line_offset_x": -2.8499999046325684, + "side": "Left" + } + } + }, + "player_number": "One" } From ba8d8b59a3dfd4d5da59230ae61a4afb4400f473 Mon Sep 17 00:00:00 2001 From: Fyor Klein Gunnewiek Date: Wed, 5 Jul 2023 16:58:01 +0200 Subject: [PATCH 5/5] Fix for player one. Can't be so close to goal --- etc/configuration/default.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/configuration/default.json b/etc/configuration/default.json index 23e26b24..32a71d9b 100644 --- a/etc/configuration/default.json +++ b/etc/configuration/default.json @@ -521,11 +521,11 @@ "initial_hypothesis_score": 10.0, "initial_poses": { "one": { - "center_line_offset_x": -3.5, + "center_line_offset_x": -2.8499999046325684, "side": "Left" }, "two": { - "center_line_offset_x": -2.8499999046325684, + "center_line_offset_x": -1.375, "side": "Left" }, "three": {