frodovdr/octonet
1
0
Fork 0
mirror of https://github.com/DigitalDevices/octonet.git synced 2023-10-10 11:36:52 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: frodovdr:1.0.78
Branches Tags
frodovdr:master
frodovdr:1.0.81 frodovdr:1.0.78 frodovdr:1.0.72 frodovdr:1.0.71
...
compare: frodovdr:1.0.81
Branches Tags
frodovdr:master
frodovdr:1.0.81 frodovdr:1.0.78 frodovdr:1.0.72 frodovdr:1.0.71

6 Commits
1.0.78 ... 1.0.81

Author SHA1 Message Date
Ralph Metzler
cd19e9e037 bump version 2017-04-27 17:44:28 +02:00
mvoelkel
1c42bee27f Prefix checking on customized server names changed 2017-03-14 21:49:57 +01:00
mvoelkel
17af2f85c8 fixed a bug with IE11 
baseURI not supported by IE11
removed leftover closing tag
 2017-02-24 18:27:36 +01:00
mvoelkel
aa3d122fd9 Set version to 1.0.80 2017-02-24 16:21:23 +01:00
Ralph Metzler
4172175691 new fpga image version 1.2 2017-02-24 12:47:20 +01:00
Ralph Metzler
6d6e0a3726 support ISDB-T tuning 2016-12-07 16:00:53 +01:00
7 changed files with 33 additions and 5 deletions
Expand all files Collapse all files

BIN
octoserve/boot/fpga.img
View File

Binary file not shown.

BIN
octoserve/boot/fpga_gtl.img
View File

Binary file not shown.

26
octoserve/dvb.c
View File

@@ -528,6 +528,29 @@ static int tune_terr2(struct dvbfe *fe)
return 0;
}
static int tune_isdbt(struct dvbfe *fe)
{
struct dtv_property p[] = {
{ .cmd = DTV_CLEAR },
{ .cmd = DTV_FREQUENCY, .u.data = fe->param[PARAM_FREQ] * 1000 },
{ .cmd = DTV_BANDWIDTH_HZ, .u.data = fe->param[PARAM_BW_HZ] },
{ .cmd = DTV_TUNE },
};
struct dtv_properties c;
int ret;
set_property(fe->fd, DTV_DELIVERY_SYSTEM, SYS_ISDBT);
c.num = ARRAY_SIZE(p);
c.props = p;
ret = ioctl(fe->fd, FE_SET_PROPERTY, &c);
if (ret < 0) {
fprintf(stderr, "FE_SET_PROPERTY returned %d\n", ret);
return -1;
}
return 0;
}
static int tune(struct dvbfe *fe)
{
int ret;
@@ -551,6 +574,9 @@ static int tune(struct dvbfe *fe)
case SYS_DVBC2:
ret = tune_c2(fe);
break;
case SYS_ISDBT:
ret = tune_isdbt(fe);
break;
default:
break;
}

3
octoserve/var/www/systeminfo.lua
View File

@@ -40,8 +40,9 @@ function GetBoxName()
local boxname = ""
local tmp = io.open("/config/boxname")
if tmp then
local pat = "OctopusNet:";
boxname = tmp:read("*l")
boxname = boxname:gsub("OctopusNet:","",1);
boxname = boxname:gsub(pat:gsub(".","%."),"",1);
tmp:close()
end
return boxname

3
octoserve/var/www/systemsettings.lua
View File

@@ -74,8 +74,9 @@ function GetBoxName()
local boxname = ""
local tmp = io.open("/config/boxname")
if tmp then
local pat = "OctopusNet:";
boxname = tmp:read("*l")
boxname = boxname:gsub("OctopusNet:","",1);
boxname = boxname:gsub(pat:gsub(".","%."),"",1);
tmp:close()
end
return boxname

4
octoserve/var/www/wait.html
View File

@@ -24,7 +24,7 @@ function Wait()
function OnLoad()
{
var param = document.baseURI.match(/\d+$/);
var param = document.URL.match(/\d+$/);
WaitCounter = 5;
if( param ) WaitCounter = parseInt(param);
@@ -48,7 +48,7 @@ function OnLoad()
</td></tr>
<tr><td class="maintd" colspan="2">&nbsp;</td></tr>
<tr>
<td class="maintd"></script></td>
<td class="maintd"></td>
<td class="content">
<div>
<!-- Begin Content -->

2
octoserve/version.h
View File

@@ -19,5 +19,5 @@
#ifndef _OCTOSERVE_VERSION_
#define _OCTOSERVE_VERSION_
#define OCTOSERVE_VERSION "1.0.78"
#define OCTOSERVE_VERSION "1.0.81"
#endif