diff --git a/applications/luci-app-modem/root/usr/share/modem/huawei.sh b/applications/luci-app-modem/root/usr/share/modem/huawei.sh index a43ea9f..e3d95ba 100755 --- a/applications/luci-app-modem/root/usr/share/modem/huawei.sh +++ b/applications/luci-app-modem/root/usr/share/modem/huawei.sh @@ -810,9 +810,11 @@ huawei_cell_info() nr_mnc=$(echo "$response" | awk -F',' '{print $3}') nr_arfcn=$(echo "$response" | awk -F',' '{print $4}') nr_scs_num=$(echo "$response" | awk -F',' '{print $5}') - nr_scs=$(huawei_get_scs ${nr_scs_num}) - nr_cell_id=$(echo "$response" | awk -F',' '{print $6}') - nr_physical_cell_id=$(echo "$response" | awk -F',' '{print $7}') + nr_scs=$(tdtech_get_scs ${nr_scs_num}) + nr_cell_id_hex=$(echo "$response" | awk -F',' '{print $6}') + nr_cell_id=$(echo "ibase=16; $nr_cell_id_hex" | bc) + nr_physical_cell_id_hex=$(echo "$response" | awk -F',' '{print $7}') + nr_physical_cell_id=$(echo "ibase=16; $nr_physical_cell_id_hex" | bc) nr_tac=$(echo "$response" | awk -F',' '{print $8}') nr_rsrp=$(echo "$response" | awk -F',' '{print $9}') nr_rsrq=$(echo "$response" | awk -F',' '{print $10}') @@ -824,8 +826,10 @@ huawei_cell_info() endc_lte_mcc=$(echo "$response" | awk -F',' '{print $2}') endc_lte_mnc=$(echo "$response" | awk -F',' '{print $3}') endc_lte_earfcn=$(echo "$response" | awk -F',' '{print $4}') - endc_lte_cell_id=$(echo "$response" | awk -F',' '{print $5}') - endc_lte_physical_cell_id=$(echo "$response" | awk -F',' '{print $6}') + endc_lte_cell_id_hex=$(echo "$response" | awk -F',' '{print $5}') + endc_lte_cell_id=$(echo "ibase=16; $endc_lte_cell_id_hex" | bc) + endc_lte_physical_cell_id_hex=$(echo "$response" | awk -F',' '{print $6}') + endc_lte_physical_cell_id=$(echo "ibase=16; $endc_lte_physical_cell_id_hex" | bc) endc_lte_tac=$(echo "$response" | awk -F',' '{print $7}') endc_lte_rsrp=$(echo "$response" | awk -F',' '{print $8}') endc_lte_rsrq=$(echo "$response" | awk -F',' '{print $9}') @@ -835,9 +839,11 @@ huawei_cell_info() endc_nr_mnc=$(echo "$response" | awk -F',' '{print $3}') endc_nr_arfcn=$(echo "$response" | awk -F',' '{print $4}') endc_nr_scs_num=$(echo "$response" | awk -F',' '{print $5}') - endc_nr_scs=$(huawei_get_scs ${nr_scs_num}) - endc_nr_cell_id=$(echo "$response" | awk -F',' '{print $6}') - endc_nr_physical_cell_id=$(echo "$response" | awk -F',' '{print $7}') + endc_nr_scs=$(tdtech_get_scs ${nr_scs_num}) + endc_nr_cell_id_hex=$(echo "$response" | awk -F',' '{print $6}') + endc_nr_cell_id=$(echo "ibase=16; $endc_nr_cell_id_hex" | bc) + endc_nr_physical_cell_id_hex=$(echo "$response" | awk -F',' '{print $7}') + endc_nr_physical_cell_id=$(echo "ibase=16; $endc_nr_physical_cell_id_hex" | bc) endc_nr_tac=$(echo "$response" | awk -F',' '{print $8}') endc_nr_rsrp=$(echo "$response" | awk -F',' '{print $9}') endc_nr_rsrq=$(echo "$response" | awk -F',' '{print $10}') @@ -848,8 +854,10 @@ huawei_cell_info() lte_mcc=$(echo "$response" | awk -F',' '{print $2}') lte_mnc=$(echo "$response" | awk -F',' '{print $3}') lte_earfcn=$(echo "$response" | awk -F',' '{print $4}') - lte_cell_id=$(echo "$response" | awk -F',' '{print $5}') - lte_physical_cell_id=$(echo "$response" | awk -F',' '{print $6}') + lte_cell_id_hex=$(echo "$response" | awk -F',' '{print $5}') + lte_cell_id=$(echo "ibase=16; $lte_cell_id_hex" | bc) + lte_physical_cell_id_hex=$(echo "$response" | awk -F',' '{print $6}') + lte_physical_cell_id=$(echo "ibase=16; $lte_physical_cell_id_hex" | bc) lte_tac=$(echo "$response" | awk -F',' '{print $7}') lte_rsrp=$(echo "$response" | awk -F',' '{print $8}') lte_rsrq=$(echo "$response" | awk -F',' '{print $9}') @@ -861,7 +869,8 @@ huawei_cell_info() wcdma_mnc=$(echo "$response" | awk -F',' '{print $3}') wcdma_arfcn=$(echo "$response" | awk -F',' '{print $4}') wcdma_psc=$(echo "$response" | awk -F',' '{print $5}') - wcdma_cell_id=$(echo "$response" | awk -F',' '{print $6}') + wcdma_cell_id_hex=$(echo "$response" | awk -F',' '{print $6}') + wcdma_cell_id=$(echo "ibase=16; $wcdma_cell_id_hex" | bc) wcdma_lac=$(echo "$response" | awk -F',' '{print $7}') wcdma_rscp=$(echo "$response" | awk -F',' '{print $8}') wcdma_rxlev=$(echo "$response" | awk -F',' '{print $9}') @@ -874,10 +883,11 @@ huawei_cell_info() gsm_mcc=$(echo "$response" | awk -F',' '{print $2}') gsm_mnc=$(echo "$response" | awk -F',' '{print $3}') gsm_band_num=$(echo "$response" | awk -F',' '{print $4}') - gsm_band=$(huawei_get_band "GSM" ${gsm_band_num}) + gsm_band=$(tdtech_get_band "GSM" ${gsm_band_num}) gsm_arfcn=$(echo "$response" | awk -F',' '{print $5}') gsm_bsic=$(echo "$response" | awk -F',' '{print $6}') - gsm_cell_id=$(echo "$response" | awk -F',' '{print $7}') + gsm_cell_id_hex=$(echo "$response" | awk -F',' '{print $7}') + gsm_cell_id=$(echo "ibase=16; $gsm_cell_id_hex" | bc) gsm_lac=$(echo "$response" | awk -F',' '{print $8}') gsm_rxlev=$(echo "$response" | awk -F',' '{print $9}') gsm_rx_quality=$(echo "$response" | awk -F',' '{print $10}') diff --git a/applications/luci-app-modem/root/usr/share/modem/tdtech.sh b/applications/luci-app-modem/root/usr/share/modem/tdtech.sh index f078bdb..a7caee8 100755 --- a/applications/luci-app-modem/root/usr/share/modem/tdtech.sh +++ b/applications/luci-app-modem/root/usr/share/modem/tdtech.sh @@ -804,8 +804,10 @@ tdtech_cell_info() nr_arfcn=$(echo "$response" | awk -F',' '{print $4}') nr_scs_num=$(echo "$response" | awk -F',' '{print $5}') nr_scs=$(tdtech_get_scs ${nr_scs_num}) - nr_cell_id=$(echo "$response" | awk -F',' '{print $6}') - nr_physical_cell_id=$(echo "$response" | awk -F',' '{print $7}') + nr_cell_id_hex=$(echo "$response" | awk -F',' '{print $6}') + nr_cell_id=$(echo "ibase=16; $nr_cell_id_hex" | bc) + nr_physical_cell_id_hex=$(echo "$response" | awk -F',' '{print $7}') + nr_physical_cell_id=$(echo "ibase=16; $nr_physical_cell_id_hex" | bc) nr_tac=$(echo "$response" | awk -F',' '{print $8}') nr_rsrp=$(echo "$response" | awk -F',' '{print $9}') nr_rsrq=$(echo "$response" | awk -F',' '{print $10}') @@ -817,8 +819,10 @@ tdtech_cell_info() endc_lte_mcc=$(echo "$response" | awk -F',' '{print $2}') endc_lte_mnc=$(echo "$response" | awk -F',' '{print $3}') endc_lte_earfcn=$(echo "$response" | awk -F',' '{print $4}') - endc_lte_cell_id=$(echo "$response" | awk -F',' '{print $5}') - endc_lte_physical_cell_id=$(echo "$response" | awk -F',' '{print $6}') + endc_lte_cell_id_hex=$(echo "$response" | awk -F',' '{print $5}') + endc_lte_cell_id=$(echo "ibase=16; $endc_lte_cell_id_hex" | bc) + endc_lte_physical_cell_id_hex=$(echo "$response" | awk -F',' '{print $6}') + endc_lte_physical_cell_id=$(echo "ibase=16; $endc_lte_physical_cell_id_hex" | bc) endc_lte_tac=$(echo "$response" | awk -F',' '{print $7}') endc_lte_rsrp=$(echo "$response" | awk -F',' '{print $8}') endc_lte_rsrq=$(echo "$response" | awk -F',' '{print $9}') @@ -829,8 +833,10 @@ tdtech_cell_info() endc_nr_arfcn=$(echo "$response" | awk -F',' '{print $4}') endc_nr_scs_num=$(echo "$response" | awk -F',' '{print $5}') endc_nr_scs=$(tdtech_get_scs ${nr_scs_num}) - endc_nr_cell_id=$(echo "$response" | awk -F',' '{print $6}') - endc_nr_physical_cell_id=$(echo "$response" | awk -F',' '{print $7}') + endc_nr_cell_id_hex=$(echo "$response" | awk -F',' '{print $6}') + endc_nr_cell_id=$(echo "ibase=16; $endc_nr_cell_id_hex" | bc) + endc_nr_physical_cell_id_hex=$(echo "$response" | awk -F',' '{print $7}') + endc_nr_physical_cell_id=$(echo "ibase=16; $endc_nr_physical_cell_id_hex" | bc) endc_nr_tac=$(echo "$response" | awk -F',' '{print $8}') endc_nr_rsrp=$(echo "$response" | awk -F',' '{print $9}') endc_nr_rsrq=$(echo "$response" | awk -F',' '{print $10}') @@ -841,8 +847,10 @@ tdtech_cell_info() lte_mcc=$(echo "$response" | awk -F',' '{print $2}') lte_mnc=$(echo "$response" | awk -F',' '{print $3}') lte_earfcn=$(echo "$response" | awk -F',' '{print $4}') - lte_cell_id=$(echo "$response" | awk -F',' '{print $5}') - lte_physical_cell_id=$(echo "$response" | awk -F',' '{print $6}') + lte_cell_id_hex=$(echo "$response" | awk -F',' '{print $5}') + lte_cell_id=$(echo "ibase=16; $lte_cell_id_hex" | bc) + lte_physical_cell_id_hex=$(echo "$response" | awk -F',' '{print $6}') + lte_physical_cell_id=$(echo "ibase=16; $lte_physical_cell_id_hex" | bc) lte_tac=$(echo "$response" | awk -F',' '{print $7}') lte_rsrp=$(echo "$response" | awk -F',' '{print $8}') lte_rsrq=$(echo "$response" | awk -F',' '{print $9}') @@ -854,7 +862,8 @@ tdtech_cell_info() wcdma_mnc=$(echo "$response" | awk -F',' '{print $3}') wcdma_arfcn=$(echo "$response" | awk -F',' '{print $4}') wcdma_psc=$(echo "$response" | awk -F',' '{print $5}') - wcdma_cell_id=$(echo "$response" | awk -F',' '{print $6}') + wcdma_cell_id_hex=$(echo "$response" | awk -F',' '{print $6}') + wcdma_cell_id=$(echo "ibase=16; $wcdma_cell_id_hex" | bc) wcdma_lac=$(echo "$response" | awk -F',' '{print $7}') wcdma_rscp=$(echo "$response" | awk -F',' '{print $8}') wcdma_rxlev=$(echo "$response" | awk -F',' '{print $9}') @@ -870,7 +879,8 @@ tdtech_cell_info() gsm_band=$(tdtech_get_band "GSM" ${gsm_band_num}) gsm_arfcn=$(echo "$response" | awk -F',' '{print $5}') gsm_bsic=$(echo "$response" | awk -F',' '{print $6}') - gsm_cell_id=$(echo "$response" | awk -F',' '{print $7}') + gsm_cell_id_hex=$(echo "$response" | awk -F',' '{print $7}') + gsm_cell_id=$(echo "ibase=16; $gsm_cell_id_hex" | bc) gsm_lac=$(echo "$response" | awk -F',' '{print $8}') gsm_rxlev=$(echo "$response" | awk -F',' '{print $9}') gsm_rx_quality=$(echo "$response" | awk -F',' '{print $10}')