Merge pull request #22 from hasegaw/pr_in_xbee

XBee: input plugin update: config and data handling
fluent · Jul 2, 2015 · 3f2422f · 3f2422f
2 parents 87db713 + d3fafc0
commit 3f2422f
Show file tree

Hide file tree

Showing 6 changed files with 362 additions and 115 deletions.
diff --git a/conf/xbee_input.conf b/conf/xbee_input.conf
@@ -0,0 +1,16 @@
+# XBee Input
+# ==========
+# This configuration file specify the information to be used
+# when gathering data from XBee input plugin. All key fields
+# in the 'XBEE' section are mandatory.
+
+[XBEE]
+    # File
+    # ====
+    # Filename of serial port. e.g. /dev/ttyS0, /dev/ttyAMA0
+    File    /dev/ttyUSB0
+
+    # Baudrate
+    # ========
+    # Specify the bitrate to communicate using the port.
+    Baudrate 9600
diff --git a/plugins/in_xbee/CMakeLists.txt b/plugins/in_xbee/CMakeLists.txt
@@ -3,6 +3,6 @@ add_subdirectory(lib/libxbee-v3)
 include_directories(lib/libxbee-v3)
 
 set(src
-  in_xbee.c)
+  in_xbee.c in_xbee_config.c)
 
 FLB_PLUGIN(in_xbee "${src}" "xbee")