From d5fb87cef51b261208fe92ab29f9bc203edf3a86 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Mon, 26 Sep 2016 06:09:17 -0400
Subject: [PATCH] Renamed start method to connect.
---
src/apex/cli.py | 8 ++++----
src/apex/kiss/kiss.py | 2 +-
src/apex/kiss/kiss_serial.py | 2 +-
src/apex/kiss/kiss_tcp.py | 3 ++-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/apex/cli.py b/src/apex/cli.py
index ee50192..bfbafe0 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 f4a1d72..ab0b52c 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 de4894a..bb3530a 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 3c47346..160c25b 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.
--
GitLab