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.

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

Hi, could please help (LDR-006)? #894

Open
wants to merge 449 commits into
base: 3.1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
449 commits
Select commit Hold shift + click to select a range
9f62a95
fix:adapting advanced-sensing
JinxiChan92 Dec 17, 2019
05cb9c0
fix:fix compile issue
JinxiChan92 Dec 18, 2019
5fe9493
fix: use the nema satellite index as data index
yusongzhou Dec 18, 2019
2f29800
fix: turn on avoid enable switch after land
yusongzhou Dec 18, 2019
f3d3a39
Merge pull request #70 in OS/onboard-sdk from OSDK-2194 to develop
Dec 18, 2019
0fff9c8
Merge pull request #71 in OS/onboard-sdk from adapting_to_advanced_se…
JinxiChan92 Dec 18, 2019
9a7ee06
fix:fix data bury about using wrong send interface and add 200ms dela…
hcbdreamer Dec 18, 2019
4e32bf7
fix:remove useless files and add sleep between heartbeat sending
JinxiChan92 Dec 18, 2019
623540c
fix:fix issues of release resources
JinxiChan92 Dec 18, 2019
aa23694
fix:add angle data reporting in the gimbal sample
JinxiChan92 Dec 18, 2019
3638365
Merge pull request #72 in OS/onboard-sdk from OSDK-2191 to develop
JinxiChan92 Dec 18, 2019
e3a121d
fix:fix the gimbal subscribe issues in gimbal sample
JinxiChan92 Dec 18, 2019
67d597a
fix:fix STM32 compile issues and improve bury function
JinxiChan92 Dec 18, 2019
2f879c7
Merge pull request #75 in OS/onboard-sdk from fix_stm32_andnd_bury to…
JinxiChan92 Dec 19, 2019
2ea649a
Merge pull request #74 in OS/onboard-sdk from improve_gimbal_demo to …
JinxiChan92 Dec 19, 2019
1049dfc
Merge pull request #73 in OS/onboard-sdk from fix_heart_beat_issue to…
JinxiChan92 Dec 20, 2019
eb4e9b2
fix:fix stm32 running cash issues
JinxiChan92 Dec 20, 2019
87031bd
feat:add gimbal manager sample in STM32
JinxiChan92 Dec 20, 2019
dc44664
fix:fix the sample flag to be original
JinxiChan92 Dec 20, 2019
40923ff
fix:fix usb callback log print format
JinxiChan92 Dec 20, 2019
fce1269
Merge pull request #76 in OS/onboard-sdk from fix_stm32_USB_crash to …
JinxiChan92 Dec 23, 2019
ff14f75
feat:add origin camera stream decoder files
JinxiChan92 Jan 9, 2020
74de4fd
feat:support liveview in linker
JinxiChan92 Jan 9, 2020
d22a0c6
feat:adapting the sample to output h264
JinxiChan92 Jan 9, 2020
ac00055
fix:fix bugs about adapting to M210 and M300
JinxiChan92 Jan 11, 2020
56789e2
feat:adapt wp2.0 to v1 protocol
yusongzhou Dec 25, 2019
c4fcd27
fix: fix the relative height get error in position control
yusongzhou Jan 12, 2020
310ada1
fix: change OSDK version of bury data to OSDK4.0.0 beta
hcbdreamer Jan 13, 2020
0626867
fix: fix the set home point ack data
yusongzhou Jan 15, 2020
fcecce4
feat: add advanced sensing demo example
Jan 15, 2020
fe66565
Merge pull request #86 in OS/onboard-sdk from OSDK-2243-WP2.0 to develop
JinxiChan92 Jan 17, 2020
6271995
Merge branch 'Add_h264_sample_and_fix_bugs' of ssh://us003.fly-access…
JinxiChan92 Jan 17, 2020
9a9cd7c
Merge pull request #88 in OS/onboard-sdk from OSDK-2250 to develop
JinxiChan92 Feb 23, 2020
ccd3e31
feat:liveview sample
JinxiChan92 Jan 19, 2020
fe64a48
feat: add advanced sensing demo example
Jan 15, 2020
78eff1c
feat:add M300 advanced-sensing support fully
JinxiChan92 Jan 20, 2020
d1ea8cb
temp adapting
JinxiChan92 Jan 21, 2020
d51acb2
fix:add comment for the APIs of GimbalManager
JinxiChan92 Feb 5, 2020
b31af42
fix:fix coding style and comments for gimbal code
JinxiChan92 Feb 10, 2020
3c8e191
fix:fix running crush in STM32 platform
JinxiChan92 Feb 12, 2020
1bfedbc
fix:fix the mission sample bug and configurate USB log.
JinxiChan92 Feb 17, 2020
5ed33e6
fix:fix code adapting to be packaged
JinxiChan92 Feb 19, 2020
3f3f200
Merge branch 'develop' into Advance-Sensing-Demo
JinxiChan92 Feb 23, 2020
fa8fa73
feature: stereo sample for M300
JinxiChan92 Feb 23, 2020
050b58b
fix:fix encType value issue
JinxiChan92 Feb 23, 2020
ccdd011
fix:fix return value loss in initLinker
JinxiChan92 Feb 24, 2020
7a5089e
fix:fix the API name and complete the stereo cam params demo
JinxiChan92 Feb 25, 2020
e4a7f05
fix:add log in the stereo vision demo sample
JinxiChan92 Feb 25, 2020
6f76bf6
Merge pull request #98 in OS/onboard-sdk from OSDK4.0_Advanced_Sensin…
JinxiChan92 Feb 25, 2020
b9bb0fc
fix:code package adapting
JinxiChan92 Feb 24, 2020
1317291
test only for stm32
JinxiChan92 Feb 24, 2020
ea8b751
fix:adapting to stm32
JinxiChan92 Feb 24, 2020
809d0ba
fix bugs for QA test
JinxiChan92 Feb 28, 2020
4063174
add advanced-sensing lib to the code
JinxiChan92 Feb 28, 2020
d8385dd
feat:osdk package simple test
JinxiChan92 Feb 28, 2020
2d12a0c
make compile unrelated to target.cmake file
yusongzhou Mar 1, 2020
8f1c329
fix:fix the dependence on private header file.
JinxiChan92 Mar 2, 2020
b0d345a
fix: make compile library for waypoint2.0
yusongzhou Mar 2, 2020
7b7f1fa
fix:add waypoint v2 function macro
yusongzhou Mar 2, 2020
a835544
fix:simpifly the sample CMakeLists.txt
Mar 3, 2020
9786694
feat:remove osdk-core and add osdk-lib/x86
yusongzhou Mar 3, 2020
24d24aa
feat:add osdk-lib/armv8 lib
Mar 3, 2020
ee3c237
fix: Turn on the adv_sensing and wp2 config switch
yusongzhou Mar 3, 2020
d9dd2b6
fix:fix advanced-sensing lib crush issue
Mar 4, 2020
038922a
fix:fix advanced-sensing running crush in x86 platform
Mar 4, 2020
6312a45
fix:fix stm32 osdk-lib dependence
JinxiChan92 Mar 4, 2020
f761908
fix:remove STM32 FreeRTOS files
JinxiChan92 Mar 4, 2020
cec2a3f
feat:refresh readme
JinxiChan92 Mar 4, 2020
52da23a
fix:update libDJIProtobuf with -fPIC feature
JinxiChan92 Mar 5, 2020
85d81f7
Update readme file of OSDK Core Library.
oliverou Mar 7, 2020
78474b8
feat:add HMS function and sample
hcbdreamer Mar 11, 2020
cca4ab9
fix:improve HMS sample
Mar 26, 2020
ee16bda
Merge pull request #109 in OS/onboard-sdk from OSDK-2320 to OSDK-2289
Mar 26, 2020
8f604b1
fix: Added Install directory cmd for supporting ROS develop
hcbdreamer Mar 25, 2020
5ea7778
fix: fix hal interface bugs.
Mar 24, 2020
2594d56
Merge pull request #112 in OS/onboard-sdk from fix_interface_bugs to …
JinxiChan92 Mar 27, 2020
f9cae55
Merge pull request #111 in OS/onboard-sdk from OSDK-2349 to OSDK-2289
JinxiChan92 Mar 27, 2020
70d4549
fix:simpify the camera manager sample case
JinxiChan92 Mar 26, 2020
5288dd0
feat:delete the old camera-gimbal sample
JinxiChan92 Mar 26, 2020
d41f9a4
Merge pull request #113 in OS/onboard-sdk from OSDK-2289 to develop
Mar 27, 2020
371ee77
feat: provide new wp2.0 sample
yusongzhou Mar 30, 2020
9327aef
refactor: remove the wp2.0 lib from msdk
yusongzhou Mar 30, 2020
6d4a9b7
feat: generate new osdk-core lib
yusongzhou Mar 30, 2020
2437c2d
feat:mop server and client sample impl
JinxiChan92 Mar 31, 2020
8734b8b
fix:adapt the sample impl for the api impl
JinxiChan92 Mar 31, 2020
cc35a39
feat: add runWaypointV2Mission function to replace main function
yusongzhou Mar 31, 2020
cb853bb
fix:fix loging for advanced-sensing
JinxiChan92 Mar 31, 2020
ab219af
fix:fix compile issues in stereo depth sample
JinxiChan92 Apr 1, 2020
3a73fe0
feat: add wp2.0 print error code explanation function
yusongzhou Apr 1, 2020
08b8c1f
fix: remove the wp2.0 sample file to sample/core
yusongzhou Apr 1, 2020
637c972
fix: modify velocity unit from cm/s to m/s
yusongzhou Apr 2, 2020
c3b5684
New: mop client sample
Apr 3, 2020
5103305
feat:add push of battery and compass info
Apr 3, 2020
f875937
fix: simplify runWaypointV2Mission function
yusongzhou Apr 7, 2020
9b8f7d5
doc: add sample reference comment
yusongzhou Apr 7, 2020
0b1386d
fixed:adapt to change of battery's interface and add sleep time
Apr 7, 2020
d952852
feat:mop QA test case
JinxiChan92 Apr 9, 2020
6b67ac3
fix:fix QA test recv buffer size issues
JinxiChan92 Apr 9, 2020
d4b92c1
fix: use LLA as waypoint's parameter
yusongzhou Apr 13, 2020
c3ea3a4
Merge pull request #117 in OS/onboard-sdk from mop_client_sample to d…
JinxiChan92 Apr 13, 2020
f812415
Merge pull request #115 in OS/onboard-sdk from OSDK-2334 to develop
JinxiChan92 Apr 13, 2020
4cba511
fix:fix the mop QA sample recv length issues
JinxiChan92 Apr 13, 2020
7eda540
Merge pull request #116 in OS/onboard-sdk from fix_perception_stereo_…
JinxiChan92 Apr 13, 2020
62ade37
fix:fix compile error/warning
JinxiChan92 Apr 13, 2020
9690f60
fix:fix compile error in sample
JinxiChan92 Apr 13, 2020
0950fb1
feat:update config file and lib
JinxiChan92 Apr 13, 2020
054a32f
Merge pull request #120 in OS/onboard-sdk from fix_error_warning to d…
JinxiChan92 Apr 13, 2020
01ec450
feat:adapting stereo camera sample to M300
JinxiChan92 Apr 7, 2020
c3f8624
Merge branch 'mop_QA_test' of ssh://us003.fly-access.com:7999/os/Onbo…
JinxiChan92 Apr 14, 2020
f932a37
fix:fix wp2.0 cmake issues
JinxiChan92 Apr 14, 2020
07f6bf6
Merge pull request #122 in OS/onboard-sdk from fix_wp2.0_cmake_issues…
JinxiChan92 Apr 14, 2020
3cf6e25
Merge pull request #121 in OS/onboard-sdk from stereo_m300_point_clou…
JinxiChan92 Apr 14, 2020
9e9f812
fix:fix sample for downloading filelist
JinxiChan92 Apr 10, 2020
0bdaa44
fix:impling file data download
JinxiChan92 Apr 14, 2020
3771b3c
feat: add mo test in MOP QA sample
JinxiChan92 Apr 16, 2020
24e5fd7
feat: add mo test in MOP QA sample
JinxiChan92 Apr 16, 2020
d81d017
fix : fix download file sample
JinxiChan92 Apr 16, 2020
68a31fa
fixed:change the way of getting single battery's information and add
Apr 17, 2020
509121a
Merge branch 'develop' of https://us003.fly-access.com/scm/os/onboard…
Apr 17, 2020
8f214c1
fix:fix sample crash
JinxiChan92 Apr 21, 2020
97992ea
Merge pull request #123 in OS/onboard-sdk from mop_QA_mo_adapting to …
Apr 21, 2020
20e2d17
Merge pull request #118 in OS/onboard-sdk from OSDK-2360 to develop
Apr 21, 2020
40eb19d
fix:fix QA test log and writefile issue
JinxiChan92 Apr 21, 2020
d3483ec
feat:MOP sample refactoring
JinxiChan92 Apr 21, 2020
172fe8c
feat:add necessary print in battery sample
Apr 21, 2020
b49fd8c
Merge branch 'download-sample-impl' of ssh://us003.fly-access.com:799…
JinxiChan92 Apr 22, 2020
f41b98f
Merge pull request #124 in OS/onboard-sdk from download-sample-impl t…
JinxiChan92 Apr 22, 2020
9185c7f
Merge pull request #126 in OS/onboard-sdk from OSDK-2360 to develop
Apr 23, 2020
422c9db
Merge pull request #125 in OS/onboard-sdk from mop_sample_refactoring…
Apr 23, 2020
c95d0f7
ENH : Perception sample improvement
JinxiChan92 Apr 23, 2020
baff13f
Merge pull request #127 in OS/onboard-sdk from perception_sample_opti…
JinxiChan92 Apr 26, 2020
30aa722
fix: fix the waypoint v2 sample pause failed
yusongzhou Apr 27, 2020
18fd99c
style: add x86's core file from resourse
yusongzhou Apr 27, 2020
92cda95
Merge pull request #129 in OS/onboard-sdk from OSDK-2412 to develop
JinxiChan92 Apr 28, 2020
dfbcecf
fix:GD610 don't support 4S timer shooting
JinxiChan92 Apr 28, 2020
43d3693
fix:fix QA test issues
JinxiChan92 Apr 29, 2020
ac0cbd6
Merge pull request #130 in OS/onboard-sdk from QA_bugfix to develop
JinxiChan92 Apr 29, 2020
83cb48a
EBH:Complete the header for STM32 platform
JinxiChan92 Apr 29, 2020
74b1850
fix:fix STM32 running crash
JinxiChan92 Apr 29, 2020
1384279
Merge pull request #131 in OS/onboard-sdk from fix_stm32_issues to de…
JinxiChan92 Apr 29, 2020
35c4960
ENH:update the internal lib and headers @ 20200429-23:29:00
JinxiChan92 Apr 29, 2020
caf82f5
fix:adapting to mop sample test file
JinxiChan92 Apr 30, 2020
dcaf493
Merge pull request #133 in OS/onboard-sdk from adapting_mop_upload_sa…
JinxiChan92 Apr 30, 2020
b41d548
feature:open source adapting : remove original osdk-lib
JinxiChan92 May 5, 2020
5cd3f71
feat:open source adapting : copy the osdk-core source
JinxiChan92 May 5, 2020
44e2902
feat:open source adapting : copy the advanced-sensing source
JinxiChan92 May 5, 2020
2778832
Open source adapting : Do adapting for project adjusting.
JinxiChan92 May 5, 2020
32bd85a
feature:add zoom setting API and sample
JinxiChan92 May 5, 2020
485655d
fix:temporary fix for the download request issues of H20T
JinxiChan92 May 5, 2020
4a6449e
feature:compile armv8 linker lib and headers files
JinxiChan92 May 5, 2020
52706eb
fix:fix linker headers install place
JinxiChan92 May 5, 2020
70a6f12
feature:open source adapt for STM32
JinxiChan92 May 5, 2020
5821e2b
fix:add installing of dji-linker.a
JinxiChan92 May 6, 2020
cd8d881
fix:restore original UDT source 4.11
JinxiChan92 May 6, 2020
ce04193
fix:adjust the structure of h264 code
JinxiChan92 May 6, 2020
fbf845e
fix:delete private messages for open-source rule
JinxiChan92 May 6, 2020
29f89fa
fix:fix static check issues
JinxiChan92 May 7, 2020
b261683
fix:fix server compile failed lack of opencv
JinxiChan92 May 7, 2020
0b1681f
fix:fix compile issues lack of opencv (2)
JinxiChan92 May 7, 2020
54e1d1d
fix:fix static code check issues
JinxiChan92 May 7, 2020
3b2a21e
Merge pull request #134 in OS/onboard-sdk from open_source_release to…
JinxiChan92 May 7, 2020
9b66323
fix:fix readme for 4.0
JinxiChan92 May 7, 2020
a9afb00
Merge pull request #135 in OS/onboard-sdk from open_source_release to…
JinxiChan92 May 7, 2020
350d1e7
fix:add readme in doc
JinxiChan92 May 7, 2020
6e284e3
Merge pull request #136 in OS/onboard-sdk from open_source_release to…
JinxiChan92 May 7, 2020
8fa5b9d
fix:fix License.txt
JinxiChan92 May 7, 2020
6f1eb85
Merge pull request #137 in OS/onboard-sdk from open_source_release to…
JinxiChan92 May 7, 2020
0c47985
fix:add document link in readme.md
JinxiChan92 May 7, 2020
a388a73
Merge pull request #138 in OS/onboard-sdk from open_source_release to…
JinxiChan92 May 7, 2020
0bb7dfc
fix:fix string in payload sample
JinxiChan92 May 7, 2020
5e5a694
Merge pull request #139 in OS/onboard-sdk from open_source_release to…
JinxiChan92 May 7, 2020
28da15a
Merge 4.0 into master branch
pcler May 7, 2020
929cdfb
fix:fix file data download saving order issure
DJI-Jerry May 11, 2020
98fa3f7
Fix:fix wp2.0 action upload failure issue
DJI-Jerry May 12, 2020
37cd844
fixed:fix waypoint upload actions fail problem
DJI-Colin May 12, 2020
15bd74b
Merge pull request #516 from DJI-Colin/waypoint-upaload-action-fix
DJI-Jerry May 13, 2020
73f93d2
Merge pull request #515 from DJI-Jerry/fix_download_and_wp2.0_bug
DJI-Jerry May 13, 2020
e4d5607
refactor:remove redundant code
DJI-Jerry May 19, 2020
2d5f117
fix:fix M300 camera stream running crash
DJI-Jerry May 21, 2020
3d244f4
fixed:1.add note of WayPointSettings's command_list and command_param.
DJI-Colin May 22, 2020
3d98480
Merge pull request #520 from DJI-Colin/add_note_of_WayPointSettings
DJI-Jerry May 25, 2020
a1fe478
Merge pull request #521 from DJI-Jerry/fix_m300_camstream_issue
DJI-Jerry May 27, 2020
55296f6
feat:add number of subscription package from 5 to 7
DJI-Colin May 27, 2020
443f818
update readme file
oliverou May 27, 2020
4914c7c
fix:fix compile issue of camera-stream-target-tracking-sample
DJI-Jerry May 28, 2020
95af810
Merge pull request #522 from DJI-Colin/add_num_of_sub_package
DJI-Jerry May 28, 2020
f8bbad7
Merge pull request #523 from DJI-Jerry/fix_compile_issue_tracking_sample
DJI-Jerry May 28, 2020
fa6d3a0
fixed:fix setWaypointEventCallback fail problem.
DJI-Colin May 29, 2020
f63c0fd
Merge pull request #525 from DJI-Colin/fixed_setWaypointEventCallback…
DJI-Jerry Jun 4, 2020
b28641d
doc:add drone support information to API comment
DJI-Jerry Jun 10, 2020
5e3ce5b
docs:add drone platform support information for telemetry
DJI-Jerry Jun 21, 2020
c296336
fix:fix error log caused by subscription in some samples.
DJI-Jerry Jun 21, 2020
e90f428
fix:add drone platform support infomation in telemetry sample.
DJI-Jerry Jun 21, 2020
eda9004
fix:fix the infinite recursion in the hal impl of usb bulk.
DJI-Jerry Jun 21, 2020
70c75b9
fix:fix crash bugs for cameramanager async api.
DJI-Jerry Jun 21, 2020
07b59e9
fix:avoid redundant firewall activation after the firewall activated.
DJI-Jerry Jun 21, 2020
9548cdc
fix:move usb bulk init impl in AdvancedSensing::AdvancedSensing
DJI-Jerry Jun 21, 2020
9afdb76
fix:do adapting for some cameras in parameters setting.
DJI-Jerry Jun 21, 2020
b246758
Merge pull request #542 from DJI-Jerry/OSDK_4.0.1_bugfixs_01
DJI-Jerry Jun 21, 2020
e740ba2
fixed:replace isUSBPlugged with isUartplugged in heartbeat
DJI-Colin Jun 29, 2020
1e3e4a0
Merge pull request #547 from DJI-Colin/replace_isUSBPlugged_with_isUa…
DJI-Jerry Jun 30, 2020
d7e280e
doc:fix the comment of supporting platforms in APIs
DJI-Jerry Jun 30, 2020
b95b74a
fix:update x86 linker lib and header file
DJI-Jerry Jun 30, 2020
5249f62
fix:update armv8 lib and header file
JinxiChan92 Jun 30, 2020
07133c1
fix:update STM32 armcc lib and header file
JinxiChan92 Jul 1, 2020
dc731de
Merge pull request #551 from DJI-Jerry/update_linker_lib
DJI-Jerry Jul 1, 2020
dd9784d
fix:fix policy for camera subscription
DJI-Jerry Jul 1, 2020
06e5ca0
fix:fix mop client crash when connect the same id again
DJI-Jerry Jul 1, 2020
3f1389c
fix:fix pthread handle null pointer issue for STM32
DJI-Jerry Jul 1, 2020
7fdf62b
ehn:do adapting for some other compilers
DJI-Jerry Jul 1, 2020
990dc22
Merge pull request #552 from DJI-Jerry/OSDK_4.0.1_bugfixs_01
DJI-Jerry Jul 1, 2020
85c0869
new: add more mop transmission samples.
DJI-Jerry Jul 1, 2020
c877e58
fix:do adapting for M210V2 for perception APIs
DJI-Jerry Jul 1, 2020
a133dad
Merge pull request #553 from DJI-Jerry/OSDK_4.0.1_bugfixs_01
DJI-Jerry Jul 2, 2020
ac93ce8
new:add new stereo new API sample
DJI-Jerry Jul 2, 2020
13d8bba
Merge pull request #554 from DJI-Jerry/OSDK_4.0.1_bugfixs_01
DJI-Jerry Jul 2, 2020
902d750
new:update linker armv8 lib
DJI-Jerry Jul 6, 2020
0727359
new: update x86 linker lib
DJI-Jerry Jul 6, 2020
a2ca14a
Merge pull request #559 from DJI-Jerry/fix_linker_lib
DJI-Jerry Jul 6, 2020
c05a360
fix:fix issue of the M300 without usb connected
JinxiChan92 Jul 10, 2020
46a5347
fix:fix shoot single photo fail when interval shoot-photo mode
DJI-Jerry Jul 13, 2020
5be8a33
Merge pull request #560 from DJI-Jerry/fix_M300_stm32_usb_issue
DJI-Jerry Jul 13, 2020
246665c
Merge pull request #561 from DJI-Jerry/master
DJI-Jerry Jul 13, 2020
185febf
fix:fix PSDK liveview getting issue
DJI-Jerry Jul 13, 2020
42510ae
Merge pull request #562 from DJI-Jerry/fix_psdk_liveview
DJI-Jerry Jul 13, 2020
8cc7615
new:add quick_setup script to do FreeRTOS porting
JinxiChan92 Jul 14, 2020
0c369fa
fix:fix payload sample typo
DJI-Jerry Jul 14, 2020
991654a
fix:fix readme of FreeRTOS porting
JinxiChan92 Jul 14, 2020
2a301c3
Merge pull request #565 from DJI-Jerry/FreeRTOS_quick_setup
DJI-Jerry Jul 16, 2020
777c30c
Merge pull request #566 from DJI-Jerry/fix_sample_typo
DJI-Jerry Jul 16, 2020
a1c2cea
fix:update linker lib
DJI-Jerry Jul 16, 2020
55eb3bb
fix:update linker lib
JinxiChan92 Jul 16, 2020
e9e941e
new:update armv7 linker lib
DJI-Jerry Jul 16, 2020
f5c44a8
Merge pull request #568 from DJI-Jerry/update_linker_lib
DJI-Jerry Jul 16, 2020
4b69caa
fix:fix file download function issues
DJI-Jerry Jul 17, 2020
39b1266
Merge pull request #571 from DJI-Jerry/fix_download_issues
DJI-Jerry Jul 17, 2020
bad9feb
new:add simluator api for drone
DJI-Jerry Jul 20, 2020
443f33e
fixed:add notes of deviceStatus.
DJI-Colin Jul 21, 2020
f2dcbe5
fix:fix compile error
DJI-Jerry Jul 21, 2020
2c5d4e6
Merge pull request #574 from DJI-Jerry/fix_compile_issues
DJI-Jerry Jul 21, 2020
026561b
new: add beta API for switching camera source from H20/H20T
DJI-Jerry Jul 21, 2020
c6ac30c
fix:fix sample typo
DJI-Jerry Jul 21, 2020
58a7f63
fix:fix comment
DJI-Jerry Jul 21, 2020
496a779
Merge pull request #575 from DJI-Jerry/fix_advanced_sensing_4.0.1
DJI-Jerry Jul 21, 2020
e306975
Merge pull request #573 from DJI-Colin/add_note_of_deviceStatus
DJI-Jerry Jul 21, 2020
e113b05
fix:delete depecated todo item and update policy
DJI-Jerry Jul 22, 2020
6687ea5
Merge pull request #576 from DJI-Jerry/update_policy
DJI-Jerry Jul 22, 2020
3b751ad
fix:fix download crush while downloading big-size file
DJI-Jerry Jul 22, 2020
b2f8306
fix:fix invalid log while downloading file
DJI-Jerry Jul 22, 2020
6124c9e
Merge pull request #577 from DJI-Jerry/fix_download_issues
DJI-Jerry Jul 22, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 9 additions & 3 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
---
Language: Cpp
BasedOnStyle: Google
BasedOnStyle: Mozilla
Standard: Cpp03
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: true
AlignConsecutiveDeclarations: true
AllowShortFunctionsOnASingleLine: false
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
BreakBeforeBraces: Allman
11 changes: 0 additions & 11 deletions .editorconfig

This file was deleted.

12 changes: 9 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
*.o
*~

osdk-core/cmake-modules/DJIOSDKConfig.cmake
osdk-core/cmake-modules/DJIOSDKConfigVersion.cmake
lib/build-DJI_onboardSDK-Desktop_Qt_5_4_2_MinGW_32bit-Debug/
Onboard_SDK_Lib/build-DJI_onboardSDK-Desktop_Qt_5_4_2_MinGW_32bit-Debug/
sample/STM32/MDK/Objects/
Expand Down Expand Up @@ -45,8 +46,13 @@ tags
.idea/
bin/
build/
Default/
CMakeFiles/
CMakeCache.txt
cmake_install.cmake
Makefile
Makefile
osdk-core/advanced-sensing-*
osdk-core/v1-1.0.0
osdk-core/mo-protocol-*
osdk-core/waypointv2-core*
cmake-build-debug
.vscode/
123 changes: 80 additions & 43 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,62 +1,99 @@
# * @Copyright (c) 2016-2017 DJI
# *
# * Permission is hereby granted, free of charge, to any person obtaining a copy
# * of this software and associated documentation files (the "Software"), to deal
# * in the Software without restriction, including without limitation the rights
# * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# * copies of the Software, and to permit persons to whom the Software is
# * furnished to do so, subject to the following conditions:
# *
# * The above copyright notice and this permission notice shall be included in
# * all copies or substantial portions of the Software.
# *
# * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# * SOFTWARE.
# *
# *

cmake_minimum_required(VERSION 2.8)
project(onboardsdk)

set(CMAKE_VERBOSE_MAKEFILE OFF)

# Add module path for <name>.cmake conf files
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/contrib/)
set(DJIOSDK 0)
set(DJIOSDK_MINOR_VERSION 1)
set(DJIOSDK_PATCH_VERSION 0)
set(DJIOSDK_VERSION
${DJIOSDK_MAJOR_VERSION}.${DJIOSDK_MINOR_VERSION}.${DJIOSDK_PATCH_VERSION})
add_definitions(-DDJIOSDK_MAJOR_VERSION=4)
add_definitions(-DDJIOSDK_MINOR_VERSION=0)
add_definitions(-DDJIOSDK_PATCH_VERSION=0)

include(${CMAKE_MODULE_PATH}/DJIConfig.cmake)
add_definitions(-DDJIOSDK_IS_DEBUG=2)

if(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|x86|AMD64|x86_64")
set(ARCH x86)
add_definitions(-DDJIOSDK_HARDWARE_TYPE=3)
elseif((CMAKE_SYSTEM_PROCESSOR MATCHES "^arm*") OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch"))
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(ARCH armv7)
add_definitions(-DDJIOSDK_HARDWARE_TYPE=1)
elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(ARCH armv8)
add_definitions(-DDJIOSDK_HARDWARE_TYPE=2)
endif()
elseif()
add_definitions(-DDJIOSDK_HARDWARE_TYPE=0)
endif()

set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/libs)

# Set test related flags
option(GTEST "Build with Google Test framework" OFF)

# Allow to build additional modules
option(LIDAR_LOGGING "Build VLP16 Puck LiDAR logging" OFF)

if(NOT ${DISTRO_VERSION} STREQUAL "1604")
message("Precision missions, collision avoidance and pointcloud to LAS converter BETA works only on Ubuntu 16.04")
else()
option(USE_PRECISION_MISSIONS "Use DJI precision-missions library" OFF)
if(USE_PRECISION_MISSIONS)
add_definitions(-DUSE_PRECISION_MISSIONS)
include(${CMAKE_MODULE_PATH}/External_PrecisionMissions.cmake)
endif()

option(USE_COLLISION_AVOIDANCE "Use DJI collision avoidance library" OFF)
if(USE_COLLISION_AVOIDANCE)
include(${CMAKE_MODULE_PATH}/External_CollisionAvoidance.cmake)
endif()
set(ADVANCED_SENSING 1)
set(WAYPT2_CORE 1)

option(USE_POINTCLOUD2LAS "Use DJI pointcloud to LAS converter library" OFF)
if(USE_POINTCLOUD2LAS)
include(${CMAKE_MODULE_PATH}/External_Pointcloud2Las.cmake)
endif()
if (ADVANCED_SENSING)
add_definitions(-DADVANCED_SENSING)
endif()

# Install VTK external dependency
if(LIDAR_LOGGING)
include(${CMAKE_MODULE_PATH}/External_VTK.cmake)
if (WAYPT2_CORE)
add_definitions(-DWAYPT2_CORE)
endif()

# Install GTest and RapidJSON external dependencies for tests
if(GTEST)
include(${CMAKE_MODULE_PATH}/External_GTest.cmake)
add_subdirectory(osdk-core)
if (${CMAKE_SYSTEM_NAME} MATCHES Linux)
add_subdirectory(sample/platform/linux)
endif()

if(GTEST OR USE_PRECISION_MISSIONS)
include(${CMAKE_MODULE_PATH}/External_RapidJSON.cmake)
endif()
#[[
INSTALL(DIRECTORY osdk-lib/${ARCH}/osdk-core/inc/
DESTINATION ${CMAKE_INSTALL_PREFIX}/include
FILES_MATCHING PATTERN "*.h*")

INSTALL(DIRECTORY osdk-lib/${ARCH}/advanced-sensing-2.0.3/inc/
DESTINATION ${CMAKE_INSTALL_PREFIX}/include
FILES_MATCHING PATTERN "*.h*")

INSTALL(DIRECTORY osdk-lib/${ARCH}/waypointv2-core-1.0.0/inc/
DESTINATION ${CMAKE_INSTALL_PREFIX}/include
FILES_MATCHING PATTERN "*.h*")

INSTALL(DIRECTORY osdk-lib/${ARCH}/osdk-core/lib/
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
FILES_MATCHING PATTERN "*.a*")

INSTALL(DIRECTORY osdk-lib/${ARCH}/advanced-sensing-2.0.3/lib/
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
FILES_MATCHING PATTERN "*.a*")

INSTALL(DIRECTORY osdk-lib/${ARCH}/waypointv2-core-1.0.0/lib/
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
FILES_MATCHING PATTERN "*.a*")
]]

add_subdirectory(osdk-core)
add_subdirectory(osdk-wrapper)
add_subdirectory(platform/linux)
add_subdirectory(sample/Linux/Non-Blocking)
add_subdirectory(sample/Linux/Blocking)
if (LIDAR_LOGGING)
add_subdirectory(sensor-integration/velodyne_vlp16puck_lite_API_example)
endif ()

Loading