qmodem:enhance modem info entries to include extra information where applicable

Author: FUjr

application/qmodem/files/usr/share/qmodem/generic.sh

@@ -23,6 +23,9 @@ add_plain_info_entry()
         json_add_string "class" "$class"
         json_add_string "class_origin" "$class"
     fi
+    if [ -n "$extra_info" ]; then
+        json_add_string "extra_info" "$extra_info"
+    fi
     json_close_object
 }
 
@@ -45,6 +48,9 @@ add_warning_message_entry()
     json_add_string "type" "warning_message"
     json_add_string "class" "warning"
     json_add_string "class_origin" "warning"
+    if [ -n "$extra_info" ]; then
+        json_add_string "extra_info" "$extra_info"
+    fi
     json_close_object
 }
 
@@ -75,6 +81,9 @@ add_bar_info_entry()
         json_add_string "class" "$class"
         json_add_string "class_origin" "$class"
     fi
+    if [ -n "$extra_info" ]; then
+        json_add_string "extra_info" "$extra_info"
+    fi
     json_close_object
 }
 

application/qmodem/files/usr/share/qmodem/vendor/huawei.sh

@@ -391,22 +391,26 @@ cell_info()
             add_plain_info_entry "LTE_BAND" "$LTE_INFO_BAND" "LTE Band"
             add_plain_info_entry "LTE_DL" "$LTE_INFO_DL" "LTE DL"
             add_plain_info_entry "LTE_UL" "$LTE_INFO_UL" "LTE UL"
+            extra_info="LTE"
             add_bar_info_entry "RSRP" "$lte_rsrp" "Reference Signal Received Power" -140 -44 dBm
             add_bar_info_entry "RSRQ" "$lte_rsrq" "Reference Signal Received Quality" -44 3 dBm
             add_bar_info_entry "SINR" "$nr_sinr" "Signal to Interference plus Noise Ratio Bandwidth" -120 25 dBm
             add_bar_info_entry "RxLev" "$lte_rxlev" "Received Signal Level" -120 -25 dBm
+            unset extra_info
             #NR
             add_plain_info_entry "${nr_mode}_INFO" "$nr_mode" "$nr_mode Information"
             add_plain_info_entry "${nr_mode}_BAND" "$NR_INFO_BAND" "NR Band"
             add_plain_info_entry "${nr_mode}_DL" "$NR_INFO_DL" "$nr_mode DL"
             add_plain_info_entry "${nr_mode}_UL" "$NR_INFO_UL" "$nr_mode UL"
+            extra_info="$nr_mode"
             add_bar_info_entry "RSRP" "$nr_rsrp" "Reference Signal Received Power" -156 -31 dBm
             add_bar_info_entry "RSRQ" "$nr_rsrq" "Reference Signal Received Quality" -43 20 dBm
             add_bar_info_entry "SINR" "$nr_sinr" "Signal to Interference plus Noise Ratio Bandwidth" -23 40 dBm
             #NR-NSA
             add_bar_info_entry "RSRP" "$second_nr_rsrp" "Reference Signal Received Power" -156 -31 dBm
             add_bar_info_entry "RSRQ" "$second_nr_rsrq" "Reference Signal Received Quality" -43 20 dBm
             add_bar_info_entry "SINR" "$second_nr_sinr" "Signal to Interference plus Noise Ratio Bandwidth" -23 40 dBm
+            unset extra_info
             ;;
         *)
             at_command="AT^MONSC"

luci/luci-app-qmodem/htdocs/luci-static/resources/view/status/include/11_modem.js

@@ -41,11 +41,12 @@ return baseclass.extend({
 
 				for (var entry of info) {
 					var full_name = entry.full_name;
+					var extra_info = entry.extra_info;
 					if (entry.value == null) {
 						continue
 					}
 					if ((entry.class == 'Base Information') ||(entry.class == '"SIM Information"')  || (entry.class == 'Cell Information' && entry.type == 'progress_bar')) {
-					fields.push(_(full_name));
+					fields.push(extra_info ? '%s (%s)'.format(_(full_name), extra_info) : _(full_name));
 					fields.push(entry);
 					}
 				}

luci/luci-app-qmodem/luasrc/view/qmodem/modem_info.htm

@@ -99,11 +99,12 @@
             var type = data.type;
             switch(type){
                 case "plain_text":
-                    var key,value,full_name;
+                    var key,value,full_name,extra_info;
                     key = data.key;
                     value = data.value;
                     full_name = data.full_name ? data.full_name : key;
-                    this.rows[index].left.innerHTML = full_name;
+                    extra_info = data.extra_info;
+                    this.rows[index].left.innerHTML = extra_info ? `${full_name} (${extra_info})` : full_name;
                     this.rows[index].right.innerHTML = value;
 
                     if (value == null || value == "") {
@@ -114,14 +115,15 @@
                     }
                     break;
                 case "progress_bar":
-                    var key,title,min,max,precentage,full_name;
+                    var key,title,min,max,precentage,full_name,extra_info;
                     key = data.key;
                     full_name = data.full_name ? data.full_name : key;
+                    extra_info = data.extra_info;
                     title = `(${data.value}/${data.max_value}${data.unit})`
                     min = data.min_value;
                     max = data.max_value;
                     precentage = (data.value - min) / (max - min) * 100;
-                    this.rows[index].left.innerHTML = full_name;
+                    this.rows[index].left.innerHTML = extra_info ? `${full_name} (${extra_info})` : full_name;
                     var progress_bar = document.createElement('div')
                     progress_bar.className = progressbar_className;
                     progress_bar.title = title;
@@ -355,7 +357,7 @@
 
         var warning_message = [];
         for (let entry of data){
-            let class_name,full_name,value,type;
+            let class_name,full_name,value,type,extra_info;
             class_name = entry.class;
             if (entry.type == "warning_message") {
                 warning_message.push(entry);
@@ -385,9 +387,10 @@
             for (let i = 0; i < warning_message.length; i++) {
                 let entry = warning_message[i];
                 let full_name = entry.full_name ? entry.full_name : entry.key;
+                let extra_info = entry.extra_info;
 
                 let node = document.createElement('p');
-                node.innerHTML = full_name + entry.value;
+                node.innerHTML = extra_info ? `${full_name} (${extra_info}) ${entry.value}` : full_name + entry.value;
                 this.warning_message(node);
             }
         }