Merge pull request #237 from openwrt-es/luci-next2

applications/luci-udpxy: add new package.

diff --git a/applications/luci-dump1090/Makefile b/applications/luci-dump1090/Makefile
new file mode 100644 (file)
index 0000000..be4c0ea
--- /dev/null
+++ b/applications/luci-dump1090/Makefile
@@ -0,0 +1,4 @@
+PO = dump1090
+
+include ../../build/config.mk
+include ../../build/module.mk

diff --git a/applications/luci-dump1090/luasrc/controller/dump1090.lua b/applications/luci-dump1090/luasrc/controller/dump1090.lua
new file mode 100644 (file)
index 0000000..c29c22f
--- /dev/null
+++ b/applications/luci-dump1090/luasrc/controller/dump1090.lua
@@ -0,0 +1,25 @@
+--[[
+LuCI - Lua Configuration Interface - dump1090 support
+
+Copyright 2014 Álvaro Fernández Rojas <noltari@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+module("luci.controller.dump1090", package.seeall)
+
+function index()
+       if not nixio.fs.access("/etc/config/dump1090") then
+               return
+       end
+
+       local page = entry({"admin", "services", "dump1090"}, cbi("dump1090"), _("dump1090"))
+       page.dependent = true
+
+end

diff --git a/applications/luci-dump1090/luasrc/model/cbi/dump1090.lua b/applications/luci-dump1090/luasrc/model/cbi/dump1090.lua
new file mode 100644 (file)
index 0000000..d3efe0b
--- /dev/null
+++ b/applications/luci-dump1090/luasrc/model/cbi/dump1090.lua
@@ -0,0 +1,151 @@
+--[[
+LuCI - Lua Configuration Interface - dump1090 support
+
+Copyright 2014 Álvaro Fernández Rojas <noltari@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+m = Map("dump1090", "dump1090", translate("dump1090 is a Mode S decoder specifically designed for RTLSDR devices, here you can configure the settings."))
+
+s = m:section(TypedSection, "dump1090", "")
+s.addremove = true
+s.anonymous = false
+
+enable=s:option(Flag, "disabled", translate("Enabled"))
+enable.enabled="0"
+enable.disabled="1"
+enable.default = "1"
+respawn=s:option(Flag, "respawn", translate("Respawn"))
+respawn.default = false
+
+device_index=s:option(Value, "device_index", translate("RTL device index"))
+device_index.rmempty = true
+device_index.datatype = "uinteger"
+
+gain=s:option(Value, "gain", translate("Gain (-10 for auto-gain)"))
+gain.rmempty = true
+gain.datatype = "integer"
+
+enable_agc=s:option(Flag, "enable_agc", translate("Enable automatic gain control"))
+enable_agc.default = false
+
+freq=s:option(Value, "freq", translate("Frequency"))
+freq.rmempty = true
+freq.datatype = "uinteger"
+
+ifile=s:option(Value, "ifile", translate("Data file"))
+ifile.rmempty = true
+ifile.datatype = "file"
+
+raw=s:option(Flag, "raw", translate("Show only messages hex values"))
+raw.default = false
+
+net=s:option(Flag, "net", translate("Enable networking"))
+
+modeac=s:option(Flag, "modeac", translate("Enable decoding of SSR Modes 3/A & 3/C"))
+modeac.default = false
+
+net_beast=s:option(Flag, "net_beast", translate("TCP raw output in Beast binary format"))
+net_beast.default = false
+
+net_only=s:option(Flag, "net_only", translate("Enable just networking, no RTL device or file used"))
+net_only.default = false
+
+net_http_port=s:option(Value, "net_http_port", translate("HTTP server port"))
+net_http_port.rmempty = true
+net_http_port.datatype = "port"
+
+net_ri_port=s:option(Value, "net_ri_port", translate("TCP raw input listen port"))
+net_ri_port.rmempty = true
+net_ri_port.datatype = "port"
+
+net_ro_port=s:option(Value, "net_ro_port", translate("TCP raw output listen port"))
+net_ro_port.rmempty = true
+net_ro_port.datatype = "port"
+
+net_sbs_port=s:option(Value, "net_sbs_port", translate("TCP BaseStation output listen port"))
+net_sbs_port.rmempty = true
+net_sbs_port.datatype = "port"
+
+net_bi_port=s:option(Value, "net_bi_port", translate("TCP Beast input listen port"))
+net_bi_port.rmempty = true
+net_bi_port.datatype = "port"
+
+net_bo_port=s:option(Value, "net_bo_port", translate("TCP Beast output listen port"))
+net_bo_port.rmempty = true
+net_bo_port.datatype = "port"
+
+net_ro_size=s:option(Value, "net_ro_size", translate("TCP raw output minimum size"))
+net_ro_size.rmempty = true
+net_ro_size.datatype = "uinteger"
+
+net_ro_rate=s:option(Value, "net_ro_rate", translate("TCP raw output memory flush rate"))
+net_ro_rate.rmempty = true
+net_ro_rate.datatype = "uinteger"
+
+net_heartbeat=s:option(Value, "net_heartbeat", translate("TCP heartbeat rate in seconds"))
+net_heartbeat.rmempty = true
+net_heartbeat.datatype = "uinteger"
+
+net_buffer=s:option(Value, "net_buffer", translate("TCP buffer size 64Kb * (2^n)"))
+net_buffer.rmempty = true
+net_buffer.datatype = "uinteger"
+
+lat=s:option(Value, "lat", translate("Reference/receiver latitude for surface posn"))
+lat.rmempty = true
+lat.datatype = "integer"
+
+lon=s:option(Value, "lon", translate("Reference/receiver longitude for surface posn"))
+lon.rmempty = true
+lon.datatype = "integer"
+
+fix=s:option(Flag, "fix", translate("Enable single-bits error correction using CRC"))
+fix.default = false
+
+no_fix=s:option(Flag, "no_fix", translate("Disable single-bits error correction using CRC"))
+no_fix.default = false
+
+no_crc_check=s:option(Flag, "no_crc_check", translate("Disable messages with broken CRC"))
+no_crc_check.default = false
+
+phase_enhance=s:option(Flag, "phase_enhance", translate("Enable phase enhancement"))
+phase_enhance.default = false
+
+agressive=s:option(Flag, "agressive", translate("More CPU for more messages"))
+agressive.default = false
+
+mlat=s:option(Flag, "mlat", translate("Display raw messages in Beast ascii mode"))
+mlat.default = false
+
+stats=s:option(Flag, "stats", translate("Print stats at exit"))
+stats.default = false
+
+stats_every=s:option(Value, "stats_every", translate("Show and reset stats every seconds"))
+stats_every.rmempty = true
+stats_every.datatype = "uinteger"
+
+onlyaddr=s:option(Flag, "onlyaddr", translate("Show only ICAO addresses"))
+onlyaddr.default = false
+
+metric=s:option(Flag, "metric", translate("Use metric units"))
+metric.default = false
+
+snip=s:option(Flag, "snip", translate("Strip IQ file removing samples"))
+snip.rmempty = true
+snip.datatype = "uinteger"
+
+debug_mode=s:option(Flag, "debug", translate("Debug mode flags"))
+debug_mode.rmempty = true
+
+ppm=s:option(Flag, "ppm", translate("Set receiver error in parts per million"))
+ppm.rmempty = true
+ppm.datatype = "uinteger"
+
+return m

diff --git a/applications/luci-dump1090/root/etc/uci-defaults/luci-dump1090 b/applications/luci-dump1090/root/etc/uci-defaults/luci-dump1090
new file mode 100644 (file)
index 0000000..4475d2f
--- /dev/null
+++ b/applications/luci-dump1090/root/etc/uci-defaults/luci-dump1090
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# needed for "Save and Apply" to restart dump1090
+uci -q batch <<-EOF >/dev/null
+       delete ucitrack.@dump1090[-1]
+       add ucitrack dump1090
+       set ucitrack.@dump1090[-1].init="dump1090"
+       commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0

diff --git a/contrib/package/luci-addons/Makefile b/contrib/package/luci-addons/Makefile
index 9742d0c..a08ac9d 100644 (file)
--- a/contrib/package/luci-addons/Makefile
+++ b/contrib/package/luci-addons/Makefile
@@ -175,6 +175,7 @@ $(eval $(call application,udpxy,LuCI Support for udpxy,udpxy))
 $(eval $(call application,upnp,Universal Plug & Play configuration module,miniupnpd))
 $(eval $(call application,ntpc,NTP time synchronisation configuration module,ntpclient))
 $(eval $(call application,ddns,Dynamic DNS configuration module,ddns-scripts))
+$(eval $(call application,dump1090,LuCI Support for dump1090,dump1090))
 $(eval $(call application,samba,Network Shares - Samba SMB/CIFS module,samba36-server))
 $(eval $(call application,mmc-over-gpio,MMC-over-GPIO configuration module,kmod-mmc-over-gpio))
 $(eval $(call application,p910nd,p910nd - Printer server module,p910nd))