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

Jump to bottom

Mavlink File Transfer Protocol (FTP) #923

Merged
merged 19 commits into from
Jun 29, 2014
Merged

Mavlink File Transfer Protocol (FTP) #923

merged 19 commits into from
Jun 29, 2014

Conversation

LorenzMeier
Copy link
Member

This pull request adds a file transfer protocol to the MAVLink app. As of now all it does is handling an empty request from this branch: mavlink/qgroundcontrol#658

@LorenzMeier LorenzMeier added this to the First beta release milestone May 12, 2014
@DrTon DrTon modified the milestone: First beta release May 16, 2014
px4dev and others added 15 commits June 7, 2014 10:54
@px4dev
Merge branch 'master' into mavlink-ftp
5d7ea2b
@px4dev
fix extraction of path info from FTP request
99dfef3
@px4dev
Don't queue empty work items.
e890661
@LorenzMeier
Support link forwarding
2235a86
@LorenzMeier
Added include order warning
4b70a0d
@LorenzMeier
MAVLink helper function fixes
dfe71b6
@LorenzMeier
Formatting and some ftp drive-by
f84e18f
@LorenzMeier
Fixed threading and transmission issues for FTP
a103fef
@px4dev
Fix packing of directory entries in the List reply
0ef6605
@LorenzMeier
merged master
6e597a6
@LorenzMeier
mavlink-ftp: Remove two extra bytes we don not need
1a0f53e
@LorenzMeier
mavlink-ftp: Remove commented out code
f9db172
@LorenzMeier
mavlink-ftp: Add extra padding because the ringbuffer implementation …
7546b99 
…relies on its use
@DonLakeFlyer
Support for List, Open, Read, Terminate commands
a398d5c 
Fixed various bugs. Flattened Mavlink::Session class while fixing bugs
in this area.
@LorenzMeier
Merge pull request #1083 from DonLakeFlyer/mavlink-ftp
5192a5e 
FTP List, Open, Read, Terminate commands working end to end with QGC
@LorenzMeier
Copy link
Member Author

This is now pretty useful, merging.

LorenzMeier added a commit that referenced this pull request Jun 29, 2014
@LorenzMeier
Merge pull request #923 from PX4/mavlink-ftp
e84cab8 
Mavlink File Transfer Protocol (FTP)
@LorenzMeier LorenzMeier merged commit e84cab8 into master Jun 29, 2014
@LorenzMeier LorenzMeier deleted the mavlink-ftp branch June 29, 2014 10:46
PX4BuildBot added a commit that referenced this pull request Jul 1, 2019
@PX4BuildBot
PX4/NuttX branch test: master
a93cc3c 
NuttX:
 - https://github.com/PX4-NuttX/nuttx/tree/master
 - PX4/NuttX@077d164

Changes from PX4/NuttX (PX4/NuttX@423371c) in current PX4/master (cdadb39)
PX4/NuttX@423371c...077d164

077d164 (HEAD, origin/master) /net/inet: Simplify design of change in last commit.
de5a616 This commit implements a proper version of SO_LINGER.  Not sufficiently tested on initial commit.
ded1900 include/nuttx/net/net.h:  Fix some long lines.
b0f7518 net/inet/inet_close.c:  Extend some comments.
5e36627 Update TODO list and fix an error in conditional compilation that I introduced with the last commit.
5af5fc4 net/inet/inet_close.c:  Last PR remove SO_LINGER socket option.  SO_LINGER was always enabled is CONFIG_NET_SOLINGER was selected.
ed9fe70 Merged in masayuki2009/nuttx.nuttx/fix_tcp_active_close (pull request #923)
5dc1618 Merged in alinjerpelea/nuttx (pull request #924)
478d274 configs/pnev5180b/src/pc17_romfs:  pnev5180b/src/lpc17_romfs: Automount baked-in ROMFS image.  Includes support for linking a binary ROMFS image into the nuttx executable and for mounting it during board bringup.
b9d2e51 libs/libc/netdb: Implemented the netdb functions getnameinfo(), getservbyport(), and getservbyport_r().

Apps:
 - https://github.com/PX4/NuttX-apps/tree/master
 - PX4/NuttX-apps@334b450

Changes from PX4/NuttX-apps (PX4/NuttX-apps@7db2a35) in current PX4/master (cdadb39)
PX4/NuttX-apps@7db2a35...334b450

334b450 (HEAD -> master, origin/master) wireless/gs2200m/gs2200m_main.c:  Fix a warning about an uninitialized return value found in build testing.
18a8032 examples/vl53l1x:  Remove.  The driver does not compile.
94ac7dc examples/vl53l1x:  Add VL53L1X example demo.
27766d7 Merged in masayuki2009/nuttx.apps/fix_apps_industry (pull request #178)
d2f3ad9 Merged in masayuki2009/nuttx.apps/wireless_gs2200m (pull request #177)
2c8e349 Merged in masayuki2009/nuttx.apps/add_system_gs2200m (pull request #176)
6561573 industry/abnt_codi, include/industry/abnt_code.h, examples.abntcodi:  Adds support for ABNT CODI library.  This is an energy meter protocol used in Brazil.
bd14bf7 apps/netutils/json:  Removed.  Replaced with apps/netutils/cjson.
24e590b apps/nshlib/nsh_ddcmd.c:  Seemingly nonsense change but somehow works around a compilation error using the ZDS-II toolchain.  It was claiming that vtbl was undefined indd_outfopen().
87c1083 apps/netutils/netinit:  MAC address configuration was represented by type long long.  That is a problem for architectures that do not support typle long long.  Replaces by two long configuration items.
PX4BuildBot added a commit that referenced this pull request Jul 2, 2019
@PX4BuildBot
PX4/NuttX branch test: master
4c98972 
NuttX:
 - https://github.com/PX4-NuttX/nuttx/tree/master
 - PX4/NuttX@79e79f0

Changes from PX4/NuttX (PX4/NuttX@423371c) in current PX4/master (9bfc4f2)
PX4/NuttX@423371c...79e79f0

79e79f0 (HEAD, origin/master) Merged in alinjerpelea/nuttx (pull request #925)
574595d Still fixing new warnings found in build testing.
8774977 Fix warnings found in build testing.
077d164 /net/inet: Simplify design of change in last commit.
de5a616 This commit implements a proper version of SO_LINGER.  Not sufficiently tested on initial commit.
ded1900 include/nuttx/net/net.h:  Fix some long lines.
b0f7518 net/inet/inet_close.c:  Extend some comments.
5e36627 Update TODO list and fix an error in conditional compilation that I introduced with the last commit.
5af5fc4 net/inet/inet_close.c:  Last PR remove SO_LINGER socket option.  SO_LINGER was always enabled is CONFIG_NET_SOLINGER was selected.
ed9fe70 Merged in masayuki2009/nuttx.nuttx/fix_tcp_active_close (pull request #923)

Apps:
 - https://github.com/PX4/NuttX-apps/tree/master
 - PX4/NuttX-apps@ee8af2a

Changes from PX4/NuttX-apps (PX4/NuttX-apps@7db2a35) in current PX4/master (9bfc4f2)
PX4/NuttX-apps@7db2a35...ee8af2a

ee8af2a (HEAD -> master, origin/master) Fix warnings found in build testing.
334b450 wireless/gs2200m/gs2200m_main.c:  Fix a warning about an uninitialized return value found in build testing.
18a8032 examples/vl53l1x:  Remove.  The driver does not compile.
94ac7dc examples/vl53l1x:  Add VL53L1X example demo.
27766d7 Merged in masayuki2009/nuttx.apps/fix_apps_industry (pull request #178)
d2f3ad9 Merged in masayuki2009/nuttx.apps/wireless_gs2200m (pull request #177)
2c8e349 Merged in masayuki2009/nuttx.apps/add_system_gs2200m (pull request #176)
6561573 industry/abnt_codi, include/industry/abnt_code.h, examples.abntcodi:  Adds support for ABNT CODI library.  This is an energy meter protocol used in Brazil.
bd14bf7 apps/netutils/json:  Removed.  Replaced with apps/netutils/cjson.
24e590b apps/nshlib/nsh_ddcmd.c:  Seemingly nonsense change but somehow works around a compilation error using the ZDS-II toolchain.  It was claiming that vtbl was undefined indd_outfopen().
PX4BuildBot added a commit that referenced this pull request Nov 3, 2022
@PX4BuildBot
Update submodule sitl_gazebo to latest Thu Nov 3 00:38:54 UTC 2022
ca12186 
    - sitl_gazebo in PX4/Firmware (6511866): PX4/PX4-SITL_gazebo-classic@56b5508
    - sitl_gazebo current upstream: PX4/PX4-SITL_gazebo-classic@48e764b
    - Changes: PX4/PX4-SITL_gazebo-classic@56b5508...48e764b

    48e764b 2022-11-02 Frederic Taillandier - allowing to override the video stream ip in a simpler way than using the jinja file (#923)
PX4BuildBot added a commit that referenced this pull request Nov 3, 2022
@PX4BuildBot
Update submodule sitl_gazebo to latest Thu Nov 3 12:38:55 UTC 2022
47780e4 
    - sitl_gazebo in PX4/Firmware (1fc1a81): PX4/PX4-SITL_gazebo-classic@56b5508
    - sitl_gazebo current upstream: PX4/PX4-SITL_gazebo-classic@48e764b
    - Changes: PX4/PX4-SITL_gazebo-classic@56b5508...48e764b

    48e764b 2022-11-02 Frederic Taillandier - allowing to override the video stream ip in a simpler way than using the jinja file (#923)
PX4BuildBot added a commit that referenced this pull request Nov 5, 2022
@PX4BuildBot
Update submodule sitl_gazebo to latest Sat Nov 5 12:38:57 UTC 2022
12319d5 
    - sitl_gazebo in PX4/Firmware (1fc1a81): PX4/PX4-SITL_gazebo-classic@56b5508
    - sitl_gazebo current upstream: PX4/PX4-SITL_gazebo-classic@6c3f1f8
    - Changes: PX4/PX4-SITL_gazebo-classic@56b5508...6c3f1f8

    6c3f1f8 2022-11-03 alessandro - send orientation q with landing_target message (#919)
48e764b 2022-11-02 Frederic Taillandier - allowing to override the video stream ip in a simpler way than using the jinja file (#923)
PX4BuildBot added a commit that referenced this pull request Nov 7, 2022
@PX4BuildBot
Update submodule sitl_gazebo to latest Mon Nov 7 12:38:21 UTC 2022
55a83aa 
    - sitl_gazebo in PX4/Firmware (1fc1a81): PX4/PX4-SITL_gazebo-classic@56b5508
    - sitl_gazebo current upstream: PX4/PX4-SITL_gazebo-classic@6c3f1f8
    - Changes: PX4/PX4-SITL_gazebo-classic@56b5508...6c3f1f8

    6c3f1f8 2022-11-03 alessandro - send orientation q with landing_target message (#919)
48e764b 2022-11-02 Frederic Taillandier - allowing to override the video stream ip in a simpler way than using the jinja file (#923)
PX4BuildBot added a commit that referenced this pull request Nov 8, 2022
@PX4BuildBot
Update submodule sitl_gazebo to latest Tue Nov 8 00:38:52 UTC 2022
ad35ce4 
    - sitl_gazebo in PX4/Firmware (3e35f94): PX4/PX4-SITL_gazebo-classic@56b5508
    - sitl_gazebo current upstream: PX4/PX4-SITL_gazebo-classic@b38e701
    - Changes: PX4/PX4-SITL_gazebo-classic@56b5508...b38e701

    b38e701 2022-11-03 frederictaillandier - adding jinja parameters
cc8f33d 2022-11-03 frederictaillandier - allowing to override the streaming gimbal ip and port
6c3f1f8 2022-11-03 alessandro - send orientation q with landing_target message (#919)
48e764b 2022-11-02 Frederic Taillandier - allowing to override the video stream ip in a simpler way than using the jinja file (#923)
PX4BuildBot added a commit that referenced this pull request Nov 9, 2022
@PX4BuildBot
Update submodule sitl_gazebo to latest Wed Nov 9 00:39:01 UTC 2022
f1cf3b9 
    - sitl_gazebo in PX4/Firmware (0e2b1ee): PX4/PX4-SITL_gazebo-classic@56b5508
    - sitl_gazebo current upstream: PX4/PX4-SITL_gazebo-classic@b38e701
    - Changes: PX4/PX4-SITL_gazebo-classic@56b5508...b38e701

    b38e701 2022-11-03 frederictaillandier - adding jinja parameters
cc8f33d 2022-11-03 frederictaillandier - allowing to override the streaming gimbal ip and port
6c3f1f8 2022-11-03 alessandro - send orientation q with landing_target message (#919)
48e764b 2022-11-02 Frederic Taillandier - allowing to override the video stream ip in a simpler way than using the jinja file (#923)
@dagar dagar mentioned this pull request Nov 9, 2022
Merged
dagar pushed a commit that referenced this pull request Nov 9, 2022
@PX4BuildBot @dagar
Update submodule sitl_gazebo to latest Wed Nov 9 00:39:01 UTC 2022
b7d2868 
    - sitl_gazebo in PX4/Firmware (0e2b1ee): PX4/PX4-SITL_gazebo-classic@56b5508
    - sitl_gazebo current upstream: PX4/PX4-SITL_gazebo-classic@b38e701
    - Changes: PX4/PX4-SITL_gazebo-classic@56b5508...b38e701

    b38e701 2022-11-03 frederictaillandier - adding jinja parameters
cc8f33d 2022-11-03 frederictaillandier - allowing to override the streaming gimbal ip and port
6c3f1f8 2022-11-03 alessandro - send orientation q with landing_target message (#919)
48e764b 2022-11-02 Frederic Taillandier - allowing to override the video stream ip in a simpler way than using the jinja file (#923)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
First beta release
Development

Successfully merging this pull request may close these issues.
4 participants
@LorenzMeier @DrTon @px4dev @DonLakeFlyer