Commit Graph

638 Commits

Author SHA1 Message Date
John Zhao
96bc0353ff Merge branch 'hotfix/2.2.4' into develop
# Conflicts:
#	CMakeLists.txt
#	wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_nodelet.cc
2018-12-31 10:25:22 +08:00
John Zhao
2a2ea0b370 chore(README.md): update version and doc links 2018-12-31 10:14:21 +08:00
John Zhao
6172f4c1b8 chore(root): update version 2018-12-31 06:45:25 +08:00
kalman
a3206e5be5 style(ros):rename mutex_data 2018-12-29 16:47:18 +08:00
kalman
e34e6e1466 style(ros):fix spell mistake 2018-12-29 16:40:03 +08:00
kalman
87c3c81a93 fix(ros):delete timestamp repeated/abnormal jundge 2018-12-29 16:32:03 +08:00
TinyOh
ceec4f492a fix(ros): include publishOther and reduce the range 2018-12-29 09:53:25 +08:00
kalman
50dc95aa71 fix(ros): fix loop_rate bug 2018-12-28 19:16:02 +08:00
kalman
04722850b8 Merge branch 'develop' of http://gitlab.mynt.com/mynteye/mynt-eye-sdk-2 into develop 2018-12-28 17:56:56 +08:00
kalman
0e4896f788 fix(ros): fix option setting bug 2018-12-28 17:56:12 +08:00
TinyOh
812638b7dc fix(ros): record -a core error 2018-12-28 17:49:59 +08:00
Tiny
031fa74113 Merge branch 'develop' of http://gitlab.mynt.com/mynteye/mynt-eye-sdk-3 into develop 2018-12-28 10:19:29 +08:00
Tiny
6689fc853f fix(uvc osx): remove the sample with xu on osx 2018-12-28 10:18:37 +08:00
kalman
ea05d35bf2 Merge branch 'develop' of http://gitlab.mynt.com/mynteye/mynt-eye-sdk-2 into develop 2018-12-27 20:21:30 +08:00
kalman
e38cc7797f refactor(tutorials): compatible with s1030 and s210a 2018-12-27 20:20:47 +08:00
Tiny
a52c5f510d fix(uvc osx): check the video format and throw warning 2018-12-27 17:13:22 +08:00
Tiny
20b6026789 fix(uvc osx): pu API support 2018-12-27 11:33:00 +08:00
Tiny
ea24c5fb38 fix(uvc osx) : fix the camera_u demo issue 2018-12-27 10:37:41 +08:00
Tiny
c8f5528bf7 Merge branch 'develop' of http://gitlab.mynt.com/mynteye/mynt-eye-sdk-2 into HEAD 2018-12-27 10:32:16 +08:00
kalman
ed45497d6c fix(tools): fix complile bug 2018-12-26 19:58:37 +08:00
Tiny
29569c5152 Merge branch 'develop' of http://gitlab.mynt.com/mynteye/mynt-eye-sdk-3 into develop 2018-12-26 13:14:12 +08:00
Tiny
5d6d635647 Merge branch 'develop' of http://gitlab.mynt.com/mynteye/mynt-eye-sdk-3 into develop 2018-12-26 11:27:41 +08:00
Tiny
c490e09de0 style(uvc osx) remove useless file 2018-12-26 11:19:43 +08:00
kalman
56c4d50c93 fix(ros):fix conflicts 2018-12-25 20:37:00 +08:00
kalman
6e638813f2 chore(root):update readme 2018-12-25 19:21:26 +08:00
kalman
18258fe7c9 chore(root):update readme 2018-12-25 19:07:52 +08:00
kalman
0bcaa0801e fix(README):update url of api doc in English 2018-12-25 18:53:39 +08:00
kalman
b10415515e chore(root):update reademe 2018-12-25 18:45:48 +08:00
Osenberg
aa19d65272 docs(doc):: Modified version number for release 2018-12-25 11:09:16 +08:00
Osenberg
1f6acd3c98 style(ros):: Remove useless log 2018-12-25 10:35:25 +08:00
John Zhao
7e42cd65b1 Merge branch 'devel-s210a-merge' into develop 2018-12-24 10:41:40 +08:00
John Zhao
34283fda0c refactor(device): move get/set params to channels adapter 2018-12-24 10:32:25 +08:00
John Zhao
52f1075182 refactor(device-s1): remove useless override 2018-12-24 00:41:59 +08:00
John Zhao
2f4ffded7c refactor(device): add channels adapter to device 2018-12-24 00:39:43 +08:00
John Zhao
c6bed032cb style(streams.h): remove comment codes 2018-12-23 21:36:12 +08:00
John Zhao
f7b85c6b05 fix(device-s1): Fix overflow of timestamp convertion 2018-12-23 21:19:58 +08:00
John Zhao
3ed2d501c2 refactor(device): change where define image info packet 2018-12-23 21:11:12 +08:00
John Zhao
104b3841d9 style(types.h): change comments 2018-12-23 20:58:18 +08:00
Osenberg
28e539e277 fix(ros):: test ros timestamp overflow. 2018-12-23 17:20:03 +08:00
kalman
b5a61075df fix(channels):update control infos by model 2018-12-22 18:03:23 +08:00
kalman
5800e1c6c8 refactor(channel):init channel need model 2018-12-22 16:17:47 +08:00
kalman
618f2c02e5 format(device/type.h):add white space 2018-12-21 22:09:49 +08:00
kalman
0d664b28ad fix(imu):fix tbe imu bug of s1030 2018-12-21 22:04:40 +08:00
Osenberg
2e97266516 fix(ros): ros time stamp overflow 2018-12-21 20:45:19 +08:00
kalman
5b8301c601 fix(device):fix the image info bug for s1030 2018-12-21 19:05:52 +08:00
Tiny
263658834a feat(uvc osx): yuyv format is right now 2018-12-21 14:17:08 +08:00
John Zhao
a06786c16d refactor(device_s): todo set img rate according to stream request 2018-12-21 00:32:22 +08:00
John Zhao
91da3a3ca8 refactor(*): adapt stereo stream to different device 2018-12-21 00:23:42 +08:00
John Zhao
a38e6a782a fix(api): update rectify params after config stream request 2018-12-20 22:08:29 +08:00
kalman
1652d976bf fix(ros): fix init device 2018-12-20 20:45:11 +08:00