update example & readme

i3water · i3water · commit 88f3d1fac72a · 2018-03-09T12:33:53.000+08:00
diff --git a/README.md b/README.md
@@ -41,7 +41,15 @@ BLE:
 void setup() {  
     Blinker.begin();  
 }
-```
+```  
+
+>SerialBLE Modules:  
+>**Blinker.begin()** will config SoftWareSerial with default settings.  
+>  
+>Blinker.begin();// default settings digital pins 2(RX) 3(TX) and baudrate 9600 bps  
+>Blinker.begin(4, 5);// config digital pins 4(RX) 5(TX) with default baudrate 9600 bps  
+>Blinker.begin(4, 5, 115200);// config digital pins 4(RX) 5(TX) and baudrate 115200 bps  
+  
 WiFi:
 ```
 #define BLINKER_WIFI  
@@ -187,7 +195,15 @@ Blinker.begin(...);
 void setup() {  
     Blinker.begin();  
 }
-```
+```  
+  
+>串口蓝牙模块:  
+>**Blinker.begin()** 将使用默认设置配置 SoftWareSerial   
+>  
+>Blinker.begin();// 默认设置: 数字IO 2(RX) 3(TX), 波特率 9600 bps
+>Blinker.begin(4, 5);// 设置数字IO 4(RX) 5(TX), 默认波特率 9600 bps  
+>Blinker.begin(4, 5, 115200);// 设置数字IO 4(RX) 5(TX) 及波特率 115200 bps  
+  
 WiFi模块:
 ```
 #define BLINKER_WIFI  
diff --git a/examples/Blinker_AHRS/AHRS_BLE/AHRS_BLE.ino b/examples/Blinker_AHRS/AHRS_BLE/AHRS_BLE.ino
@@ -1,4 +1,4 @@
-#define	BLINKER_PRINT	Serial
+#define BLINKER_PRINT	Serial
 #define BLINKER_BLE
 
 #include <Blinker.h>
diff --git a/examples/Blinker_AHRS/AHRS_WiFi/AHRS_WiFi.ino b/examples/Blinker_AHRS/AHRS_WiFi/AHRS_WiFi.ino
@@ -1,4 +1,4 @@
-#define	BLINKER_PRINT	Serial
+#define BLINKER_PRINT	Serial
 #define BLINKER_WIFI
 
 #include <Blinker.h>
diff --git a/examples/Blinker_Button/Button_BLE/Button_BLE.ino b/examples/Blinker_Button/Button_BLE/Button_BLE.ino
@@ -1,4 +1,4 @@
-#define	BLINKER_PRINT	Serial
+#define BLINKER_PRINT	Serial
 #define BLINKER_BLE
 
 #define BUTTON_1		"ButtonKey"
diff --git a/examples/Blinker_Button/Button_WiFi/Button_WiFi.ino b/examples/Blinker_Button/Button_WiFi/Button_WiFi.ino
@@ -1,4 +1,4 @@
-#define	BLINKER_PRINT	Serial
+#define BLINKER_PRINT	Serial
 #define BLINKER_WIFI
 
 #define BUTTON_1		"ButtonKey"
diff --git a/examples/Blinker_Joystick/Joystick_BLE/Joystick_BLE.ino b/examples/Blinker_Joystick/Joystick_BLE/Joystick_BLE.ino
@@ -1,4 +1,4 @@
-#define	BLINKER_PRINT	Serial
+#define BLINKER_PRINT	Serial
 #define BLINKER_BLE
 
 #include <Blinker.h>
diff --git a/examples/Blinker_Joystick/Joystick_WiFi/Joystick_WiFi.ino b/examples/Blinker_Joystick/Joystick_WiFi/Joystick_WiFi.ino
@@ -1,4 +1,4 @@
-#define	BLINKER_PRINT	Serial
+#define BLINKER_PRINT	Serial
 #define BLINKER_WIFI
 
 #include <Blinker.h>
diff --git a/examples/Blinker_SR04/SR04_BLE/SR04_BLE.ino b/examples/Blinker_SR04/SR04_BLE/SR04_BLE.ino
@@ -0,0 +1,39 @@
+#define BLINKER_PRINT	Serial
+#define BLINKER_BLE
+
+#include <Blinker.h>
+
+#include <modules/Ultrasonic.h>
+
+Ultrasonic SR04(9,8);
+
+void setup()
+{
+	Serial.begin(115200);
+
+	pinMode(LED_BUILTIN, OUTPUT);
+	digitalWrite(LED_BUILTIN, LOW);
+	
+	Blinker.begin();
+}
+
+void loop()
+{
+	Blinker.run();
+
+	if (Blinker.available()) {
+		BLINKER_LOG2("Blinker.readString(): ", Blinker.readString());
+
+		Blinker.vibrate();
+		
+		uint32_t BlinkerTime = millis();
+		Blinker.print(BlinkerTime);
+		Blinker.print("millis", BlinkerTime);
+	}
+
+    BLINKER_LOG3("SR04: ", SR04.Ranging(CM), " cm");
+
+    Blinker.print("SR04", SR04.Ranging(CM));
+
+    Blinker.delay(1000);
+}
diff --git a/examples/Blinker_SR04/SR04_WiFi/SR04_WiFi.ino b/examples/Blinker_SR04/SR04_WiFi/SR04_WiFi.ino
@@ -0,0 +1,42 @@
+#define BLINKER_PRINT	Serial
+#define BLINKER_WIFI
+
+#include <Blinker.h>
+
+char ssid[] = "<Your WiFi network SSID or name>";
+char pswd[] = "<Your WiFi network WPA password or WEP key>";
+
+#include <modules/Ultrasonic.h>
+
+Ultrasonic SR04(9,8);
+
+void setup()
+{
+	Serial.begin(115200);
+
+	pinMode(LED_BUILTIN, OUTPUT);
+	digitalWrite(LED_BUILTIN, LOW);
+
+	Blinker.begin(ssid, pswd);
+}
+
+void loop()
+{
+	Blinker.run();
+
+	if (Blinker.available()) {
+		BLINKER_LOG2("Blinker.readString(): ", Blinker.readString());
+
+		Blinker.vibrate();
+		
+		uint32_t BlinkerTime = millis();
+		Blinker.print(BlinkerTime);
+		Blinker.print("millis", BlinkerTime);
+	}
+
+    BLINKER_LOG3("SR04: ", SR04.Ranging(CM), " cm");
+
+    Blinker.print("SR04", SR04.Ranging(CM));
+
+    Blinker.delay(1000);
+}
diff --git a/examples/Blinker_Slider/Slider_BLE/Slider_BLE.ino b/examples/Blinker_Slider/Slider_BLE/Slider_BLE.ino
@@ -1,4 +1,4 @@
-#define	BLINKER_PRINT	Serial
+#define BLINKER_PRINT	Serial
 #define BLINKER_BLE
 
 #define SLIDER_1		"SliderKey"
diff --git a/examples/Blinker_Slider/Slider_WiFi/Slider_WiFi.ino b/examples/Blinker_Slider/Slider_WiFi/Slider_WiFi.ino
@@ -1,4 +1,4 @@
-#define	BLINKER_PRINT	Serial
+#define BLINKER_PRINT	Serial
 #define BLINKER_WIFI
 
 #define SLIDER_1        "SliderKey"
diff --git a/src/Adapters/BlinkerSerial.h b/src/Adapters/BlinkerSerial.h
@@ -1,13 +1,10 @@
 #ifndef BlinkerSerial_H
 #define BlinkerSerial_H
 
-#define BLINKER_SERIAL_BLE
-
 #include <SoftwareSerial.h>
 #include <Blinker/BlinkerProtocol.h>
 
-SoftwareSerial SerialBLE(SERIAL_BLE_RX_PIN, SERIAL_BLE_TX_PIN);
-// SoftwareSerial *SerialBLE;//TODO
+SoftwareSerial *SerialBLE;
 
 class BlinkerTransportStream
 {
@@ -82,17 +79,14 @@ class BlinkerSerail
             : Base(transp)
         {}
 
-        // void begin(uint8_t rx_pin = SERIAL_BLE_RX_PIN,
-        //             uint8_t tx_pin = SERIAL_BLE_TX_PIN,
-        //             uint32_t baud = SERIAL_BLE_Baud)
-        void begin()
+        void begin(uint8_t ss_rx_pin = 2,
+                    uint8_t ss_tx_pin = 3,
+                    uint32_t ss_baud = 9600)
         {
             Base::begin();
-            SerialBLE.begin(SERIAL_BLE_Baud);
-            // SerialBLE = new SoftwareSerial(rx_pin, tx_pin);
-            // SerialBLE->begin(baud);//TODO
-            // this->conn.begin(*SerialBLE);
-            this->conn.begin(SerialBLE);
+            SerialBLE = new SoftwareSerial(ss_rx_pin, ss_tx_pin);
+            SerialBLE->begin(ss_baud);
+            this->conn.begin(*SerialBLE);
             BLINKER_LOG1("SerialBLE Initialled...");
         }
 };
diff --git a/src/Blinker/BlinkerConfig.h b/src/Blinker/BlinkerConfig.h
@@ -41,12 +41,4 @@
 
 #define BLINKER_JOYSTICK_VALUE_DEFAULT  128
 
-#if defined(BLINKER_SERIAL_BLE)
-#define SERIAL_BLE_RX_PIN               2
-
-#define SERIAL_BLE_TX_PIN               3
-
-#define SERIAL_BLE_Baud                 9600
-#endif
-
 #endif
diff --git a/src/BlinkerSimpleESP32_WS.h b/src/BlinkerSimpleESP32_WS.h
@@ -65,6 +65,7 @@ class BlinkerSimpleESP32_WS
         {
             Base::begin();
             connectWiFi(ssid, pswd);
+            BLINKER_LOG1("ESP32_WiFi Initialled...");
         }
     
     // private :
diff --git a/src/BlinkerSimpleESP8266_WS.h b/src/BlinkerSimpleESP8266_WS.h
@@ -65,6 +65,7 @@ class BlinkerSimpleESP8266_WS
         {
             Base::begin();
             connectWiFi(ssid, pswd);
+            BLINKER_LOG1("ESP8266_WiFi Initialled...");
         }
     
     // private :
diff --git a/src/modules/Ultrasonic.cpp b/src/modules/Ultrasonic.cpp
@@ -0,0 +1,55 @@
+// 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"
+#else
+  #include "WProgram.h"
+#endif
+
+#include "Ultrasonic.h"
+
+Ultrasonic::Ultrasonic(int TP, int EP)
+{
+   pinMode(TP,OUTPUT);
+   pinMode(EP,INPUT);
+   Trig_pin=TP;
+   Echo_pin=EP;
+   Time_out=30000;  // 3000 µs = 50cm // 30000 µs = 5 m 
+}
+
+Ultrasonic::Ultrasonic(int TP, int EP, long TO)
+{
+   pinMode(TP,OUTPUT);
+   pinMode(EP,INPUT);
+   Trig_pin=TP;
+   Echo_pin=EP;
+   Time_out=TO;
+}
+
+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;
+}
+
+long Ultrasonic::Ranging(int sys)
+{
+  Timing();
+  if (sys) {
+	distance_cm = duration /29 / 2 ;
+	return distance_cm;
+  } else {
+	distance_inc = duration / 74 / 2;
+	return distance_inc; }
+}
diff --git a/src/modules/Ultrasonic.h b/src/modules/Ultrasonic.h
@@ -0,0 +1,34 @@
+// 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"
+#else
+  #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);
+
+  private:
+    int Trig_pin;
+    int Echo_pin;
+	long Time_out;
+    long duration,distance_cm,distance_inc;
+};
+
+#endif

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#define BLINKER_PRINT Serial`
	`1`	`+#define BLINKER_PRINT Serial`
`2`	`2`	`#define BLINKER_BLE`
`3`	`3`
`4`	`4`	`#include <Blinker.h>`