Revision 5:2532f81cba87, committed 2017-03-14

Comitter:

bkim334

Date:

Tue Mar 14 23:42:03 2017 +0000

Parent:

4:8952303a18be

Commit message:

Skittles Dispenser by Benjamin Kim and Alex Zdanov

Changed in this revision

diff -r 8952303a18be -r 2532f81cba87 mpr121.cpp
--- a/mpr121.cpp	Tue Mar 14 23:40:15 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-/*
-Copyright (c) 2011 Anthony Buckton (abuckton [at] blackink [dot} net {dot} au)
- 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
- 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-#include <mbed.h>
-#include <sstream>
-#include <string>
-#include <list>
-
-#include <mpr121.h>
-    
-Mpr121::Mpr121(I2C *i2c, Address i2cAddress)
-{
-    this->i2c = i2c;
-    
-    address = i2cAddress;
-           
-    // Configure the MPR121 settings to default
-    this->configureSettings();
-}
-
-   
-void Mpr121::configureSettings()
-{
-    // Put the MPR into setup mode
-    this->write(ELE_CFG,0x00);
-    
-    // Electrode filters for when data is > baseline
-    unsigned char gtBaseline[] = {
-         0x01,  //MHD_R
-         0x01,  //NHD_R 
-         0x00,  //NCL_R
-         0x00   //FDL_R
-         };
-         
-    writeMany(MHD_R,gtBaseline,4);   
-                 
-     // Electrode filters for when data is < baseline   
-     unsigned char ltBaseline[] = {
-        0x01,   //MHD_F
-        0x01,   //NHD_F
-        0xFF,   //NCL_F
-        0x02    //FDL_F
-        };
-        
-    writeMany(MHD_F,ltBaseline,4);
-        
-    // Electrode touch and release thresholds
-    unsigned char electrodeThresholds[] = {
-        E_THR_T, // Touch Threshhold
-        E_THR_R  // Release Threshold
-        };
-
-    for(int i=0; i<12; i++){
-        int result = writeMany((ELE0_T+(i*2)),electrodeThresholds,2);
-    }   
-
-    // Proximity Settings
-    unsigned char proximitySettings[] = {
-        0xff,   //MHD_Prox_R
-        0xff,   //NHD_Prox_R
-        0x00,   //NCL_Prox_R
-        0x00,   //FDL_Prox_R
-        0x01,   //MHD_Prox_F
-        0x01,   //NHD_Prox_F
-        0xFF,   //NCL_Prox_F
-        0xff,   //FDL_Prox_F
-        0x00,   //NHD_Prox_T
-        0x00,   //NCL_Prox_T
-        0x00    //NFD_Prox_T
-        };
-    writeMany(MHDPROXR,proximitySettings,11);
-
-    unsigned char proxThresh[] = {
-        PROX_THR_T, // Touch Threshold
-        PROX_THR_R  // Release Threshold
-        };
-    writeMany(EPROXTTH,proxThresh,2); 
-       
-    this->write(FIL_CFG,0x04);
-    
-    // Set the electrode config to transition to active mode
-    this->write(ELE_CFG,0x0c);
-}
-
-void Mpr121::setElectrodeThreshold(int electrode, unsigned char touch, unsigned char release){
-    
-    if(electrode > 11) return;
-    
-    // Get the current mode
-    unsigned char mode = this->read(ELE_CFG);
-    
-    // Put the MPR into setup mode
-    this->write(ELE_CFG,0x00);
-    
-    // Write the new threshold
-    this->write((ELE0_T+(electrode*2)), touch);
-    this->write((ELE0_T+(electrode*2)+1), release);
-    
-    //Restore the operating mode
-    this->write(ELE_CFG, mode);
-}
-    
-    
-unsigned char Mpr121::read(int key){
-
-    unsigned char data[2];
-    
-    //Start the command
-    i2c->start();
-
-    // Address the target (Write mode)
-    int ack1= i2c->write(address);
-
-    // Set the register key to read
-    int ack2 = i2c->write(key);
-
-    // Re-start for read of data
-    i2c->start();
-
-    // Re-send the target address in read mode
-    int ack3 = i2c->write(address+1);
-
-    // Read in the result
-    data[0] = i2c->read(0); 
-
-    // Reset the bus        
-    i2c->stop();
-
-    return data[0];
-}
-
-
-int Mpr121::write(int key, unsigned char value){
-    
-    //Start the command
-    i2c->start();
-
-    // Address the target (Write mode)
-    int ack1= i2c->write(address);
-
-    // Set the register key to write
-    int ack2 = i2c->write(key);
-
-    // Read in the result
-    int ack3 = i2c->write(value); 
-
-    // Reset the bus        
-    i2c->stop();
-    
-    return (ack1+ack2+ack3)-3;
-}
-
-
-int Mpr121::writeMany(int start, unsigned char* dataSet, int length){
-    //Start the command
-    i2c->start();
-
-    // Address the target (Write mode)
-    int ack= i2c->write(address);
-    if(ack!=1){
-        return -1;
-    }
-    
-    // Set the register key to write
-    ack = i2c->write(start);
-    if(ack!=1){
-        return -1;
-    }
-
-    // Write the date set
-    int count = 0;
-    while(ack==1 && (count < length)){
-        ack = i2c->write(dataSet[count]);
-        count++;
-    } 
-    // Stop the cmd
-    i2c->stop();
-    
-    return count;
-}
-      
-
-bool Mpr121::getProximityMode(){
-    if(this->read(ELE_CFG) > 0x0c)
-        return true;
-    else
-        return false;
-}
-
-void Mpr121::setProximityMode(bool mode){
-    this->write(ELE_CFG,0x00);
-    if(mode){
-        this->write(ELE_CFG,0x30); //Sense proximity from ALL pads
-    } else {
-        this->write(ELE_CFG,0x0c); //Sense touch, all 12 pads active.
-    }
-}
-
-
-int Mpr121::readTouchData(){
-    return this->read(0x00);
-}
\ No newline at end of file

diff -r 8952303a18be -r 2532f81cba87 mpr121.h
--- a/mpr121.h	Tue Mar 14 23:40:15 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-/*
-Copyright (c) 2011 Anthony Buckton (abuckton [at] blackink [dot} net {dot} au)
-
- 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
- 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
- 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-   Parts written by Jim Lindblom of Sparkfun
-   Ported to mbed by A.Buckton, Feb 2011
-*/
-
-#ifndef MPR121_H
-#define MPR121_H
-
-//using namespace std;
-
-class Mpr121 
-{
-
-public:
-    // i2c Addresses, bit-shifted
-    enum Address { ADD_VSS = 0xb4,// ADD->VSS = 0x5a <-wiring on Sparkfun board
-                   ADD_VDD = 0xb6,// ADD->VDD = 0x5b
-                   ADD_SCL = 0xb8,// ADD->SDA = 0x5c
-                   ADD_SDA = 0xba // ADD->SCL = 0x5d
-                 };
-
-    // Real initialiser, takes the i2c address of the device.
-    Mpr121(I2C *i2c, Address i2cAddress);
-    
-    bool getProximityMode();
-    
-    void setProximityMode(bool mode);
-    
-    int readTouchData();
-               
-    unsigned char read(int key);
-    
-    int write(int address, unsigned char value);
-    int writeMany(int start, unsigned char* dataSet, int length);
-
-    void setElectrodeThreshold(int electrodeId, unsigned char touchThreshold, unsigned char releaseThreshold);
-        
-protected:
-    // Configures the MPR with standard settings. This is permitted to be overwritten by sub-classes.
-    void configureSettings();
-    
-private:
-    // The I2C bus instance.
-    I2C *i2c;
-
-    // i2c address of this mpr121
-    Address address;
-};
-
-
-// MPR121 Register Defines
-#define    MHD_R        0x2B
-#define    NHD_R        0x2C
-#define    NCL_R        0x2D
-#define    FDL_R        0x2E
-#define    MHD_F        0x2F
-#define    NHD_F        0x30
-#define    NCL_F        0x31
-#define    FDL_F        0x32
-#define    NHDT         0x33
-#define    NCLT         0x34
-#define    FDLT         0x35
-// Proximity sensing controls
-#define    MHDPROXR     0x36
-#define    NHDPROXR     0x37
-#define    NCLPROXR     0x38
-#define    FDLPROXR     0x39
-#define    MHDPROXF     0x3A
-#define    NHDPROXF     0x3B
-#define    NCLPROXF     0x3C
-#define    FDLPROXF     0x3D
-#define    NHDPROXT     0x3E
-#define    NCLPROXT     0x3F
-#define    FDLPROXT     0x40
-// Electrode Touch/Release thresholds
-#define    ELE0_T       0x41
-#define    ELE0_R       0x42
-#define    ELE1_T       0x43
-#define    ELE1_R       0x44
-#define    ELE2_T       0x45
-#define    ELE2_R       0x46
-#define    ELE3_T       0x47
-#define    ELE3_R       0x48
-#define    ELE4_T       0x49
-#define    ELE4_R       0x4A
-#define    ELE5_T       0x4B
-#define    ELE5_R       0x4C
-#define    ELE6_T       0x4D
-#define    ELE6_R       0x4E
-#define    ELE7_T       0x4F
-#define    ELE7_R       0x50
-#define    ELE8_T       0x51
-#define    ELE8_R       0x52
-#define    ELE9_T       0x53
-#define    ELE9_R       0x54
-#define    ELE10_T      0x55
-#define    ELE10_R      0x56
-#define    ELE11_T      0x57
-#define    ELE11_R      0x58
-// Proximity Touch/Release thresholds
-#define    EPROXTTH     0x59
-#define    EPROXRTH     0x5A
-// Debounce configuration
-#define    DEB_CFG      0x5B
-// AFE- Analogue Front End configuration
-#define    AFE_CFG      0x5C 
-// Filter configuration
-#define    FIL_CFG      0x5D
-// Electrode configuration - transistions to "active mode"
-#define    ELE_CFG      0x5E
-
-#define GPIO_CTRL0      0x73
-#define GPIO_CTRL1      0x74
-#define GPIO_DATA       0x75
-#define    GPIO_DIR     0x76
-#define    GPIO_EN      0x77
-#define    GPIO_SET     0x78
-#define GPIO_CLEAR      0x79
-#define GPIO_TOGGLE     0x7A
-// Auto configration registers
-#define    AUTO_CFG_0   0x7B
-#define    AUTO_CFG_U   0x7D
-#define    AUTO_CFG_L   0x7E
-#define    AUTO_CFG_T   0x7F
-
-// Threshold defaults
-// Electrode touch threshold
-#define    E_THR_T      0x0F   
-// Electrode release threshold 
-#define    E_THR_R      0x0A    
-// Prox touch threshold
-#define    PROX_THR_T   0x02
-// Prox release threshold
-#define    PROX_THR_R   0x02
-
-#endif