diff --git a/UDPclient.depend b/UDPclient.depend index ba39e76..092bfac 100644 --- a/UDPclient.depend +++ b/UDPclient.depend @@ -1,5 +1,5 @@ # depslib dependency file v1.0 -1389037649 source:/home/stefan/Proj/UDPclient/main.c +1389064539 source:/home/stefan/Proj/UDPclient/main.c diff --git a/bin/Debug/UDPclient b/bin/Debug/UDPclient index 191e73b..7e743b0 100755 Binary files a/bin/Debug/UDPclient and b/bin/Debug/UDPclient differ diff --git a/client.config b/client.config index b11e9ae..26a6f60 100644 --- a/client.config +++ b/client.config @@ -1,5 +1,5 @@ INPUTDEV /dev/input/event2 FRAME_US 100000 -SERVER 127.0.0.1:32000 +SERVER 10.8.191.194:32000 TIMEOUT 250 CLINBR 0 diff --git a/henglong.c b/henglong.c index 6e5a721..3016a79 100644 --- a/henglong.c +++ b/henglong.c @@ -28,7 +28,7 @@ int data2frame(int data) int values2data(int velocity, int direction, int ignation, int mg, int fire, int turretelev, int turret_left, int turret_right, int recoil) { int data = 0; - data = (mg & 1) | (ignation & 1) << 1 | (direction & 0b11111) << 2 | (fire & 1) << 7 | (turretelev & 1) << 8 | (turret_left & 1) << 9 | (turret_right & 1) << 10 | (recoil & 1) << 11 | (velocity & 0b11111) << 12; + data = (mg & 1) | (ignation & 1) << 1 | (direction & 0b11110) << 2 | (fire & 1) << 7 | (turretelev & 1) << 8 | (turret_left & 1) << 9 | (turret_right & 1) << 10 | (recoil & 1) << 11 | (velocity & 0b11110) << 12; return data; } diff --git a/main.c b/main.c index 8c80d38..cb1804d 100644 --- a/main.c +++ b/main.c @@ -91,6 +91,8 @@ void *refl_thread_fcn(void* arg) refl_thread_args_t* refl_thread_args_ptr; uint8_t clinbr, clisel; unsigned char servoff; + + printf("pthread refl started\n"); refl_thread_args_ptr = (refl_thread_args_t*) arg; diff --git a/obj/Debug/henglong.o b/obj/Debug/henglong.o index 1b6ee4c..729229a 100644 Binary files a/obj/Debug/henglong.o and b/obj/Debug/henglong.o differ diff --git a/obj/Debug/main.o b/obj/Debug/main.o index ddbb489..faf2288 100644 Binary files a/obj/Debug/main.o and b/obj/Debug/main.o differ