Collision: Added C Src and Example

This module was initially known as GroveCollision. It has been
now changed to Collision. C source and examples added.

Signed-off-by: Abhishek Malik <abhishek.malik@intel.com>

examples/c++/CMakeLists.txt

@@ -167,7 +167,7 @@ add_example (adxl335)
 add_example (hmtrp)
 add_example (nunchuck)
 add_example (otp538u)
-add_example (grovecollision)
+add_example (collision)
 add_example (groveelectromagnet)
 add_example (emg)
 add_example (o2)

examples/c++/collision.cxx

@@ -24,7 +24,7 @@
 #include <iostream>
 #include <unistd.h>
 #include <signal.h>
-#include "grovecollision.hpp"
+#include "collision.hpp"
 
 using namespace std;
 
@@ -41,9 +41,9 @@ int main(int argc, char **argv)
   signal(SIGINT, sig_handler);
 
 //! [Interesting]
-  // The was tested with the Grove Collision Sensor
-  // Instantiate a Grove Collision on digital pin D2
-  upm::GroveCollision* collision = new upm::GroveCollision(2);
+  // The was tested with the Collision Sensor
+  // Instantiate a Collision on digital pin D2
+  upm::Collision* collision = new upm::Collision(2);
 
   bool collisionState = false;
   cout << "No collision" << endl;

examples/c/CMakeLists.txt

@@ -113,6 +113,7 @@ add_example (gp2y0a)
 add_example (ttp223)
 add_example (loudness)
 add_example (tsl2561)
+add_example (collision)
 
 # Custom examples
 add_custom_example (nmea_gps_i2c-example-c nmea_gps_i2c.c nmea_gps)

examples/c/collision.c

@@ -0,0 +1,22 @@
+//Modified: Abhishek Malik <abhishek.malik@intel.com>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "collision.h"
+
+int main()
+{
+	collision_context dev = collision_init(2);
+	bool abc = 0;
+	while(1){
+		if(collision_is_colliding(dev, &abc) != UPM_SUCCESS){
+			printf("an error has occured\n");
+		}
+		upm_delay(1);
+		printf("value retrieved: %d\n", abc);
+	}
+	collision_close(dev);
+}

examples/c/main_mvs0608.c

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2012-2014 Wind River Systems, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <zephyr.h>
+#include <mvs0608.h>
+#include <malloc.h>
+#include <gpio.h>
+#include <sys_clock.h>
+
+#define SLEEPTICKS	MSEC(200)
+#if defined(CONFIG_STDOUT_CONSOLE)
+#include <stdio.h>
+#define PRINT           printf
+#else
+#include <misc/printk.h>
+#define PRINT           printk
+#endif
+
+/*
+ * @file
+ * @brief Hello World demo
+ * Nanokernel version of hello world demo
+ */
+
+
+void main(void)
+{
+	mraa_init();
+	struct nano_timer timer;
+	void *timer_data[1];
+	nano_timer_init(&timer, timer_data);
+	mvs0608_context dev = mvs0608_init(2);
+	bool abc = 0;
+	while(1){
+		if(mvs0608_is_colliding(dev, &abc) != UPM_SUCCESS){
+			printf("an error has occured\n");
+		}
+		nano_timer_start(&timer, SLEEPTICKS);
+		nano_timer_test(&timer, TICKS_UNLIMITED);
+		printf("value retrieved: %d\n", abc);
+	}
+	mvs0608_close(dev);
+}

examples/java/CMakeLists.txt

@@ -32,7 +32,7 @@ add_example(ENC03RSample enc03r)
 add_example(ES08ASample servo)
 add_example(GroveButtonSample grove)
 add_example(GroveButton_intrSample grove)
-add_example(GroveCollision grovecollision)
+add_example(Collision collision)
 add_example(GroveEHRSample groveehr)
 add_example(Emg emg)
 add_example(Gsr gsr)

examples/java/Collision.java

@@ -22,13 +22,13 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import upm_grovecollision.*;
+import upm_collision.*;
 
-public class GroveCollision {
+public class Collision {
 
 	public static void main(String[] args) {
 		// Initializing the sensor on D2 on the Base Shield
-		upm_grovecollision.GroveCollision collision = new upm_grovecollision.GroveCollision(2);
+		upm_collision.Collision collision = new upm_collision.Collision(2);
 		boolean collisionState = false;
 
 		// ! [Interesting]

examples/javascript/collision.js

@@ -22,11 +22,11 @@
 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-var collision_lib = require("jsupm_grovecollision");
+var collision_lib = require("jsupm_collision");
 
-// The was tested with the Grove Collision Sensor
-// Instantiate a Grove Collision on digital pin D2
-var collision_obj = new collision_lib.GroveCollision(2);
+// The was tested with the Collision Sensor
+// Instantiate a Collision on digital pin D2
+var collision_obj = new collision_lib.Collision(2);
 
 var collisionState = false;
 console.log("No collision");

examples/python/collision.py

@@ -22,11 +22,11 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import time, sys, signal, atexit
-import pyupm_grovecollision as upmGrovecollision
+import pyupm_collision as upmcollision
 
-# The was tested with the Grove Collision Sensor
-# Instantiate a Grove Collision on digital pin D2
-myGrovecollision = upmGrovecollision.GroveCollision(2)
+# The was tested with the Collision Sensor
+# Instantiate a Collision on digital pin D2
+mycollision = upmcollision.Collision(2)
 
 
 ## Exit handlers ##
@@ -49,9 +49,9 @@ collisionState = False
 print "No collision"
 
 while(1):
-	if (myGrovecollision.isColliding() and not collisionState):
+	if (mycollision.isColliding() and not collisionState):
 		print "Collision!"
 		collisionState = True
-	elif (not myGrovecollision.isColliding() and collisionState):
+	elif (not mycollision.isColliding() and collisionState):
 		print "No collision"
 		collisionState = False