X-Git-Url: https://git.realraum.at/?p=svn42.git;a=blobdiff_plain;f=rf433rcv%2Fpc%2Frawhid_test.c;h=cd94bdbbce830de1d478d3cbc460eee22fa232c2;hp=eaef389ff30aa771ea785395b334aa13431739c2;hb=5b00dab1a7d2ac2d8a593f0bd6e85a7194e2c9bd;hpb=f505a1c37ea1c76897991f9882de765e34f0cc98

diff --git a/rf433rcv/pc/rawhid_test.c b/rf433rcv/pc/rawhid_test.c
index eaef389..cd94bdb 100644
--- a/rf433rcv/pc/rawhid_test.c
+++ b/rf433rcv/pc/rawhid_test.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-
+#include <sys/time.h>
 #if defined(OS_LINUX) || defined(OS_MACOSX)
 #include <sys/ioctl.h>
 #include <termios.h>
@@ -13,17 +13,22 @@
 #include "hid.h"
 
 
-static char get_keystroke(void);
-
 void sendstr(char * tosend)
 {
-  rawhid_send(0, tosend, strlen(tosend),100);
+  rawhid_send(0, tosend, strlen(tosend),1000);
+}
+
+int mtime_diff(struct timeval high,struct timeval low)
+{
+  int result=1000*(high.tv_sec-low.tv_sec);
+  result+=high.tv_usec/1000-low.tv_usec/1000;
+  return result;
 }
 
 int main (int argc, char *argv[])
 {
 	int i, r, num;
-	char c, buf[64];
+	char buf[64];
 	// C-based example is 16C0:0480:FFAB:0200
 	r = rawhid_open(1, 0x16C0, 0x0480, 0xFFAB, 0x0200);
 	if (r <= 0) {
@@ -38,15 +43,27 @@ int main (int argc, char *argv[])
   if (argc>1)
   {
     FILE * f = fopen (argv[1], "r");
+    if (strcmp("-",argv[1]) == 0)
+      f = stdin;
     if (!f)
       return -3;
+    printf("Clearing Buffer\n");  
     sendstr("c"); // clear the buffer  
-    buf[0]='f';  
-    size_t len= fread(buf+1, 1, 63, f);
-    for(i=len+1;i<64;i++)
-      buf[i]=0xff;
-    rawhid_send(0, buf, 64, 100); //fill the buffer
-    sendstr("s\x10"); // send 4 times
+    buf[0]='f'; 
+    size_t len;
+    while ( ( len = fread(buf+1, 1, 63, f)  ) )
+    {
+      
+      rawhid_send(0, buf, 64, 1000); //fill the buffer
+      printf("Sending Buffer %d bytes\n",len);
+      for(i=0;i<len+1;i++)
+      {
+        printf("%02x ",(unsigned char) buf[i]);
+      }  
+      printf("\n");
+    }
+    printf("Executing Send command\n");
+    sendstr("s\x20"); // send 32 times
     len = rawhid_recv(0, buf, 64, 255);
     for(i=0;i<len;i++)
     {
@@ -55,7 +72,11 @@ int main (int argc, char *argv[])
     printf("\n");
     return 0;
   } else {
-    while (1) {
+    struct timeval start_time,stop_time;
+    sendstr("b");
+    gettimeofday(&start_time,NULL);
+    gettimeofday(&stop_time,NULL);
+    while (mtime_diff(stop_time,start_time)<1000) {
       // check if any Raw HID packet has arrived
       num = rawhid_recv(0, buf, 64, 220);
       if (num < 0) {
@@ -64,7 +85,6 @@ int main (int argc, char *argv[])
         return 0;
       }
       if (num == 64) {
-      //	printf("\nrecv %d bytes:\n", num);
           for (i=0; i<64*8; i++) {
             if (buf[i/8] & 0x80)
             {
@@ -72,58 +92,13 @@ int main (int argc, char *argv[])
             } else {
               printf("0");
             }
-            printf(",");
+            // printf(",");
             buf[i/8]<<=1;
           }
       }
-      // check if any input on stdin
-      while ((c = get_keystroke()) >= 32) {
-        printf("\ngot key '%c', sending...\n", c);
-        buf[0] = c;
-        for (i=1; i<64; i++) {
-          buf[i] = 0;
-        }
-        rawhid_send(0, buf, 64, 100);
-      }
+      gettimeofday(&stop_time,NULL);
     }
+    sendstr("e");
+    return 0;
   }  
 }
-
-#if defined(OS_LINUX) || defined(OS_MACOSX)
-// Linux (POSIX) implementation of _kbhit().
-// Morgan McGuire, morgan@cs.brown.edu
-static int _kbhit() {
-	static const int STDIN = 0;
-	static int initialized = 0;
-	int bytesWaiting;
-
-	if (!initialized) {
-		// Use termios to turn off line buffering
-		struct termios term;
-		tcgetattr(STDIN, &term);
-		term.c_lflag &= ~ICANON;
-		tcsetattr(STDIN, TCSANOW, &term);
-		setbuf(stdin, NULL);
-		initialized = 1;
-	}
-	ioctl(STDIN, FIONREAD, &bytesWaiting);
-	return bytesWaiting;
-}
-static char _getch(void) {
-	char c;
-	if (fread(&c, 1, 1, stdin) < 1) return 0;
-	return c;
-}
-#endif
-
-
-static char get_keystroke(void)
-{
-	if (_kbhit()) {
-		char c = _getch();
-		if (c >= 32) return c;
-	}
-	return 0;
-}
-
-