Revision 0:be32bcd5f29d, committed 2015-12-08

Comitter:

asims35

Date:

Tue Dec 08 16:30:32 2015 +0000

Commit message:

Design project for ECE4180

Changed in this revision

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/4DGL-uLCD-SE.lib	Tue Dec 08 16:30:32 2015 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/4180_1/code/4DGL-uLCD-SE/#2cb1845d7681

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SDFileSystem.lib	Tue Dec 08 16:30:32 2015 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/mbed_official/code/SDFileSystem/#c8f66dc765d4

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main.cpp	Tue Dec 08 16:30:32 2015 +0000
@@ -0,0 +1,388 @@
+#include <mbed.h>
+#include <mpr121.h>
+#include "uLCD_4DGL.h"
+#include "rtos.h"
+
+
+//DigitalOut led1(LED1);
+//DigitalOut led2(LED2);
+//DigitalOut led3(LED3);
+//DigitalOut led4(LED4);
+AnalogIn   ain1(p15);
+AnalogIn   ain2(p16);
+AnalogIn   ain3(p17);
+AnalogIn   ain4(p18);
+AnalogIn   ain5(p19);
+AnalogIn   ain6(p20);
+
+DigitalOut led0(LED1);
+
+DigitalOut led1(p21);
+DigitalOut led2(p22);
+DigitalOut led3(p23);
+DigitalOut led4(p24);
+DigitalOut led5(p25);
+DigitalOut led6(p26);
+
+int cupPresence1;
+int cupPresence2;
+int cupPresence3;
+int cupPresence4;
+int cupPresence5;
+int cupPresence6;
+
+int cupPreviousState1;
+int cupPreviousState2;
+int cupPreviousState3;
+int cupPreviousState4;
+int cupPreviousState5;
+int cupPreviousState6;
+
+
+int player1Points = 0;
+int player2Points = 0;
+
+int player1MassArray[] = {0, 0, 0};
+int player2MassArray[] = {0, 0, 0};
+int player1Mass = 0;
+int player2Mass = 0;
+
+float player1BAC = 0;
+float player2BAC = 0;
+
+float a1 = 0;
+float a2 = 0;
+float r = 0.73;
+
+Mutex lcd_mutex;
+
+
+uLCD_4DGL uLCD(p28,p27,p29); // serial tx, serial rx, reset pin;
+
+Serial pc(USBTX, USBRX); // tx, rx
+
+InterruptIn keypadInterrupt(p14); // Create the interrupt receiver object on pin 26
+
+
+I2C i2c(p9, p10); // Setup the i2c bus on pins 9 and 10
+
+Mpr121 mpr121(&i2c, Mpr121::ADD_VSS); // constructor(i2c object, i2c address of the mpr121)
+
+float ledThreshold = 0.25;
+
+int keyPressed;
+
+// Key hit/release interrupt routine
+void fallInterrupt() {
+  int value=mpr121.read(0x00);
+  value +=mpr121.read(0x01)<<8;
+ 
+  switch (value)
+    {
+         case 1: keyPressed = 0; 
+         break;
+         case 2: keyPressed = 1;
+         break;
+         case 4: keyPressed = 2;
+         break;
+         case 8: keyPressed = 3;
+         break;
+         case 16: keyPressed = 4;
+         break;
+         case 32: keyPressed = 5;
+         break;
+         case 64: keyPressed = 6;
+         break;
+         case 128: keyPressed = 7;
+         break;
+         case 256: keyPressed = 8;
+         break;
+         case 512: keyPressed = 9;
+         break;
+         case 1024: keyPressed = 10;
+         break;
+         case 2048: keyPressed = 11;
+         break;
+         default: keyPressed = 12;   // no key pressed
+         break;  
+    }
+    
+ 
+}
+
+void checkLed1(void const *args) 
+{
+    while (true) 
+    {
+        if(ain1.read() < ledThreshold)
+        {
+           cupPresence1 = 1;
+           led1 = 1;
+            cupPreviousState1 = 1;
+        }
+        else
+        {
+           if(cupPreviousState1 == 1){
+           a1 = a1 + 4;
+           }
+           cupPresence1 = 0;
+           led1 = 0;
+           cupPreviousState1 = 0;
+        }
+        Thread::wait(250);
+    }
+}
+void checkLed2(void const *args) 
+{
+    while (true) 
+    {
+        if(ain2.read() < ledThreshold)
+        {
+           cupPresence2 = 1;
+           led2 = 1;
+           cupPreviousState2 = 1;
+        }
+        else
+        {
+            if(cupPreviousState2 == 1){
+           a1 = a1 + 4;
+           }
+           cupPresence2 = 0;
+           led2 = 0;
+            cupPreviousState2 = 0;
+        }
+        Thread::wait(250);
+    }
+}
+void checkLed3(void const *args) 
+{
+    while (true) 
+    {
+        if(ain3.read() < ledThreshold - 0.22)
+        {
+           cupPresence3 = 1;
+           led3 = 1;
+            cupPreviousState3 = 1;
+        }
+        else
+        {
+            if(cupPreviousState3 == 1){
+           a1 = a1 + 4;
+           }
+           cupPresence3 = 0;
+           led3 = 0;
+            cupPreviousState3 = 0;
+        }
+        Thread::wait(250);
+    }
+}
+void checkLed4(void const *args) 
+{
+    while (true) 
+    {
+        if(ain4.read() < ledThreshold)
+        {
+           cupPresence4 = 1;
+           led4 = 1;
+            cupPreviousState4 = 1;
+        }
+        else
+        {
+            if(cupPreviousState4 == 1){
+           a2 = a2 + 4;
+           }
+           cupPresence4 = 0;
+           led4 = 0;
+           cupPreviousState4 = 0;
+        }
+        Thread::wait(250);
+    }
+}
+void checkLed5(void const *args) 
+{
+    while (true) 
+    {
+        if(ain5.read() < ledThreshold + 0.05)
+        {
+           cupPresence5 = 1;
+           led5 = 1;
+           cupPreviousState5 = 1;
+        }
+        else
+        {
+           if(cupPreviousState5 == 1){
+           a2 = a2 + 4;
+           }
+           cupPresence5 = 0;
+           led5 = 0;
+           cupPreviousState5 = 0;
+        }
+        Thread::wait(250);
+    }
+}
+void checkLed6(void const *args) 
+{
+    while (true) 
+    {
+        if(ain6.read() < ledThreshold + 0.09)
+        {
+           cupPresence6 = 1;
+           led6 = 1;
+           cupPreviousState6 = 1;
+        }
+        else
+        {
+           if(cupPreviousState6 == 1){
+           a2 = a2 + 4;
+           }
+           cupPresence6 = 0;
+           led6 = 0;
+            cupPreviousState6 = 0;
+        }
+        Thread::wait(250);
+    }
+}
+
+void resetScore()
+{
+
+while(cupPresence4 != 1 || cupPresence5 != 1 || cupPresence6 != 1 || cupPresence1 != 1 || cupPresence2 != 1 || cupPresence3 != 1){
+ uLCD.locate(0,7);
+ uLCD.printf(" in while loop");
+}
+}
+  
+ void declareWinner(int winner){
+  player1Points = 0; 
+  player2Points = 0; 
+  lcd_mutex.lock();
+  uLCD.cls();
+  uLCD.locate(0,1);
+  uLCD.printf("Player %i Wins!", winner);
+  lcd_mutex.lock();
+  wait(10);
+  }
+ 
+void checkBAC(void const *args) 
+{
+    while (true) 
+    {
+     player1BAC = ((0.06*a1*5.14)/(player1Mass*r));
+     player2BAC = ((0.06*a2*5.14)/(player2Mass*r));
+        
+      Thread::wait(250);  
+}
+} 
+ 
+  
+    
+void checkScore(void const *args) 
+{
+    while (true) 
+    {
+        if(cupPresence4 == 0 && cupPresence5 == 0 && cupPresence6 == 0)
+        {
+           player1Points++;
+           //resetScore();
+         
+          if(player1Points == 3){
+            //declareWinner(1);
+            }
+              wait(5);
+        }
+        else if(cupPresence1 == 0 && cupPresence2 == 0 && cupPresence3 == 0)
+        {
+           player2Points++;
+           //resetScore();
+           if(player2Points == 3){
+            //declareWinner(2);
+            }
+            wait(5);
+        }
+        
+    
+      Thread::wait(250);  
+}
+}
+
+
+void inputMass(){
+    uLCD.locate(0,1);
+   // uLCD.set_font_size(5,5);
+   // uLCD.color(BLACK);
+   // uLCD.background_color(LGREY);
+    uLCD.printf("Player 1 Weight");
+    wait(1);
+for (int i=0; i<3; i++) {
+    player1MassArray[i] = keyPressed;
+    uLCD.locate(i,3);
+    uLCD.printf("%i",player1MassArray[i]);
+    wait(1);
+}
+    uLCD.locate(0,4);
+    //uLCD.set_font_size(5,5);
+   // uLCD.color(BLACK);
+    //uLCD.background_color(LGREY);
+    uLCD.printf("Player 2 Weight");
+    wait(1);
+for (int i=0; i<3; i++) {
+    player2MassArray[i] = keyPressed;
+    uLCD.locate(i,6);
+    uLCD.printf("%i",player2MassArray[i]);
+    wait(1);
+}
+for (int i=0; i < 3; i++)
+{
+  player1Mass = player1Mass*10 + player1MassArray[i];
+}
+for (int i=0; i < 3; i++)
+{
+  player2Mass = player2Mass*10 + player2MassArray[i];
+}
+}
+
+int main() {
+  keypadInterrupt.fall(&fallInterrupt);
+  keypadInterrupt.mode(PullUp);
+  inputMass();
+  Thread thread1(checkLed1);
+  Thread thread2(checkLed2);
+  Thread thread3(checkLed3);
+  Thread thread4(checkLed4);
+  Thread thread5(checkLed5);
+  Thread thread6(checkLed6);
+  Thread thread7(checkScore);
+  Thread thread8(checkBAC);
+
+
+ // pc.printf("Hello World!\n");
+ // uLCD.printf("\nHello uLCD World\n"); //Default Green on black text
+ // uLCD.printf("\n  Starting Demo...");
+  uLCD.filled_rectangle(0, 0 , 128, 64, BLUE);
+  uLCD.filled_rectangle(0, 64 , 128, 128, RED);
+  while (1) 
+  {
+  
+  //uLCD.color(BLACK);
+ // uLCD.background_color(LGREY);
+  uLCD.textbackground_color(BLUE);
+  //uLCD.set_font_size(20,20);
+    uLCD.text_width(2); //4X size text
+    uLCD.text_height(2);
+  uLCD.color(WHITE);
+  uLCD.locate(0,0);
+  uLCD.printf("Score: %i",player1Points);
+  uLCD.locate(0,2);
+  uLCD.printf("   BAC:\n   %1.2f",player1BAC);
+  
+  uLCD.textbackground_color(RED);
+  //uLCD.set_font_size(20,20);FONT_8X8 
+    uLCD.text_width(2); //4X size text
+    uLCD.text_height(2);
+  uLCD.locate(0,4);
+  uLCD.color(WHITE);
+  uLCD.printf("Score: %i",player2Points);
+  uLCD.locate(0,6);
+  uLCD.printf("   BAC:\n   %1.2f",player2BAC);
+  }
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed-rtos.lib	Tue Dec 08 16:30:32 2015 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/mbed_official/code/mbed-rtos/#d7bd06319118

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed.bld	Tue Dec 08 16:30:32 2015 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/mbed_official/code/mbed/builds/165afa46840b
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mpr121.cpp	Tue Dec 08 16:30:32 2015 +0000
@@ -0,0 +1,221 @@
+/*
+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

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mpr121.h	Tue Dec 08 16:30:32 2015 +0000
@@ -0,0 +1,157 @@
+/*
+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

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wave_player.lib	Tue Dec 08 16:30:32 2015 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/sravet/code/wave_player/#acc3e18e77ad