Commit Graph

214 Commits

Author SHA1 Message Date
b8ccb41ba7 started work on goal alignment 2018-06-13 20:25:12 +02:00
Jonas
74b38385d5 changed gitignore and disabled straight movement in ball_approach 2018-06-13 16:12:25 +02:00
Jonas
0823eac228 head moves back when ball is found. This ensures, that the robot can find the ball properly while rotating 2018-06-12 11:53:18 +02:00
Jonas
9bc732807a added threshold in ball_approch for error prevention 2018-06-12 11:45:28 +02:00
83f7604efe Actually made goal recognition a lot robuster 2018-06-11 21:03:11 +02:00
abc69fb69a Implemented goal detection in colorpicker 2018-06-10 21:04:20 +02:00
caf88ab7e7 Made read_config robuster against CWD 2018-06-10 13:07:28 +02:00
86b75c0504 renamed scripts folder to pykick 2018-06-10 12:40:02 +02:00
Jonas
86b071f36a added goal_video_detection which is currently not working really well 2018-06-09 11:39:48 +02:00
5035329de7 Improved ball following
1. Made copyfiles a little saner
2. Implemented ball search when not in field of view
2018-06-04 15:23:41 +02:00
Jonas
6aefab5694 added comment in ball approach, ball search, when ball is not in the view, needs to be improved 2018-06-04 12:57:14 +02:00
Jonas
11769f1681 rotate head to the left and to the right if the ball is not in the view 2018-06-04 12:46:05 +02:00
Jonas
76b53e83dd added distance estimation to ball_approach 2018-06-04 12:23:40 +02:00
Jonas
3e3927a4d9 added cam_id as attribute in imagereaders - return the right values in the to angles function 2018-06-04 11:58:18 +02:00
Jonas
99bcb5a07a do not copy the nao_config to the robot when using the copyfiles script 2018-06-04 11:56:34 +02:00
Jonas
6f79a1b0f1 added copyfiles script, which copies files to the robot 2018-06-04 11:51:01 +02:00
16aa1422e4 killed some refactoring bugs 2018-06-04 10:37:03 +02:00
Jonas
194f6cda9d check if autonomouslife is already disabled in movements.py 2018-06-04 10:22:49 +02:00
cdd79392fd renamed motion to movements because of conflict 2018-06-04 10:10:50 +02:00
5bd50de06e From now on use NaoMover from motion.py
Also use `read_config` from `utils.py`
2018-06-03 16:12:58 +02:00
cb649daa15 refactored BallFinder and live detection demo 2018-06-03 13:45:53 +02:00
79f9b587db Started overall project refactoring
1. Git will now be ignoring files whose names start with `exp_`.
   If you want to do quick experimenting but are not ready to add
   such files to repository, name them starting with `exp_`. For
   example `exp_cool_motion.py`.
2  Use the file `nao_defaults.json` to store the global project
   settings (such as IP address of the robot, or our preferred
   resolution). In your scripts make sure to load the default
   values from that file if needed (i.e. do NOT hard-code any
   configuration in your scripts). `nao_defaults.json` is a file
   with the stable config. If you need to experiment with configs,
   create a file `exp_config.json`.
3. Colorpicker is now a saner tool (you can specify output width, and
   the default IP address of the nao is pulled from the JSON config
   file).
2018-06-03 13:45:53 +02:00
d94b27db08 robot now runs after the ball 2018-06-03 13:40:00 +02:00
Jonas
908d7a88ad modified move_robot.py 2018-06-02 12:48:02 +02:00
a9029061a0 improvements in color calibration and tracking 2018-06-02 12:10:42 +02:00
Jonas
51d2a139f9 Merge branch 'master' of gitlab.lrz.de:robocupss18-blue3/kick-it 2018-06-02 10:07:28 +02:00
Jonas
8200c33e84 live_recognition with head not working perfect 2018-06-02 10:07:13 +02:00
cc8589d750 Extended colorpicker to read pictures also
Some minor refactoring on photo capturing script, also.
2018-06-01 20:11:56 +02:00
Jonas
ec90e8fda8 modified live_recognition_with_head and added first implementation live_recognition_with_head_with_body 2018-06-01 16:25:35 +02:00
Jonas
d0800ca0ab print head angle, when ball is in the middle of the view live_recognition.py 2018-06-01 15:02:09 +02:00
Jonas
2010f2e374 improved live_recognition_with_head.py 2018-06-01 14:46:53 +02:00
Jonas
31656dbada live_recognition_with_head further improved 2018-06-01 14:39:06 +02:00
Jonas
8c1707c3b4 work on live_recognition_with_head 2018-06-01 14:26:25 +02:00
Jonas
5ffbacac61 changed ip of the robot and the resolution 2018-06-01 13:34:40 +02:00
f05d777e41 Fixed a bug in live_recognition_with_head 2018-05-31 21:31:35 +02:00
4d801785ca Refactored ball following script 2018-05-31 21:25:27 +02:00
Jonas
f7de796054 added live_recognition_with_head.py 2018-05-31 21:10:21 +02:00
47f2d31ba9 quickly killed a bug in imagereaders.py 2018-05-31 20:31:40 +02:00
69b1b137a2 Major refactoring for better usability
1. Created interface classes for reading video streams
   (in imagereaders.py)
2. Created a class for ball detection (for reusability)
3. Reworked colorpicker, now it is possible to choose the mode of
   operation from command line (available are live from Nao, from
   video file or from webcam). It is possible to capture only the
   first image of a stream and work on it. Colorpicker now can save
   the settings on exit or load settings on startup.
2018-05-31 20:23:49 +02:00
Enrico Mattioli
57cf0b2206 HSV values for ball detection 2018-05-31 12:14:08 +02:00
Jonas
5a49424c6f changed default values colorpicker 2018-05-31 11:56:27 +02:00
Jonas
d195849fdb modified colorpicker 2018-05-31 11:50:21 +02:00
Jonas
ee8cc7708c modified colorpicker 2018-05-31 11:36:44 +02:00
Jonas
df043ccbc0 Merge branch 'master' of gitlab.lrz.de:robocupss18-blue3/kick-it 2018-05-31 11:16:19 +02:00
Jonas
fe2db524bb modified colorpicker - increased resolution - offline image 2018-05-31 11:12:51 +02:00
Enrico Mattioli
ff7f90b719 modified motion_setter 2018-05-31 11:07:40 +02:00
Jonas
f54fbc952d do only one photo with photocapture 2018-05-31 10:26:49 +02:00
Jonas
24bcac78e3 added motion_setter.py 2018-05-31 10:22:21 +02:00
Jonas
f7fcc42cf8 added photo_caputure script 2018-05-31 09:10:59 +02:00
Jonas
fee48480cc added ball_tracking.py script 2018-05-30 13:03:43 +02:00