Diff: MCP23S17.cpp

Revision:

2:69ce30406dc8

Parent:

1:f93b811965d8

--- a/MCP23S17.cpp	Sun Jan 29 19:11:42 2012 +0000
+++ b/MCP23S17.cpp	Thu May 14 21:04:13 2015 +0000
@@ -36,12 +36,12 @@
 
     char MCP23S17::read(Port port)
     {
-        return _read(port, GPIOA);    
+        return _read(port, MCP23S17_INTCAPA );    
     }
 
     void MCP23S17::write(Port port, char data)
     {
-        _write(port, OLATA, data);
+        _write(port, MCP23S17_OLATA, data);
     }
 
     void MCP23S17::reset()
@@ -59,37 +59,37 @@
 
     void MCP23S17::config_control_register(char data)
     {
-        _write(IOCON, data);
+        _write(MCP23S17_IOCON, data);
     }
 
     void MCP23S17::config_pullups(Port port, char data)
     {
-        _write(port, GPPUA, data);
+        _write(port, MCP23S17_GPPUA, data);
     }
 
     void MCP23S17::config_direction(Port port, char data)
     {
-        _write(port, IODIRA, data);
+        _write(port, MCP23S17_IODIRA, data);
     }
 
     void MCP23S17::config_polarity(Port port, char data)
     {
-        _write(port, IPOLA, data);
+        _write(port, MCP23S17_IPOLA, data);
     }
 
     void MCP23S17::config_interrupt_enable(Port port, char data)
     {
-        _write(port, GPINTENA, data);
+        _write(port, MCP23S17_GPINTENA, data);
     }
 
     void MCP23S17::config_interrupt_control(Port port, char data)
     {
-        _write(port, INTCONA, data);
+        _write(port, MCP23S17_INTCONA , data);
     }
 
     void MCP23S17::config_mirror_interrupt(bool mirror)
     {
-        char kopi_iocon = _read(IOCON);
+        char kopi_iocon = _read(MCP23S17_IOCON);
         if (mirror)
         {
             kopi_iocon = kopi_iocon | INTERRUPT_MIRROR_BIT;
@@ -98,17 +98,17 @@
         {
             kopi_iocon = kopi_iocon & ~INTERRUPT_MIRROR_BIT;
         }
-        _write(IOCON, kopi_iocon);
+        _write(MCP23S17_IOCON, kopi_iocon);
     }
 
     void MCP23S17::config_defaultvalue(Port port, char data)
     {
-        _write(port, DEFVALA, data);
+        _write(port, MCP23S17_DEFVALA, data);
     }
 
     void MCP23S17::config_interrupt_polarity(Polarity polarity)
     {
-        char kopi_iocon = _read(IOCON);
+        char kopi_iocon = _read(MCP23S17_IOCON);
         if (polarity == ACTIVE_LOW)
         {
             kopi_iocon = kopi_iocon | INTERRUPT_POLARITY_BIT;
@@ -117,17 +117,17 @@
         {
             kopi_iocon = kopi_iocon & ~INTERRUPT_POLARITY_BIT;
         }
-        _write(IOCON, kopi_iocon);
+        _write(MCP23S17_IOCON, kopi_iocon);
     }
 
     char MCP23S17::read_interrupt_flag(Port port)
     {
-        return _read(port, INTFA);
+        return _read(port, MCP23S17_INTFA);
     }
 
     char MCP23S17::read_interrupt_capture(Port port)
     {
-        return _read(port, INTCAPA);
+        return _read(port, MCP23S17_INTCAPA );
     } 
  
 //=============================================================================
@@ -136,7 +136,7 @@
 
     void MCP23S17::_initialization()
     {
-        _write(IOCON, 0x2A); // setup af control register (BANK = 0, MIRROR = 0, SEQOP = 1, DISSLW = 0, HAEN = 1, ODR = 0, INTPOL = 1, NC = 0)
+        _write(MCP23S17_IOCON, 0x2A); // setup af control register (BANK = 0, MIRROR = 0, SEQOP = 1, DISSLW = 0, HAEN = 1, ODR = 0, INTPOL = 1, NC = 0)
     }
     
     void MCP23S17::_make_opcode(int _hardwareaddress)