Revision 0:038ed656f129, committed 2015-03-13

Comitter:

coconnell7

Date:

Fri Mar 13 03:49:26 2015 +0000

Commit message:

1st Revision

Changed in this revision

diff -r 000000000000 -r 038ed656f129 4DGL-uLCD-SE.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/4DGL-uLCD-SE.lib	Fri Mar 13 03:49:26 2015 +0000
@@ -0,0 +1,1 @@
+https://mbed.org/users/4180_1/code/4DGL-uLCD-SE/#e39a44de229a

diff -r 000000000000 -r 038ed656f129 SDFileSystem.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SDFileSystem.lib	Fri Mar 13 03:49:26 2015 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/mbed_official/code/SDFileSystem/#c8f66dc765d4

diff -r 000000000000 -r 038ed656f129 main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main.cpp	Fri Mar 13 03:49:26 2015 +0000
@@ -0,0 +1,215 @@
+#include "mbed.h"
+#include "rtos.h"
+
+#include "uLCD_4DGL.h" // uLCD
+#include "wave_player.h" // Speaker
+#include "SDFileSystem.h" // SD card
+#include <mpr121.h> // Touchpad
+
+
+bool ArmedOnOff; // Global variable to Arm the alarm;
+int CurrentKey; // Global variable to display the current key value to the LCD
+int OldCurrentKey;
+int KeyCount = 0; //Keeps track of how many times in a row the key has been pressed
+int Trigger = 1; //Determining if the alarm has been triggered
+DigitalOut led1(LED1);
+DigitalOut led2(LED2);
+DigitalOut led3(LED3);
+DigitalOut led4(LED4);
+
+int num1; //The four digits of the passcode
+int num2;
+int num3;
+int num4;
+
+int Safety = 0; //Counter to check if correct passcode is entered
+
+
+SDFileSystem sd(p5, p6, p7, p8, "sd"); // MicroSD card
+
+AnalogIn IRout(p20); // IR Module
+
+AnalogOut DACout(p18); // Speaker / Wave Player
+wave_player waver(&DACout); // Speaker / Wave player
+
+uLCD_4DGL uLCD(p28, p27, p29); // used to create LCD object
+
+Mutex stdio_mutex; // Mutex for LCD thread
+ 
+InterruptIn interrupt(p26); // Create interrupt receiver object on pin 26
+ 
+I2C i2c(p9, p10); // Setup i2c bus on pins 9 and 10
+ 
+// constructor(i2c object, i2c address of the mpr121)
+Mpr121 mpr121(&i2c, Mpr121::ADD_VSS); // Mpr121 constructor
+
+// mpr121 keypad interrupt
+void fallInterrupt(){
+    OldCurrentKey = CurrentKey;
+    int key_code=0;
+    int i=0;
+    int value=mpr121.read(0x00);
+    value +=mpr121.read(0x01)<<8;
+    i=0;
+    for (i=0; i<12; i++) {
+        if (((value>>i)&0x01)==1) key_code=i+1;
+        }
+    led4=key_code & 0x01;
+    led3=(key_code>>1) & 0x01;
+    led2=(key_code>>2) & 0x01;
+    led1=(key_code>>3) & 0x01;
+    if(led1==0 & led2==0 & led3==0 & led4==1) //Convert recieved value from keypad
+        CurrentKey = 0;
+    if(led1==0 & led2==0 & led3==1 & led4==0)
+        CurrentKey = 1;
+    if(led1==0 & led2==0 & led3==1 & led4==1)
+        CurrentKey = 2;
+    if(led1==0 & led2==1 & led3==0 & led4==0)
+        CurrentKey = 3;
+    if(led1==0 & led2==1 & led3==0 & led4==1)
+        CurrentKey = 4;
+    if(led1==0 & led2==1 & led3==1 & led4==0)
+        CurrentKey = 5;
+    if(led1==0 & led2==1 & led3==1 & led4==1)
+        CurrentKey = 6;
+    if(led1==1 & led2==0 & led3==0 & led4==0)
+        CurrentKey = 7;
+    if(led1==1 & led2==0 & led3==0 & led4==1)
+        CurrentKey = 8;
+    if(led1==1 & led2==0 & led3==1 & led4==0)
+        CurrentKey = 9;
+    if(led1==1 & led2==0 & led3==1 & led4==1)
+        CurrentKey = 10;
+    if(led1==1 & led2==1 & led3==0 & led4==0)
+        CurrentKey = 11;
+    if(CurrentKey != OldCurrentKey & Trigger  == 1){ //Ensures that only four numbers are used at a time
+        KeyCount = KeyCount + 1;
+        if(KeyCount == 1)
+            num1 = CurrentKey;
+        if(KeyCount == 2)
+            num2 = CurrentKey;
+        if(KeyCount == 3)
+            num3 = CurrentKey;
+        if(KeyCount == 4){
+            num4 = CurrentKey;
+            Trigger = 0;
+            KeyCount = 0;
+        }
+    }
+}
+
+
+// uLCD thread
+void Armed(void const *args){ //Thread for initial state of the alarm
+    interrupt.fall(&fallInterrupt);
+    interrupt.mode(PullUp);
+    while(1){
+        if(Safety == 0){
+            stdio_mutex.lock();  // Mutex lock for LCD screen
+            if(!ArmedOnOff){
+                uLCD.locate(1,1); //The default state for the alarm
+                uLCD.printf("ALARM: ARMED   ");
+                uLCD.locate(1,5);
+                uLCD.printf("Enter Passcode: ");
+            }
+            stdio_mutex.unlock(); // Unlock mutex
+        }
+    }
+}
+
+void PassCode(void const *args){ //Thread to check passcode
+    interrupt.fall(&fallInterrupt);
+    interrupt.mode(PullUp);
+    while(1){
+        if(Trigger == 0){
+            stdio_mutex.lock();  // Mutex lock for LCD screen
+            uLCD.locate(1,7);
+            uLCD.printf("                     ");
+            uLCD.locate(1,8);
+            uLCD.printf("                     ");
+            if(num1 == 1 & num2 == 9 & num3 == 4 & num4 == 2){ //Checks to see if the correct key is entered, 1942
+                uLCD.locate(1,1);
+                uLCD.printf("ALARM: DISARMED"); //The disarmed state for the alarm upon entering the correct code
+                uLCD.locate(1,7);
+                uLCD.printf("%d %d %d %d",num1,num2,num3,num4);
+                uLCD.locate(1,8);
+                uLCD.printf("Take your item");
+                Safety = 1;
+                int countDown = 20;
+                while(countDown >=0){ // Countdown to when the alarm will re-arm
+                    uLCD.locate(1,9);
+                    uLCD.printf("ARMING IN %d     ", countDown);
+                    countDown--;
+                    Thread::wait(1000.0); // Wait 1 second
+                }
+                countDown = 20;
+                uLCD.locate(1,9);
+                uLCD.printf("                 "); //clears the lower screen
+                uLCD.locate(1,7);
+                uLCD.printf("           ");
+                uLCD.locate(1,8);
+                uLCD.printf("              ");
+                Safety = 0;
+            }
+            else {
+                uLCD.locate(1,7);
+                uLCD.printf("%d %d %d %d",num1,num2,num3,num4); //Displays the incorrect passcode waits 5 seconds for further entries
+                uLCD.locate(1,8);
+                uLCD.printf("INCORRECT");
+                Thread::wait(5000.0);
+                uLCD.locate(1,7);
+                uLCD.printf("           "); //clears the lower screen
+                uLCD.locate(1,8);
+                uLCD.printf("          ");
+            }
+            stdio_mutex.unlock(); // Unlock mutex
+            Trigger = 1;
+            Thread::wait(1000.0); // 10 second wait
+        }
+    }
+}
+
+
+void Alarm(void const *args) //Thread to sound alarm
+{
+    interrupt.fall(&fallInterrupt);
+    interrupt.mode(PullUp);
+    while(1){
+        if(ArmedOnOff==true & Safety == 0){
+            stdio_mutex.lock();  // Mutex lock for LCD screen
+            uLCD.locate(1,1);
+            uLCD.printf("ALARM: MISSING!"); //Sounds alarm if the correct code isn't entered and the object is missing
+            uLCD.locate(1,5);
+            uLCD.printf("Enter Passcode: ");
+            stdio_mutex.unlock(); // Unlock mutex
+            FILE *wave_file;
+            wave_file=fopen("/sd/myMusic/Alarm.wav","r");
+            waver.play(wave_file);
+            fclose(wave_file);
+
+            //Thread::wait(1000.0); // Wait 1 second
+        }
+    }
+}
+
+
+int main(){
+    Thread thread1(Alarm);
+    Thread thread3(Armed);
+    Thread thread4(PassCode);
+    interrupt.mode(PullUp);
+    interrupt.fall(&fallInterrupt);
+    
+    while(1){
+            
+
+        if (IRout < 0.5f){
+            //led1 = 1;
+            ArmedOnOff = true;
+        }
+        else {
+            ArmedOnOff = false;
+        }
+
+    }
+}
\ No newline at end of file

diff -r 000000000000 -r 038ed656f129 mbed-rtos.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed-rtos.lib	Fri Mar 13 03:49:26 2015 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/mbed_official/code/mbed-rtos/#83e169389a69

diff -r 000000000000 -r 038ed656f129 mbed.bld
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed.bld	Fri Mar 13 03:49:26 2015 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/mbed_official/code/mbed/builds/e188a91d3eaa
\ No newline at end of file

diff -r 000000000000 -r 038ed656f129 mpr121.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mpr121.cpp	Fri Mar 13 03:49:26 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

diff -r 000000000000 -r 038ed656f129 mpr121.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mpr121.h	Fri Mar 13 03:49:26 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

diff -r 000000000000 -r 038ed656f129 wave_player.lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wave_player.lib	Fri Mar 13 03:49:26 2015 +0000
@@ -0,0 +1,1 @@
+http://mbed.org/users/sravet/code/wave_player/#acc3e18e77ad