From 67fc8e05999bc1221444ed14ab8262cef7a46d8f Mon Sep 17 00:00:00 2001 From: Miller Lowe Date: Wed, 23 Nov 2016 14:23:31 -0800 Subject: [PATCH 1/5] pre-vacation changes --- bin/can_logger.py | 4 ++-- can/CAN.py | 2 +- can/notifier.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/can_logger.py b/bin/can_logger.py index 479ac3db9..0e5996f79 100755 --- a/bin/can_logger.py +++ b/bin/can_logger.py @@ -70,8 +70,8 @@ bus = can.interface.Bus(results.channel, bustype=results.interface, can_filters=can_filters) print('Can Logger (Started on {})\n'.format(datetime.datetime.now())) - logger = can.Logger(results.log_file) - notifier = can.Notifier(bus, [logger], timeout=0.1) + #logger = can.Logger(results.log_file) + notifier = can.Notifier(bus, [print], timeout=0.1) try: while True: diff --git a/can/CAN.py b/can/CAN.py index 7b4ea1c89..76d7ad2d7 100644 --- a/can/CAN.py +++ b/can/CAN.py @@ -24,7 +24,7 @@ buffer = memoryview log = logging.getLogger('can') -log.debug("Loading python-can") +#log.debug("Loading python-can") def set_logging_level(level_name=None): diff --git a/can/notifier.py b/can/notifier.py index 1493c9b56..0fb486a00 100644 --- a/can/notifier.py +++ b/can/notifier.py @@ -42,4 +42,4 @@ def rx_thread(self): callback(msg) for listener in self.listeners: - listener.stop() \ No newline at end of file + listener.stop() From 90e40c5c84f18c7db4cbc1ae431daa97a8bb18f0 Mon Sep 17 00:00:00 2001 From: Miller Lowe Date: Wed, 23 Nov 2016 14:23:31 -0800 Subject: [PATCH 2/5] pre-vacation changes --- can/logger.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/can/logger.py b/can/logger.py index 7f7c6842f..4c720e878 100644 --- a/can/logger.py +++ b/can/logger.py @@ -78,7 +78,8 @@ def main(): config["bitrate"] = results.bitrate bus = can.interface.Bus(results.channel, **config) print('Can Logger (Started on {})\n'.format(datetime.datetime.now())) - logger = Logger(results.log_file) + #logger = can.Logger(results.log_file) + notifier = can.Notifier(bus, [print], timeout=0.1) try: while True: From 8031f8be320c3581e0edbde356c0affde5a602e2 Mon Sep 17 00:00:00 2001 From: Miller Lowe Date: Tue, 26 Sep 2017 12:17:36 -0700 Subject: [PATCH 3/5] Update README.rst --- README.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.rst b/README.rst index 3ab5a4a54..b58467bda 100644 --- a/README.rst +++ b/README.rst @@ -16,6 +16,10 @@ python-can :alt: CI Server += NOTE: I was using this fork of hardbyte/python-can as a base of python-j1939 but it's no longer needed. +the python-j1939 requires only the develop branch of hardbyte/python-can + + The **C**\ ontroller **A**\ rea **N**\ etwork is a bus standard designed to allow microcontrollers and devices to communicate with each other. It has priority based bus arbitration, reliable deterministic From 5eae57ba85112db2a901882f37b8174543f25a19 Mon Sep 17 00:00:00 2001 From: Miller Lowe Date: Tue, 26 Sep 2017 12:18:44 -0700 Subject: [PATCH 4/5] Update README.rst --- README.rst | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/README.rst b/README.rst index b58467bda..ec92136b3 100644 --- a/README.rst +++ b/README.rst @@ -1,22 +1,8 @@ python-can ========== -|release| |docs| |build| -.. |release| image:: https://img.shields.io/pypi/v/python-can.svg - :target: https://pypi.python.org/pypi/python-can/ - :alt: Latest Version - -.. |docs| image:: https://readthedocs.org/projects/python-can/badge/?version=stable - :target: https://python-can.readthedocs.io/en/stable/ - :alt: Documentation Status - -.. |build| image:: https://travis-ci.org/hardbyte/python-can.svg?branch=master - :target: https://travis-ci.org/hardbyte/python-can - :alt: CI Server - - -= NOTE: I was using this fork of hardbyte/python-can as a base of python-j1939 but it's no longer needed. +*NOTE*: I was using this fork of hardbyte/python-can as a base of python-j1939 but it's no longer needed. the python-j1939 requires only the develop branch of hardbyte/python-can From e33fa745e817ffba8c2deb4a15954d90267b1f39 Mon Sep 17 00:00:00 2001 From: Miller Lowe Date: Tue, 26 Sep 2017 12:19:41 -0700 Subject: [PATCH 5/5] Update README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index ec92136b3..159df5fba 100644 --- a/README.rst +++ b/README.rst @@ -3,7 +3,7 @@ python-can *NOTE*: I was using this fork of hardbyte/python-can as a base of python-j1939 but it's no longer needed. -the python-j1939 requires only the develop branch of hardbyte/python-can +the python-j1939 requires only the develop branch of hardbyte/python-can. No not use this repo for any future development, instead go to the source at hardbyte/python-can. The **C**\ ontroller **A**\ rea **N**\ etwork is a bus standard designed