domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base-files: uci-defaults-new: fix storing rssi leds and triggers in board.json

Browse Source 
Remove extra nesting of rssi leds in the led object and move rssi monitor
declaration to its own object.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 47655
This commit is contained in:
Jo-Philipp Wich
2015-11-26 12:04:38 +00:00
parent 92d414eb07
commit bd4c757685
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
package/base-files/files/lib/functions/uci-defaults-new.sh
View File

@@ -349,16 +349,16 @@ ucidef_set_led_rssi() {
json_select_object led json_select_object led
json_select_object rssi
json_select_object "$1" json_select_object "$1"
json_add_string type rssi
json_add_string name "$name" json_add_string name "$name"
json_add_string iface "$iface"
json_add_string sysfs "$sysfs" json_add_string sysfs "$sysfs"
json_add_string minq "$minq" json_add_string minq "$minq"
json_add_string maxq "$maxq" json_add_string maxq "$maxq"
json_add_string offset "$offset" json_add_string offset "$offset"
json_add_string factor "$factor" json_add_string factor "$factor"
json_select .. json_select ..
json_select ..
json_select .. json_select ..
} }
@@ -368,12 +368,11 @@ ucidef_set_rssimon() {
local refresh="$2" local refresh="$2"
local threshold="$3" local threshold="$3"
json_select_object led json_select_object rssimon
json_select_object rssi json_select_object "$dev"
json_add_string type rssi [ -n "$refresh" ] && json_add_int refresh "$refresh"
json_add_string dev "$dev" [ -n "$threshold" ] && json_add_int threshold "$threshold"
json_add_string threshold "$threshold"
json_select .. json_select ..
json_select .. json_select ..