diff --git a/src/apex/cli.py b/src/apex/cli.py index ee5019292ed3ebc4a2c5f3a2b9fb74affc2b58b6..bfbafe0e24acda9376d1a6374d4ad7e391203263 100644 --- a/src/apex/cli.py +++ b/src/apex/cli.py @@ -119,11 +119,11 @@ def main(verbose, configfile): return kiss_init_string = config.get(section, 'kiss_init') if kiss_init_string == 'MODE_INIT_W8DED': - kiss_tnc.start(kissConstants.MODE_INIT_W8DED) + kiss_tnc.connect(kissConstants.MODE_INIT_W8DED) elif kiss_init_string == 'MODE_INIT_KENWOOD_D710': - kiss_tnc.start(kissConstants.MODE_INIT_KENWOOD_D710) + kiss_tnc.connect(kissConstants.MODE_INIT_KENWOOD_D710) elif kiss_init_string == 'NONE': - kiss_tnc.start() + kiss_tnc.connect() else: click.echo(click.style('Error: ', fg='red', bold=True, blink=True) + click.style('Invalid configuration, value assigned to kiss_init was not recognized: %s' @@ -165,7 +165,7 @@ def main(verbose, configfile): click.echo('Plugin found at the following location: %s' % repr(plugin_loader)) loaded_plugin = load_plugin(plugin_loader) plugin_modules.append(loaded_plugin) - new_thread = threading.Thread(target=loaded_plugin.start, args=(config, port_map, packet_cache, aprsis)) + new_thread = threading.Thread(target=loaded_plugin.connect, args=(config, port_map, packet_cache, aprsis)) new_thread.start() plugin_threads.append(new_thread) except IOError: diff --git a/src/apex/kiss/kiss.py b/src/apex/kiss/kiss.py index f4a1d729abe7f29701b845a164189236d9cb6048..ab0b52c2be0d4484f033041daf750657b5b834b1 100644 --- a/src/apex/kiss/kiss.py +++ b/src/apex/kiss/kiss.py @@ -106,7 +106,7 @@ class Kiss(with_metaclass(ABCMeta, object)): def _write_interface(self, data): pass - def start(self, mode_init=None, **kwargs): + def connect(self, mode_init=None, **kwargs): """ Initializes the KISS device and commits configuration. diff --git a/src/apex/kiss/kiss_serial.py b/src/apex/kiss/kiss_serial.py index de4894a07ee4a86a58cb33ff525369ee63e0e8a3..bb3530ae66748578e87cb1ddeb83fe55b390006c 100644 --- a/src/apex/kiss/kiss_serial.py +++ b/src/apex/kiss/kiss_serial.py @@ -75,7 +75,7 @@ class KissSerial(Kiss): def _write_interface(self, data): self.serial.write(data) - def start(self, mode_init=None, **kwargs): + def connect(self, mode_init=None, **kwargs): """ Initializes the KISS device and commits configuration. diff --git a/src/apex/kiss/kiss_tcp.py b/src/apex/kiss/kiss_tcp.py index 3c47346cb32ec16100e56683c20dac0623ec0c0b..160c25b25fb024356f8b757ef82c4988e4b5f567 100644 --- a/src/apex/kiss/kiss_tcp.py +++ b/src/apex/kiss/kiss_tcp.py @@ -20,6 +20,7 @@ __email__ = 'jeffrey.freeman@syncleus.com' __license__ = 'Apache License, Version 2.0' __copyright__ = 'Copyright 2016, Syncleus, Inc. and contributors' __credits__ = [] +__version__ = '0.0.2' class KissTcp(Kiss): @@ -61,7 +62,7 @@ class KissTcp(Kiss): def _write_interface(self, data): self.socket.write(data) - def start(self, mode_init=None, **kwargs): + def connect(self, mode_init=None, **kwargs): """ Initializes the KISS device and commits configuration.