commit 3da60ab5d76888dd0b3d06a48631df74944a071f
author Piotr Krysik <ptrkrysik@gmail.com> Sat Aug 26 11:55:12 2017 +0200
committer Piotr Krysik <ptrkrysik@gmail.com> Sat Aug 26 11:55:12 2017 +0200
tree 901c58936cd823722c1758166f3e37893e3210d0
parent aed9f5cc80e2c123eb0294dff21e853c1ffa376b
parent 3138f90f6ed048c6ecbcb7bfc2edcf426643de00

Merge branch 'petterreinholdtsen-scanner-str-repr' into packaging

apps/grgsm_scanner

diff --git a/apps/grgsm_scanner b/apps/grgsm_scanner
index 6f708b7..cb56bb3 100755
--- a/apps/grgsm_scanner
+++ b/apps/grgsm_scanner
@@ -288,7 +288,13 @@
             return self.getKey().__cmp__(other.getKey())
 
     def __repr__(self):
-        return "ARFCN: %4d, Freq: %6.1fM, CID: %5u, LAC: %5u, MCC: %3u, MNC: %3u, Pwr: %3i" % (
+        return "%s(%s, %s, %s, %s, %s, %s, %s, %s, %s)" % (
+            self.__class__, self.arfcn, self.freq, self.cid, self.lac,
+            self.mcc, self.mnc, self.ccch_conf, self.power,
+            self.neighbours, self.cell_arfcns)
+
+    def __str__(self):
+        return "ARFCN: %4u, Freq: %6.1fM, CID: %5u, LAC: %5u, MCC: %3u, MNC: %3u, Pwr: %3i" % (
             self.arfcn, self.freq / 1e6, self.cid, self.lac, self.mcc, self.mnc, self.power)
 
 def do_scan(samp_rate, band, speed, ppm, gain, args, prn = None):