Event catch for Led blinking

-------------------------------------------------------------------------------
* 4c20476 libwifi: remove dependency on unused netlink route
-------------------------------------------------------------------------------
commit 4c204761a38a27ff9ff7021c3c34b92d7e3fdb84
Author: Anjan Chanda <anjan.chanda@iopsys.eu>
Date: 2019-08-15 11:54:00 +0200

    libwifi: remove dependency on unused netlink route

Base directory -> /
 libwifi/wifi.c | 1 -
 1 file changed, 1 deletion(-)
-------------------------------------------------------------------------------

easy-soc-libs/Makefile

@@ -11,7 +11,7 @@ PKG_RELEASE:=1
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a0ec330f74d0ef5ec6d7e61ac4079de9c93f36ab
+PKG_SOURCE_VERSION:=4c204761a38a27ff9ff7021c3c34b92d7e3fdb84
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

gryphon-led-module/src/sk9822.h

@@ -22,7 +22,7 @@
 #include <linux/types.h>
 
 #define SK9822_DEFAULT_NUM_LEDS 32 // U16, used if DT param fails
-#define SK9822_DEFAULT_BRIGHTNESS 1  // 5-bit brightness, 0-31
+#define SK9822_DEFAULT_BRIGHTNESS 15  // 5-bit brightness, 0-31
 
 typedef struct {
 	uint8_t b;

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-07-03
+PKG_VERSION:=4.0-2019-08-17
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b0f29f5102d5ade78b586d190abb521fcc668b78
+PKG_SOURCE_VERSION:=17b9e07a38753eab3964dffd0b0cc7da3118840a
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

netmode/files/lib/functions/netmode.sh

@@ -121,6 +121,11 @@ run_netmode_scripts() {
 	local mode=$1
 	local when=$2
 	local script
+	local path
+
+	path=$(readlink -f /etc/netmodes/$mode/)
+	[ "${path:0:14}" == "/etc/netmodes/" ] || exit
+
 	if [ -d /etc/netmodes/$mode/scripts/$when ]; then
 		logger -s -p user.info -t "netmode" "Executing $when netmode scripts" >/dev/console
 		for script in $(ls /etc/netmodes/$mode/scripts/$when/); do

port-management/files/etc/init.d/port_management

@@ -56,7 +56,7 @@ configure_ethports(){
 	config_get speed $name speed
 	config_get ifname $name ifname
 	config_get pause $name pause
-	set_port_speed $ifname $speed
+	set_port_speed $ifname $speed $name
 	set_port_pause $ifname $pause
 }
 

questd/Makefile

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=4.1.1
 
-PKG_SOURCE_VERSION:=a361300405fff58379d3d1568d5df46bcb752214
+PKG_SOURCE_VERSION:=c1d8ba92f6a8538f7a48960592cfe91c0c057c2b
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
 

uboot/Makefile

@@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git
 
 ifdef CONFIG_TARGET_intel_mips
 PKG_SOURCE_URL:=git@dev.iopsys.eu:intel/uboot.git
-PKG_SOURCE_VERSION:=c77089efc41ea3292125330221bd5016796631b9
+PKG_SOURCE_VERSION:=819227ec4cf4f2f8f7e8d46a3bee58e329089de6
 else
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
 PKG_SOURCE_VERSION:=670ad7a30f3c6871b6c8a972e19ca2dd78ea8c9b
@@ -74,7 +74,7 @@ define uboot/grx500_norrland
   TITLE:=U-Boot for Norrland Board
   UBOOT_IMG:=u-boot-nand.bin
   DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=14
+  PKG_RELEASE:=15
 endef
 
 UBOOTS := \

voice-client/files/etc/config/voice_client

@@ -175,3 +175,8 @@ config sip_service_provider 'sip0'
 	option is_fax '0'
 	option transport 'udp'
 
+config tone_setting 'toneringbk'
+
+config tone_setting 'tonering'
+
+config tone_setting 'tonebusy'

voice-client/files/etc/firewall.sip

@@ -1 +1,6 @@
-iptables -I zone_wan_input 4 -m udp -p udp --dport 10000:20000 -m comment --comment "!fw3: Allow-RTP" -j ACCEPT
+rtpstart=$(uci -q get voice_client.SIP.rtpstart)
+rtpstart=${rtpstart:-10000}
+rtpend=$(uci -q get voice_client.SIP.rtpend)
+rtpend=${rtpend:-20000}
+
+iptables -I zone_wan_input -m udp -p udp --dport $rtpstart:$rtpend -m comment --comment "!fw3: Allow-RTP" -j ACCEPT

voice-client/files/etc/init.d/voice_client

@@ -86,6 +86,7 @@ TMPL_UDPTL=$TEMPLATEDIR/udptl.conf.TEMPLATE
 
 TMPL_CHANNEL=$TEMPLATEDIR/$LINENAME.conf.TEMPLATE
 TMPL_CHANNEL_LINE=$TEMPLATEDIR/tel_line.TEMPLATE
+TMPL_TONE_LINE=$TEMPLATEDIR/tone.conf.TEMPLATE
 
 TMPL_MEETME=$TEMPLATEDIR/meetme.conf.TEMPLATE
 
@@ -207,7 +208,7 @@ assemble_and_copy_config()
 	[ ! -d $ASTERISKDIR/manager.d ] && mkdir -p $ASTERISKDIR/manager.d/
 
 	# Get rid of the working directory
-	rm -rf $WORKDIR
+        rm -rf $WORKDIR
 }
 
 # read configured codecs for a Line section
@@ -1839,7 +1840,43 @@ configure_tel()
 	fi
 	sed -i "s/|DTMFCOMPATIBILITY|/$dtmfcompatibility/"      $WORKDIR/$LINENAME.tmp
 }
+configure_tone_setting()
+{
+     local frequency
+     local frequency_sec
+     local impedance
+     local outputlevel
 
+     config_get frequency $1 frequency
+     config_get frequency_sec $1 frequency_sec
+     config_get impedance $1 impedance
+     config_get outputlevel $1 outputlevel
+
+     if [ -z "$frequency" ]; then
+               frequency=100
+     fi
+
+     if [ -z "$frequency_sec" ]; then
+                frequencyB=200
+     fi
+
+     if [ -z "$impedance" ]; then
+                impedance=100
+     fi
+
+     if [ -z "$outputlevel" ]; then
+                outputlevel=350
+     fi
+
+     cp $TMPL_TONE_LINE $WORKDIR/tel_line.tmp
+     sed -i "s/|SECTION|/$1/"                                $WORKDIR/tel_line.tmp
+     sed -i "s/|FREQUENCY|/$frequency/"                      $WORKDIR/tel_line.tmp
+     sed -i "s/|FREQUENCY|/$frequency_sec/"                  $WORKDIR/tel_line.tmp
+     sed -i "s/|FREQUENCY|/$impedance/"                      $WORKDIR/tel_line.tmp
+     sed -i "s/|FREQUENCY|/$outputlevel/"                    $WORKDIR/tel_line.tmp
+     cat $WORKDIR/tel_line.tmp >>                            $WORKDIR/$LINENAME.tmp
+     rm -f                                                   $WORKDIR/tel_line.tmp
+}
 #
 # Configure settings for individual line in $LINENAME.conf
 #
@@ -1891,6 +1928,7 @@ configure_tel_line()
 	fi
 
 	cp $TMPL_CHANNEL_LINE $WORKDIR/tel_line.tmp
+
 	sed -i "s/|SECTION|/$1/"				$WORKDIR/tel_line.tmp
 	sed -i "s/|CALLERID|/$extension/g"			$WORKDIR/tel_line.tmp
 	sed -i "s/|CONTEXT|/$sip_provider/g"			$WORKDIR/tel_line.tmp
@@ -1903,7 +1941,7 @@ configure_tel_line()
 	sed -i "s/|CLIR|/$clir/"				$WORKDIR/tel_line.tmp
 	sed -i "s/|LINE_NAME|/$LINENAME/"			$WORKDIR/tel_line.tmp
 
-	#Configure CHANNEL line with codecs according to the SIP line settings
+        #Configure CHANNEL line with codecs according to the SIP line settings
 #	local is_fax
 #	config_get is_fax $sip_provider is_fax
 # 	if [ -z "$is_fax" -o "$is_fax" = "1" ] ; then
@@ -2176,6 +2214,7 @@ start_service() {
 	config_foreach configure_tel_line_extension tel_line
 	config_foreach create_extensions_dialtone tel_line
 	configure_codecs
+	config_foreach configure_tone_setting tone_setting
 
 	###########################
 	# Voicemail configuration

voice-client/files/sbin/voice-monitor

@@ -21,21 +21,21 @@ fi
 
 OFFHOOK=0
 REGISTERED=0
-
+INCOMING=0
 asterisk -x 'sip show registry' | grep -q "Registered" && REGISTERED=1
 ubus call endpt status | grep -q "OFFHOOK" && OFFHOOK=1
 
 if [ $OFFHOOK -eq 1 ]; then
 	ubus call led.voice1 set '{"state":"notice"}'
 elif [ $REGISTERED -eq 1 ]; then
-	ubus call led.voice1 set '{"state":"ok"}'
+        ubus call led.voice1 set '{"state":"ok"}'
 else
 	ubus call led.voice1 set '{"state":"error"}'
 fi
 
 ubus listen asterisk.registry asterisk.endpoint | \
 while read event ; do
-	#echo "voice-monitor got event: $event" >/dev/console
+#       echo "voice-monitor got event: $event" >/dev/console
 	json_load "$event"
 	if json_select asterisk.registry >/dev/null; then
 		json_get_var status status
@@ -57,11 +57,20 @@ while read event ; do
 		    ONHOOK)
 			OFFHOOK=0
 			if [ $REGISTERED -eq 1 ]; then
-				ubus call led.voice1 set '{"state":"ok"}'
-			else
-			        ubus call led.voice1 set '{"state":"error"}'
+                             ubus call led.voice1 set '{"state":"ok"}'
+                        else
+			     ubus call led.voice1 set '{"state":"error"}'
 			fi
 			;;
+                    RINGING)
+                       INCOMING=0
+                       asterisk -x 'sip show channels' | grep -q "INVITE" && INCOMING=1
+                       if [ $INCOMING -eq 1 ]; then
+                                  ubus call led.voice1 set '{"state":"notice"}'
+                       else
+                                  ubus call led.voice1 set '{"state":"ok"}'
+                       fi
+                       ;;
 		    *)
 			# Do nothing for other events.
 			;;
@@ -69,4 +78,5 @@ while read event ; do
 	fi
 done &
 
+
 echo $(($!-1)) $! >/tmp/voice-monitor.pid

voice-client/files/usr/sbin/ringing

@@ -49,6 +49,11 @@ set_ringing_schedule() {
 	stop_hour=$(echo $stop | awk -F ':' '{print$1}')
 	stop_min=$(echo $stop | awk -F ':' '{print$2}')
 
+	[ "${start_min//[0-9]/}" = "" ] || return
+	[ "${start_hour//[0-9]/}" = "" ] || return
+	[ "${stop_min//[0-9]/}" = "" ] || return
+	[ "${stop_hour//[0-9]/}" = "" ] || return
+
 	daymatch=0
 	for day in $days; do
 		[ "${day:0:3}" == "$current_day" ] && daymatch=1
@@ -56,6 +61,8 @@ set_ringing_schedule() {
 		[ -n "$dayns" ] && dayns="$dayns,$dayn" || dayns="$dayn"
 	done
 
+	[ "${dayns//[0-6,\-]/}" = "" ] || return
+
 	if [ $daymatch -eq 1 -a $current_time -gt ${start/:/} -a $current_time -lt ${stop/:/} ]; then
 		timematch=1
 		uci -q set voice_client.RINGING_STATUS.shouldring="$status"