diff --git a/tnc/config.py b/tnc/config.py index 02f0f4f1..e3851d2f 100644 --- a/tnc/config.py +++ b/tnc/config.py @@ -39,15 +39,13 @@ class CONFIG: """ write entire config """ - #self.config['DEFAULT'] = {'':''} - self.config['NETWORK'] = {'#Network settings': None, - 'TNCPORT': 0 + 'TNCPORT': data[50] } self.config['STATION'] = {'#Station settings': None, - 'mycall' : data[1], - 'mygrid' : data[2] + 'mycall': data[1], + 'mygrid': data[2] } self.config['AUDIO'] = {'#Audio settings': None, diff --git a/tnc/daemon.py b/tnc/daemon.py index 614dbbba..732dad88 100755 --- a/tnc/daemon.py +++ b/tnc/daemon.py @@ -128,6 +128,9 @@ class DAEMON: while True: try: data = self.daemon_queue.get() + # increase length of list for storing additional + # parameters starting at entry 64 + data = data[:64] + [None] * (64 - len(data)) # data[1] mycall # data[2] mygrid @@ -163,6 +166,8 @@ class DAEMON: options.append("--port") options.append(str(static.DAEMONPORT - 1)) + # create an additional list entry for parameters not covered by gui + data[50] = int(static.DAEMONPORT - 1) options.append("--mycall") options.append(data[1]) diff --git a/tnc/main.py b/tnc/main.py index 9eac1dea..621ee10b 100755 --- a/tnc/main.py +++ b/tnc/main.py @@ -264,7 +264,7 @@ if __name__ == "__main__": static.MYGRID = bytes(config['STATION']['mygrid'], "utf-8") static.AUDIO_INPUT_DEVICE = int(config['AUDIO']['rx']) static.AUDIO_OUTPUT_DEVICE = int(config['AUDIO']['tx']) - static.PORT = 0 #### + static.PORT = int(config['NETWORK']['tncport']) static.HAMLIB_DEVICE_NAME = config['RADIO']['devicename'] static.HAMLIB_DEVICE_PORT = config['RADIO']['deviceport'] static.HAMLIB_PTT_TYPE = config['RADIO']['pttprotocol']