Lurkars/bombatuino
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added libraries and clean up

Browse Source
This commit is contained in:
Lukas
2013-02-14 02:59:15 +01:00
parent 52975c9dba
commit d94fed811b
16 changed files with 528 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/libraries/INPUT_74HC4051/INPUT_74HC4051.cpp
+67
View File
@@ -0,0 +1,67 @@
#include "Arduino.h"
#include "INPUT_74HC4051.h"
void INPUT_74HC4051::begin(uint8_t analog, uint8_t s0, uint8_t s1, uint8_t s2,CallbackFunction cbF) {
_analog = analog;
_s0 = s0;
_s1 = s1;
_s2 = s2;
pinMode(_analog,INPUT);
pinMode(_s0,OUTPUT);
pinMode(_s1,OUTPUT);
pinMode(_s2,OUTPUT);
_callbackFunction = cbF;
//init start values
uint8_t pin,r0,r1,r2;
for (pin=0; pin<8; pin++) {
r0 = bitRead(pin,0);
r1 = bitRead(pin,1);
r2 = bitRead(pin,2);
digitalWrite(_s0, r0);
digitalWrite(_s1, r1);
digitalWrite(_s2, r2);
//delayMicroseconds(10);
_value[pin] = analogRead(_analog);
}
}
void INPUT_74HC4051::loop() {
uint8_t pin,r0,r1,r2;
int value;
for (pin=0; pin<8; pin++) {
r0 = bitRead(pin,0);
r1 = bitRead(pin,1);
r2 = bitRead(pin,2);
digitalWrite(_s0, r0);
digitalWrite(_s1, r1);
digitalWrite(_s2, r2);
//delayMicroseconds(10);
value = analogRead(_analog);
if (_value[pin] < value - INPUT_74HC4051_TOLERANCE || _value[pin] > value + INPUT_74HC4051_TOLERANCE) {
_value[pin] = value;
(*_callbackFunction)(_analog,pin,value);
}
}
}
int INPUT_74HC4051::getSpecificValue(uint8_t pin) {
if (pin >= 8)
return -1;
uint8_t r0,r1,r2;
r0 = bitRead(pin,0);
r1 = bitRead(pin,1);
r2 = bitRead(pin,2);
digitalWrite(_s0, r0);
digitalWrite(_s1, r1);
digitalWrite(_s2, r2);
//delayMicroseconds(10);
int value = analogRead(_analog);
_value[pin] = value;
return value;
}
source/libraries/INPUT_74HC4051/INPUT_74HC4051.h
+29
View File
@@ -0,0 +1,29 @@
/*
INPUT_4051.h - Library for reading inputs from 4051 multiplexer
*/
#ifndef INPUT_74HC4051_h
#define INPUT_74HC4051_h
#define INPUT_74HC4051_TOLERANCE 1
#if !defined(CallbackFunction)
typedef void (*CallbackFunction)(int,int,int);
#endif
class INPUT_74HC4051
{
public:
void begin(uint8_t analog, uint8_t s0, uint8_t s1, uint8_t s2,CallbackFunction cbF);
void loop(void);
int getSpecificValue(uint8_t pin);
private:
uint8_t _analog;
uint8_t _s0;
uint8_t _s1;
uint8_t _s2;
int _value[8];
CallbackFunction _callbackFunction;
};
#endif
source/libraries/INPUT_MCP23017/INPUT_MCP23017.cpp
+115
View File
@@ -0,0 +1,115 @@
#include <Wire.h>
#include "Arduino.h"
#include "INPUT_MCP23017.h"
void INPUT_MCP23017::begin(uint8_t addr,CallbackFunction cbF) {
Wire.begin();
if (addr > 7)
_addr = 7;
else _addr = addr;
_callbackFunction = cbF;
// set defaults!
Wire.beginTransmission(MCP23017_ADDRESS | _addr);
Wire.write((byte)MCP23017_IODIRA);
Wire.write(0xFF); // all inputs on port A
Wire.endTransmission();
Wire.beginTransmission(MCP23017_ADDRESS | _addr);
Wire.write(MCP23017_IODIRB);
Wire.write(0xFF); // all inputs on port B
Wire.endTransmission();
Wire.beginTransmission(MCP23017_ADDRESS | _addr);
Wire.write(MCP23017_GPPUA);
Wire.write(0xFF); // all pullup resistors on port A
Wire.endTransmission();
Wire.beginTransmission(MCP23017_ADDRESS | _addr);
Wire.write(MCP23017_GPPUB);
Wire.write(0xFF); // all pullup resistors on port B
Wire.endTransmission();
Wire.beginTransmission(MCP23017_ADDRESS | _addr);
Wire.write((byte)MCP23017_IPOLA);
Wire.write(0xFF); // inverse all inputs
Wire.endTransmission();
Wire.beginTransmission(MCP23017_ADDRESS | _addr);
Wire.write(MCP23017_IPOLB);
Wire.write(0xFF); // inverse all inputs
Wire.endTransmission();
//init start values
uint8_t pin,bank;
//read bank A
Wire.beginTransmission(MCP23017_ADDRESS | _addr);
Wire.write(MCP23017_GPIOA);
Wire.endTransmission();
Wire.requestFrom(MCP23017_ADDRESS | _addr, 1);
bank = Wire.read();
for (pin=0; pin<8; pin++)
_value[pin] = (bank >> pin) & 0x1;
//read bank B
Wire.beginTransmission(MCP23017_ADDRESS | _addr);
Wire.write(MCP23017_GPIOB);
Wire.endTransmission();
Wire.requestFrom(MCP23017_ADDRESS | _addr, 1);
bank = Wire.read();
for (pin=8; pin<16; pin++)
_value[pin] = (bank >> (pin-8)) & 0x1;
}
void INPUT_MCP23017::loop() {
uint8_t pin,bank;
int value;
//read bank A
Wire.beginTransmission(MCP23017_ADDRESS | _addr);
Wire.write(MCP23017_GPIOA);
Wire.endTransmission();
Wire.requestFrom(MCP23017_ADDRESS | _addr, 1);
bank = Wire.read();
for (pin=0; pin<8; pin++) {
value = (bank >> pin) & 0x1;
if (_value[pin] != value) {
_value[pin] = value;
(*_callbackFunction)(_addr,pin,value);
}
}
//read bank B
Wire.beginTransmission(MCP23017_ADDRESS | _addr);
Wire.write(MCP23017_GPIOB);
Wire.endTransmission();
Wire.requestFrom(MCP23017_ADDRESS | _addr, 1);
bank = Wire.read();
for (pin=8; pin<16; pin++) {
value = (bank >> (pin-8)) & 0x1;
if (_value[pin] != value) {
_value[pin] = value;
(*_callbackFunction)(_addr,pin,value);
}
}
}
int INPUT_MCP23017::getSpecificValue(uint8_t pin) {
if (pin > 16)
return LOW;
Wire.beginTransmission(MCP23017_ADDRESS | _addr);
uint8_t p = pin;
if (pin > 8) {
Wire.write(MCP23017_GPIOB);
p -= 8;
} else
Wire.write(MCP23017_GPIOA);
Wire.endTransmission();
uint8_t bank = Wire.read();
int value = (bank >> p) & 0x1;
_value[pin] = value;
return value;
}
source/libraries/INPUT_MCP23017/INPUT_MCP23017.h
+51
View File
@@ -0,0 +1,51 @@
/*
INPUT_MCP23017.h - Library for reading inputs from MCP23017 port Expander
*/
#ifndef INPUT_MCP23017_h
#define INPUT_MCP23017_h
#if !defined(CallbackFunction)
typedef void (*CallbackFunction)(int,int,int);
#endif
class INPUT_MCP23017
{
public:
void begin(uint8_t addr,CallbackFunction cbF);
void loop(void);
int getSpecificValue(uint8_t pin);
private:
uint8_t _addr;
int _value[16];
CallbackFunction _callbackFunction;
};
#define MCP23017_ADDRESS 0x20
// registers (from https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library/blob/master/Adafruit_MCP23017.h)
#define MCP23017_IODIRA 0x00
#define MCP23017_IPOLA 0x02
#define MCP23017_GPINTENA 0x04
#define MCP23017_DEFVALA 0x06
#define MCP23017_INTCONA 0x08
#define MCP23017_IOCONA 0x0A
#define MCP23017_GPPUA 0x0C
#define MCP23017_INTFA 0x0E
#define MCP23017_INTCAPA 0x10
#define MCP23017_GPIOA 0x12
#define MCP23017_OLATA 0x14
#define MCP23017_IODIRB 0x01
#define MCP23017_IPOLB 0x03
#define MCP23017_GPINTENB 0x05
#define MCP23017_DEFVALB 0x07
#define MCP23017_INTCONB 0x09
#define MCP23017_IOCONB 0x0B
#define MCP23017_GPPUB 0x0D
#define MCP23017_INTFB 0x0F
#define MCP23017_INTCAPB 0x11
#define MCP23017_GPIOB 0x13
#define MCP23017_OLATB 0x15
#endif