Skip to content

Fixes and tweaks to support apsync along with Nvidia TX2 #1

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

Closed
mtbsteve wants to merge 2 commits into from
Closed

Fixes and tweaks to support apsync along with Nvidia TX2 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d24a16
Fixes and tweaks for the Jetson TX2
mtbsteve Jul 28, 2019
384f965
temporary fix for the HOME path issue - added an absolute path to
mtbsteve Jul 28, 2019
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
7 changes: 5 additions & 2 deletions files/apsync/video.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<body>

<p><a href="/index.html"><img src="/images/main_logo.png" alt="ArduPilot"></a></p>
<h1>Video Streaming</h1>
<h1>Video Streaming - (for UDP Streaming use Cherrypy instead)</h1>
<div id="serverStoppedDiv">
<p>Network Interface: <select id="if_select_box"></select><button type="submit" style="padding:1px" value="set_if" onclick="start_server();">Start RTSP Server</button></p>
</div>
Expand All @@ -21,6 +21,9 @@ <h1>Video Streaming</h1>
</table>
<p><input type="submit" name="action" value="Stop RTSP Server" onclick="stop_server();"></p>
</div>
<hr>
<p><a href="/index.html">home</a>

<script>
var VideoPresetsEnum = {
VIDEO_320x240x15: 0, VIDEO_640x480x15: 1, VIDEO_1280x720x15: 2,
Expand Down Expand Up @@ -202,4 +205,4 @@ <h1>Video Streaming</h1>
}

</script>
</html>
</html>
2 changes: 1 addition & 1 deletion files/filesystem.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<p><a href="index.html"><img src="images/main_logo.png" alt="ArduPilot"></a></p>

<h2>ArduPilot Filesystem</h2>
<h2>ArduPilot Companion Computer Filesystem</h2>

<h1>Index of <b id="directory_name">/</b></h1>

Expand Down
4 changes: 1 addition & 3 deletions files/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@

<h2>ArduPilot Web Server</h2>

Welcome to the ArduPilot Web Interface!<p>
Welcome to the ArduPilot Web Interface for Nvidia Jetson TX2<p>

<ul>
<li><a href="filesystem.html?start_directory=/home/apsync/dflogger/dataflash">Download DataFlash Logs</a></li>
<li><a href="filesystem.html">Filesystem access</a></li>
<li><a href="apsync/system.html">System control</a></li>
<li><a href="apsync/status.html">System Status</a></li>
<li><a href="apsync/calibration.html">Calibration</a></li>
<li><a href="parameters.html">Flight Parameters</a></li>
<li><a href="apsync/video.html">Video Streaming</a></li>
</ul>
Expand Down
3 changes: 2 additions & 1 deletion functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,8 @@ static void start_rtsp_server(struct template_state *tmpl, const char *name, con
} else if (stream_server_pid == 0) {
char* home_dir;
char stream_server_path[256];
home_dir = getenv("HOME");
// home_dir = getenv("HOME");
home_dir = "/home/apsync"; // fix the path issue when executed from /etc/rc.local
sprintf(stream_server_path, "%s/start_apstreamline/bin/stream_server", home_dir);
printf("%s", stream_server_path);
if (execl(stream_server_path, "stream_server", argv[0], NULL)==-1) {
Expand Down