Skip to content

Commit

Permalink
Merge branch 'beta/x2_gen2/v0.29.0' into fix/x2gen2/cut_angle
Browse files Browse the repository at this point in the history
  • Loading branch information
badai-nguyen authored Nov 28, 2024
2 parents 37e6fb1 + 246b793 commit 178d53f
Show file tree
Hide file tree
Showing 10 changed files with 79 additions and 70 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[4, 0, 155],[4, 203, 360],
[5, 0, 152],[5, 206, 217],[5, 220, 360],
[6, 0, 146],[6, 217, 360],
[7, 0, 143],[7, 235, 360],
[7, 0, 143],[7, 230, 360],
[8, 0, 143],[8, 228.5, 360],
[9, 0, 142],[9, 228.5, 360],
[10, 0, 141],[10, 235, 360],
Expand All @@ -31,12 +31,12 @@
[25, 0, 122],[25, 235, 360],
[26, 0, 121],[26, 235, 360],
[27, 0, 120],[27, 235, 360],
[28, 0, 119],[28, 240, 360],
[28, 0, 119],[28, 239, 360],
[29, 0, 118],[29, 240, 360],
[30, 0, 110],[30, 240, 360],
[31, 0, 109],[31, 240, 265],
[32, 0, 109],[32, 244, 265],
[33, 0, 108],[33, 244, 265],
[31, 0, 109],[31, 240, 267],
[32, 0, 109],[32, 244, 267],
[33, 0, 108],[33, 244, 267],
[34, 0, 108],[34, 244, 265],
[35, 0, 107],[35, 244, 265],
[36, 0, 107],[36, 244, 265],
Expand All @@ -54,6 +54,9 @@
[48, 0, 95],
[49, 0, 94],
[50, 0, 93],
[51, 0, 93]
[51, 0, 93],
[52, 0, 92],
[53, 0, 92],
[54, 0, 92]
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[4, 0, 155],[4, 203, 360],
[5, 0, 152],[5, 206, 217],[5, 220, 360],
[6, 0, 146],[6, 217, 360],
[7, 0, 143],[7, 235, 360],
[7, 0, 143],[7, 230, 360],
[8, 0, 139],[8, 228.5, 360],
[9, 0, 135],[9, 228.5, 360],
[10, 0, 133],[10, 235, 360],
Expand All @@ -31,12 +31,12 @@
[25, 0, 114],[25, 235, 360],
[26, 0, 113],[26, 235, 360],
[27, 0, 112],[27, 235, 360],
[28, 0, 119],[28, 240, 360],
[28, 0, 119],[28, 239, 360],
[29, 0, 118],[29, 240, 360],
[30, 0, 110],[30, 240, 360],
[31, 0, 109],[31, 240, 265],
[32, 0, 109],[32, 244, 265],
[33, 0, 108],[33, 244, 265],
[31, 0, 109],[31, 240, 267],
[32, 0, 109],[32, 244, 267],
[33, 0, 108],[33, 244, 267],
[34, 0, 108],[34, 244, 265],
[35, 0, 107],[35, 244, 265],
[36, 0, 107],[36, 244, 265],
Expand All @@ -55,6 +55,9 @@
[49, 0, 94],
[50, 0, 93],
[51, 0, 93],
[52, 0, 92],
[53, 0, 92],
[54, 0, 92]
[1, 0, 360],
[2, 0, 360],
[4, 0, 360],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[4, 0, 155],[4, 203, 360],
[5, 0, 152],[5, 206, 217],[5, 220, 360],
[6, 0, 146],[6, 217, 360],
[7, 0, 143],[7, 235, 360],
[7, 0, 143],[7, 230, 360],
[8, 0, 139],[8, 228.5, 360],
[9, 0, 135],[9, 228.5, 360],
[10, 0, 133],[10, 235, 360],
Expand All @@ -31,12 +31,12 @@
[25, 0, 114],[25, 235, 360],
[26, 0, 113],[26, 235, 360],
[27, 0, 112],[27, 235, 360],
[28, 0, 119],[28, 240, 360],
[28, 0, 119],[28, 239, 360],
[29, 0, 118],[29, 240, 360],
[30, 0, 110],[30, 240, 360],
[31, 0, 109],[31, 240, 265],
[32, 0, 109],[32, 244, 265],
[33, 0, 108],[33, 244, 265],
[31, 0, 109],[31, 240, 267],
[32, 0, 109],[32, 244, 267],
[33, 0, 108],[33, 244, 267],
[34, 0, 108],[34, 244, 265],
[35, 0, 107],[35, 244, 265],
[36, 0, 107],[36, 244, 265],
Expand All @@ -55,6 +55,9 @@
[49, 0, 94],
[50, 0, 93],
[51, 0, 93],
[52, 0, 92],
[53, 0, 92],
[54, 0, 92],
[0, 0, 360],
[3, 0, 360],
[6, 0, 360],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@
[118, 303.81, 360],
[119, 302.09, 360],
[120, 298.42, 360],
[121, 299.63, 360],
[122, 298.42, 360],
[123, 298.42, 360],
[124, 293, 360],
[125, 90, 91],[125, 293, 360],
[126, 90, 91],[126, 292.12, 360],
[127, 90, 91],[127, 289.71, 360]
[121, 90, 91],[121, 299.63, 360],
[122, 90, 92],[122, 298.42, 360],
[123, 90, 92],[123, 298.42, 360],
[124, 90, 93],[124, 293, 360],
[125, 90, 93],[125, 293, 360],
[126, 90, 93],[126, 292.12, 360],
[127, 90, 93],[127, 289.71, 360]
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@
[118, 303.81, 360],
[119, 302.09, 360],
[120, 298.42, 360],
[121, 299.63, 360],
[122, 298.42, 360],
[123, 298.42, 360],
[124, 293, 360],
[125, 90, 91],[125, 293, 360],
[126, 90, 91],[126, 292.12, 360],
[127, 90, 91],[127, 289.71, 360],
[121, 90, 91],[121, 299.63, 360],
[122, 90, 92],[122, 298.42, 360],
[123, 90, 92],[123, 298.42, 360],
[124, 90, 93],[124, 293, 360],
[125, 90, 93],[125, 293, 360],
[126, 90, 93],[126, 292.12, 360],
[127, 90, 93],[127, 289.71, 360],
[1, 0, 360],
[2, 0, 360],
[4, 0, 360],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@
[118, 303.81, 360],
[119, 302.09, 360],
[120, 298.42, 360],
[121, 299.63, 360],
[122, 298.42, 360],
[123, 298.42, 360],
[124, 293, 360],
[125, 90, 91],[125, 293, 360],
[126, 90, 91],[126, 292.12, 360],
[127, 90, 91],[127, 289.71, 360],
[121, 90, 91],[121, 299.63, 360],
[122, 90, 92],[122, 298.42, 360],
[123, 90, 92],[123, 298.42, 360],
[124, 90, 93],[124, 293, 360],
[125, 90, 93],[125, 293, 360],
[126, 90, 93],[126, 292.12, 360],
[127, 90, 93],[127, 289.71, 360],
[0, 0, 360],
[3, 0, 360],
[6, 0, 360],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
[14, 0, 150],[14, 232, 360],
[15, 0, 150],[15, 233, 360],
[16, 0, 150],[16, 234, 360],
[17, 0, 145],[17, 235, 360],
[18, 0, 145],[18, 235, 360],
[19, 0, 135],[19, 236, 360],
[20, 102, 130],[20, 240, 360],
[17, 0, 147],[17, 235, 360],
[18, 0, 148],[18, 235, 360],
[19, 0, 146],[19, 236, 360],
[20, 97, 143],[20, 240, 360],
[21, 102, 125],[21, 241, 360],
[22, 105, 125],[22, 241, 360],
[23, 105, 124],[23, 244, 360],
[24, 105, 123],[24, 245, 360],
[25, 106, 122],[25, 246, 360],
[26, 107, 121],[26, 247, 360],
[27, 108, 120],[27, 248, 360],
[28, 109, 119],[28, 248, 360],
[23, 105, 125],[23, 244, 360],
[24, 105, 125],[24, 245, 360],
[25, 106, 124],[25, 246, 360],
[26, 107, 123],[26, 247, 360],
[27, 108, 122],[27, 248, 360],
[28, 109, 120],[28, 248, 360],
[29, 110, 118],[29, 250, 360],
[30, 111, 117],[30, 250, 360],
[31, 112.5, 116],[31, 251, 360],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
[14, 0, 150],[14, 232, 360],
[15, 0, 150],[15, 233, 360],
[16, 0, 150],[16, 234, 360],
[17, 0, 145],[17, 235, 360],
[18, 0, 145],[18, 235, 360],
[19, 0, 135],[19, 236, 360],
[20, 102, 130],[20, 240, 360],
[21, 105, 125],[21, 241, 360],
[17, 0, 147],[17, 235, 360],
[18, 0, 148],[18, 235, 360],
[19, 0, 146],[19, 236, 360],
[20, 97, 143],[20, 240, 360],
[21, 102, 125],[21, 241, 360],
[22, 105, 125],[22, 241, 360],
[23, 105, 124],[23, 244, 360],
[24, 105, 123],[24, 245, 360],
[25, 106, 122],[25, 246, 360],
[26, 107, 121],[26, 247, 360],
[27, 108, 120],[27, 248, 360],
[28, 109, 119],[28, 248, 360],
[23, 105, 125],[23, 244, 360],
[24, 105, 125],[24, 245, 360],
[25, 106, 124],[25, 246, 360],
[26, 107, 123],[26, 247, 360],
[27, 108, 122],[27, 248, 360],
[28, 109, 120],[28, 248, 360],
[29, 110, 118],[29, 250, 360],
[30, 111, 117],[30, 250, 360],
[31, 112.5, 116],[31, 251, 360],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
[14, 0, 150],[14, 232, 360],
[15, 0, 150],[15, 233, 360],
[16, 0, 150],[16, 234, 360],
[17, 0, 145],[17, 235, 360],
[18, 0, 145],[18, 235, 360],
[19, 0, 135],[19, 236, 360],
[20, 102, 130],[20, 240, 360],
[21, 105, 125],[21, 241, 360],
[17, 0, 147],[17, 235, 360],
[18, 0, 148],[18, 235, 360],
[19, 0, 146],[19, 236, 360],
[20, 97, 143],[20, 240, 360],
[21, 102, 125],[21, 241, 360],
[22, 105, 125],[22, 241, 360],
[23, 105, 124],[23, 244, 360],
[24, 105, 123],[24, 245, 360],
[25, 106, 122],[25, 246, 360],
[26, 107, 121],[26, 247, 360],
[27, 108, 120],[27, 248, 360],
[28, 109, 119],[28, 248, 360],
[23, 105, 125],[23, 244, 360],
[24, 105, 125],[24, 245, 360],
[25, 106, 124],[25, 246, 360],
[26, 107, 123],[26, 247, 360],
[27, 108, 122],[27, 248, 360],
[28, 109, 120],[28, 248, 360],
[29, 110, 118],[29, 250, 360],
[30, 111, 117],[30, 250, 360],
[31, 112.5, 116],[31, 251, 360],
Expand Down
2 changes: 1 addition & 1 deletion aip_x2_gen2_launch/launch/lidar.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
<arg name="host_ip" value="$(var host_ip)"/>
<arg name="data_port" value="2323"/>
<arg name="sync_angle" value="180"/>
<arg name="cut_angle" value="274.0" />
<arg name="cut_angle" value="275.0" />
<arg name="cloud_min_angle" value="85"/>
<arg name="cloud_max_angle" value="275"/>
<arg name="return_mode" value="LastStrongest"/>
Expand Down

0 comments on commit 178d53f

Please sign in to comment.