From 414e08a911678db1d33dc4114f660e0e44021007 Mon Sep 17 00:00:00 2001 From: Thomas Preston Date: Thu, 22 Jan 2015 10:35:53 +0000 Subject: [PATCH] updated docs ready for pushing to github --- README.md | 4 +++- docs/pifacerelayplus.rst | 10 +++++----- pifacerelayplus/core.py | 11 ++++------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 5a72878..8834997 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,16 @@ pifacerelayplus =============== The PiFace Relay Plus module. + Documentation ============= -[http://pifacedigitalio.readthedocs.org/](http://pifacedigitalio.readthedocs.org/) +[http://pifacerelayplus.readthedocs.org/](http://pifacerelayplus.readthedocs.org/) You can also find the documentation and some examples installed at: /usr/share/doc/python3-pifacerelayplus/ + Install ======= Aptitude diff --git a/docs/pifacerelayplus.rst b/docs/pifacerelayplus.rst index 6f094e8..78dc3f5 100644 --- a/docs/pifacerelayplus.rst +++ b/docs/pifacerelayplus.rst @@ -1,10 +1,10 @@ ################# PiFace Relay Plus ################# -PiFace Relay Plus has four inputs and four relays (each relay is connected in -parallel with an LED). `Extra Boards` offer additional functionality: +PiFace Relay Plus (the base board) has four inputs and four relays (each +relay is connected in parallel with an LED). `Extra Boards` offer +additional functionality: -- *Relay Extra Board* adds four more Relays. -- *Motor Extra Board* adds two motor drivers capable of driving two motors +- *Relay Extra* board adds four more Relays. +- *Motor Extra* board adds two motor drivers capable of driving two motors each for control of up to four motors. -.. - *Digital Extra Board* adds four inputs/switches, four outputs/an RGB LED. diff --git a/pifacerelayplus/core.py b/pifacerelayplus/core.py index d0a0332..bfd14c4 100644 --- a/pifacerelayplus/core.py +++ b/pifacerelayplus/core.py @@ -17,7 +17,6 @@ # Plus boards # Motor board IC datasheet: http://www.ti.com/lit/ds/symlink/drv8835.pdf -# RELAY, MOTOR_DC, MOTOR_STEPPER, DIGITAL = range(4) RELAY, MOTOR_DC, MOTOR_STEPPER = range(3) DEFAULT_GPIOA_CONF = {'value': 0, 'direction': 0, 'pullup': 0}, @@ -213,13 +212,11 @@ def __init__(self, gpioa_conf = {'value': 0, 'direction': 0, 'pullup': 0} gpiob_conf = {'value': 0, 'direction': 0, 'pullup': 0} - elif plus_board == MOTOR_STEPPER: - self.motors = [MotorStepper(i, self) for i in range(2)] - gpioa_conf = {'value': 0, 'direction': 0, 'pullup': 0} - gpiob_conf = {'value': 0, 'direction': 0, 'pullup': 0} + # elif plus_board == MOTOR_STEPPER: + # self.motors = [MotorStepper(i, self) for i in range(2)] + # gpioa_conf = {'value': 0, 'direction': 0, 'pullup': 0} + # gpiob_conf = {'value': 0, 'direction': 0, 'pullup': 0} - # elif plus_board == DIGITAL: - # pass else: gpioa_conf = DEFAULT_GPIOA_CONF gpiob_conf = DEFAULT_GPIOB_CONF