added read argument; changed executable name; fixed makefile

.gitignore

@@ -3,4 +3,4 @@
 *.lib
 *.swp
 *~
-camotion-pifaceo
+camotion-piface

Makefile

@@ -5,14 +5,14 @@ LDLIBS = -lpifacedigital -lmcp23s17
 OBJ = $(addprefix src/, $(SRC:.cpp=.o))
 
 
-all: camotion-pifaceo
+all: camotion-piface
 
 install: all
 	cp camotion-pifaceo /usr/local/bin/
 
-camotion-pifaceo: $(OBJ)
+camotion-piface: $(OBJ)
 	$(LINK.cpp) $(OBJ) $(OUTPUT_OPTION) $(LDLIBS)
 
 clean:
 	rm -f $(OBJ)
-	rm -f camotion-pifaceo
+	rm -f camotion-piface

src/mainclass.cpp

@@ -20,20 +20,23 @@ int MainClass::usage()
   std::cerr << "Usage: " << basename(argv_[0]) << std::endl <<
     " [--device DEVICE|--device=DEVICE|-e DEVICE]" << std::endl <<
     " [--up OUTPUT|--up=OUTPUT|-u OUTPUT]" << std::endl <<
-    " [--down OUTPUT|--down=OUPUT|-d OUTPUT]" << std::endl <<
+    " [--down OUTPUT|--down=OUTPUT|-d OUTPUT]" << std::endl <<
+    " [--read INPUT|--read=INPUT|-r INPUT]" << std::endl <<
     " [--sleep MS|--sleep=MS|-s MS]" << std::endl <<
     " [--help|-h]" << std::endl <<
     " [--version|-v]" << std::endl;
-  std::cerr << std::endl << "Controls the output pins of a PiFace digital IO."
+  std::cerr << std::endl << "Controls the output pins and read pins of a PiFace digital IO."
     << std::endl << std::endl;
   std::cerr << "--device \tSwitch to the provided device."
     << std::endl << "--up \t\tEnable the provided ouput pin."
     << std::endl << "--down \t\tDisable the provided output pin."
+    << std::endl << "--read \t\tRead and print the provided input pin."
     << std::endl << "--sleep \tSleep for the provided amount of milliseconds."
     << std::endl << "--help \t\tDisplay this message."
     << std::endl << "--version \tDisplay version."
     << std::endl << std::endl;
   std::cerr << "OUTPUT \t: The output pin to enable/disable. 0 <= OUTPUT <= 7."
+    << std::endl << "INPUT \t: The input pin to read. 0 <= INPUT <= 7."
     << std::endl << "MS \t: The number of milliseconds to sleep. 0 <= MS <= "
     << UINT_MAX << "."
     << std::endl << "DEVICE \t: The device number. Default is 0. "
@@ -56,6 +59,7 @@ bool MainClass::build_actions_()
     {"device", 1, 0, 'e'},
     {"up", 1, 0, 'u'},
     {"down", 1, 0, 'd'},
+    {"read", 1, 0, 'r'},
     {"sleep", 1, 0, 's'},
     {"help", 0, 0, 'h'},
     {"version", 0, 0, 'v'},
@@ -65,7 +69,7 @@ bool MainClass::build_actions_()
   extern int optind;
   extern char* optarg;
   char* endptr;
-  while ((opt = getopt_long(argc_, argv_, "e:u:d:s:hv", opts, 0)) != -1)
+  while ((opt = getopt_long(argc_, argv_, "e:u:d:r:s:hv", opts, 0)) != -1)
   {
     long int arg = optarg ? strtol(optarg, &endptr, 10) : 0;
     if (arg < 0)
@@ -96,6 +100,21 @@ bool MainClass::build_actions_()
           return true;
           });
     }
+    else if (opt == 'r')
+    {
+      if (arg > 7)
+        return bad_value_();
+      actions_.push_back([arg, opt]() -> bool
+          {
+          if (get_current_device() == -1 &&
+            !set_current_device(0))
+            return false;
+          uint8_t status = pifacedigital_read_bit(arg, INPUT, get_current_device());
+          std::cout << "Pin " << arg << " value: " <<
+            (int) status << std::endl;
+          return true;
+          });
+    }
     else if (opt == 's')
     {
       if (arg > INT_MAX)
@@ -109,7 +128,7 @@ bool MainClass::build_actions_()
     }
     else if (opt == 'v')
     {
-      std::cout << "camotion-piface 1.0" << std::endl;
+      std::cout << "camotion-piface 1.1" << std::endl;
       actions_.clear();
       return true;
     }