NRC7292 Software Package v1.3.2 release

README.md

@@ -2,23 +2,26 @@
 
 ## Notice
 ### Release roadmap
+- v1.3.2 (2020.09.16)
 - v1.3.1 (2020.08.05)
 - v1.3.0 (2020.05.30)
 
 ### Latest release
-- [NRC7292_SW_PKG_v1.3.1](https://github.com/newracom/nrc7292_sw_pkg/releases/tag/v1.3.1)
+- [NRC7292_SW_PKG_v1.3.2](https://github.com/newracom/nrc7292_sw_pkg/releases/tag/v1.3.2)
 
 ### Release package contents
 - host
   - cli_app
+  - doc
   - evk
   - nrc_driver
-  - doc
+  - tools
 - host_kr_mic
   - cli_app
+  - doc
   - evk
   - nrc_driver
-  - doc
+  - tools
 
 ## NRC7292 Software Package User Guide
 ### (Optional) Install toolchain

package/host/VERSION-SDK.txt

@@ -1,3 +1,4 @@
 VERSION_MAJOR 1
 VERSION_MINOR 3
-VERSION_REVISION 1
+VERSION_REVISION 2
+

package/host/evk/binary/VERSION-SDK.txt

@@ -1,3 +1,4 @@
 VERSION_MAJOR 1
 VERSION_MINOR 3
-VERSION_REVISION 1
+VERSION_REVISION 2
+

package/host/evk/sw_pkg/README.txt

@@ -9,5 +9,5 @@ chmod -R 755 *
 #apply single-band (Sub1G) to EVK
 ./update.sh
 
-#apply dual-band (Sub1G + 2.4GHz) 1.3.0 to EVK
+#apply dual-band (Sub1G + 2.4GHz) to EVK
 ./update.sh dual

package/host/evk/sw_pkg/nrc_pkg/VERSION-SDK.txt

@@ -1,3 +1,4 @@
 VERSION_MAJOR 1
 VERSION_MINOR 3
-VERSION_REVISION 1
+VERSION_REVISION 2
+

package/host/evk/sw_pkg/nrc_pkg/script/start.py

@@ -7,22 +7,24 @@
 
 ##################################################################################
 # Default Configuration (you can change value you want here)
-model       = 7292     # 7292 or 7192
-hif_speed   = 16000000 # HSPI Clock
-gain_type   = 'phy'    # 'phy' or 'nrf(legacy)'
-txpwr_val   = 17       # TX Power
-maxagg_num  = 8        # 0(AMPDU off) or  >2(AMPDU on)
-cqm_off     = 0        # 0(CQM on) or 1(CQM off)
-fw_download = 1        # 0(FW Download off) or 1(FW Download on)
+model       = 7292      # 7292 or 7192
+hif_speed   = 16000000  # HSPI Clock
+gain_type   = 'phy'     # 'phy' or 'nrf(legacy)'
+txpwr_val   = 17        # TX Power
+maxagg_num  = 8         # 0(AMPDU off) or  >2(AMPDU on)
+cqm_off     = 0         # 0(CQM on) or 1(CQM off)
+fw_download = 1         # 0(FW Download off) or 1(FW Download on)
 fw_name     = 'uni_s1g.bin'
-bd_download = 0        # 0(Board Data Download off) or 1(Board Data Download on)
+bd_download = 0         # 0(Board Data Download off) or 1(Board Data Download on)
 bd_name     = 'nrc7292_bd.dat'
-guard_int   = 'long'   # 'long'(LGI) or 'short'(SGI)
-supplicant_debug = 0   # WPA Supplicant debug option : 0(off) or 1(on)
-hostapd_debug    = 0   # Hostapd debug option    : 0(off) or 1(on)
-max_cpuclock     = 1   # RPi Max CPU Clock : 0(off) or 1(on)
-relay_type       = 0   # 0 (wlan0: STA, wlan1: AP) 1 (wlan0: AP, wlan1: STA)
-power_save       = 0   # power save : 0(off) or 1(on)
+guard_int   = 'long'    # 'long'(LGI) or 'short'(SGI)
+supplicant_debug = 0    # WPA Supplicant debug option : 0(off) or 1(on)
+hostapd_debug    = 0    # Hostapd debug option    : 0(off) or 1(on)
+max_cpuclock     = 1    # RPi Max CPU Clock : 0(off) or 1(on)
+relay_type       = 0    # 0 (wlan0: STA, wlan1: AP) 1 (wlan0: AP, wlan1: STA)
+power_save       = 0    # power save : 0(off) or 1(on)
+bss_max_idle_enable = 0 # 0(bss_max_idle off) or 1(bss_max_idle on)
+bss_max_idle = 10       # number of keepalives (0 ~ 65535)
 ##################################################################################
 
 def check(interface):
@@ -103,10 +105,12 @@ def argv_print():
     if int(bd_download) == 1:
         print ("Download Board Data      : " + bd_name)
     print ("TX Power         : " + str(txpwr_val))
+    if int(bss_max_idle_enable) == 1 and strSTA() == 'AP':
+        print ("bss_max_idle     : " + str(bss_max_idle))
     print ("------------------------------")
 
 def copyConf():
-    os.system("sudo /home/pi/nrc_pkg/sw/firmware/copy " + str(model))
+    os.system("sudo /home/pi/nrc_pkg/sw/firmware/copy " + str(model) + " " + str(bd_name))
     os.system("/home/pi/nrc_pkg/script/conf/etc/ip_config.sh " + strSTA() + " " +  str(relay_type))
 
 def startNAT():
@@ -177,7 +181,12 @@ def run_common():
     else:
         power_save_arg = " power_save=0"
 
-    insmod_arg = fw_arg + bd_arg + alt_mode_arg + power_save_arg + " disable_cqm=" + str(cqm_off) + " hifspeed=" + str(hif_speed)
+    if int(bss_max_idle_enable) == 1 and strSTA() == 'AP':
+        bss_max_idle_arg = " bss_max_idle=" + str(bss_max_idle)
+    else:
+        bss_max_idle_arg = ""
+
+    insmod_arg = fw_arg + bd_arg + alt_mode_arg + power_save_arg + bss_max_idle_arg + " disable_cqm=" + str(cqm_off) + " hifspeed=" + str(hif_speed)
     print "[2] Loading module"
     print "sudo insmod /home/pi/nrc_pkg/sw/driver/nrc.ko " + insmod_arg
     os.system("sudo insmod /home/pi/nrc_pkg/sw/driver/nrc.ko " + insmod_arg + "")

package/host/evk/sw_pkg/nrc_pkg/sw/firmware/copy

@@ -1,6 +1,6 @@
 cp /home/pi/nrc_pkg/sw/firmware/nrc$1_cspi.bin /home/pi/nrc_pkg/sw/firmware/uni_s1g.bin
 sudo cp /home/pi/nrc_pkg/sw/firmware/uni_s1g.bin /lib/firmware
-sudo cp /home/pi/nrc_pkg/sw/firmware/nrc7292_bd.dat /lib/firmware
+sudo cp /home/pi/nrc_pkg/sw/firmware/$2 /lib/firmware
 ls -al /home/pi/nrc_pkg/sw/firmware
 ls -al /lib/firmware/uni_s1g*
 

package/host/evk/sw_pkg/nrc_pkg_dual/VERSION-SDK.txt

@@ -1,3 +1,4 @@
 VERSION_MAJOR 1
 VERSION_MINOR 3
-VERSION_REVISION 1
+VERSION_REVISION 2
+

package/host/evk/sw_pkg/nrc_pkg_dual/script/run_recovery.py

@@ -0,0 +1,131 @@
+import os
+import sys
+import time
+import ctypes
+import threading
+import libnl.handlers
+from libnl.error import errmsg
+from libnl.nl import nl_recvmsgs
+from libnl.attr import nla_parse
+from libnl.nl80211 import nl80211
+from libnl.msg import nlmsg_data, nlmsg_hdr
+from libnl.linux_private.genetlink import genlmsghdr
+from libnl.genl.ctrl import genl_ctrl_resolve, genl_ctrl_resolve_grp
+from libnl.genl.genl import genl_connect, genlmsg_attrdata, genlmsg_attrlen
+from libnl.socket_ import nl_socket_add_membership, nl_socket_alloc, nl_socket_drop_membership
+
+NL_CMD_RECOVERY_MSG = 27
+
+PATH_TO_DRIVER = "/home/pi/nrc_pkg/sw/driver/nrc.ko"
+PATH_TO_CONFIG = "/home/pi/nrc_pkg/script/conf/{}/"
+FIRMWARE = "uni_s1g.bin"
+
+class Recovery:
+	def __init__(self):
+		self.recovery = False
+		self.recovery_count = 0
+		self.keyboard = False
+		self.sk = None
+		self.driver_id = None
+		self.station_type = 0
+		self.config = -1
+		self.country = "US"
+
+	def trigger_recovery(self):
+		self.recovery_count += 1
+		self.recovery = False
+
+		#startup routine
+		self.startup()
+
+		print("Recovery Count: {}".format(self.recovery_count))
+		self.connect()
+
+	def startup(self): #example
+		app = "wpa_supplicant" if self.is_sta() else "hostapd"
+
+		os.system("sudo killall -9 {} > /dev/null 2>&1".format(app))
+		os.system("sudo rmmod nrc > /dev/null 2>&1")
+
+		os.system("sudo insmod {} fw_name={} > /dev/null".format(PATH_TO_DRIVER, FIRMWARE))
+		time.sleep(5)
+		os.system("sudo {} {} {}/{} -B > /dev/null".format(app, "-iwlan0 -c" if self.is_sta() else "", PATH_TO_CONFIG.format(self.country), self.get_config()))
+		time.sleep(7)
+
+	def parse_arg(self):
+		if (len(sys.argv) < 4):
+			sys.exit("Usage: python run_recovery.py <station-type> <security-type> <country-code>")
+
+		self.station_type = int(sys.argv[1])
+		self.config = int(sys.argv[2])
+		self.country = sys.argv[3]
+
+	def is_sta(self):
+		return self.station_type == 0
+
+	def get_config(self):
+		station = "sta" if self.is_sta() else "ap"
+		if self.config == 0:
+			return "{}_halow_open.conf".format(station)
+		elif self.config == 1:
+			return "{}_halow_wpa2.conf".format(station)
+		elif self.config == 2:
+			return "{}_halow_owe.conf".format(station)
+		elif self.config == 3:
+			return "{}_halow_sae.conf".format(station)
+		else:
+			return "{}_halow_open.conf".format(station)
+
+	def connect(self):
+		self.sk = nl_socket_alloc()
+		recovery.ok(0, genl_connect, self.sk)
+		self.driver_id = recovery.ok(0, genl_ctrl_resolve, self.sk, b'NRC-NL-FAM')
+
+	def ok(self, no_exit, func, *args, **kwargs):
+		ret = func(*args, **kwargs)
+		if no_exit or ret >= 0:
+			return ret
+		reason = errmsg[abs(ret)]
+		print('{0}() returned {1} ({2})'.format(func.__name__, ret, reason))
+
+	def callback_trigger(self, msg, arg):
+		gnlh = genlmsghdr(nlmsg_data(nlmsg_hdr(msg)))
+
+		tb = dict((i, None) for i in range(10 + 1))
+		nla_parse(tb, nl80211.NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), None)
+		if tb.get(NL_CMD_RECOVERY_MSG):
+			self.recovery = True
+
+		return libnl.handlers.NL_STOP
+
+	def mcast_handler(self):
+		mcid = self.ok(0, genl_ctrl_resolve_grp, self.sk, b'NRC-NL-FAM', b'nrc-log')
+		ret = nl_socket_add_membership(self.sk, mcid)
+		err = ctypes.c_int(1)
+		results = ctypes.c_int(-1)
+		cb = libnl.handlers.nl_cb_alloc(libnl.handlers.NL_CB_DEFAULT)
+		libnl.handlers.nl_cb_set(cb, libnl.handlers.NL_CB_VALID, libnl.handlers.NL_CB_CUSTOM, self.callback_trigger, results)
+		libnl.handlers.nl_cb_set(cb, libnl.handlers.NL_CB_SEQ_CHECK, libnl.handlers.NL_CB_CUSTOM, lambda *_: libnl.handlers.NL_OK, None)
+
+		try:
+			while True:
+				ret = nl_recvmsgs(self.sk, cb)
+				if self.recovery: break
+		except KeyboardInterrupt:
+			self.keyboard = True
+		finally:
+			nl_socket_drop_membership(self.sk, mcid)
+
+if __name__ == "__main__":
+	recovery = Recovery()
+	recovery.parse_arg()
+	recovery.connect()
+
+	while True:
+		print("Waiting for recovery trigger...")
+		recovery.mcast_handler()
+		if recovery.keyboard:
+			break
+		if recovery.recovery:
+			print("Recovery Triggered...")
+			recovery.trigger_recovery()

package/host/evk/sw_pkg/nrc_pkg_dual/script/start.py

@@ -7,28 +7,30 @@
 
 ##################################################################################
 # Default Configuration (you can change value you want here)
-model       = 7292     # 7292 or 7192
-hif_speed   = 16000000 # HSPI Clock
-gain_type   = 'phy'    # 'phy' or 'nrf(legacy)'
-txpwr_val   = 17       # TX Power
-maxagg_num  = 8        # 0(AMPDU off) or  >2(AMPDU on)
-cqm_off     = 0        # 0(CQM on) or 1(CQM off)
-fw_download = 1        # 0(FW Download off) or 1(FW Download on)
+model       = 7292      # 7292 or 7192
+hif_speed   = 16000000  # HSPI Clock
+gain_type   = 'phy'     # 'phy' or 'nrf(legacy)'
+txpwr_val   = 17        # TX Power
+maxagg_num  = 8         # 0(AMPDU off) or  >2(AMPDU on)
+cqm_off     = 0         # 0(CQM on) or 1(CQM off)
+fw_download = 1         # 0(FW Download off) or 1(FW Download on)
 fw_name     = 'uni_s1g.bin'
-bd_download = 0        # 0(Board Data Download off) or 1(Board Data Download on)
+bd_download = 0         # 0(Board Data Download off) or 1(Board Data Download on)
 bd_name     = 'nrc7292_bd.dat'
-guard_int   = 'long'   # 'long'(LGI) or 'short'(SGI)
-concurrent  = 0        # 0(Concurrent Mode off) or 1(Coucurrent Mode on)
+guard_int   = 'long'    # 'long'(LGI) or 'short'(SGI)
+concurrent  = 0         # 0(Concurrent Mode off) or 1(Coucurrent Mode on)
 interface_11ah   = 'wlan1'  # 11ah driver interface : 'wlan0' or 'wlan1'
-supplicant_debug = 0   # WPA Supplicant debug option : 0(off) or 1(on)
-hostapd_debug    = 0   # Hostapd debug option    : 0(off) or 1(on)
-max_cpuclock     = 1   # RPi Max CPU Clock : 0(off) or 1(on)
+supplicant_debug = 0    # WPA Supplicant debug option : 0(off) or 1(on)
+hostapd_debug    = 0    # Hostapd debug option    : 0(off) or 1(on)
+max_cpuclock     = 1    # RPi Max CPU Clock : 0(off) or 1(on)
 # Optional Configuration for dual-band (11N + 11AH)
 enable_11n        = 1        # Enable Dual-Band (11ah + 11n)
 role_11n          = 'AP'     # Role of 11N ('AP' or 'STA')
 interface_11n     = 'wlan0'  # 11n driver interface : 'wlan0'
-disable_NAT       = 0  # 1(NAT disable) 0(NAT enable)
-power_save        = 0  # power save : 0(off) or 1(on)
+disable_NAT       = 0   # 1(NAT disable) 0(NAT enable)
+power_save        = 0   # power save : 0(off) or 1(on)
+bss_max_idle_enable = 0 # 0(bss_max_idle off) or 1(bss_max_idle on)
+bss_max_idle = 10       # number of keepalives (0 ~ 65535)
 ##################################################################################
 
 def check(interface):
@@ -108,14 +110,16 @@ def argv_print():
         print ("Download Board Data      : " + bd_name)
     print ("Interface        : " + interface_11ah)
     print ("TX Power         : " + str(txpwr_val))
+    if int(bss_max_idle_enable) == 1 and strSTA() == 'AP':
+        print ("bss_max_idle     : " + str(bss_max_idle))
     print ("------------------------------")
     if int(enable_11n):
         print ("11n Interface    : " + interface_11n)
         print ("11n Role         : " + role_11n)
         print ("------------------------------")
 
 def copyConf():
-    os.system("sudo /home/pi/nrc_pkg/sw/firmware/copy " + str(model))
+    os.system("sudo /home/pi/nrc_pkg/sw/firmware/copy " + str(model) + " " + str(bd_name))
     if strSTA() == 'AP':
         os.system("sudo cp /home/pi/nrc_pkg/etc/dhcpcd/dhcpcd_ap.conf /etc/dhcpcd.conf")
         os.system("sudo cp /home/pi/nrc_pkg/etc/dhcpcd/dnsmasq/dnsmasq_ap.conf /etc/dnsmasq.conf")
@@ -187,7 +191,12 @@ def run_common():
     else:
         power_save_arg = " power_save=0"
 
-    insmod_arg = fw_arg + alt_mode_arg + power_save_arg + " disable_cqm=" + str(cqm_off) + " hifspeed=" + str(hif_speed)
+    if int(bss_max_idle_enable) == 1 and strSTA() == 'AP':
+        bss_max_idle_arg = " bss_max_idle=" + str(bss_max_idle)
+    else:
+        bss_max_idle_arg = ""
+
+    insmod_arg = fw_arg + bd_arg + alt_mode_arg + power_save_arg + bss_max_idle_arg + " disable_cqm=" + str(cqm_off) + " hifspeed=" + str(hif_speed)
     print "[2] Loading module"
     print "sudo insmod /home/pi/nrc_pkg/sw/driver/nrc.ko " + insmod_arg
     os.system("sudo insmod /home/pi/nrc_pkg/sw/driver/nrc.ko " + insmod_arg + "")

package/host/evk/sw_pkg/nrc_pkg_dual/sw/driver/README.txt

@@ -1,2 +1 @@
-SDK-v1.3.0
 built on Linux kernel 4.14.70

package/host/evk/sw_pkg/nrc_pkg_dual/sw/firmware/copy

@@ -1,6 +1,6 @@
 cp /home/pi/nrc_pkg/sw/firmware/nrc$1_cspi.bin /home/pi/nrc_pkg/sw/firmware/uni_s1g.bin
 sudo cp /home/pi/nrc_pkg/sw/firmware/uni_s1g.bin /lib/firmware
-sudo cp /home/pi/nrc_pkg/sw/firmware/nrc7292_bd.dat /lib/firmware
+sudo cp /home/pi/nrc_pkg/sw/firmware/$2 /lib/firmware
 ls -al /home/pi/nrc_pkg/sw/firmware
 ls -al /lib/firmware/uni_s1g*