From c3417a2803e841d222fcce2791f97decb5b41056 Mon Sep 17 00:00:00 2001 From: Stefan Helmert Date: Mon, 13 Jan 2014 14:53:48 +0100 Subject: [PATCH] bug sucking keys fixed --- bin/Debug/UDPclient | Bin 25615 -> 25607 bytes client.config | 2 +- main.c | 22 +++++++++++----------- obj/Debug/main.o | Bin 18088 -> 18056 bytes 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bin/Debug/UDPclient b/bin/Debug/UDPclient index 48a66b14e985af3abe8f1d14f8bb2f4ac86c393e..2113d8b19563247dc23f47d6477139eab4499403 100755 GIT binary patch delta 3395 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 K!M%%D3I7FQzi4p) diff --git a/client.config b/client.config index 26a6f60..962b1be 100644 --- a/client.config +++ b/client.config @@ -1,5 +1,5 @@ INPUTDEV /dev/input/event2 FRAME_US 100000 -SERVER 10.8.191.194:32000 +SERVER 10.8.212.195:32000 TIMEOUT 250 CLINBR 0 diff --git a/main.c b/main.c index 6027337..04c9e50 100644 --- a/main.c +++ b/main.c @@ -24,7 +24,8 @@ typedef struct input_thread_t { char* filename; - struct input_event event; + int frame; + henglong_t hl; } input_thread_t; @@ -52,12 +53,12 @@ void *input_thread_fcn(void * arg) } if(EV_KEY == ev.type) { - args->event = ev; printf("%d %d\n", ev.code, ev.value); + args->frame = data2frame(event2data(&args->hl, ev)); } // quit - if(16==args->event.code && 1==args->event.value) break; + if(16==ev.code && 1==ev.value) break; } printf("Exiting input thread.\n"); @@ -178,12 +179,11 @@ int main(int argc, char* argv[]) input_thread_t input_thread_args; refl_thread_args_t refl_thread_args; int i=0; - int frame; + int frame = 0; uint16_t frame_nbr; int sockfd, n_send; struct sockaddr_in servaddr; unsigned char sendline[64]; - henglong_t hl1; uint64_t time_us; henglongconf_t conf; @@ -193,8 +193,7 @@ int main(int argc, char* argv[]) return 0; } - inithenglong(&hl1); - + inithenglong(&input_thread_args.hl); conf = getconfig(argv[1]); @@ -221,7 +220,8 @@ int main(int argc, char* argv[]) while(1){ usleep(conf.frame_us); - frame = data2frame(event2data(&hl1, input_thread_args.event)); + frame = input_thread_args.frame; + time_us = get_us(); frame_nbr++; refl_thread_args.frame_nbr_send = frame_nbr; @@ -238,12 +238,12 @@ int main(int argc, char* argv[]) sendline[i+10] = (frame >> i*8) & 0xFF; } sendline[14] = conf.clinbr; - sendline[15] = hl1.clisel; - sendline[16] = hl1.servoff; + sendline[15] = input_thread_args.hl.clisel; + sendline[16] = input_thread_args.hl.servoff; n_send = sendto(sockfd, sendline, 32, 0, (struct sockaddr *)&servaddr, sizeof(servaddr)); - printf("SEND FRAME -- FRM_NBR: %5d, BYTES send: %3d, SEND_FRM: %#x, CLINBR: %d, CLISEL: %d, SERVOFF: %d\n", frame_nbr, n_send, frame, conf.clinbr, hl1.clisel, hl1.servoff); + printf("SEND FRAME -- FRM_NBR: %5d, BYTES send: %3d, SEND_FRM: %#x, CLINBR: %d, CLISEL: %d, SERVOFF: %d\n", frame_nbr, n_send, frame, conf.clinbr, input_thread_args.hl.clisel, input_thread_args.hl.servoff); if(pthread_kill(inpthread, 0)) break; } diff --git a/obj/Debug/main.o b/obj/Debug/main.o index 859a7aaf19db049575fb023cd7b1bb69e7f5d44c..aea1af8ee13f2b5188c148d4179f8a8d39914df5 100644 GIT binary patch delta 5596 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 mUXk!){C*sVcJHH_xM@pxSQdr-W