fixdevelop

luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm

@@ -948,6 +948,7 @@
 			</div>
 		    </div>
 		</div>
+		<!-- <div class="cbi-value" data-depends="[{&#34;cbid.sqm.<%=ifname%>.enabled&#34;:&#34;1&#34;}]" data-index="17"> -->
 		<div class="cbi-value" data-index="17">
 		    <label class="cbi-value-title"><%:Enable SQM autorate%></label>
 		    <div class="cbi-value-field">

luci-app-openmptcprouter/root/bin/omr-modemmanager

@@ -6,11 +6,13 @@ timeout 1 mmcli -L | while read MODEM; do
 	MODEM_ID=$(echo $MODEM |  awk -F' ' '{print $1}' | awk -F/ '{print $6}')
 	MODEM_INFO="$(timeout 1 mmcli -m $MODEM_ID --output-keyvalue)"
 	if [ -n "$MODEM_INFO" ] && [ "$(echo "$MODEM_INFO" | grep 'modem.generic.device ' | awk -F": " '{print $2}')" = "$MODEM_INTF" ]; then
-		PERCENT=$(echo "$MODEM_INFO" | grep -m 1 'modem.generic.signal-quality.value ' | awk -F": " '{print $2}')
-		OPERATOR=$(echo "$MODEM_INFO" | grep -m 1 'modem.3gpp.operator-name ' | awk -F": " '{print $2}')
-		NUMBER=$(echo "$MODEM_INFO" | grep -m 1 'modem.generic.own-numbders.value[1]' | awk -F": " '{print $2}')
-		STATE=$(echo "$MODEM_INFO" | grep -m 1 'modem.generic.state ' | awk -F": " '{print $2}')
-		TYPE=$(echo "$MODEM_INFO" | grep -m 1 'modem.generic.access-technologies.value\[1\]' | awk -F": " '{print $2}')
+		PERCENT=$(echo "$MODEM_INFO" | grep 'modem.generic.signal-quality.value ' | awk -F": " '{print $2}')
+		[ -z "$PERCENT" ] && PERCENT=$(awk -v n="$(mmcli -m $MODEM_ID --command 'AT+CSQ')" 'BEGIN{ print int(n*10) }')
+		OPERATOR=$(echo "$MODEM_INFO" | grep 'modem.3gpp.operator-name ' | awk -F": " '{print $2}')
+		[ -z "$OPERATOR" ] && OPERATOR=$(mmcli -m $MODEM_ID --command 'AT+QSPN' | awk -F[\"\"] '{ print $2 }')
+		NUMBER=$(echo "$MODEM_INFO" | grep 'modem.generic.own-numbders.value[1]' | awk -F": " '{print $2}')
+		STATE=$(echo "$MODEM_INFO" | grep 'modem.generic.state ' | awk -F": " '{print $2}')
+		TYPE=$(echo "$MODEM_INFO" | grep 'modem.generic.access-technologies.value\[1\]' | awk -F": " '{print $2}')
 		[ -z "$INFO" ] && echo $PERCENT
 		[ "$INFO" = "all" ] && echo "$PERCENT;$OPERATOR;$NUMBER;$STATE;$TYPE"
 		exit

luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter

@@ -93,8 +93,8 @@ function add_interface(add_interface_ifname)
 	ucic:set("qos","wan" .. i,"interface")
 	ucic:set("qos","wan" .. i,"classgroup","Default")
 	ucic:set("qos","wan" .. i,"enabled","0")
-	ucic:set("qos","wan" .. i,"upload","4000")
-	ucic:set("qos","wan" .. i,"download","100000")
+	ucic:set("qos","wan" .. i,"upload","1000000")
+	ucic:set("qos","wan" .. i,"download","1000000")
 	ucic:save("qos")
 	ucic:commit("qos")
 
@@ -163,7 +163,7 @@ function set_interface(intf,proto,ipaddr,netmask,gateway,sqmenabled,downloadspee
 		ucic:set("qos",intf,"interface")
 		ucic:set("qos",intf,"classgroup","Default")
 		ucic:set("qos",intf,"enabled","0")
-		ucic:set("qos",intf,"upload","4000")
+		ucic:set("qos",intf,"upload","100000")
 		ucic:set("qos",intf,"download","100000")
 	end
 
@@ -1113,9 +1113,7 @@ function interfaces_status()
 	mArray.openmptcprouter['model'] = sys.exec("ubus call system board | jsonfilter -q -e '@.model' 2>/dev/null | tr -d '\n'")
 	local board_name = sys.exec("ubus call system board | jsonfilter -q -e '@.board_name' 2>/dev/null | tr -d '\n'")
 	-- retrieve core temperature
-	if board_name:match("^raspberrypi.*") then
-		mArray.openmptcprouter["core_temp"] = sys.exec("cat /sys/class/thermal/thermal_zone0/temp 2>/dev/null"):match("%d+")
-	end
+	mArray.openmptcprouter["core_temp"] = sys.exec("cat /sys/class/thermal/thermal_zone0/temp 2>/dev/null"):match("%d+")
 	mArray.openmptcprouter["loadavg"] = sys.exec("cat /proc/loadavg 2>/dev/null"):match("[%d%.]+ [%d%.]+ [%d%.]+")
 	mArray.openmptcprouter["uptime"] = sys.exec("cat /proc/uptime 2>/dev/null"):match("[%d%.]+")