dump1090: remove interactive options, hardcode quiet and add respawn config.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
Álvaro Fernández Rojas 2014-10-27 20:56:14 +01:00
parent 2d56e60686
commit 1ffcf17b02
3 changed files with 9 additions and 13 deletions

View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=dump1090 PKG_NAME:=dump1090
PKG_VERSION:=2014-10-25 PKG_VERSION:=2014-10-27
PKG_RELEASE:=$(PKG_SOURCE_VERSION) PKG_RELEASE:=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git

View file

@ -1,14 +1,11 @@
config dump1090 main config dump1090 main
option disabled '1' option disabled '1'
option respawn '1'
option device_index '' option device_index ''
option gain '' option gain ''
option enable_agc '0' option enable_agc '0'
option freq '' option freq ''
option ifile '' option ifile ''
option interactive '0'
option interactive_rows ''
option interactive_ttl ''
option interactive_rtl1090 '0'
option raw '0' option raw '0'
option net '1' option net '1'
option modeac '0' option modeac '0'
@ -38,5 +35,4 @@ config dump1090 main
option metric '0' option metric '0'
option snip '' option snip ''
option debug '' option debug ''
option quiet '1'
option ppm '' option ppm ''

View file

@ -29,23 +29,21 @@ append_bool() {
start_instance() { start_instance() {
local cfg="$1" local cfg="$1"
local aux
config_get_bool disabled "$cfg" 'disabled' '0' config_get_bool aux "$cfg" 'disabled' '0'
[ "$disabled" = 1 ] && return 1 [ "$aux" = 1 ] && return 1
procd_open_instance procd_open_instance
procd_set_param command /usr/bin/dump1090 procd_set_param command /usr/bin/dump1090
procd_append_param command "--quiet"
append_arg "$cfg" device_index "--device-index" append_arg "$cfg" device_index "--device-index"
append_arg "$cfg" gain "--gain" append_arg "$cfg" gain "--gain"
append_bool "$cfg" enable_agc "--enable-agc" append_bool "$cfg" enable_agc "--enable-agc"
append_arg "$cfg" freq "--freq" append_arg "$cfg" freq "--freq"
append_arg "$cfg" ifile "--ifile" append_arg "$cfg" ifile "--ifile"
append_bool "$cfg" interactive "--interactive"
append_arg "$cfg" interactive_rows "--interactive-rows"
append_arg "$cfg" interactive_ttl "--interactive-ttl"
append_bool "$cfg" interactive_rtl1090 "--interactive-rtl1090"
append_bool "$cfg" raw "--raw" append_bool "$cfg" raw "--raw"
append_bool "$cfg" net "--net" append_bool "$cfg" net "--net"
append_bool "$cfg" modeac "--modeac" append_bool "$cfg" modeac "--modeac"
@ -75,9 +73,11 @@ start_instance() {
append_bool "$cfg" metric "--metric" append_bool "$cfg" metric "--metric"
append_arg "$cfg" snip "--snip" append_arg "$cfg" snip "--snip"
append_arg "$cfg" debug "--debug" append_arg "$cfg" debug "--debug"
append_bool "$cfg" quiet "--quiet"
append_arg "$cfg" ppm "--ppm" append_arg "$cfg" ppm "--ppm"
config_get_bool aux "$cfg" 'respawn' '0'
[ "$aux" = 1 ] && procd_set_param respawn
procd_close_instance procd_close_instance
} }