From db4d9c0dd9d765a3f92f63b6aa413316f01be15e Mon Sep 17 00:00:00 2001 From: wicker25 Date: Sun, 2 Mar 2014 23:12:46 +0100 Subject: [PATCH] Fixed addresses in 'mcp23x08.hpp' --- CMakeLists.txt | 2 +- ChangeLog | 6 ++++++ README.md | 2 +- VERSION | 2 +- include/rpi-hw/driver/mcp23x08.hpp | 20 ++++++++++---------- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f8cdb41..18f4406 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required( VERSION 2.6 ) # Set the version of the library set( RPI_HW_VERSION_MAJOR 0 ) set( RPI_HW_VERSION_MINOR 7 ) -set( RPI_HW_VERSION_PATCH 2 ) +set( RPI_HW_VERSION_PATCH 3 ) set( RPI_HW_VERSION "${RPI_HW_VERSION_MAJOR}.${RPI_HW_VERSION_MINOR}.${RPI_HW_VERSION_PATCH}" ) # Project directories diff --git a/ChangeLog b/ChangeLog index 3db3b4f..9ba9b75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ ChangeLog of Rpi-hw - A free C++ library designed to manage the Raspberry Pi's GPIO connector and its other buses. +============ Rpi-hw 0.7.3 - urgency=high =========== + +2014-03-02 Wicker25 < wicker25@gmail.com > + + * mcp23x08.hpp: Fixed addresses of the registers. + ============ Rpi-hw 0.7.2 - urgency=low =========== 2013-12-26 Wicker25 < wicker25@gmail.com > diff --git a/README.md b/README.md index 2b20c5a..b80b827 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Rpi-hw v0.7.2 +Rpi-hw v0.7.3 ============= [Rpi-hw](http://hackyourmind.org/projects/rpi-hw) (short for "Raspberry Pi Hardware") is a free C++ library diff --git a/VERSION b/VERSION index 7486fdb..f38fc53 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.7.2 +0.7.3 diff --git a/include/rpi-hw/driver/mcp23x08.hpp b/include/rpi-hw/driver/mcp23x08.hpp index 7aec1f1..db2cc9c 100644 --- a/include/rpi-hw/driver/mcp23x08.hpp +++ b/include/rpi-hw/driver/mcp23x08.hpp @@ -54,16 +54,16 @@ class mcp23x08 : public io_expander { enum Registers { IODIR = 0x00, //!< Controls the direction of the data I/O. - IPOL = 0x02, //!< Configures the polarity on the corresponding GPIO port bits. - GPINTEN = 0x04, //!< Controls the interrupt-on-change feature for each pin - DEFVAL = 0x06, //!< Sets the default comparison value. - INTCON = 0x08, //!< Controls how the associated pin value is compared for the interrupt-on-change feature. - IOCON = 0x0a, //!< Configures the device. - GPPU = 0x0c, //!< Controls the pull-up resistors for the port pins. - INTF = 0x0e, //!< Reflects the interrupt condition on the port pins of any pin that is enabled for interrupts. - INTCAP = 0x10, //!< Captures the GPIO port value at the time the interrupt occurred. - GPIO = 0x12, //!< Reflects the value on the port. - OLAT = 0x14, //!< Provides access to the output latches. + IPOL = 0x01, //!< Configures the polarity on the corresponding GPIO port bits. + GPINTEN = 0x02, //!< Controls the interrupt-on-change feature for each pin + DEFVAL = 0x03, //!< Sets the default comparison value. + INTCON = 0x04, //!< Controls how the associated pin value is compared for the interrupt-on-change feature. + IOCON = 0x05, //!< Configures the device. + GPPU = 0x06, //!< Controls the pull-up resistors for the port pins. + INTF = 0x07, //!< Reflects the interrupt condition on the port pins of any pin that is enabled for interrupts. + INTCAP = 0x08, //!< Captures the GPIO port value at the time the interrupt occurred. + GPIO = 0x09, //!< Reflects the value on the port. + OLAT = 0x0a //!< Provides access to the output latches. }; //! The controller configuration set (bit flags).