* [PATCH] Better display serving cell info
@ 2021-05-08 23:12 Smitty
0 siblings, 0 replies; only message in thread
From: Smitty @ 2021-05-08 23:12 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 6282 bytes --]
Fixes some missing space in the output:
[ Mobile Country Code = 722 ]
Instead of:
[ Mobile Country Code = 722]
This also unifies the display logic between {get,test}-serving-cell-info
---
test/get-serving-cell-info | 48 ++++++++++++++++++++-----------
test/test-serving-cell-info | 56 +++++++++++++++++++++++++++++++------
2 files changed, 80 insertions(+), 24 deletions(-)
diff --git a/test/get-serving-cell-info b/test/get-serving-cell-info
index 7a5d8981..b9609bdf 100755
--- a/test/get-serving-cell-info
+++ b/test/get-serving-cell-info
@@ -38,51 +38,67 @@ cqi = 'ChannelQualityIndicator'
print("Current serving cell information:")
if tech in servingcell:
- print(" [ Radio Access Technology = %s]" % (servingcell[tech]))
+ print(" [ Radio Access Technology = %s ]" \
+ % (servingcell[tech]))
if mcc in servingcell:
- print(" [ Mobile Country Code = %s]" % (servingcell[mcc]))
+ print(" [ Mobile Country Code = %s ]" \
+ % (servingcell[mcc]))
if mnc in servingcell:
- print(" [ Mobile Network Code = %s]" % (servingcell[mnc]))
+ print(" [ Mobile Network Code = %s ]" \
+ % (servingcell[mnc]))
if lac in servingcell:
- print(" [ Location Area Code = %d]" % (servingcell[lac]))
+ print(" [ Location Area Code = %d ]" \
+ % (servingcell[lac]))
if cid in servingcell:
- print(" [ Cell Identity = %d]" % (servingcell[cid]))
+ print(" [ Cell Identity = %d ]" \
+ % (servingcell[cid]))
if psc in servingcell:
- print(" [ Primary Scrambling Code = %d]" % (servingcell[psc]))
+ print(" [ Primary Scrambling Code = %d ]" \
+ % (servingcell[psc]))
if rssi in servingcell:
- print(" [ Signal Strength = %d]" % (servingcell[rssi]))
+ print(" [ Signal Strength = %d ]" \
+ % (servingcell[rssi]))
if rxlev in servingcell:
- print(" [ Received Signal Strength = %d]" % (servingcell[rxlev]))
+ print(" [ Received Signal Strength = %d ]" \
+ % (servingcell[rxlev]))
if ber in servingcell:
- print(" [ Bit Error Rate = %d]" % (servingcell[ber]))
+ print(" [ Bit Error Rate = %d ]" \
+ % (servingcell[ber]))
if rscp in servingcell:
- print(" [ Received Signal Code Power = %d]" % (servingcell[rscp]))
+ print(" [ Received Signal Code Power = %d ]" \
+ % (servingcell[rscp]))
if ecn0 in servingcell:
- print(" [ Received Energy Ratio = %d]" % (servingcell[ecn0]))
+ print(" [ Received Energy Ratio = %d ]" \
+ % (servingcell[ecn0]))
if rsrq in servingcell:
- print(" [ Reference Signal Received Quality = %d]" % (servingcell[rsrq]))
+ print(" [ Reference Signal Received Quality = %d ]" \
+ % (servingcell[rsrq]))
if rsrp in servingcell:
- print(" [ Reference Signal Received Power = %d]" % (servingcell[rsrp]))
+ print(" [ Reference Signal Received Power = %d ]" \
+ % (servingcell[rsrp]))
if earfcn in servingcell:
- print(" [ E-UTRA Absolue Radio Frequency Channel = %d ]" % (servingcell[earfcn]))
+ print(" [ E-UTRA Absolue Radio Frequency Channel = %d ]" \
+ % (servingcell[earfcn]))
if eband in servingcell:
- print(" [ E-UTRA operating Band = %d ]" % (servingcell[eband]))
+ print(" [ E-UTRA operating Band = %d ]" \
+ % (servingcell[eband]))
if cqi in servingcell:
- print(" [ Channel Quality Indicator = %d ]" % (servingcell[cqi]))
+ print(" [ Channel Quality Indicator = %d ]" \
+ % (servingcell[cqi]))
print('')
diff --git a/test/test-serving-cell-info b/test/test-serving-cell-info
index 498ce88b..df4a9b52 100755
--- a/test/test-serving-cell-info
+++ b/test/test-serving-cell-info
@@ -30,39 +30,79 @@ class NetworkMonitorAgent(dbus.service.Object):
psc = 'PrimaryScramblingCode'
rssi = 'Strength'
ber = 'BitErrorRate'
+ rxlev = 'ReceivedSignalStrength'
+ rscp = 'ReceivedSignalCodePower'
+ ecn0 = 'ReceivedEnergyRatio'
+ rsrq = 'ReferenceSignalReceivedQuality'
+ rsrp = 'ReferenceSignalReceivedPower'
+ earfcn = 'EARFCN'
+ eband = 'EBand'
+ cqi = 'ChannelQualityIndicator'
if tech in servingcell:
- print(" [ Radio Access Technology = %s]" \
+ print(" [ Radio Access Technology = %s ]" \
% (servingcell[tech]))
if mcc in servingcell:
- print(" [ Mobile Country Code = %s]" \
+ print(" [ Mobile Country Code = %s ]" \
% (servingcell[mcc]))
if mnc in servingcell:
- print(" [ Mobile Network Code = %s]" \
+ print(" [ Mobile Network Code = %s ]" \
% (servingcell[mnc]))
if lac in servingcell:
- print(" [ Location Area Code = %d]" \
+ print(" [ Location Area Code = %d ]" \
% (servingcell[lac]))
if cid in servingcell:
- print(" [ Cell Identity = %d]" \
+ print(" [ Cell Identity = %d ]" \
% (servingcell[cid]))
if psc in servingcell:
- print(" [ Primary Scrambling Code = %d]" \
+ print(" [ Primary Scrambling Code = %d ]" \
% (servingcell[psc]))
if rssi in servingcell:
- print(" [ Signal Strength = %d]" \
+ print(" [ Signal Strength = %d ]" \
% (servingcell[rssi]))
+ if rxlev in servingcell:
+ print(" [ Received Signal Strength = %d ]" \
+ % (servingcell[rxlev]))
+
if ber in servingcell:
- print(" [ Bit Error Rate = %d]" \
+ print(" [ Bit Error Rate = %d ]" \
% (servingcell[ber]))
+ if rscp in servingcell:
+ print(" [ Received Signal Code Power = %d ]" \
+ % (servingcell[rscp]))
+
+ if ecn0 in servingcell:
+ print(" [ Received Energy Ratio = %d ]" \
+ % (servingcell[ecn0]))
+
+ if rsrq in servingcell:
+ print(" [ Reference Signal Received Quality = %d ]" \
+ % (servingcell[rsrq]))
+
+ if rsrp in servingcell:
+ print(" [ Reference Signal Received Power = %d ]" \
+ % (servingcell[rsrp]))
+
+ if earfcn in servingcell:
+ print(" [ E-UTRA Absolue Radio Frequency Channel = %d ]" \
+ % (servingcell[earfcn]))
+
+ if eband in servingcell:
+ print(" [ E-UTRA operating Band = %d ]" \
+ % (servingcell[eband]))
+
+ if cqi in servingcell:
+ print(" [ Channel Quality Indicator = %d ]" \
+ % (servingcell[cqi]))
+
print('')
if __name__ == '__main__':
--
2.27.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-05-08 23:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-08 23:12 [PATCH] Better display serving cell info Smitty
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.