Revision 1:b8305e120e11, committed 2015-05-08

Comitter:

fangoman91

Date:

Fri May 08 06:50:54 2015 +0000

Parent:

0:1fa357ea3fcc

Commit message:

Dimiter Kentry update. Eliminate one column and add software pulldown resistors

Changed in this revision

--- a/keypad.cpp	Sat Nov 06 14:36:22 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*	 Copyright (c) 2010 Dimiter Kentri
-
-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.
-*/
-
-/*Simple example
-
-#include "mbed.h"
-#include "keypad.h"
-	  
-Serial pc(USBTX, USBRX); 
-Keypad telepad(p13,p14,p15,p16,p17,p18,p19,p20);
-					
-int main(void){
-  char key;
-  pc.printf("Enter codes\n\r");
-  while(1){ 
-	key = telepad.getKey();	
-	if(key != KEY_RELEASED){
-	pc.printf("%c\n",key);
-	wait(0.6);
-	 }
-	}
-}		*/
-
-#include "mbed.h"
-#include "keypad.h"
-
-using namespace mbed;
-
-Keypad::Keypad(PinName col1, PinName col2, PinName col3, PinName col4, PinName row1,PinName row2, PinName row3, PinName row4): _col1(col1),
-    _col2(col2),_col3(col3),_col4(col4),_rows(row1,row2,row3,row4)    {    
-        
-}     
-
-int Keypad::getKeyIndex(){
-    for(int k=0; k<4; k++) {
-            _rows = 0;
-    }    
-    for(int i=0; i<4; i++) {
-            _rows = 1 << i;     
-        for(int j=0; j<4;j++){         
-            if (_col1)
-                return 1+(i*4);
-            else if (_col2)
-                return 2+(i*4);
-               else if (_col3)
-                   return 3+(i*4); 
-            else if (_col4)
-                return 4+(i*4);            
-        }
-    }    
-    return -1;
-}          
-
-char Keypad::getKey(){
-int k = getKeyIndex();    
-if(k != -1)
-    return  keys[k-1];
- else 
- return 0;
-}

--- a/keypad.h	Sat Nov 06 14:36:22 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*	 Copyright (c) 2010 Dimiter Kentri
-
-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.
-*/
-
-#ifndef KEYPAD_H
-#define KEYPAD_H
-
-#include "DigitalIn.h"
-#include "BusOut.h"
-
-
-namespace mbed{
-
-const char NO_KEY = '\0';
-#define KEY_RELEASED NO_KEY
-          
-
-       
-const int keys[16] = {'1','2','3','A',
-                      '4','5','6','B',
-                      '7','8','9','C',
-                      '*','0','#','D'};
-                      
-class Keypad{    
-    public:
-        Keypad(PinName col1, PinName col2, PinName col3, PinName col4, PinName row1,PinName row2, PinName row3, PinName row4);
-        int getKeyIndex();
-        char getKey();
-
-    protected:
-        DigitalIn _col1,_col2,_col3,_col4;    
-        BusOut _rows;
-};
-
-}
-#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/keypad3x4.cpp	Fri May 08 06:50:54 2015 +0000
@@ -0,0 +1,65 @@
+
+
+//Dimiter Kentri update
+
+
+/*	 Copyright (c) 2010 Dimiter Kentri
+
+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 "keypad3x4.h"
+
+using namespace mbed;
+
+Keypad::Keypad(PinName col1,PinName col2,PinName col3,PinName row1,PinName row2,PinName row3,PinName row4):_col1(col1),_col2(col2),_col3(col3),_rows(row1,row2,row3,row4)    
+{    
+	_col1.mode(PullUp);
+	_col2.mode(PullUp);
+	_col3.mode(PullUp);      
+}     
+
+int Keypad::getKeyIndex()
+{
+    _rows = 0;   
+    for(int i=0; i<4; i++) 
+    {
+        _rows = 1 << i;     
+	    for(int j=0; j<4;j++)
+	    {         
+        	if (_col1)
+          		return 1+(i*3);
+    		else if (_col2)
+                return 2+(i*3);
+            else if (_col3)
+                return 3+(i*3);            
+        }
+    }    
+    return 11;
+}          
+
+char Keypad::getKey()
+{
+	int k = getKeyIndex();    
+	if(k != 11)
+    	return  keys[k-1];
+ 	else 
+ 		return 0;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/keypad3x4.h	Fri May 08 06:50:54 2015 +0000
@@ -0,0 +1,70 @@
+
+
+//Dimiter Kentri update
+
+
+/*	 Copyright (c) 2010 Dimiter Kentri
+
+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.
+*/
+
+/*Simple example
+
+#include "mbed.h"
+#include "keypad.h"
+	  
+Serial pc(USBTX, USBRX); 
+Keypad telepad(p13,p14,p15,p17,p18,p19,p20);
+					
+int main(void){
+  char key;
+  pc.printf("Enter codes\n\r");
+  while(1){ 
+	key = telepad.getKey();	
+	if(key != KEY_RELEASED){
+	pc.printf("%c\n",key);
+	wait(0.6);
+	 }
+	}
+}*/
+
+#ifndef KEYPAD3x4_H
+#define KEYPAD3x4_H
+
+#include "DigitalIn.h"
+#include "BusOut.h"
+
+
+namespace mbed
+{
+	const char NO_KEY = '\0';
+	#define KEY_RELEASED NO_KEY
+	const int keys[12] = {'1','2','3','4','5','6','7','8','9','*','0','#',};                  
+	class Keypad
+	{    
+	    public:
+	        Keypad(PinName col1,PinName col2,PinName col3,PinName row1,PinName row2,PinName row3,PinName row4);
+	        char getKey();
+	    protected:
+	    	int getKeyIndex();
+	        DigitalIn _col1,_col2,_col3;    
+	        BusOut _rows;
+	};
+}
+#endif