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.

Sign up for GitHub

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

ARDrone 2 support #2

Open
wants to merge 61 commits into
base: master
Choose a base branch
from
Open

ARDrone 2 support #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
a69cbc9
Adding an H.264 decoder using ffmpeg.
adetaylor Jan 22, 2013
548b071
Adding prototype png splitter.
adetaylor Jan 22, 2013
712d0f2
Adding credit.
adetaylor Jan 22, 2013
fcb071b
More shonky Python to make it possible to receive PNGs from AR.Drone …
adetaylor Jan 22, 2013
76444ed
Typo.
adetaylor Jan 24, 2013
7f5ad24
Further work towards an AR.Drone-2.0 compatible Python video interface.
adetaylor Jan 24, 2013
8883c78
Minor fixes.
adetaylor Jan 26, 2013
604dee9
Switching default to AR.Drone 2.0.
adetaylor Jan 26, 2013
cb117ad
More fixes.
adetaylor Jan 26, 2013
4ddce2a
More fixes.
adetaylor Jan 26, 2013
bc40f87
Fixes need to work with ARDrone 2.0 including deal
May 23, 2013
b95c6c9
Merge pull request #1 from braincorp/first-attempt
jjh42 Jun 6, 2013
d082a29
Debug and test to handle delays with ardrone 2.0
Aug 27, 2013
1a2c20f
Where is the error ?
Aug 27, 2013
222c7d7
New changes, delay closer to 300 ms
Aug 29, 2013
8234f24
Changes
Aug 30, 2013
877448c
ppm/png option
Aug 30, 2013
b62d833
small changes
Aug 30, 2013
b96a241
new files that I removed
Aug 30, 2013
ece2d1f
commit modifs
Aug 30, 2013
5161779
new test for losing connection
Aug 31, 2013
d1e77ff
capture for test
Aug 31, 2013
de5cc25
updates
Aug 31, 2013
57dacdc
Working
Aug 31, 2013
73cf210
Remove prints and some cleaning
Aug 31, 2013
c1fc850
Only send navdata information when flying information is available
Sep 5, 2013
a3ea286
Remove unused import,
Sep 5, 2013
d86f5e2
Cleaning code, removing prints and stuff
Sep 5, 2013
94bde96
Address pull request comments
Sep 5, 2013
3078ac6
fix altitude
Sep 5, 2013
31d114c
Remove locks
Sep 5, 2013
b69ef2e
Merge pull request #2 from braincorp/removing_delays
jjh42 Sep 5, 2013
57d9563
Dealing with lost connection with the parrot
Sep 6, 2013
28d6859
improve
Sep 6, 2013
6240c7b
Adding logging info
Sep 6, 2013
026a401
Works again.
Sep 6, 2013
a3140ed
Merge pull request #4 from braincorp/Improving_connection_stability
jjh42 Sep 6, 2013
4c42656
Merge branch 'master' of github.com:braincorp/python-ardrone into imp…
Sep 7, 2013
adc7cd0
Merge remote-tracking branch 'origin/master' into improve-video-perf
Sep 7, 2013
8fb9d24
Merge branch 'master' of github.com:braincorp/python-ardrone into imp…
Sep 7, 2013
14b8396
Merge remote-tracking branch 'origin/improve-video-perf' into improve…
Sep 7, 2013
f47f103
Merge remote-tracking branch 'origin/improve-video-perf' into improve…
Sep 7, 2013
d42665e
Merge pull request #3 from braincorp/improve-video-perf
Sep 7, 2013
524bfe0
Removing IPC Thread and fixing bug
Sep 7, 2013
4c9050e
Removing Process, replace with thread
Sep 7, 2013
a91224c
Merge pull request #5 from braincorp/Removing_IPC_Thread
jjh42 Sep 9, 2013
3d037ec
Option for hd in camera setting for the drone
Sep 11, 2013
cb534e9
Merge pull request #6 from braincorp/HD_VS_SD_OPTION
jjh42 Sep 11, 2013
5acd29c
Test for library installed
Sep 16, 2013
16c4023
Merge pull request #7 from braincorp/Fix_bug_ffmpeg
jjh42 Sep 16, 2013
0309a96
PAckage file
Sep 20, 2013
69c9524
new setup file
Sep 20, 2013
515c8e6
modified setup.py
Sep 20, 2013
80d75a3
Update setup.py
Sep 20, 2013
38a9251
Merge pull request #8 from braincorp/init_file_missing
Sep 20, 2013
e288ca1
Remove png stream
Nov 1, 2013
26fdd9f
Make capture 10 times smaller and remove ppm stream
Nov 1, 2013
b0a3fc7
Merge pull request #9 from braincorp/Make_project_smaller
Nov 1, 2013
8989480
Using a dict for control state received by the drone
Nov 2, 2013
d798e3f
add comments
Nov 2, 2013
dc5a985
Merge pull request #10 from braincorp/dict_for_control_state
Nov 2, 2013
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.pyc
*~
.cache
11 changes: 11 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
language: python
python:
- "2.7"
notifications:
- email: false
install:
- sudo apt-get update
- sudo apt-get install ffmpeg
- pip install -r requirements.txt
- pip install -r dev-requirements.txt
script: py.test -n 4
4 changes: 1 addition & 3 deletions README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ Requirements:
This software was tested with the following setup:

* Python 2.6.6
* Psyco 1.6 (recommended)
* Pygame 1.8.1 (only for the demo)
* Unmodified AR.Drone firmware 1.5.1
* Unmodified AR.Drone firmware 2.0


License:
Expand Down
119 changes: 0 additions & 119 deletions arnetwork.py
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pytest==2.3.5
pytest-xdist==1.8
Loading