# HG changeset patch # User Christopher Hoover ch@murgatroid.com # Date 1511121137 28800 # Sun Nov 19 11:52:17 2017 -0800 # Node ID a946dd7a9512969a1ecaf46e0a940294e2c003c4 # Parent fd6871c5064f6d1f80d33e12e05cc671a05652ce Fixes CSV header, which was missing a column. #5353

diff -r fd6871c5064f -r a946dd7a9512 chirp/chirp_common.py --- a/chirp/chirp_common.py Sun Nov 05 21:16:23 2017 -0500 +++ b/chirp/chirp_common.py Sun Nov 19 11:52:17 2017 -0800 @@ -321,7 +321,7 @@ "rToneFreq", "cToneFreq", "DtcsCode", "DtcsPolarity", "Mode", "TStep", "Skip", "Comment", - "URCALL", "RPT1CALL", "RPT2CALL"] + "URCALL", "RPT1CALL", "RPT2CALL", "DVCODE"]

def __setattr__(self, name, val): if not hasattr(self, name): diff -r fd6871c5064f -r a946dd7a9512 csvdump/csvapp.py --- a/csvdump/csvapp.py Sun Nov 05 21:16:23 2017 -0500 +++ b/csvdump/csvapp.py Sun Nov 19 11:52:17 2017 -0800 @@ -119,7 +119,9 @@

print >>f, chirp.chirp_common.Memory.CSV_FORMAT for m in self.radio.get_memories(): - print >>f, m.to_csv() + csv = m.to_csv() + assert len(csv) == len(chirp.chirp_common.Memory.CSV_FORMAT) + print >>f, csv count += 1 f.close()

@@ -145,7 +147,9 @@

try: m = self.radio.get_memory(i) - print >>f, m.to_csv() + csv = m.to_csv() + assert len(csv) == len(chirp.chirp_common.Memory.CSV_FORMAT) + print >>f, csv except chirp.errors.InvalidMemoryLocation: pass