thunfisch
/
linkpi_firmware_history
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rootfs_enc1v2_hi3520d_20230831

This commit is contained in:
Jan Koppe 2024-02-15 22:07:44 +01:00
parent 79baf85443
commit c59ee73319
Signed by: thunfisch
GPG Key ID: BE935B0735A2129B
31 changed files with 261 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rootfs/etc/fw_env.config Normal file
View File

@ -0,0 +1 @@
/dev/mtd0 0x0 0x80000 0x40000

BIN
rootfs/link/bin/Encoder
View File

Binary file not shown.

1
rootfs/link/config/rtty.json Normal file
View File

@ -0,0 +1 @@
{"enable":false,"ip":"191.80.63.50","id":"00000001","des":"编码板","token":""}

11
rootfs/link/config/verLogs.json
View File

@ -1,4 +1,15 @@
[
{
"version": "2.5.0 build 20230831",
"logs": [
"修正http接口获取/设置水印异常问题",
"修正srt输出，latency参数值不能大于1000的问题",
"优化ENC1V3与ENCSHV2机型的4K输出画质",
"ENC1V3、ENCSHV2、ENC5V2机型，HDMI输出增加水平镜像功能",
"高级设置下远程访问页面，新增Rtty访问设备方式",
"系统底层优化"
]
},
{
"version": "2.4.0 build 20230731",
"logs": [

2
rootfs/link/config/version.json
View File

@ -1,5 +1,5 @@
{
"app": "2.0.0 build 20220512_869",
"sdk": "2.0.0 build 20220518_20716",
"sys": "2.4.0 build 20230731"
"sys": "2.5.0 build 20230831"
}

13
rootfs/link/shell/dhcp_echo.sh Normal file
View File

@ -0,0 +1,13 @@
#!/bin/sh
if [ $1 != "bound" ]; then
exit 0
fi
if [ "$ip" == "" ]; then
exit 0
fi
echo "dhcp_result"
echo "dev:"$interface
echo "ip:"$ip
echo "mask:"$subnet
echo "gw:"$router
echo "dns:"$dns

1
rootfs/link/shell/init.sh
View File

@ -14,6 +14,7 @@ else
/link/shell/netManager.sh
/link/shell/init/filesystem.sh
/link/shell/init/service.sh
/link/shell/init/rtty.sh
/link/shell/app.sh
fi

32
rootfs/link/shell/init/rtty.sh Normal file
View File

@ -0,0 +1,32 @@
. /link/shell/util/hardware.sh
cfg=/link/config/rtty.json
ver=/link/config/version.json
#model=${model:4}
sys=`jq -r .sys $ver`
build=`echo $sys | sed 's/\"//g' | awk '{split($1, arr, " "); print arr[1]}'`
(
while [ true ]
do
enable=`jq -r .enable $cfg`
if [ "$enable" == "true" ] ;then
ip=`jq -r .ip $cfg`
id=`jq -r .id $cfg`
des=`jq -r .des $cfg`
token=`jq -r .token $cfg`
if [ "$des" == "" ];then
des=$model" build "$build
else
des=$des" ( "$model" build "$build" )"
fi
if [ "$token" == "" ] ;then
rtty -I "$id" -h $ip -p 5912 -a -v -d "$des"
else
rtty -I "$id" -h $ip -p 5912 -a -v -d "$des" -t $token
fi
fi
sleep 2
done
) &

5
rootfs/link/shell/init/service.sh
View File

@ -47,3 +47,8 @@ if [ `jget sls` == "true" ]; then
fi
/link/shell/ntp.sh &
frp_enable=$(cat /link/config/rproxy/frp_enable |awk '{printf "%s",$1}')
if [ "$frp_enable" == "true" ]; then
/link/shell/frp.sh &
fi

7
rootfs/link/shell/update.sh
View File

@ -41,6 +41,11 @@ if [ ! -z "$(ls -A /link/update)" ]; then
rm -rf /tmp/history_config
rm /link/config/auto/no_user_setting
if [ -f "/link/config/uboot_env.txt" ]; then
fw_setenv -s /link/config/uboot_env.txt
rm /link/config/uboot_env.txt
fi
if [ -f "/link/config/reboot" ]; then
rm /link/config/reboot
reboot
@ -55,3 +60,5 @@ fi

22
rootfs/link/web/func.php
View File

@ -453,19 +453,21 @@ function formatBytes($total) {
function getDiskSpace() {
global $result;
$mountDir = '/root/usb';
$output = shell_exec('df ' . $mountDir);
$output = shell_exec('df -h ' . $mountDir);
if(strpos($output, $mountDir) != false) {
$totalSpace = disk_total_space($mountDir);
$freeSpace = disk_free_space($mountDir);
$usedSpace = $totalSpace - $freeSpace;
// $totalSpace = disk_total_space($mountDir);
// $freeSpace = disk_free_space($mountDir);
// $usedSpace = $totalSpace - $freeSpace;
$lines = explode("\n", trim($output));
$dataLine = $lines[count($lines) - 1];
$totalSpace = preg_split('/\s+/', $dataLine)[1];
$usedSpace = preg_split('/\s+/', $dataLine)[2];
$result->total = formatBytes($totalSpace);
$result->free = formatBytes($freeSpace);
$result->used = formatBytes($usedSpace);
$result->total = $totalSpace;
$result->used = $usedSpace;
} else {
$result->total = 0;
$result->free = 0;
$result->used = 0;
}
}
@ -571,6 +573,10 @@ function getAliase() {
$result->result = $ret["data"];
}
function reloadRtty() {
exec("pkill rtty");
}
function send($url, $data = null){
global $result;
$context = null;

71
rootfs/link/web/link/api/overlay.php
View File

@ -14,20 +14,27 @@ class Overlay extends Verify
$this->link_verify();
$conf = $this->load_conf('/link/config/config.json');
$result = [];
foreach ($conf as $item) {
if (!$item['type'] == 'file')
continue;
$overlayConf = [];
if(file_exists("/link/config/auto/overlay.json"))
$overlayConf = $this->load_conf('/link/config/auto/overlay.json');
for($i=0;$i<count($conf);$i++) {
$item = $conf[$i];
$obj = array(
'id' => $item['id'],
'name' => $item['name'],
'type' => $item['type'],
'enable'=> $item['enable'],
'enable2'=> $item['enable2'],
'overlay' => $item['overlay']
);
if(count($overlayConf) > 0)
$obj['overlay'] = $overlayConf[$i];
else
$obj['overlay'] = $item['overlay'];
array_push($result, $obj);
}
return $this->handleRet($result, "success", "执行完成", "execution is completed");
} catch (Exception $ex) {
return $this->handleRet('', 'error', $ex->getMessage(), $ex->getMessage());
@ -42,31 +49,47 @@ class Overlay extends Verify
$this->check_args($params);
$conf = $this->load_conf('/link/config/config.json');
for($i=0;$i<count($params);$i++)
$mark = file_exists("/link/config/auto/overlay.json");
if($mark)
{
$param = $params[$i];
$id = $param['id'];
$chn=null;$index=-1;
for($j=0;$j<count($conf);$j++)
$overlayConf = [];
for($i=0;$i<count($params);$i++)
{
$item = $conf[$j];
if($id != $item['id'])
continue;
if(!isset($param['overlay']))
continue;
$item['overlay'] = $param['overlay'];
$chn = $item;
$index = $j;
$param = $params[$i];
$overlayConf[] = $param['overlay'];
}
if($index > -1)
$conf[$index] = $chn;
$client = new RpcClient();
$client->update_overlay($overlayConf);
}
else
{
for($i=0;$i<count($params);$i++)
{
$param = $params[$i];
$client = new RpcClient();
$client->update_enc($conf);
$id = $param['id'];
$chn=null;$index=-1;
for($j=0;$j<count($conf);$j++)
{
$item = $conf[$j];
if($id != $item['id'])
continue;
if(!isset($param['overlay']))
continue;
$item['overlay'] = $param['overlay'];
$chn = $item;
$index = $j;
}
if($index > -1)
$conf[$index] = $chn;
}
$client = new RpcClient();
$client->update_enc($conf);
}
return $this->handleRet("","success","执行完成","execution is completed");
}

8
rootfs/link/web/link/monitor.php
View File

@ -1,13 +1,5 @@
<?php
// +----------------------------------------------------------------------
// | LPH协议 应用程序入口
// +----------------------------------------------------------------------
// | 码云：https://gitee.com/LinkPi/
// +----------------------------------------------------------------------
// | 广州灵派科技有限公司 (www.linkpi.cn)
// +----------------------------------------------------------------------
require __DIR__ . '/autoload.php';
use Link\App;

7
rootfs/link/web/link/rpc/rpc_client.php
View File

@ -87,4 +87,11 @@ class RpcClient
$client->send();
return $ret;
}
public function update_overlay($param)
{
$client = new Client(self::enc_url);
$client->query('enc.updateOverlay',[json_encode($param,JSON_UNESCAPED_UNICODE|JSON_PRETTY_PRINT)]);
$client->send();
}
}

34
rootfs/link/web/mix.php
View File

@ -174,6 +174,23 @@ include("head.php");
</select>
</div>
</div>
<?php
if ($hardware["chip"]=="SS524V100" || $hardware["chip"]=="SS528V100" || $hardware["chip"]=="HI3531DV200") {
?>
<div class="form-group">
<label class="col-sm-4 control-label">
<cn>左右镜像</cn>
<en>mirror</en>
</label>
<div class="col-sm-6">
<input type="checkbox" zcfg="output.mirror" class="switch form-control">
</div>
</div>
<?php
}
?>
<div class="form-group">
<label class="col-sm-4 control-label">
<cn>视频源</cn>
@ -289,6 +306,21 @@ include("head.php");
</select>
</div>
</div>
<?php
if ($hardware["chip"]=="SS524V100" || $hardware["chip"]=="SS528V100" || $hardware["chip"]=="HI3531DV200") {
?>
<div class="form-group">
<label class="col-sm-4 control-label">
<cn>左右镜像</cn>
<en>mirror</en>
</label>
<div class="col-sm-6">
<input type="checkbox" zcfg="output2.mirror" class="switch form-control">
</div>
</div>
<?php
}
?>
<div class="form-group">
<label class="col-sm-4 control-label">
<cn>视频源</cn>
@ -433,10 +465,10 @@ include("head.php");
if (config[i].type != "mix")
continue;
mixV = config[i].srcV;
$("#channels").append('<option value="' + config[i].id + '">' + config[i].name + '</option>');
zcfg("#output", config[i]);
}
setInterval(show, 300);

86
rootfs/link/web/rproxy.php
View File

@ -5,7 +5,7 @@ include( "head.php" );
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="title">
<div class="panel-heading">
<h3 class="panel-title">
<cn>远程访问</cn>
<en>Reverse Proxy</en>
@ -96,13 +96,70 @@ include( "head.php" );
</div>
</div>
-->
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
Rtty
</h3>
</div>
<div class="panel-body">
<form class="form-horizontal" id="rtty" role="form">
<div class="form-group">
<label class="col-sm-2 control-label">
<cn>启用</cn>
<en>Enable</en>
</label>
<div class="col-sm-2">
<input type="checkbox" zcfg="enable" class="switch form-control">
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
<cn>描述</cn>
<en>Des</en>
</label>
<div class="col-sm-6">
<input type="text" zcfg="des" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">IP</label>
<div class="col-sm-6">
<input type="text" zcfg="ip" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">ID</label>
<div class="col-sm-6">
<input type="text" zcfg="id" class="form-control" readonly disabled />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">Token</label>
<div class="col-sm-6">
<input type="text" zcfg="token" class="form-control"/>
</div>
</div>
<hr>
<div class="form-group">
<button type="button" id="save_rtty" class=" save btn btn-warning col-sm-4 col-sm-offset-4">
<cn>保存</cn><en>Save</en>
</button>
</div>
</form>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
frp
Frp
</h3>
</div>
<div class="panel-body">
@ -127,7 +184,7 @@ include( "head.php" );
</div>
<hr>
<div class="form-group">
<button type="button" id="save_frp" class=" save btn btn-warning col-sm-6 col-sm-offset-3">
<button type="button" id="save_frp" class=" save btn btn-warning col-sm-4 col-sm-offset-4">
<cn>保存</cn><en>Save</en>
</button>
</div>
@ -137,6 +194,7 @@ include( "head.php" );
</div>
</div>
<div class="modal fade" id="bindModal" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
@ -177,6 +235,17 @@ include( "head.php" );
}
initMqtt();
var rttyCfg;
function initRtty() {
$.getJSON( "config/rtty.json", function (resutl) {
rttyCfg = resutl;
rpc("enc.getSN",[],function (sn) {
rttyCfg.id = sn;
zcfg( "#rtty",rttyCfg );
})
})
}
initRtty();
//$( '#bindModal' ).modal( 'show' );
@ -259,7 +328,6 @@ include( "head.php" );
}
} ).responseText;
/*
$( "#save_ngrok" ).click( function ( e ) {
func( "setNgrok", $( "#ngrok" ).serialize(), function ( res ) {
@ -284,6 +352,16 @@ include( "head.php" );
} );
} );
$("#save_rtty").click(function () {
func("saveConfigFile",{path: "config/rtty.json",data:JSON.stringify(rttyCfg,null,2)},function (res) {
if(res.result == "OK") {
func("reloadRtty");
htmlAlert( "#alert", "success", "<cn>保存成功</cn><en>Saved successfully!</en>", "", 2000 );
} else {
htmlAlert( "#alert", "danger", "<cn>保存设置失败</cn><en>Save config failed</en>！", "", 2000 );
}
});
});
} );
</script>
<?php

BIN
rootfs/usr/bin/fw_printenv Normal file
View File

Binary file not shown.

BIN
rootfs/usr/bin/fw_setenv Normal file
View File

Binary file not shown.

BIN
rootfs/usr/bin/rtty Normal file
View File

Binary file not shown.

BIN
rootfs/usr/lib/libLinkBase.so.1.0.0
View File

Binary file not shown.

BIN
rootfs/usr/lib/libLinkIO.so.1.0.0
View File

Binary file not shown.

BIN
rootfs/usr/lib/libLinkNDI.so.1.0.0
View File

Binary file not shown.

BIN
rootfs/usr/lib/libLinkRTLP.so.1.0.0
View File

Binary file not shown.

BIN
rootfs/usr/lib/libavformat.so.58.23.100
View File

Binary file not shown.

1
rootfs/usr/lib/libev.so Symbolic link
View File

@ -0,0 +1 @@
libev.so.4.0.0

1
rootfs/usr/lib/libev.so.4 Symbolic link
View File

@ -0,0 +1 @@
libev.so.4.0.0

BIN
rootfs/usr/lib/libev.so.4.0.0 Normal file
View File

Binary file not shown.

1
rootfs/usr/lib/libubootenv.so Symbolic link
View File

@ -0,0 +1 @@
libubootenv.so.0

1
rootfs/usr/lib/libubootenv.so.0 Symbolic link
View File

@ -0,0 +1 @@
libubootenv.so.0.3.3

BIN
rootfs/usr/lib/libubootenv.so.0.3.3 Normal file
View File

Binary file not shown.

1
rootfs/usr/php/etc/php-fpm.conf
View File

@ -502,6 +502,7 @@ catch_workers_output = yes
; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
; the current environment.
; Default Value: clean env
env[LD_LIBRARY_PATH] = /lib:/usr/lib:/usr/local/lib
;env[HOSTNAME] = $HOSTNAME
;env[PATH] = /usr/local/bin:/usr/bin:/bin
;env[TMP] = /tmp