Skip to content

Commit 4c8f35f

Browse files
committed
Support magisk canary
1 parent 2346d89 commit 4c8f35f

File tree

4 files changed

+44
-31
lines changed

4 files changed

+44
-31
lines changed

README.md

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
Double your bandwith on your Qualcomm devices!
44

5-
在「高通设备」上以40Mhz运行2.4Ghz/5.0Ghz的Wifi
5+
高通设备 WiFi 增强模块
66

77
## Details 细节
88

9-
By default, some devices provided an ini file to control the wifi behavior. This module modified the `WCNSS_qcom_cfg.ini` in order to support 40mhz.
9+
By default, some devices provided an ini file to control the WiFi behavior. This module modified the `WCNSS_qcom_cfg.ini` in order to support 40mhz.
1010

11-
默认情况下,某些设备提供了一个ini文件来控制wifi行为,该模块修改了`WCNSS_qcom_cfg.ini`以支持40MHz。
11+
默认情况下,某些设备提供了一个ini文件来控制 WiFi 行为,该模块修改了`WCNSS_qcom_cfg.ini`以支持40MHz。
1212

1313
- Make 2.4Ghz/5Ghz WiFi running at 40Mhz enabled. 开启 40Mhz WiFi 支持。
1414
```
@@ -26,6 +26,11 @@ gForce1x1Exception=0
2626
sae_enabled=1
2727
```
2828

29+
- Disable BandCapability limits. 禁用频段适用限制。
30+
```
31+
BandCapability=0
32+
```
33+
2934
This module should work on most of the devices. The basic logic is simple, but not all devices need such kind of module. If you can find `WCNSS_qcom_cfg.ini` in your system partition, please open an issue to report it to me; if you can't, this module won't work for you, including almost all Nexus/Pixel devices.
3035

3136
该模块可在大多数设备上使用。其逻辑很简单,但是并非所有设备都适用该模块。如果您可以在系统分区中找到`WCNSS_qcom_cfg.ini`,请创建 issue 告诉我。 如果不能,则该模块将对您的设备不起作用,包括几乎所有的 Nexus / Pixel 设备。
@@ -34,32 +39,31 @@ This module should work on most of the devices. The basic logic is simple, but n
3439

3540
Please follow the instuction below from @axeldna: 请按照说明进行操作
3641

37-
1. Removed the installed Wifi Bonding module.
38-
移除已安装了的WIFI Bonding模块。
39-
2. Removed all saved wifi 2.4Ghz networks (I removed all of them anyway, but shouldn't be necessary) .
40-
移除所有已保存的2.4Ghz的Wifi(非必要)
41-
3. Rebooted the phone (to make sure wifi settings are removed from cloud account too).
42-
重启手机(以确保从云服务中删除相关的Wifi设置项)。
43-
4. Installed the Wifi Bonding module. 安装Wifi Bonding模块。
42+
1. Removed the installed WiFi Bonding module.
43+
移除已安装了的WiFi Bonding模块。
44+
2. Removed all saved WiFi 2.4Ghz networks (I removed all of them anyway, but shouldn't be necessary) .
45+
移除所有已保存的2.4Ghz的WiFi(非必要)
46+
3. Rebooted the phone (to make sure WiFi settings are removed from cloud account too).
47+
重启手机(以确保从云服务中删除相关的WiFi设置项)。
48+
4. Installed the WiFi Bonding module. 安装WiFi Bonding模块。
4449
5. Rebooted the phone (as indicated by Magisk to start the module).
4550
重启手机(根据Magisk指示来重启)。
46-
6. With a phone "free of wifi" and with a fresh Wifi Bonding module, I joined 2.4Ghz wifi networks.
47-
试着开始接入2.4Ghz的Wifi
51+
6. With a phone "free of WiFi" and with a fresh WiFi Bonding module, I joined 2.4Ghz WiFi networks.
52+
试着开始接入2.4Ghz的WiFi
4853
7. Checked my newly registered 2.4Ghz networks and they are showing 150Mbps Link Speed.
49-
自测新连上的2.4Ghz的Wifi有150Mbps的连接速度
54+
自测新连上的2.4Ghz的WiFi有150Mbps的连接速度
5055
8. On some MTK solution AP, they are showing 300Mbps Link Speed.
51-
连接一些联发科路由的Wifi有300Mbps的连接速度
56+
连接一些联发科路由的WiFi有300Mbps的连接速度
5257

5358
## NOTICE 小贴士
5459

5560
* You should use latest Magisk Manager to install this module. If you meet any problem under installation from Magisk Manager, please try to install it from recovery. 您应该使用最新的Magisk Manager来安装此模块。如果您在Magisk Manager中安装模块遇到问题,请尝试使用Recovery来安装
5661

5762
* Recent fixes:
58-
59-
Update for magisk tmpfs location changes.
63+
Support Magisk Canary(26404).
64+
Fix path detection for old devices.
6065

6166

6267
## Credit & Support 版权及支持
63-
* Copyright (C) 2017-2020 simonsmh <simonsmh@gmail.com>
6468
* Any issue or pull request is welcomed. 欢迎提交 issue 以及 Pull Request
6569
* Star this module at [GitHub](https://github.com/Magisk-Modules-Repo/wifi-bonding) 欢迎点亮项目小星星

customize.sh

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
1-
[ -x "$(which magisk)" ] && MIRRORPATH=$(magisk --path)/.magisk/mirror || unset MIRRORPATH
2-
array=$(find /system /vendor /product /system_ext -name WCNSS_qcom_cfg.ini)
3-
for CFG in $array
1+
if [ "$MAGISK_VER_CODE" -lt 24000 ]; then
2+
ui_print "*********************************************************"
3+
ui_print "! Please install Magisk v24+"
4+
abort "*********************************************************"
5+
fi
6+
[ -x "$(which magisk)" ] && CMDPREFIX="magisk --denylist exec" || unset CMDPREFIX
7+
CHECK_DIRS="/system /vendor /product /system_ext"
8+
EXISTING_DIRS=""
9+
for dir in $CHECK_DIRS; do
10+
[[ -d "$dir" ]] && EXISTING_DIRS="$EXISTING_DIRS $dir"
11+
done
12+
CFGS=$($CMDPREFIX find $EXISTING_DIRS -type f -name WCNSS_qcom_cfg.ini)
13+
for CFG in $CFGS
414
do
5-
[[ -f $CFG ]] && [[ ! -L $CFG ]] && {
6-
SELECTPATH=$CFG
15+
[[ -f $CFG ]] && {
716
mkdir -p `dirname $MODPATH$CFG`
8-
ui_print "- Migrating $MIRRORPATH$SELECTPATH"
9-
cp -af $MIRRORPATH$SELECTPATH $MODPATH$SELECTPATH
17+
ui_print "- Migrating $CFG"
18+
$CMDPREFIX cp -af $CFG $MODPATH$CFG
1019
ui_print "- Starting modifiy"
11-
sed -i '/gChannelBondingMode24GHz=/d;/gChannelBondingMode5GHz=/d;/gForce1x1Exception=/d;/sae_enabled=/d;s/^END$/gChannelBondingMode24GHz=1\ngChannelBondingMode5GHz=1\ngForce1x1Exception=0\nsae_enabled=1\nEND/g' $MODPATH$SELECTPATH
20+
sed -i '/gChannelBondingMode24GHz=/d;/gChannelBondingMode5GHz=/d;/gForce1x1Exception=/d;/sae_enabled=/d;/BandCapability=/d;s/^END$/gChannelBondingMode24GHz=1\ngChannelBondingMode5GHz=1\ngForce1x1Exception=0\nsae_enabled=1\nBandCapability=0\nEND/g' $MODPATH$CFG
1221
}
1322
done
14-
[[ -z $SELECTPATH ]] && abort "- Installation FAILED. Your device didn't support WCNSS_qcom_cfg.ini." || { mkdir -p $MODPATH/system; mv -f $MODPATH/vendor $MODPATH/system/vendor; mv -f $MODPATH/product $MODPATH/system/product; mv -f $MODPATH/system_ext $MODPATH/system/system_ext;}
23+
[[ -z $CFG ]] && abort "- Installation FAILED. Your device didn't support WCNSS_qcom_cfg.ini." || { mkdir -p $MODPATH/system; mv -f $MODPATH/vendor $MODPATH/system/vendor; mv -f $MODPATH/product $MODPATH/system/product; mv -f $MODPATH/system_ext $MODPATH/system/system_ext;}

module.prop

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
id=wifi-bonding
22
name=Wifi Bonding (Qcom)
3-
version=1.15
4-
versionCode=16
3+
version=1.16
4+
versionCode=17
55
author=simonsmh
66
description=Doubles your wi-fi bandwith by modifying WCNSS_qcom_cfg.ini.
77
updateJson=https://cdn.jsdelivr.net/gh/Magisk-Modules-Repo/wifi-bonding/version.json

version.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"version": "1.15",
3-
"versionCode": 16,
4-
"zipUrl": "https://github.com/Magisk-Modules-Repo/wifi-bonding/releases/download/16/wifi_bonding.zip",
2+
"version": "1.16",
3+
"versionCode": 17,
4+
"zipUrl": "https://github.com/Magisk-Modules-Repo/wifi-bonding/releases/download/17/wifi_bonding.zip",
55
"changelog": "https://cdn.jsdelivr.net/gh/Magisk-Modules-Repo/wifi-bonding/README.md"
66
}

0 commit comments

Comments
 (0)