Update to non-xxx file names and DMR-MARC format files

ambe_audio.py

@@ -16,7 +16,7 @@ from bitstring import BitArray
 
 import sys, socket, ConfigParser, thread, traceback
 import cPickle as pickle
-from dmrlink import IPSC, NETWORK, networks, logger, int_id, hex_str_3, get_info, talkgroup_ids, subscriber_ids
+from dmrlink import IPSC, NETWORK, networks, logger, int_id, hex_str_3, get_info, talkgroup_ids, subscriber_ids, peer_ids
 from time import time
 
 __author__ = 'Cortney T. Buffington, N0MJS'
@@ -133,7 +133,8 @@ class ambeIPSC(IPSC):
             if _payload_type == BURST_DATA_TYPE['VOICE_HEAD']:
                 if self._currentTG == self._no_tg:
                     _src_sub    = get_info(int_id(_src_sub), subscriber_ids)
-                    print('Voice Transmission Start on TS {} and TG {} ({}) from {}'.format("2" if _ts else "1", _dst_sub, _tg_id, _src_sub))
+                    _peerid     = get_info(int_id(_peerid), peer_ids)
+                    print('Voice Transmission Start on TS {} and TG {} ({}) from {} on peer {}'.format("2" if _ts else "1", _dst_sub, _tg_id, _src_sub, _peerid))
                     self._currentTG = _tg_id
                     self._transmitStartTime = time()
                 else:

dmrlink.py

@@ -286,15 +286,8 @@ subscriber_ids = {}
 peer_ids = {}
 talkgroup_ids = {}
 
-#try:
-#    with open(PATH+'subscriber_ids.csv', 'rU') as subscriber_ids_csv:
-#        subscribers = csv.reader(subscriber_ids_csv, dialect='excel', delimiter=',')
-#        for row in subscribers:
-#            subscriber_ids[int(row[1])] = (row[0])
-#except ImportError:
-#    logger.warning('subscriber_ids.csv not found: Subscriber aliases will not be available')
 try:
-    with open(PATH+'subscriber_idsxxx.csv', 'rU') as subscriber_ids_csv:
+    with open(PATH+'subscriber_ids.csv', 'rU') as subscriber_ids_csv:
         subscribers = csv.reader(subscriber_ids_csv, dialect='excel', delimiter=',')
         for row in subscribers:
             subscriber_ids[int(row[0])] = (row[1])
@@ -305,7 +298,7 @@ try:
     with open(PATH+'peer_ids.csv', 'rU') as peer_ids_csv:
         peers = csv.reader(peer_ids_csv, dialect='excel', delimiter=',')
         for row in peers:
-            peer_ids[int(row[1])] = (row[0])
+            peer_ids[int(row[0])] = (row[1])
 except ImportError:
     logger.warning('peer_ids.csv not found: Peer aliases will not be available')