Added Internet Module and minor bug fixes.

STEMpedia · Jun 15, 2019 · bf5102e · bf5102e
1 parent 3807f9c
commit bf5102e
Show file tree

Hide file tree

Showing 36 changed files with 907 additions and 1,640 deletions.
diff --git a/README.md b/README.md
@@ -14,9 +14,9 @@ Dabble consists of various modules that allows you to control your hardware and
 6)  Inputs: Provide analog and digital inputs via buttons, knobs, and switches.
 7)  Camera: Use the camera of your Smartphone for taking photos and videos, face recognition and colour picking.
 8)  Phone Sensor: Access different sensors of your Smartphone such as the accelerometer, gyroscope, proximity sensor,magnetometer, light meter, sound meter, GPS, temperature sensor, and barometer to make projects and conduct experiments.
-9)  Oscilloscope (Coming Soon): Visualise and analyse the input and output signals given to the device using the oscilloscope module.
-10) IoT: Currently consist of Data Logger and Notification and SMS module other modules related to Internet of Things will be added soon.
-11) Music (Coming Soon): Receive commands from the device and play tones, songs, or other recorded files on your Smartphone.
+9)  Oscilloscope: Visualise and analyse the input and output signals given to the device using the oscilloscope module.
+10) IoT: Currently consist of Data Logger,Notification and Internet module. However the Internet module is still under development.
+11) Music: Receive commands from the device and play tones, songs, or other recorded files on your Smartphone.
 12) Projects  (Coming Soon): Make dedicated projects to experience different concepts of the real world first-hand.
 
 # Dabble Library

diff --git a/examples/01. evive/07.Camera/captureImages/captureImages.ino b/examples/01. evive/07.Camera/captureImages/captureImages.ino
@@ -5,7 +5,7 @@
    You can reduce the size of library compiled by enabling only those modules that you want to
    use. For this first define CUSTOM_SETTINGS followed by defining INCLUDE_modulename.
 
-   Explore more on: https://thestempedia.com/docs/dabble/
+   Explore more on: https://thestempedia.com/docs/dabble/camera-module-photos-videos/
 */
 #define CUSTOM_SETTINGS
 #define INCLUDE_CAMERA_MODULE

diff --git a/examples/01. evive/07.Camera/recordVideos/recordVideos.ino b/examples/01. evive/07.Camera/recordVideos/recordVideos.ino
@@ -5,7 +5,7 @@
    You can reduce the size of library compiled by enabling only those modules that you want to
    use. For this first define CUSTOM_SETTINGS followed by defining INCLUDE_modulename.
 
-   Explore more on: https://thestempedia.com/docs/dabble/
+   Explore more on: https://thestempedia.com/docs/dabble/camera-module-photos-videos/
 */
 #define CUSTOM_SETTINGS
 #define INCLUDE_CAMERA_MODULE

diff --git a/examples/01. evive/09.ColorDetector/PredictColor/PredictColor.ino b/examples/01. evive/09.ColorDetector/PredictColor/PredictColor.ino
@@ -6,7 +6,7 @@
 
    This code helps you in identifying basic colors namely red, blue, green, yellow and violet.
    The method present in the library allows you to differentiate only these 5 colors.
-   Explore more on: https://thestempedia.com/docs/dabble/
+   Explore more on: https://thestempedia.com/docs/dabble/camera-module-color-detector/
 */
 #define CUSTOM_SETTINGS
 #define INCLUDE_COLORDETECTOR_MODULE

diff --git a/examples/01. evive/10.IOT/DataLogger/DataLogger.ino b/examples/01. evive/10.IOT/DataLogger/DataLogger.ino
@@ -5,7 +5,7 @@
    You can reduce the size of library compiled by enabling only those modules that you want to
    use.For this first define CUSTOM_SETTINGS followed by defining INCLUDE_modulename.
 
-   Explore more on: https://thestempedia.com/docs/dabble/
+   Explore more on: https://thestempedia.com/docs/dabble/iot-module-data-logger/
 */   
 #define CUSTOM_SETTINGS
 #define INCLUDE_DATALOGGER_MODULE

diff --git a/examples/01. evive/10.IOT/Internet/Thingspeak_evive/Thingspeak_evive.ino b/examples/01. evive/10.IOT/Internet/Thingspeak_evive/Thingspeak_evive.ino
@@ -0,0 +1,30 @@
+/*
+   In this example you will be sending data of evive potentiometer to your thingspeak channel.
+   Data is send to field 1 of your thingspeak channel.   
+  
+   You can reduce the size of library compiled by enabling only those modules that you
+   want to use. For this first define CUSTOM_SETTINGS followed by defining
+   INCLUDE_modulename.
+
+   Explore more on: https://thestempedia.com/docs/dabble/internet-module/
+*/
+#define CUSTOM_SETTINGS
+#define INCLUDE_INTERNET_MODULE
+#include <evive.h>
+#include <Dabble.h>
+String WRITE_KEY = "IXPXC82OLNNH1EBW";   //enter your thingspeak channel write key   
+
+
+void setup() {
+  Dabble.begin(115200); //Enter baudrate of your bluetooth.Connect bluetooth on Bluetooth port present on evive.
+  pinMode(TACTILESW1,INPUT);
+}
+
+void loop() {
+  Dabble.processInput(); //this function is used to refresh data obtained from smartphone.Hence calling this function is mandatory in order to get data properly from your mobile.
+  if(digitalRead(TACTILESW1) == HIGH)
+  {
+    Internet.updateThingspeakField(WRITE_KEY, 1, analogRead(POT1));  //Thingspeak Write Key, Field number, Data
+    Dabble.delay(500);   //Debounce delay
+  }
+}
diff --git a/examples/01. evive/10.IOT/Notification/Notification.ino b/examples/01. evive/10.IOT/Notification/Notification.ino
@@ -5,7 +5,7 @@
    want to use. For this first define CUSTOM_SETTINGS followed by defining
    INCLUDE_modulename.
 
-   Explore more on: https://thestempedia.com/docs/dabble/
+   Explore more on: https://thestempedia.com/docs/dabble/notification/
 */
 #define CUSTOM_SETTINGS
 #define INCLUDE_NOTIFICATION_MODULE

diff --git a/examples/01. evive/10.IOT/SMS/SMS.ino b/examples/01. evive/10.IOT/SMS/SMS.ino
diff --git a/examples/01. evive/11.Music/11.Music.ino b/examples/01. evive/11.Music/11.Music.ino
@@ -6,7 +6,7 @@
   You can reduce the size of library compiled by enabling only those modules that you want to
   use. For this first define CUSTOM_SETTINGS followed by defining INCLUDE_modulename.
 
-  Explore more on: https://thestempedia.com/docs/dabble/
+  Explore more on: https://thestempedia.com/docs/dabble/music-module/
 
 */
 #define CUSTOM_SETTINGS

diff --git a/examples/01. evive/Oscilloscope/Oscilloscope.ino b/examples/01. evive/Oscilloscope/Oscilloscope.ino
@@ -1,3 +1,6 @@
+/*
+	Explore more: https://thestempedia.com/docs/dabble/oscilloscope-module/
+*/
 #include <evive.h>
 #include "OscilloscopeModule.h"
 void setup() {

diff --git a/examples/02. Uno Nano Mega/03.Gamepad/03.Gamepad.ino b/examples/02. Uno Nano Mega/03.Gamepad/03.Gamepad.ino
diff --git a/examples/02. Uno Nano Mega/07.Camera/captureImages/captureImages.ino b/examples/02. Uno Nano Mega/07.Camera/captureImages/captureImages.ino
@@ -17,7 +17,7 @@
    You can reduce the size of library compiled by enabling only those modules that you want
    to use. For this first define CUSTOM_SETTINGS followed by defining INCLUDE_modulename.
 
-   Explore more on: https://thestempedia.com/docs/dabble/
+   Explore more on: https://thestempedia.com/docs/dabble/camera-module-photos-videos/
 */
 #define CUSTOM_SETTINGS
 #define INCLUDE_CAMERA_MODULE

diff --git a/examples/02. Uno Nano Mega/07.Camera/recordVideos/recordVideos.ino b/examples/02. Uno Nano Mega/07.Camera/recordVideos/recordVideos.ino
@@ -17,7 +17,7 @@
    You can reduce the size of library compiled by enabling only those modules that you want
    to use. For this first define CUSTOM_SETTINGS followed by defining INCLUDE_modulename.
 
-   Explore more on: https://thestempedia.com/docs/dabble/
+   Explore more on: https://thestempedia.com/docs/dabble/camera-module-photos-videos/
 */
 #define CUSTOM_SETTINGS
 #define INCLUDE_CAMERA_MODULE
@@ -36,7 +36,6 @@ void loop() {
   if( a == '1')
   {
     Camera.setParameters(FRONT,OFF,HIGH_QUALITY,0);  //Direction , Flash, Quality, zoom(0-100%)
-    Camera.captureImage();
     Camera.startRecording();
   }
   if( a == '2')
@@ -68,7 +67,7 @@ void printMessage()
   Serial.println("Tasks executed on sending different numbers are as followed: ");
   Serial.println("1 - Take a high quality video from front camera with no flash and no zoom.");
   Serial.println("2 - Take a low quality video from rear camera with Auto flash");
-  Serial.println("3 - Take a 50% zoomed image from Rear camera with high quality"); 
+  Serial.println("3 - Take a 50% zoomed video from Rear camera with high quality"); 
   Serial.println("4 - Stop video recording");
 }
 

diff --git a/examples/02. Uno Nano Mega/09.ColorDetector/PredictColor/PredictColor.ino b/examples/02. Uno Nano Mega/09.ColorDetector/PredictColor/PredictColor.ino
@@ -16,7 +16,7 @@
 
    This code helps you in identifying basic colors namely red, blue, green, yellow and violet.
    The method present in the library allows you to differentiate only these 5 colors.
-   Explore more on: https://thestempedia.com/docs/dabble/
+   Explore more on: https://thestempedia.com/docs/dabble/camera-module-color-detector/
 */
 #define CUSTOM_SETTINGS
 #define INCLUDE_COLORDETECTOR_MODULE

diff --git a/examples/02. Uno Nano Mega/10.IOT/Internet/Thingspeak/Thingspeak.ino b/examples/02. Uno Nano Mega/10.IOT/Internet/Thingspeak/Thingspeak.ino
@@ -0,0 +1,38 @@
+/*
+   In this example you will be sending data of analog pin to your thingspeak channel.
+   Data is send to field 1 of your thingspeak channel.   
+   
+   NOTE:
+   1)For Arduino Mega Connect Bluetooth on Serial3 pins.
+   2)For Arduino Uno/Nano library uses SoftwareSerial,hence pin 2 and pin 3 are used
+   as RX and TX pins respectively on SoftwareSerial.Hence with arduino Uno
+   follow below connections for bluetooth.
+   UNO  - BLUETOOTH
+   2    - TX
+   3    - RX
+   3)For Uno/Nano keep bluetooth Baudrate below 38400.
+
+
+   You can reduce the size of library compiled by enabling only those modules that you want
+   to use. For this first define CUSTOM_SETTINGS followed by defining INCLUDE_modulename.
+
+   Explore more on: https://thestempedia.com/docs/dabble/internet-module/
+*/
+#define CUSTOM_SETTINGS
+#define INCLUDE_INTERNET_MODULE
+#include <Dabble.h>
+String WRITE_KEY = "IXPXC82OLNNH1EBW";   //enter your thingspeak write key 
+uint8_t pushButton = 4;
+void setup() {
+  Dabble.begin(9600); //Change this baudrate as per your bluetooth baudrate. Connect bluetooth on digital pin 2(RX) and 3(TX) for Uno/Nano and on Serial3 pins for Mega.
+  pinMode(pushButton,INPUT_PULLUP);  
+}
+
+void loop() {
+  Dabble.processInput(); //this function is used to refresh data obtained from smartphone.Hence calling this function is mandatory in order to get data properly from your mobile.
+  if(digitalRead(pushButton) == LOW)
+  {
+    Internet.updateThingspeakField(WRITE_KEY, 1, analogRead(A0));
+    Dabble.delay(500);   //Debounce delay
+  }
+}
diff --git a/examples/02. Uno Nano Mega/10.IOT/Notification/Notification.ino b/examples/02. Uno Nano Mega/10.IOT/Notification/Notification.ino
@@ -15,7 +15,7 @@
     You can reduce the size of library compiled by enabling only those modules that you want to
     use. For this first define CUSTOM_SETTINGS followed by defining INCLUDE_modulename.
 
-    Explore more on: https://thestempedia.com/docs/dabble/
+    Explore more on: https://thestempedia.com/docs/dabble/notification/
 */
 
 #define CUSTOM_SETTINGS

diff --git a/examples/02. Uno Nano Mega/10.IOT/SMS/SMS.ino b/examples/02. Uno Nano Mega/10.IOT/SMS/SMS.ino
diff --git a/examples/02. Uno Nano Mega/11.Music/11.Music.ino b/examples/02. Uno Nano Mega/11.Music/11.Music.ino
@@ -18,7 +18,7 @@
   You can reduce the size of library compiled by enabling only those modules that you want to
   use. For this first define CUSTOM_SETTINGS followed by defining INCLUDE_modulename.
 
-  Explore more on: https://thestempedia.com/docs/dabble/
+  Explore more on: https://thestempedia.com/docs/dabble/music-module/
 
 */
 #define CUSTOM_SETTINGS

diff --git a/examples/02. Uno Nano Mega/Oscilloscope/Oscilloscope.ino b/examples/02. Uno Nano Mega/Oscilloscope/Oscilloscope.ino
@@ -1,3 +1,6 @@
+/*
+	Explore more: https://thestempedia.com/docs/dabble/oscilloscope-module/
+*/
 #include "OscilloscopeModule.h"
 void setup() {
   /*

diff --git a/keywords.txt b/keywords.txt
@@ -109,6 +109,10 @@ setDataSpeed	KEYWORD2
 play	KEYWORD2
 addToQueue	KEYWORD2
 stop	KEYWORD2
+updateThingspeakChannel	KEYWORD2
+updateThingspeakChannel	KEYWORD2
+updateThingspeakField	KEYWORD2
+updateThingspeakField	KEYWORD2
 #######################################
 # Constants And Literals (LITERAL1)
 #######################################