Skip to content

Advanced collect #7

Open
wants to merge 148 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
132f94b
loc
EgorPristanskiy Oct 29, 2018
38fd195
loc
EgorPristanskiy Oct 29, 2018
d8dfaa1
Merge branch 'master' into loc
EgorPristanskiy Oct 29, 2018
4ff0b3d
core and nav
nickzherdev Oct 30, 2018
d9dd722
core and nav
nickzherdev Oct 30, 2018
5b63e23
gwgw
EgorPristanskiy Nov 1, 2018
c400811
add particles visualization
EgorPristanskiy Nov 1, 2018
ab62576
Merge branch 'loc' of https://github.com/SkoltechRobotics/ros-eurobot…
EgorPristanskiy Nov 1, 2018
6b38121
Create .gitignore
MisterMap Nov 4, 2018
b69e1d3
strange robot behavior
EgorPristanskiy Nov 6, 2018
157cc18
change func cvt_local2global
EgorPristanskiy Nov 6, 2018
003a0c6
add visualization files
EgorPristanskiy Nov 6, 2018
e419c16
add config file for secondary_robot
EgorPristanskiy Nov 6, 2018
42437de
simmulation changes
EgorPristanskiy Nov 6, 2018
19f947f
add interpolation
EgorPristanskiy Nov 13, 2018
a1de775
cost function
EgorPristanskiy Nov 16, 2018
a610b0a
remove particle_filter_node
EgorPristanskiy Nov 16, 2018
f40661b
new cost function
EgorPristanskiy Nov 17, 2018
daf9a7c
new cost function
EgorPristanskiy Nov 17, 2018
f15b447
remove .idea
EgorPristanskiy Nov 17, 2018
40e58ec
new cost function
EgorPristanskiy Nov 17, 2018
f5bbce3
create stm_node
kshpv Nov 19, 2018
c94cb39
add beacons detectoin, visualizations and visualization landmarks
EgorPristanskiy Nov 19, 2018
e9ca1d5
remove core_functions.pyc
EgorPristanskiy Nov 19, 2018
8d16dc2
minor improvements
kshpv Nov 21, 2018
a822c49
add alpha filter
EgorPristanskiy Nov 22, 2018
ac225cc
add alpha filter
EgorPristanskiy Nov 22, 2018
3185be8
add alpha filter
EgorPristanskiy Nov 22, 2018
6920706
add triangulation
EgorPristanskiy Dec 3, 2018
06d8a16
Merge branch 'loc' of https://github.com/SkoltechRobotics/ros-eurobot…
EgorPristanskiy Dec 3, 2018
8535e45
go to point from prev year
nickzherdev Dec 3, 2018
4f8eec4
arc movement
nickzherdev Dec 11, 2018
1bf955e
added if name = main
nickzherdev Dec 11, 2018
54a249d
some improvements
kshpv Dec 11, 2018
93c0174
Initial commit
kshpv Dec 11, 2018
eeda4cf
usefull commands
nickzherdev Dec 13, 2018
2401358
bug fixes
nickzherdev Dec 13, 2018
0a568da
add new models, improve core_functions
EgorPristanskiy Dec 13, 2018
aef6293
change secendary_robot params
EgorPristanskiy Dec 13, 2018
3dcc0bf
Merge https://github.com/SkoltechRobotics/ros-eurobot-2019 into navnew
nickzherdev Dec 13, 2018
3171f5d
new weight function
EgorPristanskiy Dec 13, 2018
7febbd3
test
nickzherdev Dec 13, 2018
d560c2a
- timer func changed to plan
nickzherdev Dec 13, 2018
ff3208b
bug fixes
nickzherdev Dec 13, 2018
97d7cf8
config params
nickzherdev Dec 13, 2018
7e83529
Merge remote-tracking branch 'upstream/loc' into test_nav_loc
nickzherdev Dec 13, 2018
2c9348c
Alexey's version
nickzherdev Dec 13, 2018
334a5a5
next version nav
nickzherdev Dec 13, 2018
6cbc732
new weight function
EgorPristanskiy Dec 15, 2018
e0bfd8e
Merge branch 'test_nav_loc' of https://github.com/SkoltechRobotics/ro…
EgorPristanskiy Dec 16, 2018
ccc97c0
new speed operator
nickzherdev Dec 17, 2018
147291e
get_particle_measurement_model
EgorPristanskiy Dec 17, 2018
1b5fd37
Merge branch 'test_nav_loc' of https://github.com/SkoltechRobotics/ro…
nickzherdev Dec 17, 2018
26b74d4
Cheatsheat
nickzherdev Dec 18, 2018
650b63b
refactored
nickzherdev Dec 18, 2018
9c7b620
acc/dcl arc_move and .py files moved from src to scripts
nickzherdev Dec 18, 2018
f62cad7
Merge branch 'test_nav_loc' of https://github.com/SkoltechRobotics/ro…
nickzherdev Dec 18, 2018
db60fd8
bug fixes, still wrong alpha_init
nickzherdev Dec 18, 2018
0a84436
Misha's comments and corrected wrap_angle
nickzherdev Dec 18, 2018
c2ae924
test line mov
nickzherdev Dec 18, 2018
e326069
Merge branch 'test_nav_loc' of https://github.com/SkoltechRobotics/ro…
nickzherdev Dec 18, 2018
9fac7e8
Merge branch 'test_nav_loc' of https://github.com/SkoltechRobotics/ro…
nickzherdev Dec 18, 2018
1195b22
testing
nickzherdev Dec 18, 2018
db10a66
Add files via upload
nickzherdev Dec 18, 2018
005e570
line movement trying whiles
nickzherdev Dec 19, 2018
f350a8c
line move whiles
nickzherdev Dec 19, 2018
dd186e1
bug fixes
nickzherdev Dec 19, 2018
aa0d374
Modification of movement
nickzherdev Dec 19, 2018
74ef2cc
trash was removed
kshpv Dec 19, 2018
36d79db
...
kshpv Dec 19, 2018
b9a413d
Merge branch 'master' of https://github.com/SkoltechRobotics/ros-euro…
kshpv Dec 19, 2018
59139b8
Merge branch 'master' into stm
kshpv Dec 19, 2018
709812b
add new commands to protocol
kshpv Dec 19, 2018
8fba0a9
debugging code
nickzherdev Dec 21, 2018
04ab120
Merge branch 'test_nav_loc' of https://github.com/SkoltechRobotics/ro…
nickzherdev Dec 21, 2018
c4bde69
improved architecture
nickzherdev Dec 22, 2018
7200636
improvements
nickzherdev Dec 22, 2018
5559314
arch improvements
nickzherdev Dec 23, 2018
0b1474b
to test
nickzherdev Dec 23, 2018
b54e888
removed old navi files, added MotionPlannerMode with corrections from…
nickzherdev Dec 24, 2018
d0ffc23
added core functions
nickzherdev Dec 24, 2018
cff9bf1
removed old
nickzherdev Dec 24, 2018
200ce6e
problems with delay, arc move works
nickzherdev Dec 25, 2018
73b32f3
change loginfo
nickzherdev Dec 25, 2018
bd7c9c5
presentation
nickzherdev Dec 25, 2018
c94b83c
Vekselberg version + markdown cheatsheet
nickzherdev Dec 26, 2018
ccc1db1
Some changes
nickzherdev Dec 26, 2018
d373a03
Merge remote-tracking branch 'upstream/stm' into test_nav_loc
nickzherdev Dec 26, 2018
020def1
experiments with vertical pucks
nickzherdev Dec 26, 2018
3d77dfa
Add some stm node
nickzherdev Dec 27, 2018
e54af89
changes from robot
nickzherdev Dec 27, 2018
1233f09
Merge branch 'test_nav_loc' of https://github.com/SkoltechRobotics/ro…
nickzherdev Dec 27, 2018
72f2db7
mv demonstration to main pkg
nickzherdev Dec 27, 2018
d765f23
Merge branch 'test_nav_loc' of https://github.com/SkoltechRobotics/ro…
nickzherdev Dec 27, 2018
664ff97
Add move to puck
nickzherdev Dec 27, 2018
7c01da9
start rewriting strategy.py to be Class-based
nickzherdev Jan 9, 2019
d7a82b1
add path follower
EgorPristanskiy Jan 14, 2019
a9b7dbb
add path follower
EgorPristanskiy Jan 18, 2019
a1d976d
add simulation for path follower
EgorPristanskiy Jan 18, 2019
e6cc2b9
collect_pucks.py receives list of group of pucks, calculates convex h…
nickzherdev Jan 19, 2019
f73de49
Merge branch 'take_puck' of https://github.com/SkoltechRobotics/ros-e…
nickzherdev Jan 19, 2019
2fd2102
just a backup of futher additions, no testing yet
nickzherdev Jan 22, 2019
2fd6d0d
added backup
nickzherdev Jan 22, 2019
ed7a678
added backup
nickzherdev Jan 22, 2019
0ee727e
updating known coords
nickzherdev Jan 22, 2019
62f0841
Delete collect_pucks.py
nickzherdev Jan 24, 2019
f8b4eaa
Add files via upload
nickzherdev Jan 24, 2019
14ffd64
added calculating landing poses, sorting wrt current pose
nickzherdev Jan 24, 2019
7bf0179
added landing poses
nickzherdev Jan 25, 2019
af7fdce
further improvements
nickzherdev Jan 25, 2019
2812d2e
new architecture. add odometry, manipulator files. add launch file
kshpv Jan 25, 2019
2739a2e
further improvements
nickzherdev Jan 25, 2019
bf661e5
further improvements
nickzherdev Jan 27, 2019
6bce5d3
further improvements
nickzherdev Jan 27, 2019
406db23
further improvements
nickzherdev Jan 27, 2019
277836d
add jupyter files. minor changes
kshpv Jan 28, 2019
fd96709
added move command
nickzherdev Jan 28, 2019
bbc00bf
minor changes
nickzherdev Jan 28, 2019
f066dfd
changes after testing
nickzherdev Jan 29, 2019
c6816b5
added fsm for collecting chaos pucks
nickzherdev Jan 29, 2019
f8c6254
changed package folder and received Alexey's remarks
nickzherdev Jan 30, 2019
8c8ae81
camera_simulation_pucks_pub
nickzherdev Jan 30, 2019
7399c28
bugs fix
nickzherdev Jan 30, 2019
a223fb6
fixed math for calculating landings and found, that if we publish co…
nickzherdev Feb 1, 2019
33d8ca7
added launch not tested
nickzherdev Feb 1, 2019
51dc787
experimental branch, added pub tactics in imitate cam
nickzherdev Feb 2, 2019
adde842
EVRIKAAA
nickzherdev Feb 4, 2019
85b42fd
minor changes
nickzherdev Feb 5, 2019
1b26262
added collect wall six
nickzherdev Feb 5, 2019
7dc09aa
fix sort
nickzherdev Feb 5, 2019
c693920
minor changes
kshpv Feb 6, 2019
b0400c1
add response publisher
kshpv Feb 6, 2019
4210dab
minor changes
kshpv Feb 6, 2019
e74944e
minor changes
kshpv Feb 6, 2019
842bb96
created launch for testing puck collecting on robot
nickzherdev Feb 6, 2019
6ab6e1a
created launch for testing puck collecting on robot
nickzherdev Feb 6, 2019
0ac66b8
add resposne for manipulator
kshpv Feb 6, 2019
91a946e
add new commands. add config yaml to launch file
nickzherdev Feb 6, 2019
7b74276
add rosparam to launch file
kshpv Feb 6, 2019
50b22e4
add working manipulator
nickzherdev Feb 6, 2019
b70e4dd
changes from robot
nickzherdev Feb 7, 2019
1246569
arc move
nickzherdev Feb 7, 2019
0c9c0c5
Merge branch 'take_puck' into advanced_collect
nickzherdev Feb 7, 2019
10e8a30
few changes on new version
nickzherdev Feb 7, 2019
d5b9dc5
Add one master launch
nickzherdev Feb 7, 2019
26cffff
Misha's improvements: ssh by secondary robot, start with robot_start,…
nickzherdev Feb 7, 2019
2d5693d
removed all rotted
nickzherdev Feb 8, 2019
caf1390
improved FSM
nickzherdev Feb 8, 2019
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*.pyc
*.idea
*.swp
*.swo
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"python.pythonPath": "usr/bin/python"
}
267 changes: 267 additions & 0 deletions Cheatsheet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,267 @@
# CODE GUIDELINES
---------------------
1) Code should look like a poem and be self-explanatory
2) Use functions
3) First list yaml-params, than publishers, and in the end - Subcribers
4) Timer in the end, it should call function motion_timer_callback, from which desiable methods are chosen
5) No magic constants in code
6) No pre-optimization, and more post-opt
7) Write specs --> write tests --> write code --> release
8) For subscriber callback the last parameter is data from topic, for timer callback - event
9) не надо делать абсолютные пути '/secondary_robot/stm_command', лучше в launch файле сделать remap
10)


# ROBOT COMMUNICATION
------------------
rostopic pub -1 /move_command std_msgs/String "data: 'abc arc_move 0.3 1.2 0'"
rostopic pub -1 /secondary_robot/move_command std_msgs/String "data 'abc arc_move 1 1 3.14'"

8 - vels
14 - pos
rostopic pub -1 /secondary_robot/stm_command std_msgs/String "data: '8 0 0 0'"
rostopic pub -1 /secondary_robot/stm_command std_msgs/String "data: '14 0 0 0'"

roslaunch eurobot_tactics tactics_sim_launch.launch


ssh [email protected]

roscd eurobot_nav

на роботе
roslaunch eurobot_loc pf_launch.launch

на компе
roslaunch eurobot_loc remote.launch
roslaunch eurobot_loc visualization.launch

python arc_move_v01.py

rostopic echo /secondary_robot/stm_command
rostopic list
rosnode list

"""
roslaunch eurobot multimaster.launch
autostart

autostart ??? command
crontab -e
"""

- To turn off odroid from ssh:
sudo shutdown -h now

rosed

- To check coords and delay
rosrun tf tf_echo map secondary_robot



rostopic pub -1 /move_command std_msgs/String "data: 'abc move_arc 1.5 0.45 3.14'"
rostopic pub -1 /move_command std_msgs/String "data: 'abc move_arc 0.61 0.45 3.14'"
rostopic pub -1 /move_command std_msgs/String "data: 'abc move_arc 0.5 0.34 1.57'"
rostopic pub -1 /move_command std_msgs/String "data: 'abc move_arc 0.61 1.05 3.14'"


rostopic pub -1 /cmd_tactics std_msgs/String "data: 'abc collect_chaos'"

rosrun rqt_graph rqt_graph


WIRELESS PART SETUP
---------------
ifconfig




GIT
---------------
http://rogerdudler.github.io/git-guide/
http://365git.tumblr.com/post/504140728/fast-forward-merge
http://rogerdudler.github.io/git-guide/

git push --set-upstream upstream test_nav_loc

git config --global user.email [email protected]
git config --global user.name "nickzherdev"

# create new repository
cd eurobot2019_ws/
git init
git status
git checkout branchname # Change working branch
git checkout -b your-branch # Create the branch on your local machine and switch in this branch

git add filename
git commit -m “Add chocolate.jpeg.”
git push origin master (or git push upstream navnew)

git remote add origin (upstream)
git remote add upstream https://github.com/SkoltechRobotics/ros-eurobot-2019.git
git remote add [name_of_your_remote] [name_of_your_new_branch]
git commit

git remote -v
git push origin [name_of_your_new_branch]

git push upstream navnew
git push upstream grab_atoms

git merge branchname (ex: loc)

git push upstream navnew --force
git push --set-upstream upstream test_nav_loc

В том случае, если ветка master (или branch_name) не является отслеживаемой веткой origin/master (или origin/branch_name), а вы хотите сделать её таковой.

Выполнив команду git push -u origin master вы устанавливаете связь между той веткой, в которой вы находитесь и веткой master на удалённом сервере. Команду требуется выполнить единожды, чтобы потом можно было отправлять/принимать изменения лишь выполняя git push из ветки без указания всяких алиасов для сервера и удалённых веток. Это сделано для удобства.

на роботе
git clone https://github.com/SkoltechRobotics/ros-eurobot-2019.git

git config --global http.sslverify false

in case of problems with sertificates use this command
git config --global http.sslverify false



## Team




FILESYSTEM
--------------
transfer a file using sftp in UNIX

cd catkin_ws/src/ros-eurobot-2018/

/home/safoex/eurobot2019_ws/src/ros-eurobot-2019/eurobot_nav

~/eurobot2019_ws/src

rm -rf ros-eurobot-2019/ # recursevly delete folder and it's subfolders and files

chmod +x "filename"


# make backup
- to show all connected devices use lsblk in terminal

- completely empty writable emmc through disk util
- to create IMAGE of all partitions
apt-get install pv
sudo dd if=/dev/sdf bs=1M | pv | dd of=/media/safoex/01D251799AF7F600/backup_eurobot_2101/backup.img
https://forum.odroid.com/viewtopic.php?f=52&t=22930

- to restore IMAGE on new emmc / sd_card
sudo dd if=/media/safoex/01D251799AF7F600/backup_eurobot_2101/backup.img of=/dev/sdf bs=1M


Error mounting /dev/sdf1 at /media/safoex/EurobotMain: Command-line `mount -t "ext4" -o "uhelper=udisks2,nodev,nosuid" "/dev/sdf1" "/media/safoex/EurobotMain"' exited with non-zero exit status 32: mount: wrong fs type, bad option, bad superblock on /dev/sdf1,
missing codepage or helper program, or other error

In some cases useful info is found in syslog - try
dmesg | tail or so.alsfasfafkasfsafmsdklgnsdklmsdklmsklvmsdklvmklsa


gedit ~/.bashrc

sudo vim /etc/hosts

## remove nesessity to enter password
sudo update-alternatives --config editor
sudo visudo
myuser ALL=(ALL) NOPASSWD:ALL



ROS WORKSPACE:
--------------

catkin workspace
http://wiki.ros.org/catkin/workspaces

Creating a ROS Package
http://wiki.ros.org/ROS/Tutorials/CreatingPackage
http://wiki.ros.org/ROS/Tutorials/catkin/CreatingPackage


# create new node
catkin_create_pkg eurobot_tactics std_msgs rospy roscpp

# navigate to workspace/src to create a new package eurobot_core and eurobot_nav
cd ~/catkin_ws/src
mkdir ros-eurobot-2019
cd ros-eurobot-2019

mkdir scripts

vim /etc/hosts

# Create new workspace
http://wiki.ros.org/catkin/Tutorials/create_a_workspace

mkdir -p ~/eurobot2019_ws/src
cd eurobot2019_ws/
catkin_make
source devel/setup.bash
vim ~/.bashrc

source ~/.bashrc
rosrun eurobot_tactics TacticsNode.py
gedit ~/.bashrc

In the header of each file we need to state which env to use:
#!/usr/bin/env python





TROOBLESHOOTING
------------------

Localization not working
- check if LIDAR is turned on (starts making noise) and connected to Ethernet port in Odroid
- check in RViz if robot is coreectly localized






GOALS
------------------
Цель - подобрать роботом шайбу и овтезти её на акселлератор

Задачи

Получить координаты шайбы по камере (Алексей)
Подъехать к ней по дуге (Николай) в правильное место с учётом зазора для манипулятора
Произвести операцию схватывания
Отвезти в акселлератор
Сбросить
Вернуться на место
Вынести все параметры в yaml файл




# Проверить, что робот остановился.
# Информация о том, что робот отсановился, публикуется в топик response
# Проверить, что цель достигнута.

# Alexey
# Проверить, что манипулятор в исходной позиции, Опустить манипулятор, Проверить, что манипулятор опустился
# Включить насос (на сколько?)
# Поднять манипулятор до конца
# Подпереть атом граблей
# Выключить насос


41 changes: 0 additions & 41 deletions camera_test.py

This file was deleted.

Loading