Diff: main.cpp

Revision:

8:782d1dcdfd94

Parent:

7:04a9ea641c79

--- a/main.cpp	Fri Oct 21 20:19:04 2016 +0000
+++ b/main.cpp	Sat Oct 22 01:28:35 2016 +0000
@@ -26,7 +26,7 @@
 const MDK_REGISTER_CMD my_cmd_func_table[FUNCTION_TABLE_NUM] = {
     {0x2700, my_function_CMD_2700},     // Command -> function
 };
- 
+ int buzzing=0;
 //int lastPrx = 0;
 int toggle = 0;
 unsigned char prxPress = 0x02;
@@ -40,15 +40,16 @@
     ledR = 1.0f - (pData[0] / 255.0f);
     ledG = 1.0f - (pData[1] / 255.0f);
     ledB = 1.0f - (pData[2] / 255.0f);
+    toggle = pData[0];
     np_api_upload(0x2701, &response, 1);
 }
 
-int i2c_read_gesture()
+int i2c_read_gesture(char gestReg)
 {
     char    readVal;
-    char    gestReg;
+    //char    gestReg;
  
-    gestReg    = 0x04;
+    //gestReg    = 0x04;
  
     i2c.write( 0x20, &gestReg, 1 );
     i2c.read( 0x20, &readVal, 1 );
@@ -76,10 +77,13 @@
 {
     float A_4 = 1000000/Do4;
     //int proxData = max44000.readReg(MAX44000::REG_PRX_DATA);
-    int gesture = i2c_read_gesture();
+    int gesture = i2c_read_gesture(0x04);
+    
+    if(!buzzing){
     if (gesture == 0x01) {
         if (!toggle) {
             np_api_upload(0x2800, &prxPress, 1);
+            //int dummy = i2c_read_gesture(0x0a);
             //Stop_tunes(Buzzer);
             }
         toggle = 1;
@@ -87,30 +91,29 @@
     } else if (gesture == 0x02) {
         if(toggle){
         np_api_upload(0x2800, &prxPress, 1);
-        //Tune(Buzzer, A_4, 4);  //4 Octave C beat 4/16
         }
     toggle = 0;}
     
-    if(toggle)
-    	Tune(Buzzer, A_4, 4);  //4 Octave C beat 4/16
-    /*
-    if(toggle && (gesture==0x03))
-		buzzing=1;
-	
-	if(buzzing && gesture == 0x05)
-		buzzing = 0;
-	
-if(buzzing){
-	if(!buz){
-		buz=1;}
-	else{
-		buz=0;}	
-		}*/
+    if(toggle){
+        int distance = i2c_read_gesture(0x0a);
+        if(distance<60){
+        buzzing =1;}
+        }
+    
  
     if (!button && lastBtn) {
         np_api_upload(0x2800, &btnPress, 1);
     }
+    }
     lastBtn = button;
+    if(buzzing){
+    	Tune(Buzzer, A_4, 4);  //4 Octave C beat 4/16
+    	}
+    if(buzzing &&!toggle){
+    	buzzing=0;
+    	//np_api_upload(0x2800, &prxPress, 1);
+    	//toggle = 1;
+    	}
 }