wfs: C port; C++ wraps C

Signed-off-by: Jon Trulson <jtrulson@ics.com>

examples/c++/wfs.cxx

@@ -33,46 +33,47 @@ int shouldRun = true;
 
 void sig_handler(int signo)
 {
-  if (signo == SIGINT)
-    shouldRun = false;
+    if (signo == SIGINT)
+        shouldRun = false;
 }
 
 
 int main()
 {
-  signal(SIGINT, sig_handler);
+    signal(SIGINT, sig_handler);
 
 //! [Interesting]
-  // Instantiate a Water Flow Sensor on digital pin D2
-  upm::WFS* flow = new upm::WFS(2);
-  
-  // set the flow counter to 0 and start counting
-  flow->clearFlowCounter();
-  flow->startFlowCounter();
+    // Instantiate a Water Flow Sensor on digital pin D2.  This must
+    // be an interrupt capable pin.
+    upm::WFS* flow = new upm::WFS(2);
 
-  while (shouldRun)
+    // set the flow counter to 0 and start counting
+    flow->clearFlowCounter();
+    flow->startFlowCounter();
+
+    while (shouldRun)
     {
-      // we grab these (,illis and flowCount) just for display
-      // purposes in this example
-      uint32_t millis = flow->getMillis();
-      uint32_t flowCount = flow->flowCounter();
+        // we grab these (millis and flowCount) just for display
+        // purposes in this example
+        uint32_t millis = flow->getMillis();
+        uint32_t flowCount = flow->flowCounter();
 
-      float fr = flow->flowRate();
+        float fr = flow->flowRate();
 
-      // output milliseconds passed, flow count, and computed flow rate
-      cout << "Millis: " << millis << " Flow Count: " << flowCount;
-      cout << " Flow Rate: " << fr << " LPM" << endl;
+        // output milliseconds passed, flow count, and computed flow rate
+        cout << "Millis: " << millis << " Flow Count: " << flowCount;
+        cout << " Flow Rate: " << fr << " LPM" << endl;
 
-      // best to gather data for at least one second for reasonable
-      // results.
-      sleep(2);
+        // best to gather data for at least one second for reasonable
+        // results.
+        sleep(2);
     }
 
-  flow->stopFlowCounter();
+    flow->stopFlowCounter();
 //! [Interesting]
 
-  cout << "Exiting..." << endl;
+    cout << "Exiting..." << endl;
 
-  delete flow;
-  return 0;
+    delete flow;
+    return 0;
 }

examples/c/CMakeLists.txt

@@ -146,6 +146,7 @@ add_example (max30100)
 add_example (speaker)
 add_example (cjq4435)
 add_example (hmc5883l)
+add_example (wfs)
 
 # Custom examples
 add_custom_example (nmea_gps_i2c-example-c nmea_gps_i2c.c nmea_gps)

examples/c/wfs.c

@@ -0,0 +1,91 @@
+/*
+ * Author: Jon Trulson <jtrulson@ics.com>
+ * Copyright (c) 2014-02017 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <stdio.h>
+#include <signal.h>
+
+#include <upm_utilities.h>
+#include "wfs.h"
+
+int shouldRun = true;
+
+void sig_handler(int signo)
+{
+    if (signo == SIGINT)
+        shouldRun = false;
+}
+
+
+int main(int argc, char **argv)
+{
+    signal(SIGINT, sig_handler);
+
+//! [Interesting]
+    // Instantiate a Water Flow Sensor on digital pin D2.  This must
+    // be an interrupt capable pin.
+
+    wfs_context sensor = wfs_init(2);
+    if (!sensor)
+    {
+        printf("%s: wfs_init() failed\n", __FUNCTION__);
+        return 1;
+    }
+
+    // set the flow counter to 0 and start counting
+    wfs_clear_flow_counter(sensor);
+    if (wfs_start_flow_counter(sensor))
+    {
+        printf("%s: wfs_start_flow_counter() failed\n", __FUNCTION__);
+        wfs_close(sensor);
+        return 1;
+    }
+
+    while (shouldRun)
+    {
+        // we grab these (millis and flowCount) just for display
+        // purposes in this example
+        uint32_t millis = wfs_get_millis(sensor);
+        uint32_t flowCount = wfs_flow_counter(sensor);
+
+        float fr = wfs_flow_rate(sensor);
+
+        // output milliseconds passed, flow count, and computed flow rate
+        printf("Millis: %8d Flow Count: %5d Flow Rate: %f LPM\n",
+               millis, flowCount, fr);
+
+        // best to gather data for at least one second for reasonable
+        // results.
+        upm_delay(2);
+    }
+
+    wfs_stop_flow_counter(sensor);
+
+    printf("Exiting...\n");
+
+    wfs_close(sensor);
+
+//! [Interesting]
+    return 0;
+}

examples/java/WFSSample.java

@@ -25,20 +25,23 @@
 //NOT TESTED!!!
 public class WFSSample {
 
-	public static void main(String[] args) throws InterruptedException {
-		// ! [Interesting]
-		// Instantiate a Water Flow Sensor on digital pin D2
-		upm_wfs.WFS flow = new upm_wfs.WFS(2);
+    public static void main(String[] args) throws InterruptedException {
+// ! [Interesting]
 
-		flow.clearFlowCounter();
-		flow.startFlowCounter();
+        // Instantiate a Water Flow Sensor on
+        // digital pin D2.  This must be an
+        // interrupt capable pin.
+        upm_wfs.WFS flow = new upm_wfs.WFS(2);
 
-		while (true) {
-			System.out.print("Millis: " + flow.getMillis() + " FlowCount: " + flow.flowCounter());
-			System.out.println(" Flow Rate: " + flow.flowRate() + " LPM");
+        flow.clearFlowCounter();
+        flow.startFlowCounter();
 
-			Thread.sleep(2000);
-		}
-		// ! [Interesting]
-	}
+        while (true) {
+            System.out.print("Millis: " + flow.getMillis() + " FlowCount: " + flow.flowCounter());
+            System.out.println(" Flow Rate: " + flow.flowRate() + " LPM");
+
+            Thread.sleep(2000);
+        }
+// ! [Interesting]
+    }
 }

examples/javascript/wfs.js

@@ -24,7 +24,8 @@
 
 var waterFlow_lib = require('jsupm_wfs');
 
-// Instantiate a Water Flow Sensor on digital pin D2
+// Instantiate a Water Flow Sensor on digital pin D2.  This must be an
+// interrupt capable pin.
 var myWaterFlow_obj = new waterFlow_lib.WFS(2);
 
 // set the flow counter to 0 and start counting

examples/python/wfs.py

@@ -26,7 +26,8 @@ import time, sys, signal, atexit
 from upm import pyupm_wfs as upmwfs
 
 def main():
-    # Instantiate a Water Flow Sensor on digital pin D2
+    # Instantiate a Water Flow Sensor on digital pin D2.  This must be
+    # an interrupt capable GPIO.
     myWaterFlow = upmwfs.WFS(2)
 
     ## Exit handlers ##