From 7393c6bfb437b2a6c2c455c2edd6a6f3bd0c284f Mon Sep 17 00:00:00 2001 From: leimingsheng Date: Fri, 21 Feb 2025 09:33:20 +0800 Subject: [PATCH] code sync --- tool/plugin/i2c_m7.sh | 12 +++++++++--- tool/plugin/nicsensor.sh | 19 ++++++++++++++++--- tool/plugin/platform_5280m7.sh | 2 +- tool/plugin/plugin_tmp112.sh | 27 +++++++++++++++++++++++++-- 4 files changed, 51 insertions(+), 9 deletions(-) diff --git a/tool/plugin/i2c_m7.sh b/tool/plugin/i2c_m7.sh index e12abbd..1896119 100644 --- a/tool/plugin/i2c_m7.sh +++ b/tool/plugin/i2c_m7.sh @@ -6,8 +6,14 @@ slave=$3 data=$4 rc=$5 +path=`pwd` +fmt_print="${path}/format_print.sh" + if [ $rc -eq 0 ];then - i2ctransfer - y $i2c_bus w$wc@$slave $data + cmd="i2ctransfer -y $i2c_bus w$wc@$slave $data" else - i2ctransfer - y $i2c_bus w$wc@$slave $data r$5 -fi \ No newline at end of file + cmd="i2ctransfer -y $i2c_bus w$wc@$slave $data r$5" +fi + +$fmt_print "log" "Info" "[M7 i2c Command]: $cmd" +$cmd \ No newline at end of file diff --git a/tool/plugin/nicsensor.sh b/tool/plugin/nicsensor.sh index 995a1e0..1cc05f1 100644 --- a/tool/plugin/nicsensor.sh +++ b/tool/plugin/nicsensor.sh @@ -6,6 +6,7 @@ server_platform="m7" slot_name=$1 sensor_type=$2 chip_slave=$3 +param_num=$# nic_type="" slot_id="" @@ -16,8 +17,18 @@ sensor_script="${path}/plugin_${sensor_type}.sh" i2c_script="${path}/i2c_${server_platform}.sh" fmt_print="${path}/format_print.sh" +print_helper(){ + echo "Usage : ./nicsensor.sh [slot] [sensor] [i2c slave]" + echo "For Detect: ./nicsensor.sh detect [ocp/pcie]" +} + conf_pre_check(){ + if [ $param_num -lt 1 ];then + print_helper + exit 0 + fi + # init debug log if [ -e "/tmp/nicsensor_debug.log" ];then rm /tmp/nicsensor_debug.log @@ -29,12 +40,12 @@ conf_pre_check(){ fi if [ ! -e $server_script ];then - $fmt_print "console" "Error" "$server_script not exist!" + $fmt_print "console" "Error" "Server Script $server_script not exist! Maybe unsupport for now!" exit 1 fi if [ ! -e $sensor_script ];then - $fmt_print "console" "Error" "$sensor_script not exist!" + $fmt_print "console" "Error" "Sensor Script $sensor_script not exist! Maybe unsupport for now!" exit 1 fi @@ -74,6 +85,8 @@ connect_i2c(){ start_sensor_reading(){ $fmt_print "log" "Info" "start sensor reading" + + $sensor_script "read" "${i2c_bus}" "${chip_slave}" "${server_platform}" } # --------------------------------------------------------- # Start Execute Script @@ -82,7 +95,7 @@ conf_pre_check parse_slot_name -connect_i2c +i2c_bus=`connect_i2c` start_sensor_reading diff --git a/tool/plugin/platform_5280m7.sh b/tool/plugin/platform_5280m7.sh index 0119c90..6134c62 100644 --- a/tool/plugin/platform_5280m7.sh +++ b/tool/plugin/platform_5280m7.sh @@ -81,7 +81,7 @@ get_pca9641_control(){ select_pca9548_channel(){ $fmt_print "log" "Info" "[platform_5280m7] Start Switch PCA9548" - # $i2c_script "$i2c_bus" 1 "$pca9548_slave" "$pca9548_channel" 0 + $i2c_script "$i2c_bus" 1 "$pca9548_slave" "$pca9548_channel" 0 } build_i2c_connect(){ diff --git a/tool/plugin/plugin_tmp112.sh b/tool/plugin/plugin_tmp112.sh index 290e4a5..b82e03a 100644 --- a/tool/plugin/plugin_tmp112.sh +++ b/tool/plugin/plugin_tmp112.sh @@ -1,5 +1,16 @@ #!/bin/sh +mode=$1 +i2c_bus=$2 +chip_slave=$3 +server_platform=$4 + +path=`pwd` +fmt_print="${path}/format_print.sh" +i2c_script="${path}/i2c_${server_platform}.sh" + +sensor_name="TMP112" + # @Param1 tmp112 data high 8bit # @Param2 tmp112 data low 8bit # @Param3 customization sensor name @@ -34,5 +45,17 @@ convert_tmp112_data(){ echo "$3 : $temp" } -# E.G. ./plugin_tmp112.sh 0x08 0x40 temp -convert_tmp112_data $1 $2 $3 \ No newline at end of file +read_tmp112_data(){ + res=`$i2c_script $i2c_bus "1" "$chip_slave" "0x00" "2"` + convert_tmp112_data $res "$sensor_name" +} + + +case "${mode}" in + "read") + read_tmp112_data + ;; + *) + $fmt_print "console" "Error" "[plugin_tmp112]Unexpected Input Param : $mode" + ;; +esac