Revision 2:aa6fdecebf2b, committed 2020-04-06

Comitter:

kenjiArai

Date:

Mon Apr 06 04:57:04 2020 +0000

Parent:

1:abadd53f2072

Child:

3:0c888cad9376

Commit message:

Extended not only 3x4 but 4x4,4x5 and 5x5 keys

Changed in this revision

--- a/Keypad.lib	Sat Sep 30 23:29:05 2017 +0000
+++ b/Keypad.lib	Mon Apr 06 04:57:04 2020 +0000
@@ -1,1 +1,1 @@
-https://os.mbed.com/users/kenjiArai/code/Keypad/#ed0ad90ad734
+https://os.mbed.com/users/kenjiArai/code/Keypad/#0ea41738b560

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/check_revision.cpp	Mon Apr 06 04:57:04 2020 +0000
@@ -0,0 +1,31 @@
+/*
+ * Check Mbed revision
+ *
+ * Copyright (c) 2020 Kenji Arai / JH1PJL
+ *  http://www7b.biglobe.ne.jp/~kenjia/
+ *  https://os.mbed.com/users/kenjiArai/
+ *      Revised:    Feburary  16th, 2020
+ *      Revised:    April      6th, 2020
+ */
+
+#include "mbed.h"
+
+// RUN on mbed-os-6.0.0-alpha-3
+//    https://github.com/ARMmbed/mbed-os/releases/tag/mbed-os-6.0.0-alpha-3
+#if   (MBED_MAJOR_VERSION == 5) &&\
+      (MBED_MINOR_VERSION == 15) &&\
+      (MBED_PATCH_VERSION == 1)
+// RUN on mbed 2.0.165
+#elif (MBED_MAJOR_VERSION == 2) &&\
+      (MBED_MINOR_VERSION == 0) &&\
+      (MBED_PATCH_VERSION == 165)
+#else
+#     error "Please use mbed-os-6.0.0-alpha-3 or mbed2-165"
+#endif
+
+void print_revision(void)
+{
+    printf("MBED_MAJOR_VERSION = %d, ", MBED_MAJOR_VERSION);
+    printf("MINOR = %d, ", MBED_MINOR_VERSION);
+    printf("PATCH = %d\r\n", MBED_PATCH_VERSION);
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/key_3x4.cpp	Mon Apr 06 04:57:04 2020 +0000
@@ -0,0 +1,63 @@
+/*
+ * Mbed Application program
+ *  example:
+ *      Akizuki AE-KIT45-KEYPAD4X3
+ *      http://akizukidenshi.com/catalog/g/gK-12229/
+ *
+ * Copyright (c) 2017,'20 Kenji Arai / JH1PJL
+ *  http://www7b.biglobe.ne.jp/~kenjia/
+ *  https://os.mbed.com/users/kenjiArai/
+ *      Created:    September 27th, 2017
+ *      Revised:    April      6th, 2020
+ */
+
+//  Pre-selection --------------------------------------------------------------
+#include    "select_example.h"
+//#define KEY3X4
+#ifdef KEY3X4
+
+//  Include --------------------------------------------------------------------
+#include "mbed.h"
+#include "Keypad.h"
+
+//  Definition -----------------------------------------------------------------
+
+//  Object ---------------------------------------------------------------------
+DigitalOut  my_led(LED1);
+Serial      pc(USBTX,USBRX);
+//              X    Y   Z   A   B   C   D   OUT(XYZ), IN(ABCD)
+Keypad      key(D10, D9, D8, D7, D6, D5, D4);
+//              X    Y   Z   A   B   C   D   OUT(XYZ), IN(ABCD)
+//Keypad      key(D10, D9, D8, D6, D5, D4, D3);
+
+//  RAM ------------------------------------------------------------------------
+
+//  ROM / Constant data --------------------------------------------------------
+//                          X*A = *, X*B = 7, X*C = 4, X*D = 1
+//                          Y*A = 0, Y*B = 8, Y*C = 5, Y*D = 2
+//                          Z*A = #, Z*B = 9, Z*C = 6, Z*D = 3
+//                          key_table[0]=? is not used!
+const char *const key_table = "?*7410852#963";
+//                              123456789012
+
+//  Function prototypes --------------------------------------------------------
+
+//------------------------------------------------------------------------------
+//  Control Program
+//------------------------------------------------------------------------------
+int main()
+{
+    uint32_t key_num;
+    uint32_t counter = 0;
+
+    pc.printf("Start Key-Pad test\r\n");
+    while(true) {
+        while ((key_num = key.read()) != 0) {
+            pc.printf("%2u:[%2d] %c\r\n",
+                      counter++, key_num, *(key_table + key_num));
+        }
+        wait_us(100000);
+    }
+}
+
+#endif  // #ifdef KEY3X4
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/key_4x4.cpp	Mon Apr 06 04:57:04 2020 +0000
@@ -0,0 +1,59 @@
+/*
+ * Mbed Application program
+ *
+ * Copyright (c) 2020 Kenji Arai / JH1PJL
+ *  http://www7b.biglobe.ne.jp/~kenjia/
+ *  https://os.mbed.com/users/kenjiArai/
+ *      Created:    April      5th, 2020
+ *      Revised:    April      6th, 2020
+ */
+
+//  Pre-selection --------------------------------------------------------------
+#include    "select_example.h"
+//#define KEY4X4
+#ifdef KEY4X4
+
+//  Include --------------------------------------------------------------------
+#include "mbed.h"
+#include "Keypad.h"
+
+//  Definition -----------------------------------------------------------------
+
+//  Object ---------------------------------------------------------------------
+DigitalOut  my_led(LED1);
+Serial      pc(USBTX,USBRX);
+//              X    Y   Z   W    A   B   C   D   OUT(XYZW), IN(ABCD)
+Keypad      key(D10, D9, D8, D7, D6, D5, D4, D3);
+
+//  RAM ------------------------------------------------------------------------
+
+//  ROM / Constant data --------------------------------------------------------
+//                          X*A = *, X*B = 7, X*C = 4, X*D = 1
+//                          Y*A = 0, Y*B = 8, Y*C = 5, Y*D = 2
+//                          Z*A = #, Z*B = 9, Z*C = 6, Z*D = 3
+//                          W*A = A, W*B = B, W*C = C, W*D = D
+//                          key_table[0]=? is not used!
+const char *const key_table = "?*7410852#963ABCD";
+//                              1234567890123456
+
+//  Function prototypes --------------------------------------------------------
+
+//------------------------------------------------------------------------------
+//  Control Program
+//------------------------------------------------------------------------------
+int main()
+{
+    uint32_t key_num;
+    uint32_t counter = 0;
+
+    pc.printf("Start Key-Pad test\r\n");
+    while(true) {
+        while ((key_num = key.read()) != 0) {
+            pc.printf("%2u:[%2d] %c\r\n",
+                      counter++, key_num, *(key_table + key_num));
+        }
+        wait_us(100000);
+    }
+}
+
+#endif  // #ifdef KEY4X4
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/key_4x5.cpp	Mon Apr 06 04:57:04 2020 +0000
@@ -0,0 +1,59 @@
+/*
+ * Mbed Application program
+ *
+ * Copyright (c) 2020 Kenji Arai / JH1PJL
+ *  http://www7b.biglobe.ne.jp/~kenjia/
+ *  https://os.mbed.com/users/kenjiArai/
+ *      Created:    April      5th, 2020
+ *      Revised:    April      6th, 2020
+ */
+
+//  Pre-selection --------------------------------------------------------------
+#include    "select_example.h"
+//#define KEY4X5
+#ifdef KEY4X5
+
+//  Include --------------------------------------------------------------------
+#include "mbed.h"
+#include "Keypad.h"
+
+//  Definition -----------------------------------------------------------------
+
+//  Object ---------------------------------------------------------------------
+DigitalOut  my_led(LED1);
+Serial      pc(USBTX,USBRX);
+//              X    Y   Z   W    A   B   C   D   E   OUT(XYZW), IN(ABCDE)
+Keypad      key(D10, D9, D8, D7, D6, D5, D4, D3, D2);
+
+//  RAM ------------------------------------------------------------------------
+
+//  ROM / Constant data --------------------------------------------------------
+//                          X*A = *, X*B = D, X*C = 9, X*D = 5, X*E = 1
+//                          Y*A = /, Y*B = E, Y*C = A, Y*D = 6, Y*E = 2
+//                          Z*A = #, Z*B = F, Z*C = B, Z*D = 7, Z*E = 3
+//                          W*A = +, W*B = G, W*C = C, W*D = 8, W*E = 4
+//                          key_table[0]=? is not used!
+const char *const key_table = "?*D951/EA62#FB73+GC84";
+//                              12345678901234567890
+
+//  Function prototypes --------------------------------------------------------
+
+//------------------------------------------------------------------------------
+//  Control Program
+//------------------------------------------------------------------------------
+int main()
+{
+    uint32_t key_num;
+    uint32_t counter = 0;
+
+    pc.printf("Start Key-Pad test\r\n");
+    while(true) {
+        while ((key_num = key.read()) != 0) {
+            pc.printf("%2u:[%2d] %c\r\n",
+                      counter++, key_num, *(key_table + key_num));
+        }
+        wait_us(100000);
+    }
+}
+
+#endif  // #ifdef KEY4X5
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/key_5x5.cpp	Mon Apr 06 04:57:04 2020 +0000
@@ -0,0 +1,60 @@
+/*
+ * Mbed Application program
+ *
+ * Copyright (c) 2020 Kenji Arai / JH1PJL
+ *  http://www7b.biglobe.ne.jp/~kenjia/
+ *  https://os.mbed.com/users/kenjiArai/
+ *      Created:    April      5th, 2020
+ *      Revised:    April      6th, 2020
+ */
+
+//  Pre-selection --------------------------------------------------------------
+#include    "select_example.h"
+//#define KEY5X5
+#ifdef KEY5X5
+
+//  Include --------------------------------------------------------------------
+#include "mbed.h"
+#include "Keypad.h"
+
+//  Definition -----------------------------------------------------------------
+
+//  Object ---------------------------------------------------------------------
+DigitalOut  my_led(LED1);
+Serial      pc(USBTX,USBRX);
+//              X    Y    Z   W   V   A   B   C   D   E   OUT(XYZWV), IN(ABCDE)
+Keypad      key(D11, D10, D9, D8, D7, D6, D5, D4, D3, D2);
+
+//  RAM ------------------------------------------------------------------------
+
+//  ROM / Constant data --------------------------------------------------------
+//                          X*A = *, X*B = G, X*C = B, X*D = 6, X*E = 1
+//                          Y*A = /, Y*B = H, Y*C = C, Y*D = 7, Y*E = 2
+//                          Z*A = ., Z*B = I, Z*C = D, Z*D = 8, Z*E = 3
+//                          W*A = +, W*B = J, W*C = E, W*D = 9, W*E = 4
+//                          V*A = -, V*B = =, V*C = F, V*D = A, V*E = 5
+//                          key_table[0]=? is not used!
+const char *const key_table = "?*GB61/HC72.ID83+JE94-=FA5";
+//                              1234567890123456789012345
+
+//  Function prototypes --------------------------------------------------------
+
+//------------------------------------------------------------------------------
+//  Control Program
+//------------------------------------------------------------------------------
+int main()
+{
+    uint32_t key_num;
+    uint32_t counter = 0;
+
+    pc.printf("Start Key-Pad test\r\n");
+    while(true) {
+        while ((key_num = key.read()) != 0) {
+            pc.printf("%2u:[%2d] %c\r\n",
+                      counter++, key_num, *(key_table + key_num));
+        }
+        wait_us(100000);
+    }
+}
+
+#endif  // #ifdef KEY5X5
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/key_complex.cpp	Mon Apr 06 04:57:04 2020 +0000
@@ -0,0 +1,84 @@
+/*
+ * Mbed Application program
+ *
+ * Copyright (c) 2020 Kenji Arai / JH1PJL
+ *  http://www7b.biglobe.ne.jp/~kenjia/
+ *  https://os.mbed.com/users/kenjiArai/
+ *      Created:    April      5th, 2020
+ *      Revised:    April      6th, 2020
+ */
+
+//  Pre-selection --------------------------------------------------------------
+#include    "select_example.h"
+//#define COMPLEX
+#ifdef COMPLEX
+
+//  Include --------------------------------------------------------------------
+#include "mbed.h"
+#include "Keypad.h"
+
+//  Definition -----------------------------------------------------------------
+#define A_SW    24      // see key_table[25] = A
+#define B_SW     3      // see key_table[3]  = B
+#define C_SW     8      // see key_table[8]  = C
+
+//  Object ---------------------------------------------------------------------
+DigitalOut  my_led(D13);
+//DigitalOut  my_led(LED1);
+DigitalOut  led0(A0);
+DigitalOut  led1(A1);
+DigitalOut  led2(A2);
+Serial      pc(USBTX,USBRX);
+//              X   Y   Z   W   V   A    B    C   D   E   OUT(XYZWV), IN(ABCDE)
+Keypad      key(D6, D5, D4, D3, D2, D11, D10, D9, D8, D7);
+
+//  RAM ------------------------------------------------------------------------
+
+//  ROM / Constant data --------------------------------------------------------
+//                       key_table[0]=? is not used!
+//                         1     2     3     4     5
+const char key_table[] = {NUL,
+                          '*',  'G',  'B',  '6',  '1',    // 1
+                          '/',  'H',  'C',  '7',  '2',    // 2
+                          CR,   '-',  'D',  '8',  '3',    // 3
+                          SPC,  '+',  'E',  '9',  '4',    // 4
+                          BS,   '=',  'F',  'A',  '5',    // 5
+                          NUL
+                         };
+
+//  Function prototypes --------------------------------------------------------
+
+//------------------------------------------------------------------------------
+//  Control Program
+//------------------------------------------------------------------------------
+int main()
+{
+    uint32_t key_num;
+    uint32_t counter = 0;
+
+    pc.printf("Start Key-Pad test\r\n");
+    while(true) {
+        while ((key_num = key.read()) != 0) {
+            pc.printf("%2u:[%2d] %c\r\n",
+                      counter++, key_num, key_table[key_num]);
+        }
+        if (key.read_state(A_SW) == true) {
+            led0 = 1;
+        } else {
+            led0 = 0;
+        }
+        if (key.read_state(B_SW) == true) {
+            led1 = 1;
+        } else {
+            led1 = 0;
+        }
+        if (key.read_state(C_SW) == true) {
+            led2 = 1;
+        } else {
+            led2 = 0;
+        }
+        wait_us(100000);
+    }
+}
+
+#endif  // #ifdef COMPLEX
\ No newline at end of file

--- a/main.cpp	Sat Sep 30 23:29:05 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
- * Mbed Application program / Akizuki AE-KIT45-KEYPAD4X3
- *  http://akizukidenshi.com/catalog/g/gK-12229/
- *
- * Copyright (c) 2017 Kenji Arai / JH1PJL
- *  http://www.page.sannet.ne.jp/kenjia/index.html
- *  http://mbed.org/users/kenjiArai/
- *      Created:    September 27th, 2017
- *      Revised:    October    1st, 2017
- */
-
-//  Include --------------------------------------------------------------------
-#include "mbed.h"
-#include "Keypad.h"
-
-//  Definition -----------------------------------------------------------------
-
-//  Object ---------------------------------------------------------------------
-DigitalOut  my_led(LED1);
-Serial      pc(USBTX,USBRX);
-            //  X    Y   Z   A   B   C   D   OUT(XYZ), IN(ABCD)
-Keypad      key(D10, D9, D8, D7, D6, D5, D4);
-
-//  RAM ------------------------------------------------------------------------
-
-//  ROM / Constant data --------------------------------------------------------
-                        // X*A = *, X*B = 7, X*C = 4, X*D = 1
-                        // Y*A = 0, Y*B = 8, Y*C = 5, Y*D = 2
-                        // Z*A = #, Z*B = 9, Z*C = 6, Z*D = 3
-char *const key_table = "?*7410852#963";  // key_table[0]=? is not used!
-
-//  Function prototypes --------------------------------------------------------
-
-//------------------------------------------------------------------------------
-//  Control Program
-//------------------------------------------------------------------------------
-int main() {
-    uint32_t key_num;
-    uint32_t counter = 0;
-
-    pc.printf("Start Key-Pad test\r\n");
-    while(true) {
-        while ((key_num = key.read()) != 0){
-            pc.printf("%04u : %c\r\n", counter++, *(key_table + key_num));
-        }
-        wait(0.1);  
-    }
-}

--- a/mbed-os.lib	Sat Sep 30 23:29:05 2017 +0000
+++ b/mbed-os.lib	Mon Apr 06 04:57:04 2020 +0000
@@ -1,1 +1,1 @@
-https://github.com/ARMmbed/mbed-os/#ca661f9d28526ca8f874b05432493a489c9671ea
+https://github.com/ARMmbed/mbed-os/#532654ebb31c7bf79601042a6fa976b85532ef47

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/select_example.h	Mon Apr 06 04:57:04 2020 +0000
@@ -0,0 +1,33 @@
+/*
+ * Mbed Application program
+ *
+ * Copyright (c) 2020 Kenji Arai / JH1PJL
+ *  http://www7b.biglobe.ne.jp/~kenjia/
+ *  https://os.mbed.com/users/kenjiArai/
+ *      Created:    April      5th, 2020
+ *      Revised:    April      6th, 2020
+ */
+/*
+    You can select several examples as followings.
+    0.  key_3x4.cpp
+    1.  key_4x4.cpp
+    2.  key_4x5.cpp
+    3.  key_5x5.cpp
+    4.  key_complex.cpp
+ */
+#define PROG_NUMBER     0       // select 0 to 4
+
+//----------------- You don't need any modification ----------------------------
+#if PROG_NUMBER      == 0
+#   define KEY3X4
+#elif PROG_NUMBER    == 1
+#   define KEY4X4
+#elif PROG_NUMBER    == 2
+#   define KEY4X5
+#elif PROG_NUMBER    == 3
+#   define KEY5X5
+#elif PROG_NUMBER    == 4
+#   define COMPLEX
+#else
+#   error " Please set 0 to 4 number for PROG_NUMBER!!"
+#endif
\ No newline at end of file