Changeset 8112

Timestamp:

03/19/08 02:26:34 (16 months ago)

Author:

mootoh

Message:

lang/cplusplus/gainer++: implementing ain for MODE_1. something wrong here.

Location:

lang/cplusplus/gainer++

Files:

• gainer-button.cc (modified) (1 diff)
• gainer.cc (modified) (2 diffs)

lang/cplusplus/gainer++/gainer-button.cc

@@ -42 +42 @@
     std::cerr << "process_next_event" << std::endl;
     //gainer->process_next_event();
-    //gainer->peek_analog_inputs();
-    gainer->peek_digital_inputs();
+    gainer->peek_analog_inputs();
+    //gainer->peek_digital_inputs();
     usleep(100000);
     /*

lang/cplusplus/gainer++/gainer.cc

@@ -6 +6 @@
 #include <sys/select.h>
 #include "gainer.h"
-#include <cassert>
+#include <iomanip>
 
 #define ABORT_UNLESS(stmt) \
@@ -155 +155 @@
     case 'I': { // analog_input
       std::string::size_type ast(event.find('*'));
-      std::string nums(event.substr(1, ast-1));
-      std::cout << nums << std::endl;
-      for (int i(1); ; i++) {
-        char ch(event[i]);
-        if (isdigit(ch) or ('A' <= ch and 'F' >= ch))
-          digital_inputs[i-1] = ch-'0';
-        else
-          break;
-      }
+      std::string s(event.substr(1, ast-1));
+      sscanf(s.c_str(), "%02X%02X%02X%02X*",
+        &analog_inputs[0], &analog_inputs[1],
+        &analog_inputs[2], &analog_inputs[3]);
       break;
     }