From e56a52087315376e3895d319a26ed4a4f1e02ed8 Mon Sep 17 00:00:00 2001 From: joan Date: Thu, 12 Dec 2013 10:35:55 +0000 Subject: [PATCH] V8 --- README | 12 ++++++++++-- pigpio.c | 4 ++-- pigpio.h | 17 +++++++++++++---- setup.py | 7 ++++++- 4 files changed, 31 insertions(+), 9 deletions(-) diff --git a/README b/README index b673035..86e7ba0 100644 --- a/README +++ b/README @@ -60,10 +60,18 @@ cat /dev/pigerr & echo "help" >/dev/pigpio -PYTHON INTERFACE +PYTHON MODULE + +By default the Python pigpio module is installed to the +default python location. You can install it for additional +Python versions by + +pythonx.y setup.py install + +where x.y is the Python version. If the pigpiod daemon is running you can test the Python -interface by entering the following commands. +module by entering the following commands. python diff --git a/pigpio.c b/pigpio.c index 5b721b8..82803f5 100644 --- a/pigpio.c +++ b/pigpio.c @@ -25,7 +25,7 @@ OTHER DEALINGS IN THE SOFTWARE. For more information, please refer to */ -/* pigpio version 7 */ +/* pigpio version 8 */ #include #include @@ -3176,7 +3176,7 @@ static void initClock(int mainClock) /* ----------------------------------------------------------------------- */ -static void initDMAgo(uint32_t * dmaAddr, uint32_t cbAddr) +static void initDMAgo(volatile uint32_t * dmaAddr, uint32_t cbAddr) { DBG(DBG_STARTUP, ""); diff --git a/pigpio.h b/pigpio.h index ce7b8b2..8ab7c67 100644 --- a/pigpio.h +++ b/pigpio.h @@ -26,7 +26,7 @@ For more information, please refer to */ /* -This version is for pigpio version 7 +This version is for pigpio version 8 */ #ifndef PIGPIO_H @@ -49,6 +49,8 @@ This version is for pigpio version 7 / 7) notifications when any of gpios 0-31 change state. / / 8) the construction of arbitrary waveforms to give precise timing of / / output gpio level changes. / +/ 9) rudimentary permission control through the socket and pipe interfaces / +/ so users can be prevented from "updating" inappropriate gpios. / / / / NOTE: / / / @@ -82,7 +84,7 @@ This version is for pigpio version 7 #include -#define PIGPIO_VERSION 7 +#define PIGPIO_VERSION 8 /*-------------------------------------------------------------------------*/ @@ -179,6 +181,7 @@ gpioCfgDMAchannel Configure the DMA channel (DEPRECATED). gpioCfgDMAchannels Configure the DMA channels. gpioCfgPermissions Configure the gpio access permissions. gpioCfgInterfaces Configure user interfaces. +gpioCfgInternals Configure miscellaneous internals. gpioCfgSocketPort Configure socket port. */ @@ -1641,8 +1644,14 @@ int gpioCfgPermissions(uint64_t updateMask); /* Configures pigpio to only allow updates (writes or mode changes) for the gpios specified by the mask. - The default setting is to allow updates to gpios 0-31, i.e. an update mask - of 0x00000000FFFFFFFF. + The default setting depends upon the board revision (Type 1 or Type 2). + The user gpios are added to the mask. If the board revision is not + recognised then the mask is formed by or'ing the bits for the two + board revisions. + + Unknown board: PI_DEFAULT_UPDATE_MASK_R0 0xFBE6CF9F + Type 1 board: PI_DEFAULT_UPDATE_MASK_R1 0x03E6CF93 + Type 2 board: PI_DEFAULT_UPDATE_MASK_R2 0xFBC6CF9C */ diff --git a/setup.py b/setup.py index ceff7d9..bc27f8c 100644 --- a/setup.py +++ b/setup.py @@ -4,9 +4,14 @@ from distutils.core import setup setup(name='pigpio', version='1.0', - description='Raspberry Pi gpio utility', author='joan', author_email='joan@abyz.me.uk', + maintainer='joan', + maintainer_email='joan@abyz.me.uk', url='http://abyz.co.uk/rpi/pigpio/python.html/', + description='Raspberry Pi gpio module', + long_description='Raspberry Pi Python module for access to the pigpio daemon', + download_url='http://abyz.co.uk/rpi/pigpio/pigpio.tar', + license='TBD', py_modules=['pigpio'] )