Merge branch 'master' of github.com:xdu-aero-association/rosettadrone…

… into master
xdu-aero-association · May 26, 2022 · f004830 · f004830
2 parents ec22186 + ac143b9
commit f004830
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
@@ -5,12 +5,14 @@ on:
     branches:
     - master
     - work
-    - add-feature
+    - AddGaode
+    - OpenCV-Landing
   pull_request:
     branches:
     - master
     - work
-    - add-feature
+    - AddGaode
+    - OpenCV-Landing
 
 jobs:
   build:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -16,13 +16,15 @@ on:
     branches:
     - master
     - work
-    - add-feature
+    - AddGaode
+    - OpenCV-Landing
   pull_request:
     # The branches below must be a subset of the branches above
     branches:
     - master
     - work
-    - add-feature
+    - AddGaode
+    - OpenCV-Landing
   schedule:
     - cron: '15 13 * * 5'
 

diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml
@@ -11,12 +11,14 @@ on:
     branches:
     - master
     - work
-    - add-feature
+    - AddGaode
+    - OpenCV-Landing
   pull_request:
     branches:
     - master
     - work
-    - add-feature
+    - AddGaode
+    - OpenCV-Landing
 jobs:
   run-lint:
     runs-on: ubuntu-latest

diff --git a/README.md b/README.md
@@ -19,6 +19,12 @@ and supports Android 5.1 and newer, with DJI SDK 4.15.2 and Androidx lib.
 
 ## The project works with QGroundcontrol, goto and joystic is implemented
 
+### Work Progress
+
+- [ ] Change map from GoogleMap to GaodeMap.
+- [ ] Add opencv feature detection.
+- [ ] Add custom feature for precision landing.
+
 ### **Please create issues and create PR on this fork.**
 
 ## IMPORTANT: Install `git lfs`