diff --git a/README.md b/README.md index 5684a1d..962e4a7 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ pip3 install note-python ``` For use with MicroPython or CircuitPython, copy the contents of the `notecard` -directory into the `lib` directory of your device. +directory into the `lib/notecard` directory of your device. ## Usage diff --git a/examples/notecard-basics/mpy_example.py b/examples/notecard-basics/mpy_example.py index a1cee74..b355201 100644 --- a/examples/notecard-basics/mpy_example.py +++ b/examples/notecard-basics/mpy_example.py @@ -6,7 +6,6 @@ import sys import time import notecard -import board if sys.implementation.name != "micropython": raise Exception("Please run this example in a MicroPython environment.") @@ -52,11 +51,11 @@ def run_example(product_uid, use_uart=True): """Connect to Notcard and run a transaction test.""" print("Opening port...") if use_uart: - port = UART(board.UART, 9600) + port = UART(1, 115200) port.init(9600, bits=8, parity=None, stop=1, timeout=3000, timeout_char=100) else: - port = I2C(board.I2C_ID, scl=Pin(board.SCL), sda=Pin(board.SDA)) + port = I2C(1, freq=100000) print("Opening Notecard...") if use_uart: diff --git a/notecard/binary_helpers.py b/notecard/binary_helpers.py index c15fe85..47bc92a 100644 --- a/notecard/binary_helpers.py +++ b/notecard/binary_helpers.py @@ -1,8 +1,8 @@ """Helper methods for doing binary transfers to/from a Notecard.""" import sys -from .cobs import cobs_encode, cobs_decode -from .notecard import Notecard, CARD_INTRA_TRANSACTION_TIMEOUT_SEC +from notecard.cobs import cobs_encode, cobs_decode +from notecard.notecard import Notecard, CARD_INTRA_TRANSACTION_TIMEOUT_SEC BINARY_RETRIES = 2 diff --git a/notecard/card.py b/notecard/card.py index 6881e28..4edf1af 100644 --- a/notecard/card.py +++ b/notecard/card.py @@ -10,7 +10,7 @@ # This module is optional and not required for use with the Notecard. import notecard -from .validators import validate_card_object +from notecard.validators import validate_card_object @validate_card_object diff --git a/notecard/env.py b/notecard/env.py index 0a48cbb..58de6b8 100644 --- a/notecard/env.py +++ b/notecard/env.py @@ -10,7 +10,7 @@ # This module is optional and not required for use with the Notecard. import notecard -from .validators import validate_card_object +from notecard.validators import validate_card_object @validate_card_object diff --git a/notecard/file.py b/notecard/file.py index 0253150..91cb5a9 100644 --- a/notecard/file.py +++ b/notecard/file.py @@ -10,7 +10,7 @@ # This module is optional and not required for use with the Notecard. import notecard -from .validators import validate_card_object +from notecard.validators import validate_card_object @validate_card_object diff --git a/notecard/hub.py b/notecard/hub.py index 784290a..0403d24 100644 --- a/notecard/hub.py +++ b/notecard/hub.py @@ -10,7 +10,7 @@ # This module is optional and not required for use with the Notecard. import notecard -from .validators import validate_card_object +from notecard.validators import validate_card_object @validate_card_object diff --git a/notecard/note.py b/notecard/note.py index 29b60ad..2716687 100644 --- a/notecard/note.py +++ b/notecard/note.py @@ -10,7 +10,7 @@ # This module is optional and not required for use with the Notecard. import notecard -from .validators import validate_card_object +from notecard.validators import validate_card_object @validate_card_object diff --git a/notecard/notecard.py b/notecard/notecard.py index 50b2513..3ac22ac 100644 --- a/notecard/notecard.py +++ b/notecard/notecard.py @@ -34,14 +34,14 @@ import os import json import time -from .timeout import start_timeout, has_timed_out -from .transaction_manager import TransactionManager, NoOpTransactionManager -from .crc32 import crc32 +from notecard.timeout import start_timeout, has_timed_out +from notecard.transaction_manager import TransactionManager, NoOpTransactionManager +from notecard.crc32 import crc32 use_periphery = False use_serial_lock = False -if sys.implementation.name == 'cpython' and (sys.platform == 'linux' or sys.platform == 'linux2'): +if sys.implementation.name == 'cpython' and (sys.platform == 'linux' or sys.platform == 'linux2' or sys.platform == 'darwin'): use_periphery = True from periphery import I2C diff --git a/notecard/transaction_manager.py b/notecard/transaction_manager.py index bbd5351..fa78a93 100644 --- a/notecard/transaction_manager.py +++ b/notecard/transaction_manager.py @@ -3,8 +3,8 @@ import sys import time -from .timeout import start_timeout, has_timed_out -from .gpio import GPIO +from notecard.timeout import start_timeout, has_timed_out +from notecard.gpio import GPIO class TransactionManager: