update example

Author: i3water

examples/Blinker_SR04/SR04_BLE/SR04_BLE.ino

@@ -5,7 +5,7 @@
 
 #include <modules/Ultrasonic.h>
 
-Ultrasonic SR04(9,8);
+Ultrasonic SR04(9, 8);// Trig, Echo
 
 void setup()
 {
@@ -31,9 +31,9 @@ void loop()
 		Blinker.print("millis", BlinkerTime);
 	}
 
-    BLINKER_LOG3("SR04: ", SR04.Ranging(CM), " cm");
+    BLINKER_LOG3("SR04: ", SR04.cm(), " cm");
 
-    Blinker.print("SR04", SR04.Ranging(CM));
+    Blinker.print("SR04", SR04.cm());
 
     Blinker.delay(1000);
 }

examples/Blinker_SR04/SR04_WiFi/SR04_WiFi.ino

@@ -8,7 +8,7 @@ char pswd[] = "<Your WiFi network WPA password or WEP key>";
 
 #include <modules/Ultrasonic.h>
 
-Ultrasonic SR04(9,8);
+Ultrasonic SR04(9, 8);// Trig, Echo
 
 void setup()
 {
@@ -34,9 +34,9 @@ void loop()
 		Blinker.print("millis", BlinkerTime);
 	}
 
-    BLINKER_LOG3("SR04: ", SR04.Ranging(CM), " cm");
+    BLINKER_LOG3("SR04: ", SR04.cm(), " cm");
 
-    Blinker.print("SR04", SR04.Ranging(CM));
+    Blinker.print("SR04", SR04.cm());
 
     Blinker.delay(1000);
 }

src/modules/Ultrasonic.cpp

@@ -1,55 +1,52 @@
-// Ultrasonic - Library for HR-SC04 Ultrasonic Ranging Module.
-// GitHub: https://github.com/JRodrigoTech/Ultrasonic-HC-SR04
-// #### LICENSE ####
-// This code is licensed under Creative Commons Share alike 
-// and Attribution by J.Rodrigo ( http://www.jrodrigo.net ).
-
 #if ARDUINO >= 100
-  #include "Arduino.h"
+    #include "Arduino.h"
 #else
-  #include "WProgram.h"
+    #include "WProgram.h"
 #endif
 
 #include "Ultrasonic.h"
 
-Ultrasonic::Ultrasonic(int TP, int EP)
+Ultrasonic::Ultrasonic(uint8_t TP, uint8_t EP, uint32_t TO)
 {
-   pinMode(TP,OUTPUT);
-   pinMode(EP,INPUT);
-   Trig_pin=TP;
-   Echo_pin=EP;
-   Time_out=30000;  // 3000 µs = 50cm // 30000 µs = 5 m 
+    pinMode(TP,OUTPUT);
+    pinMode(EP,INPUT);
+    Trig_pin = TP;
+    Echo_pin = EP;
+    Time_out = TO;
 }
 
-Ultrasonic::Ultrasonic(int TP, int EP, long TO)
+uint32_t Ultrasonic::cm()
 {
-   pinMode(TP,OUTPUT);
-   pinMode(EP,INPUT);
-   Trig_pin=TP;
-   Echo_pin=EP;
-   Time_out=TO;
-}
+    uint32_t duration, distance_cm;
 
-long Ultrasonic::Timing()
-{
-  digitalWrite(Trig_pin, LOW);
-  delayMicroseconds(2);
-  digitalWrite(Trig_pin, HIGH);
-  delayMicroseconds(10);
-  digitalWrite(Trig_pin, LOW);
-  duration = pulseIn(Echo_pin,HIGH,Time_out);
-  if ( duration == 0 ) {
-	duration = Time_out; }
-  return duration;
+    digitalWrite(Trig_pin, LOW);
+    delayMicroseconds(2);
+    digitalWrite(Trig_pin, HIGH);
+    delayMicroseconds(10);
+    digitalWrite(Trig_pin, LOW);
+    duration = pulseIn(Echo_pin,HIGH,Time_out);
+    if ( duration == 0 ) {
+        duration = Time_out;
+    }
+
+    distance_cm = duration /29 / 2 ;
+    return distance_cm;
 }
 
-long Ultrasonic::Ranging(int sys)
+uint32_t Ultrasonic::inch()
 {
-  Timing();
-  if (sys) {
-	distance_cm = duration /29 / 2 ;
-	return distance_cm;
-  } else {
-	distance_inc = duration / 74 / 2;
-	return distance_inc; }
+    uint32_t duration, distance_inc;
+
+    digitalWrite(Trig_pin, LOW);
+    delayMicroseconds(2);
+    digitalWrite(Trig_pin, HIGH);
+    delayMicroseconds(10);
+    digitalWrite(Trig_pin, LOW);
+    duration = pulseIn(Echo_pin,HIGH,Time_out);
+    if ( duration == 0 ) {
+        duration = Time_out;
+    }
+
+    distance_inc = duration / 74 / 2;
+    return distance_inc;
 }

src/modules/Ultrasonic.h

@@ -1,34 +1,24 @@
-// Ultrasonic - Library for HR-SC04 Ultrasonic Ranging Module.
-// GitHub: https://github.com/JRodrigoTech/Ultrasonic-HC-SR04
-// #### LICENSE ####
-// This code is licensed under Creative Commons Share alike 
-// and Attribution by J.Rodrigo ( http://www.jrodrigo.net ).
-
 #ifndef Ultrasonic_h
 #define Ultrasonic_h
 
 #if ARDUINO >= 100
-  #include "Arduino.h"
+    #include "Arduino.h"
 #else
-  #include "WProgram.h"
+    #include "WProgram.h"
 #endif
 
-#define CM 1
-#define INC 0
-
 class Ultrasonic
 {
-  public:
-    Ultrasonic(int TP, int EP);
-	Ultrasonic(int TP, int EP, long TO);
-    long Timing();
-    long Ranging(int sys);
+    public:
+        Ultrasonic(uint8_t TP, uint8_t EP, uint32_t TO = 30000);
+        // 3000 µs = 50cm // 30000 µs = 5 m 
+        uint32_t cm();
+        uint32_t inch();
 
-  private:
-    int Trig_pin;
-    int Echo_pin;
-	long Time_out;
-    long duration,distance_cm,distance_inc;
+    private:
+        uint8_t Trig_pin;
+        uint8_t Echo_pin;
+        uint32_t Time_out;
 };
 
 #endif