From 032b36ea7b07370d2d47c5c02e525b736e2c10e2 Mon Sep 17 00:00:00 2001 From: leimingsheng Date: Wed, 26 Mar 2025 15:21:18 +0800 Subject: [PATCH] =?UTF-8?q?fix(master=20:=20nicsensor)=E4=BF=AE=E6=AD=A3de?= =?UTF-8?q?tect=E6=93=8D=E4=BD=9C=E5=90=8E=E6=9C=AA=E6=81=A2=E5=A4=8D9548?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E9=97=AE=E9=A2=98=20=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=8F=8F=E8=BF=B0=EF=BC=9A=20=E5=81=9Adetect=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E5=90=8E=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=B0=86PCA9548?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=81=A2=E5=A4=8D=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E6=AC=A1=E6=A3=80=E6=B5=8B=E6=97=B6=E4=BB=8D?= =?UTF-8?q?=E6=9C=89=E4=B9=8B=E5=89=8D=E7=9A=84=E6=95=B0=E6=8D=AE=E3=80=82?= =?UTF-8?q?=E5=BD=93=E4=B8=8B=E4=B8=80=E6=AC=A1=E6=A3=80=E6=B5=8B=E6=97=B6?= =?UTF-8?q?=E6=8D=A2=E4=BA=86=E5=8F=A6=E4=B8=80=E4=B8=AA9548=E4=BC=9A?= =?UTF-8?q?=E4=BA=A7=E7=94=9F=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nicsensor.sh | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/nicsensor.sh b/nicsensor.sh index 07af049..31b4cc1 100755 --- a/nicsensor.sh +++ b/nicsensor.sh @@ -134,7 +134,7 @@ ina3221_ch2_volt="0" ina3221_ch0_current="0" ina3221_ch1_current="0" ina3221_ch2_current="0" -SCRIPT_VERSION="1.5 Rev1 Intest" +SCRIPT_VERSION="1.5 Rev2 Intest" fru_file_name=$option_data2 fru_write_size=0 @@ -230,6 +230,13 @@ do_i2c_detect(){ i2cdetect -y $1 } +# Reset pca9548 channel to 0x00 +# @Param1 i2c bus number +# @Param2 pca9548 slave address +reset_pca9548(){ + i2ctransfer -y $1 w1@$2 0x00 +} + # script self test conf_pre_check(){ # check DEBUG_MODE value @@ -1231,6 +1238,7 @@ detect_on_5280m7(){ do_i2c_detect $i2c_bus 0x70 0x01 0 0 do_i2c_detect $i2c_bus 0x70 0x02 1 1 do_i2c_detect $i2c_bus 0x70 0x04 2 2 + reset_pca9548 $i2c_bus 0x70 else i2c_bus=12 pca9641_slave="0x41" @@ -1239,6 +1247,7 @@ detect_on_5280m7(){ do_i2c_detect $i2c_bus 0x72 0x02 1 0 do_i2c_detect $i2c_bus 0x72 0x04 2 1 do_i2c_detect $i2c_bus 0x72 0x08 3 2 + reset_pca9548 $i2c_bus 0x72 i2c_bus=13 pca9641_slave="0x42" @@ -1247,6 +1256,7 @@ detect_on_5280m7(){ do_i2c_detect $i2c_bus 0x72 0x02 1 3 do_i2c_detect $i2c_bus 0x72 0x04 2 4 do_i2c_detect $i2c_bus 0x72 0x08 3 5 + reset_pca9548 $i2c_bus 0x72 fi } @@ -1266,6 +1276,7 @@ detect_on_5468m7(){ do_i2c_detect $i2c_bus 0x70 0x04 2 2 do_i2c_detect $i2c_bus 0x70 0x08 3 3 do_i2c_detect $i2c_bus 0x70 0x10 4 4 + reset_pca9548 $i2c_bus 0x70 i2c_bus=14 pca9641_slave="0x42" @@ -1277,6 +1288,7 @@ detect_on_5468m7(){ do_i2c_detect $i2c_bus 0x71 0x08 3 8 do_i2c_detect $i2c_bus 0x71 0x10 4 9 do_i2c_detect $i2c_bus 0x71 0x20 5 10 + reset_pca9548 $i2c_bus 0x71 } detect_on_donghu(){ @@ -1295,6 +1307,7 @@ detect_on_donghu(){ do_i2c_detect $i2c_bus 0x70 0x04 2 5 do_i2c_detect $i2c_bus 0x70 0x02 1 6 do_i2c_detect $i2c_bus 0x70 0x01 0 7 + reset_pca9548 $i2c_bus 0x70 } detect_on_yichun(){ @@ -1306,12 +1319,15 @@ detect_on_yichun(){ i2c_bus=12 do_i2c_detect $i2c_bus 0x74 0x02 2 0 + reset_pca9548 $i2c_bus 0x74 i2c_bus=13 do_i2c_detect $i2c_bus 0x74 0x02 2 1 + reset_pca9548 $i2c_bus 0x74 i2c_bus=14 do_i2c_detect $i2c_bus 0x74 0x02 2 2 + reset_pca9548 $i2c_bus 0x74 } detect_on_qiandaohu(){ @@ -1330,12 +1346,14 @@ detect_on_qiandaohu(){ do_i2c_detect $i2c_bus 0x70 0x40 6 5 do_i2c_detect $i2c_bus 0x70 0x10 4 6 do_i2c_detect $i2c_bus 0x70 0x20 5 7 + reset_pca9548 $i2c_bus 0x70 i2c_bus=6 do_i2c_detect $i2c_bus 0x71 0x08 3 8 do_i2c_detect $i2c_bus 0x71 0x04 2 9 do_i2c_detect $i2c_bus 0x71 0x01 0 10 do_i2c_detect $i2c_bus 0x71 0x08 3 11 + reset_pca9548 $i2c_bus 0x71 } detect_on_5688m7(){ @@ -1353,10 +1371,13 @@ detect_on_5688m7(){ do_i2c_detect $i2c_bus 0x71 0x02 1 1 do_i2c_detect $i2c_bus 0x71 0x04 2 2 do_i2c_detect $i2c_bus 0x71 0x08 3 3 + reset_pca9548 $i2c_bus 0x71 + do_i2c_detect $i2c_bus 0x72 0x01 0 4 do_i2c_detect $i2c_bus 0x72 0x02 1 5 do_i2c_detect $i2c_bus 0x72 0x04 2 6 do_i2c_detect $i2c_bus 0x72 0x08 3 7 + reset_pca9548 $i2c_bus 0x72 } debug_user_defined_detect(){