Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

46 lokalizacija diskova kamera #62

Closed
wants to merge 11 commits into from
Closed

46 lokalizacija diskova kamera #62

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a69b6bc
Added RPi camera
miloshunter Jan 14, 2022
af0a249
Merge remote-tracking branch 'origin/main' into 46-lokalizacija-disko…
miloshunter Jan 14, 2022
8b7af64
Removing second robot...
miloshunter Jan 14, 2022
57d0b57
Setting up real Field of View for Raspberry Pi Camera
miloshunter Jan 14, 2022
1d4de4e
Adjusted the position of the Camera
miloshunter Jan 14, 2022
97ab8de
Added python subsriber to receive images from OnRobot camera
miloshunter Jan 14, 2022
a1699f9
First draft of AruCo marker detection. Next step is calibration
miloshunter Jan 14, 2022
2ee5dbd
Merge remote-tracking branch 'origin/main' into 46-lokalizacija-disko…
miloshunter Jan 18, 2022
6edf669
Merge branch 'main' into 46-lokalizacija-diskova-kamera
miloshunter Jan 25, 2022
a5b4778
Added calibration file in Webots
miloshunter Jan 25, 2022
6689b5b
Using .yaml calibration file that is generated by image_pipeline package
miloshunter Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions mep3_simulation/webots_data/protos/RobotMemristor.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ PROTO RobotMemristor [
hiddenField SFFloat robot_z_size 0.335
hiddenField SFFloat robot_height 0.013
hiddenField SFFloat robot_plate_width 0.005
field MFNode extensionSlot [] # Extends the robot with new nodes in the extension slot.

]
{
Robot {
Expand Down Expand Up @@ -161,6 +163,9 @@ Robot {
translation 0 0 %<= fields.robot_z_size.value + 0.03 >%
rotation 0.577351 0.577349 0.577351 2.0944
}
Group {
children IS extensionSlot
}
]
boundingObject Group {
children [
Expand Down
16 changes: 12 additions & 4 deletions mep3_simulation/webots_data/worlds/eurobot_2022.wbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,18 @@ Floor {
metalness 0
}
}
RobotMemristor {
name "MemristorRobot"
translation 0 0 0
controller "<extern>"
extensionSlot [
JetBotRaspberryPiCamera {
translation 0.06 0 0.34
rotation 0 1 0 2.62
fieldOfView 1.16
}
]
}
Solid {
children [
DEF purple_statuette_support_shape Group {
Expand Down Expand Up @@ -596,10 +608,6 @@ Sample {
rotation 0.8246198587813874 0.4760949184673239 0.30550894768068065 -2.1681953071795865
frontTexture "blue"
}
RobotMemristor {
translation 0 0 0
controller "<extern>"
}
ExcavationSquare {
name "excSq0"
translation -0.8325 -1.022 0
Expand Down
Loading