Diff: 6_check_APDS_9960/main6.cpp

Revision:

1:cce280da16d4

Parent:

0:f1a10797d9f6

--- a/6_check_APDS_9960/main6.cpp	Fri Feb 07 01:21:16 2020 +0000
+++ b/6_check_APDS_9960/main6.cpp	Sun Feb 28 07:31:58 2021 +0000
@@ -2,12 +2,13 @@
  * APDS-9960
  *  Digital Proximity, Ambient Light, RGB and Gesture Sensor
  *
+ * Mbed Application program
+ *  Nano 33 BLE Sense board runs on mbed-OS6
  *  Modified by Kenji Arai / JH1PJL
  *      http://www7b.biglobe.ne.jp/~kenjia/
  *      https://os.mbed.com/users/kenjiArai/
- *
- *      Started:    Feburary   2nd, 2020
- *      Revised:    Feburary   3rd, 2020
+ *      Started:    February   2nd, 2020
+ *      Revised:    February  28th, 2021
  *
  *  Original:
  *      https://os.mbed.com/users/kbhagat6/code/Gesture_User_Interface/
@@ -21,14 +22,12 @@
 //  Include --------------------------------------------------------------------
 #include    "mbed.h"
 #include    "nano33blesense_iodef.h"
-#include    "PinDetect.h"
 #include    "glibr.h"
 
 //  Definition -----------------------------------------------------------------
 
 //  Object ---------------------------------------------------------------------
-RawSerial       pc(STDIO_UART_TX, STDIO_UART_RX, 115200);
-PinDetect       apds_int(PIN_APDS_INT);
+InterruptIn     apds_int(PIN_APDS_INT);
 DigitalOut      sen_pwr(PIN_VDD_ENV, 1);
 DigitalOut      i2c_pullup(PIN_I2C_PULLUP, 1);
 DigitalOut      led_y(PIN_YELLOW, 0);
@@ -44,9 +43,13 @@
 //  RAM ------------------------------------------------------------------------
 
 //  Function prototypes --------------------------------------------------------
-extern void check_i2c_connected_devices(void);
 void apds_hit_callback (void);
 
+//  subroutin (must be at this below line and do NOT change order) -------------
+#include    "usb_serial_as_stdio.h"
+#include    "check_revision.h"
+#include    "common.h"
+
 //------------------------------------------------------------------------------
 //  Control Program
 //------------------------------------------------------------------------------
@@ -54,95 +57,78 @@
 {
     bool gerror = false;
 
+    usb_serial_initialize();
+    print_revision();
     i2c_pullup = 1;
     sen_pwr = 1;
-    pc.printf("\r\nCheck APDS_9960\r\n");
-    thread_sleep_for(200);
+    print_usb("Check APDS_9960\r\n");
+    ThisThread::sleep_for(200ms);
     //  check I2C line
     check_i2c_connected_devices();
     gesture = new glibr(PIN_SDA1, PIN_SCL1);
     if (gesture->ginit()) {
-        pc.printf("APDS-9960 initialization complete\n\r");
+        print_usb("APDS-9960 initialization complete\n\r");
     } else {
-        pc.printf("Something went wrong during APDS-9960 init\n\r");
+        print_usb("Something went wrong during APDS-9960 init\n\r");
         gerror=true;
     }
-    uint8_t id = 0;
-    if (id == 0) {
-        pc.printf("??? is ready. ID = 0x%x\r\n", id);
-    } else {
-        pc.printf("??? is NOT ready. return value = 0x%x\r\n", id);
-    }
     // Start running the APDS-9960 gesture sensor engine
     if ( gesture->enableGestureSensor(true) ) {
-        pc.printf("Gesture sensor is now running\n\r");
+        print_usb("Gesture sensor is now running\n\r");
     } else {
-        pc.printf("Something went wrong during gesture sensor init!\n\r");
+        print_usb("Something went wrong during gesture sensor init!\n\r");
         gerror=true;
     }
-    //
+    // set pullup for Interrupt input pin
     apds_int.mode(PullUp);
     // Delay for initial pullup to take effect
-    thread_sleep_for(100);
+    ThisThread::sleep_for(1ms);
     // Setup Interrupt callback function for a pb hit
-    apds_int.attach_deasserted(&apds_hit_callback);
-    // Start sampling pb input using interrupts
-    apds_int.setSampleFrequency();   
+    apds_int.fall(&apds_hit_callback);
+    // Enable interrut
+    apds_int.enable_irq(); 
     while(!(gesture->isGestureAvailable())){        
-        ;
-        thread_sleep_for(500);
-        ;
-        thread_sleep_for(500);
+        ThisThread::sleep_for(200ms);
     }
-
     int temp;
     while(gerror == false) {
-        /*ret = gesture->isGestureAvailable();
-        pc.printf("Is Gesture Available?: %d\n", ret);
-        val = gesture->readGesture();
-        */
         if (gesture->isGestureAvailable()) {
             if(gesture->isGestureAvailable()){
                 temp = gesture->readGesture();
             }
             switch ( temp) {
                 case DIR_UP:
-                    pc.printf("Forward\r\n");
+                    print_usb("Forward\r\n");
                     break;
                 case DIR_DOWN:
-                    pc.printf("Backward\r\n");
+                    print_usb("Backward\r\n");
                     break;
                 case DIR_LEFT:
-                    pc.printf("LEFT\r\n");
+                    print_usb("LEFT\r\n");
                     break;
                 case DIR_RIGHT:
-                    pc.printf("RIGHT\r\n");
+                    print_usb("RIGHT\r\n");
                     break;
                 case 67: 
-                    pc.printf("Collision\r\n");
+                    print_usb("Collision\r\n");
                     break;
                 case DIR_NEAR:
-                    pc.printf("NEAR\r\n");
+                    print_usb("NEAR\r\n");
                     break;
                 case DIR_FAR:
-                    pc.printf("FAR\r\n");
+                    print_usb("FAR\r\n");
                     break;
                 default:
-                    pc.printf("NONE\r\n");
+                    print_usb("NONE\r\n");
                     break; 
             }
         }
-        //thread_sleep_for(1000);
     }
 }
 
 void apds_hit_callback (void)
 {
     led_y =!led_y;
-    //str.append("S");
-    //pc2.printf("%s\n", str);
-    //printSTOP(3, 7); 
-    //str.clear();
 }
 
-#endif  // EXAMPLE_9_CHECK_APDS_9960
\ No newline at end of file
+#endif  // EXAMPLE_6_CHECK_APDS_9960
\ No newline at end of file