Merge pull request #28 from comawill/pull-req/fix26

Attempt to solve Issue #26 (Motes change names while programming)

platform/inga/99-inga-usb.rules

@@ -0,0 +1,9 @@
+# example udev-rule
+# change groupname if needed
+#
+# create symlink at /dev/inga/node-${SERIALID}
+SUBSYSTEM=="tty", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", ATTRS{product}=="INGA", SYMLINK+="inga/node-$attr{serial}"
+# assign to group plugdev
+KERNEL=="ttyUSB[0‐9]*", GROUP="plugdev"
+# assign to group plugdev
+SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", GROUP="plugdev"

platform/inga/Makefile.inga

@@ -166,18 +166,14 @@ UNAME := $(shell uname)
 ifeq ($(UNAME), Darwin)
   # Mac OS X
   SERIALDUMP = $(CONTIKI)/tools/sky/serialdump-macos
-  MOTELIST ?= $(CONTIKI)/tools/sky/motelist-macos
-  MOTES ?= $(shell $(MOTELIST) 2>&- | grep usbserial | \
-	  cut -f 4 -d \  | \
-	  perl -ne 'print $$1 . " " if(m-(/dev/\w+\.\w+\-\w+)-);')
+  MOTELIST ?= $(CONTIKI)/tools/inga/motelist
+  MOTES ?= $(shell $(MOTELIST))
 else ifeq ($(UNAME), Linux)
   # Linux
   INGA_TOOL = $(CONTIKI)/tools/inga/inga_tool/inga_tool
   SERIALDUMP = $(CONTIKI)/tools/sky/serialdump-linux
-  MOTELIST ?= $(CONTIKI)/tools/sky/motelist-linux
-  MOTES ?= $(shell $(MOTELIST) 2>&- | grep USB | \
-	  cut -f 4 -d \  | \
-	  perl -ne 'print $$1 . " " if(m-(/dev/\w+)-);')
+  MOTELIST ?= $(CONTIKI)/tools/inga/motelist
+  MOTES ?= $(shell $(MOTELIST))
 else
   $(warning Operating system '$(UNAME)' not supported)
 endif

tools/inga/motelist

@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+import glob
+import platform
+
+# Simple script that collects all available INGA-motes
+#
+# On Linux-systems with udev-rule $(CONTIKI)/platform/inga/99-inga-usb.rule
+# it is also possible to fetch only INGA-motes
+
+if __name__ == "__main__":
+	motes = []
+	system = platform.system()
+
+	if(system == "Darwin"):  # OS X
+		motes = glob.glob("/dev/tty.usbserial-*")
+
+	elif(system == "Linux"): # Linux
+		motes = glob.glob("/dev/inga/*")
+
+		if not motes:
+			motes = glob.glob("/dev/serial/by-id/*IBR_INGA*")
+
+		if not motes:
+			motes = glob.glob("/dev/ttyUSB*")
+
+	if motes:
+		for mote in motes:
+			print(mote)
+		exit(0)
+	exit(1)