From 98c602a12fea91c64119148c3362277ec8936d44 Mon Sep 17 00:00:00 2001 From: Stefan Helmert Date: Tue, 7 Jan 2014 05:25:14 +0100 Subject: [PATCH] velocity and direction highest value 0b11110 corrected --- UDPclient.depend | 2 +- bin/Debug/UDPclient | Bin 25623 -> 25623 bytes client.config | 2 +- henglong.c | 2 +- main.c | 2 ++ obj/Debug/henglong.o | Bin 7944 -> 7944 bytes obj/Debug/main.o | Bin 17992 -> 18000 bytes 7 files changed, 5 insertions(+), 3 deletions(-) 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 191e73bab35be326f8ff0f3a937cbdf2dd0b4036..7e743b095132008815548c1e9c3816d2376c598f 100755 GIT binary patch delta 505 zcmYk2J4gdT5QcYlV|-i+i>xAw3I~FXl0qVeC};%B6heG~3Kj{G7{NwDy!b+6KwPc} zSZSqV)ad$%AYx%*r(M8G?F5k^h^;$!7B>Vro4HKVvnpcx3f0=x1ycPMu2XFo3m3aA+@RVw zC|t5JLy6-CP0MoAw-2ytdj0zFs!5bd?9B61EM2>;P+dfr&!Bf5douBo^xOzCfdocZk6jaK8b6d*%ah^xQN6rp<;wL(NTrx zb~wm)F#MwcZ$RfoR-H_gVmyj?S#NEbkGaFs9s*ZO)&Qv(FXB9fQOi4EZ+R_?-GafR ojPxD>V^wpqHt?g#>fl5we7Qyd63iiP+h3O>Lxf)HOIibX;sYAG>Zd?ry)mn~wc zl^TskSEGf9g@uh^7qC)m6%oYNojVJgWxxHIZ)P@q59xczWnJJE$F45$$}d-Q-NbCF zh!A~RBLt#;2O-oT`X^O1*Qnm8;V2JH6Nt^INHdnHUau}N-(z8t>VsHlwpzGG^>0uZ zw{e{k$2FQ3*z>;Y48G}oLC==hAWv5uWa#NzZ@F1H)?<)4x_;ZXE5EFMQ)c9kJ zHK-y;*y&@`jUy%P@HWbV*d!&SuLd&W$!D0EfYswITwyp>lzA<+tYP+o)}uo!y)xP8 zKg^k|2tC=nD$)3s$#yY4_NedCczntoB5;CU%1783u9>sR&-QSUQ~VOjhnSZRD?GEq zezt?*A9b@Tbjq|kHU1f4VZ`%FYs*~39h__+aIt6&5Rb3|&XXUuyuJ38m$J~#HF%Jr o&Md&3^mPB|vdlkT4Ao*L&;%{wAkZN;`<&uE&<5MGcHl$*1^7C5Y5)KL 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 1b6ee4c5f38533033b33fa399a23878e139c8055..729229a6fe07b76e0868eb2a264c054991e6ee08 100644 GIT binary patch delta 20 bcmeCM>#*Cv$;c=-nTyexQEsyz<1SeMIpPIB delta 20 bcmeCM>#*Cv$;c=_nTyexQGT-@<1SeMIrIfV diff --git a/obj/Debug/main.o b/obj/Debug/main.o index ddbb489731cd3448e0da3514009781fb3c9dc439..faf2288395da754983c2fc525c13a9914acea1f5 100644 GIT binary patch delta 611 zcmY+Azb`{k6vyv*x2mYbkE#fhit5II#L^Ig%^;B=v5>SOek2we+WOgI=*u0%A|0D3 zef9jPMKqBxNHiFXm<|2|&b{XudWY}J=YG#Q_xsM{0Td1((FW~V-%HJOC~jx0g5iO+ z5gTKg$D;L4F3DCETx1YlLW_I0G^&gYD2!Pc?NPXA;RfNp#_$^FZkkiIDX?ur+%7(y z?(nUHF}HHI1%9}mT&YvID;-S_5XEEwu79i%#_!SOdf^|*EreV$-yWHFA*$V%KgD%p zh1nhVINEuH@`nADeT<1@T{%y~7-p#tf0g}bNsp;4-?J1gEggJ)mL{H^C^r`_Lc_w$ zRf#N4SZFk;=OYWQAcL%&tLc-}cuq7zWX{M%YWg_g1(~Bo)K7GID0i&?%oAQUs%;qa zuE1OegX;|yAY!?>2{m?zYH!Sx+r#16d}=ra&dZn0)yA$;Y`|k?nyWQ8AaU752yP^jCP+Atw5b%wrls}Wr3afih{VCM zsjsc2dJ+c-O-M@o0XRGO515&Ed$5Oh^PA_LXP$YdnuDht9H^icLvJnf3EfFZBVivT z#~p-70h?02GABoKbeX{F3X|l(mV}*a!veE5rUwM>*_c7xmk3*CzU$U(YaSe%pgZZO z+n2s`5#kfdCS^a_I7xT~ZgWL4B1k(tfNXrMBJMsgQ8ubIM75gq@O)Vm?~~Z8^GnHw znIKNr1G9D?vGUILHw_X(PrMCs0m3XxTl!0>WhsP3mhTuwD{zIK9z(~oQ=yjA|IoDY zyi~`V4{W?>7sqFoJW&Fd+*dMYaHEMdj#OOWgOrRZ#48jh|IrYVb;xII{KOHjJH#~1 zxF@pML*QmZ1jyKGX}OAkGE{sDeE Bf)@Y)