diff --git a/README.md b/README.md index e5bf8e6..ab11e54 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,17 @@ # openpilot-server #### 1. 配置文件 -(1)在 config.txt 文件中, - 是绑定websocket server 的ip和端口。 - 是绑定http server 的ip和端口。 - 是该服务端公网的域名。 - 是该服务端公网的域名。 - 高德API KEY 。https://console.amap.com/dev/index 这里注册。选择绑定“Web服务” +(1)在 config.txt 文件中, + 是绑定websocket server 的ip和端口。 + 是绑定http server 的ip和端口。 + 是该服务端公网的域名。 + 是该服务端公网的域名。 + 高德API KEY 。https://console.amap.com/dev/index 这里注册。选择绑定“Web服务” + ffmpeg程序路径。 ffmpeg 从https://ffmpeg.org/download.html下载。 (2) 启动 -在服务器上启动opserver.exe。 +在服务器上启动opserver.exe。 -#### 2. 设置c3/c3x +#### 2. 设置c3/c3x (1) ssh进入c3/c3x 设备。 (2) 在/data/continue.sh export 添加 。 export ATHENA_HOST='ws://laolang.duckdns.org:7899' @@ -19,22 +20,22 @@ 像这样: /-----/data/continue.sh file----------------- #!/usr/bin/bash - + export ATHENA_HOST='ws://laolang.duckdns.org:7899' export API_HOST='http://laolang.duckdns.org:7898' export MAPBOX_TOKEN='pk.eyJ1Ijoiam5ld2IiLCJhIjoiY2xxNW8zZXprMGw1ZzJwbzZneHd2NHljbSJ9.gV7VPRfbXFetD-1OVF0XZg' - + cd /data/openpilot exec ./launch_openpilot.sh /---------------------- - + (3) rm -rf /data/params/d/DongleId sudo reboot #重启你的c3/c3x - -#### 3. 下载文件和设置导航 + +#### 3. 下载文件和设置导航 (1) 浏览器中打开 http:// 例如 [http://laolang.duckdns.org:7898](http://laolang.duckdns.org:7898/static/index.html) -输入测试Dongle ID : e7a8b8c1cb559c9d +输入测试Dongle ID : e7a8b8c1cb559c9d (2) 进入设置导航地址。(仅支持IPhone地图和高德地图) @@ -42,7 +43,7 @@ exec ./launch_openpilot.sh # openpilot-server for english -#### 1. Configuration File +#### 1. Configuration File (1) In the config.txt file, IP and port of the websocket server. IP and port of the http server. @@ -50,8 +51,8 @@ exec ./launch_openpilot.sh The domain name of the server. (2) Launch Launch opserver.exe on your windows server. - -#### 2. Configuration in c3/c3x + +#### 2. Configuration in c3/c3x (1) SSH into the c3/c3x device. (2) In "/data/continue.sh" file, export and . export ATHENA_HOST='ws://laolang.duckdns.org:7899' @@ -59,24 +60,24 @@ export API_HOST=' http://laolang.duckdns.org:7898 ' export MAPBOX_TOKEN='' like this: /-----/data/continue.sh file----------------- -#!/usr/bin/bash - +#!/usr/bin/bash + export ATHENA_HOST='ws://laolang.duckdns.org:7899' export API_HOST='http://laolang.duckdns.org:7898' export MAPBOX_TOKEN='' - + cd /data/openpilot exec ./launch_openpilot.sh - + /---------------------- - + (3) rm -rf /data/params/d/DongleId sudo reboot #Restart your c3/c3x - -#### 3. Download and navigation -(1) Open http:// (for example [http://laolang.duckdns.org:7898](http://laolang.duckdns.org:7898/static/index.html)) in your browser + +#### 3. Download and navigation +(1) Open http:// (for example [http://laolang.duckdns.org:7898](http://laolang.duckdns.org:7898/static/index.html)) in your browser Input test Dongle ID : e7a8b8c1cb559c9d - + (2) In the web page configure the navigation.(Only support IPhone map and AMap) #### 4.Star me. Thank you diff --git a/config.txt b/config.txt index c7dfba0..73fa702 100644 --- a/config.txt +++ b/config.txt @@ -2,4 +2,5 @@ ws_bind=0.0.0.0:7899 http_bind=0.0.0.0:7898 athena_host=ws://laolang.duckdns.org:7899 upload_url=http://laolang.duckdns.org:7898 -amap_key=23428738744447ba93dda0d6473ff026e \ No newline at end of file +amap_key=23428738744447ba93dda0d6473ff026e +ffmpeg_path=D:\\software\\ffmpeg.exe \ No newline at end of file diff --git a/opserver.exe b/opserver.exe index af454c2..0ffe92a 100644 Binary files a/opserver.exe and b/opserver.exe differ diff --git a/opserver_linux_amd64 b/opserver_linux_amd64 index fbbb3a8..4ef2f37 100644 Binary files a/opserver_linux_amd64 and b/opserver_linux_amd64 differ diff --git a/static/index.html b/static/index.html index 963571f..3d11cd0 100644 --- a/static/index.html +++ b/static/index.html @@ -131,6 +131,11 @@ window.location = url; } + function showVOD(){ + url = "/static/vod.html" + window.location = url; + } + function recordOperationTime(){ strSec = Math.floor(Date.now() / 1000) localStorage.setItem("operationTime", strSec) @@ -172,8 +177,12 @@ + +