change ultrasonic

DFRobot · Dec 25, 2020 · 578b9e9 · 578b9e9
1 parent b7f7c12
commit 578b9e9
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 2 deletions.
diff --git a/NecIR.cpp b/NecIR.cpp
@@ -88,4 +88,44 @@ int irCode(){
     return data;
 }
 
+//%
+int readPulseIn(int status){
+  uint32_t lasttime,nowtime,temp;
+  if(status == 1){//HIGH
+        lasttime = system_timer_current_time_us();
+	while(!uBit.io.P2.getDigitalValue()){ 
+           temp = system_timer_current_time_us();
+           if((temp - lasttime) > 70000){
+	     //uBit.serial.printf("time out 0 %d\r\n",(temp-lasttime));
+	     return -1;
+           }
+        }
+        lasttime = system_timer_current_time_us();
+	while(uBit.io.P2.getDigitalValue()){
+           if((system_timer_current_time_us() - lasttime) > 70000){
+	     //uBit.serial.printf("time out 1");
+	     return -1;
+           }
+        }
+        nowtime = system_timer_current_time_us();
+
+  }else{//LOW
+	while(uBit.io.P2.getDigitalValue()){
+           if((system_timer_current_time_us() - lasttime) > 70000){
+	     //uBit.serial.printf("time out 3");
+	     return -1;
+           }
+        }
+	lasttime = system_timer_current_time_us();
+	while(!uBit.io.P2.getDigitalValue()){
+           if((system_timer_current_time_us() - lasttime) > 70000){
+	     //uBit.serial.printf("time out 4");
+	     return -1;
+           }
+	}
+	nowtime = system_timer_current_time_us();
+  }
+  return (nowtime - lasttime);
+}
+
 }
diff --git a/maqueen.ts b/maqueen.ts
@@ -242,6 +242,10 @@ function valuotokeyConversion():number{
         onPressEvent(IrPressEvent, maqueencb)
     }
 
+    //% advanced=true shim=maqueenIRV2::readPulseIn
+        function readPulseIn(status:number): number {
+            return 0;
+        }
     /**
      * Read ultrasonic sensor.
      */
@@ -254,11 +258,11 @@ function valuotokeyConversion():number{
         if (pins.digitalReadPin(DigitalPin.P2) == 0) {
             pins.digitalWritePin(DigitalPin.P1, 1);
             pins.digitalWritePin(DigitalPin.P1, 0);
-            d = pins.pulseIn(DigitalPin.P2, PulseValue.High, maxCmDistance * 58);
+            d = readPulseIn(1);//pins.pulseIn(DigitalPin.P2, PulseValue.High, maxCmDistance * 58);
         } else {
             pins.digitalWritePin(DigitalPin.P1, 0);
             pins.digitalWritePin(DigitalPin.P1, 1);
-            d = pins.pulseIn(DigitalPin.P2, PulseValue.Low, maxCmDistance * 58);
+            d = readPulseIn(0);//pins.pulseIn(DigitalPin.P2, PulseValue.Low, maxCmDistance * 58);
         }
         let x = d / 39;
         if (x <= 0 || x > 500) {
@@ -432,4 +436,5 @@ function valuotokeyConversion():number{
         basic.pause(50);
     })
 
+
 }
diff --git a/pxt.json b/pxt.json
@@ -31,6 +31,10 @@
         "test.ts"
     ],
     "public": true,
+    "targetVersions": {
+        "target": "3.1.46",
+        "targetId": "microbit"
+    },
     "supportedTargets": [
         "microbit"
     ],