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

add JESS support

Browse Source
This commit is contained in:
Ralph Metzler 2015-09-07 02:20:17 +02:00
parent 377e23126d
commit ee9b3bf44f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
octoserve/dvb.c
View File

@ -262,7 +262,7 @@ static int set_en50607(int fd, uint32_t freq, uint32_t sr,
.msg = {0x70, 0x00, 0x00, 0x00, 0x00}, .msg = {0x70, 0x00, 0x00, 0x00, 0x00},
.msg_len = 4 .msg_len = 4
}; };
uint32_t t = (freq / 1000) - 100; uint32_t t = freq - 100;
hor &= 1; hor &= 1;
cmd.msg[1] = slot << 3; cmd.msg[1] = slot << 3;
@ -1241,8 +1241,6 @@ void scif_config(struct octoserve *os, char *name, char *val)
char *end; char *end;
unsigned long int nr = strtoul(val, &end, 10), freq = 0; unsigned long int nr = strtoul(val, &end, 10), freq = 0;
if (nr > 8)
return;
if (*end == ',') { if (*end == ',') {
val = end + 1; val = end + 1;
freq = strtoul(val, &end, 10); freq = strtoul(val, &end, 10);

5
octoserve/var/www/scif.html
View File

@ -65,11 +65,12 @@ function SaveSettings()
{ {
if( SCIFEnabled ) if( SCIFEnabled )
{ {
param = 'Manufacturer='+SelectedManufacturer+'&Unit='+SelectedUnit+'&Type=1'; CurUnit = ManufacturerList[SelectedManufacturer].UnitList[SelectedUnit];
Protocol = CurUnit.Protocol == "EN50607" ? '2' : '1';
param = 'Manufacturer='+SelectedManufacturer+'&Unit='+SelectedUnit+'&Type='+Protocol;
for( i = 0; i < TunerList.length; i++ ) for( i = 0; i < TunerList.length; i++ )
{ {
param += '&Tuner'+(i+1)+'='; param += '&Tuner'+(i+1)+'=';
CurUnit = ManufacturerList[SelectedManufacturer].UnitList[SelectedUnit];
SelectedFrequency = TunerList[i].Select.selectedIndex; SelectedFrequency = TunerList[i].Select.selectedIndex;
if( SelectedFrequency > 0 ) if( SelectedFrequency > 0 )
param += SelectedFrequency + ',' + CurUnit.Frequencies[SelectedFrequency-1]; param += SelectedFrequency + ',' + CurUnit.Frequencies[SelectedFrequency-1];

5
octoserve/var/www/scifdb.lua
View File

@ -27,7 +27,7 @@ for i,child in ipairs(dom.kids) do
local Manufacturer = unit.attr["Manufacturer"]; local Manufacturer = unit.attr["Manufacturer"];
local Type = unit.attr["Type"]; local Type = unit.attr["Type"];
local Protocol = unit.attr["Protocol"]; local Protocol = unit.attr["Protocol"];
if not Protocol then Protocol = "" end if not Protocol then Protocol = "EN50494" end
if not Manufacturer then Manufacturer = "" end if not Manufacturer then Manufacturer = "" end
if not Type then Type = "LNB" end if not Type then Type = "LNB" end
-- print ( " ",Name,Manufacturer,Type) -- print ( " ",Name,Manufacturer,Type)
@ -39,7 +39,7 @@ for i,child in ipairs(dom.kids) do
ManufacturerArray[ManufacturerCount] = CurManu ManufacturerArray[ManufacturerCount] = CurManu
end end
CurManu.UnitCount = CurManu.UnitCount + 1 CurManu.UnitCount = CurManu.UnitCount + 1
local CurUnit = { Name = Name, Type = Type, Frequencies = {} } local CurUnit = { Name = Name, Type = Type, Protocol = Protocol, Frequencies = {} }
CurManu.UnitList[CurManu.UnitCount] = CurUnit CurManu.UnitList[CurManu.UnitCount] = CurUnit
local fcount = 0 local fcount = 0
for k,Frequency in ipairs(unit.kids) do for k,Frequency in ipairs(unit.kids) do
@ -74,6 +74,7 @@ for i,CurManu in ipairs(ManufacturerArray) do
print("") print("")
print(string.format("ManufacturerList[%d].UnitList[%d] = new Object();",i-1,j-1)) print(string.format("ManufacturerList[%d].UnitList[%d] = new Object();",i-1,j-1))
print(string.format("ManufacturerList[%d].UnitList[%d].Name = \"%s\";",i-1,j-1,CurUnit.Name)) print(string.format("ManufacturerList[%d].UnitList[%d].Name = \"%s\";",i-1,j-1,CurUnit.Name))
print(string.format("ManufacturerList[%d].UnitList[%d].Protocol = \"%s\";",i-1,j-1,CurUnit.Protocol))
print(string.format("ManufacturerList[%d].UnitList[%d].Frequencies = new Array();",i-1,j-1)) print(string.format("ManufacturerList[%d].UnitList[%d].Frequencies = new Array();",i-1,j-1))
for k,Frequency in ipairs(CurUnit.Frequencies) do for k,Frequency in ipairs(CurUnit.Frequencies) do
print(string.format("ManufacturerList[%d].UnitList[%d].Frequencies[%d] = %d;",i-1,j-1,k-1,Frequency)) print(string.format("ManufacturerList[%d].UnitList[%d].Frequencies[%d] = %d;",i-1,j-1,k-1,Frequency))