From 8c2c8310dd7d3a5a2f2450938a935160ff975074 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Fri, 10 May 2013 16:09:54 +0000 Subject: [PATCH] 20130510-181001 --- V5B/Reciver/Reciver.atsuo | Bin 16896 -> 16896 bytes V5B/Reciver/Reciver/Debug/Reciver.elf | Bin 16740 -> 16740 bytes V5B/Reciver/Reciver/Debug/Reciver.hex | 16 ++--- V5B/Reciver/Reciver/Debug/Reciver.lss | 36 +++++------ V5B/Reciver/Reciver/Debug/Reciver.srec | 16 ++--- V5B/Reciver/Reciver/Reciver.c | 8 +-- V5B/Reciver/Reciver/Reciver.cproj | 86 ++++++++++++------------- V5B/Reciver/Reciver/codes.h | 2 +- 8 files changed, 82 insertions(+), 82 deletions(-) diff --git a/V5B/Reciver/Reciver.atsuo b/V5B/Reciver/Reciver.atsuo index 5368cdc9b3daf0cf2bf39cbd296eaacc8e47d3ec..93819c0464cc0ec377b685d480a81b862f9ce2f3 100644 GIT binary patch delta 723 zcmYLH-Ahw(7(VaWZ|aDf+;BDBQHdz4Wpxn}CWJ&V!;1wWA-j-1 zys7zKbXP$aY4jof!01L#NH@{PAfdk?kf;dRO+ngwbki4}!}C1vbKc*}@0|QJ9I1g!}t*?Y-NRF`P)3}Iek{Dx5#;TC^mG8=H!8^eA0 zWfoRwCsCN=a@~3Vo6_(9~Jwidwe zVJH6b+woPxgfH47sJ5%d+*md{hIxMr{%dpNNIX>-a^n4Pn5z*9n58@fbI~>CtxU{y ztclFDs}7zA7Ah;_O(IYDpF_vMaQ)g9ETlcOqk_x+eq4y3qoX@8)cxEF0stlTx~k4$ zYxkty0uhU;1^k+>1sNUbr!a+(%%Z*3iurn`%*Qs)KIppm<5YA*)tc8YSrED$J{X8E zMW>oi|4x{yXq^82_G%K}CI=ff_l&LEl(|E=OPC>S^1j0>P#AU1rXo0=v?{^bnThp} z!_R!LTknk@efW~;rxZpRUQRWjH{r%FX{Vz93_Io0d_-zcOKDu|34pkLoxS{9F9JNm Op}s-PhpTx}?S%gfn$xlX delta 1009 zcmbtS%TE(w5Z|xe!nV9xN_dJO(txE4+je)mOG;U`Eoz8Xd|Wt?Km~&$C@DsuKoe{5 z0isUA!2=k*m>3^nqlqy@OgRxBB=QHC7>_0%deMV8i^W7wCeG$J-^}lu$2XHrBuOGk zo(|IacXRKEsn9!Oq)=*MoL*<@(5ga!m8*vYLu(gJih;~%FS0F0NYQRcTi%-~J%PzY zY3ZDZY5OW>JHiwro4b>rwrwy4=;UOGtWq?lP4K<&Af&7D`*E@I4W=F)J>?fs5rLG&t)(m0jW8sr%hf?*CRl<-Vy5iq*)oh>K!Zl;5*@hEH_{k|M^&<>)D#%uu}}!vH8Ly-1rTwRXsZs|z+_`& zHA3&HrR&}ppx@C2Pa5*Hx6U#Gic5i;j$&98tS}cSg<97x_~O&SJRfbZQFA z5IQeY0%DDuv~{OmtZCCg>+^3{k9m$0x-jFJ;%F>s-@N+?EH>z>qW!hgzBjPKBB|{3f`Ju=@Fz+PRyI`;QF|j>ZOthXV1VecNk@$0s;mmD*Iv z!?p=N56icQ+gVu%hFQVm@$fvaimJ#@e!z~Gy3dUapT-Q;X}E=J{kujm$74=4Ar-kzS5Y_GdtV!5c;+aHxhUY0pR5rX6DGN9lO z01)?;u|_KN&vT6fkq3eG=iAn5m4!r?HF<9~xsrR}F+e6e}so?(qXY~}U`d1BGThQ5B0V@rAwM2`9XrBW>$bGO? NbwI+It8FM8`3c@973%;1 diff --git a/V5B/Reciver/Reciver/Debug/Reciver.elf b/V5B/Reciver/Reciver/Debug/Reciver.elf index 87300185a451a9636a513e383da60b4062af5340..7bdcb231425790cb93b022b61b3762860efd9f01 100644 GIT binary patch delta 352 zcmaFT#Q3C%aRUouK-bd=4<<}bWN4V2z@Y!U%Ob%g;V9Izjc^zXFQ-{%HEv9s7Jf?15!z9JW zsImFDfB++-#^f7<-+`P9LRTe>Je(Mypaw|40%A6Xc`OV8hdnUGc^ahH80JrYuPw^V zaKafxO9nW5!PL!x>*ry(VlY`&M}ldZ^JIA)QRx~XxT0N1isq{T4Xf7?-CU!yg3$os XkUxwJ3^GiZ4nc^69I`n?Pe2#|9`j|o delta 333 zcmaFT#Q3C%aRUouK*#e54<<}bWN4V2z@Y!W?fJw9iUAD{6C56XXE?yX;4m?XAz)%M zL(=2M2Yi=+@((9IM3(P)jG`MTJ2`|gf+^|o 9c: 2f ef ldi r18, 0xFF ; 255 - 9e: 86 e1 ldi r24, 0x16 ; 22 - a0: 91 e1 ldi r25, 0x11 ; 17 + 9e: 83 ec ldi r24, 0xC3 ; 195 + a0: 99 e0 ldi r25, 0x09 ; 9 a2: 21 50 subi r18, 0x01 ; 1 a4: 80 40 sbci r24, 0x00 ; 0 a6: 90 40 sbci r25, 0x00 ; 0 a8: e1 f7 brne .-8 ; 0xa2 aa: 00 c0 rjmp .+0 ; 0xac ac: 00 00 nop - _delay_ms(700); - servopos = RIGHT-120; - ae: 8c e3 ldi r24, 0x3C ; 60 + _delay_ms(400); + servopos = RIGHT-140; + ae: 88 e2 ldi r24, 0x28 ; 40 b0: 90 e0 ldi r25, 0x00 ; 0 b2: 90 93 61 00 sts 0x0061, r25 b6: 80 93 60 00 sts 0x0060, r24 ba: 2f ef ldi r18, 0xFF ; 255 - bc: 86 e1 ldi r24, 0x16 ; 22 - be: 91 e1 ldi r25, 0x11 ; 17 + bc: 82 e5 ldi r24, 0x52 ; 82 + be: 97 e0 ldi r25, 0x07 ; 7 c0: 21 50 subi r18, 0x01 ; 1 c2: 80 40 sbci r24, 0x00 ; 0 c4: 90 40 sbci r25, 0x00 ; 0 c6: e1 f7 brne .-8 ; 0xc0 c8: 00 c0 rjmp .+0 ; 0xca ca: 00 00 nop - _delay_ms(700); + _delay_ms(300); servopos = RIGHT; cc: 84 eb ldi r24, 0xB4 ; 180 ce: 90 e0 ldi r25, 0x00 ; 0 @@ -212,7 +212,7 @@ void poll() { 114: cd d1 rcall .+922 ; 0x4b0 rf12_txpacket(MASTER, DEVICE, DEDECT); 116: 48 e0 ldi r20, 0x08 ; 8 - 118: 62 e3 ldi r22, 0x32 ; 50 + 118: 68 e2 ldi r22, 0x28 ; 40 11a: 81 e0 ldi r24, 0x01 ; 1 11c: cd d1 rcall .+922 ; 0x4b8 rf12_beginasyncrx(); @@ -298,7 +298,7 @@ void recive() { if(addr == ALL || addr == DEVICE || addr == GROUP) { 190: 88 23 and r24, r24 192: 39 f0 breq .+14 ; 0x1a2 - 194: 82 33 cpi r24, 0x32 ; 50 + 194: 88 32 cpi r24, 0x28 ; 40 196: 29 f0 breq .+10 ; 0x1a2 198: 80 3f cpi r24, 0xF0 ; 240 19a: 09 f0 breq .+2 ; 0x19e @@ -394,8 +394,8 @@ void recive() { } rf12_endasyncrx(); 1fa: 5a d1 rcall .+692 ; 0x4b0 - 1fc: 2f ef ldi r18, 0xFF ; 255 - 1fe: 86 e7 ldi r24, 0x76 ; 118 + 1fc: 2f e7 ldi r18, 0x7F ; 127 + 1fe: 88 e3 ldi r24, 0x38 ; 56 200: 91 e0 ldi r25, 0x01 ; 1 202: 21 50 subi r18, 0x01 ; 1 204: 80 40 sbci r24, 0x00 ; 0 @@ -407,7 +407,7 @@ void recive() { rf12_txpacket(MASTER, DEVICE, status); 20e: 40 91 62 00 lds r20, 0x0062 212: 50 91 63 00 lds r21, 0x0063 - 216: 62 e3 ldi r22, 0x32 ; 50 + 216: 68 e2 ldi r22, 0x28 ; 40 218: 81 e0 ldi r24, 0x01 ; 1 21a: 4e d1 rcall .+668 ; 0x4b8 return; diff --git a/V5B/Reciver/Reciver/Debug/Reciver.srec b/V5B/Reciver/Reciver/Debug/Reciver.srec index e9e4502..e6fe7d7 100644 --- a/V5B/Reciver/Reciver/Debug/Reciver.srec +++ b/V5B/Reciver/Reciver/Debug/Reciver.srec @@ -6,17 +6,17 @@ S1130030E8EBF5E002C005900D92A436B107D9F7BC S113004020E0A4E6B0E001C01D92A636B207E1F7B5 S113005068D1B0C2D5CF80916200909163000697B9 S113006009F443C086E090E09093630080936200BB -S113007088E790E090936100809360002FEF86E71B +S11300708AE590E090936100809360002FE788E325 S113008091E0215080409040E1F700C00000409191 -S113009062005091630062E381E00ED22FEF86E1AB -S11300A091E1215080409040E1F700C000008CE3D2 -S11300B090E090936100809360002FEF86E191E1DE +S113009062005091630068E281E00ED22FEF83EC9E +S11300A099E0215080409040E1F700C0000088E2D0 +S11300B090E090936100809360002FEF82E597E0D9 S11300C0215080409040E1F700C0000084EB90E0B4 S11300D090936100809360002FEF86E191E12150BD S11300E080409040E1F700C000000895BA988091E4 S11300F0620090916300039729F4B29B03C0D8D1A6 S1130100AADFC3D18091620090916300029741F409 -S1130110B29B06C0CDD148E062E381E0CDD1B5D138 +S1130110B29B06C0CDD148E068E281E0CDD1B5D133 S1130120CC992DC08091620090916300029739F5BB S113013086E090E090936300809362002FEF81E16A S11301409AE7215080409040E1F700C000002FEF73 @@ -24,15 +24,15 @@ S113015081E19AE7215080409040E1F700C000001F S11301602FEF81E19AE7215080409040E1F700C0F1 S1130170000083E090E09093630080936200089510 S1130180CF9383D101C0B2DF8AD18111FCCF8CD14E -S1130190882339F0823329F0803F09F03FC001C041 +S1130190882339F0883229F0803F09F03FC001C03C S11301A0A5DF7DD18111FCCF7FD1C82F01C09EDF97 S11301B076D18111FCCFC13089F576D1843049F0F4 S11301C018F48130C1F419C0853051F0873099F4A6 S11301D00EC082E090E090936300809362000DC0B3 S11301E083E090E0909363008093620006C060D146 -S11301F032DF4BD113C05CD111C05AD12FEF86E747 +S11301F032DF4BD113C05CD111C05AD12FE788E351 S113020091E0215080409040E1F700C0000040910F -S113021062005091630062E381E04ED1CF91089572 +S113021062005091630068E281E04ED1CF9108956D S113022010BE85E083BF88E582BF81E089BF089561 S11302301F920F920FB60F9211242F933F938F9317 S11302409F9388E582BF809162009091630002973A diff --git a/V5B/Reciver/Reciver/Reciver.c b/V5B/Reciver/Reciver/Reciver.c index 6bf80df..dd25550 100644 --- a/V5B/Reciver/Reciver/Reciver.c +++ b/V5B/Reciver/Reciver/Reciver.c @@ -23,12 +23,12 @@ void turn() { if(status == RUN) return; status = RUN; - servopos = RIGHT-60; + servopos = RIGHT-90; _delay_ms(10+DEVICE); rf12_txpacket(MASTER, DEVICE, status); - _delay_ms(700); - servopos = RIGHT-120; - _delay_ms(700); + _delay_ms(400); + servopos = RIGHT-140; + _delay_ms(300); servopos = RIGHT; _delay_ms(700); } diff --git a/V5B/Reciver/Reciver/Reciver.cproj b/V5B/Reciver/Reciver/Reciver.cproj index dc5292e..43ec80c 100644 --- a/V5B/Reciver/Reciver/Reciver.cproj +++ b/V5B/Reciver/Reciver/Reciver.cproj @@ -60,14 +60,14 @@ - - - - - - - - + + + + + + + + true true @@ -76,46 +76,46 @@ - True - True - True - True - True - True - Optimize for size (-Os) - -fdata-sections - True - True - True - - - libm - - - + True + True + True + True + True + True + Optimize for size (-Os) + -fdata-sections + True + True + True + + + libm + + + - True - True - True - True - True - True - Optimize (-O1) - True - True - Default (-g2) - True - - - libm - - - Default (-Wa,-g) - + True + True + True + True + True + True + Optimize (-O1) + True + True + Default (-g2) + True + + + libm + + + Default (-Wa,-g) + diff --git a/V5B/Reciver/Reciver/codes.h b/V5B/Reciver/Reciver/codes.h index a37242e..112ae8f 100644 --- a/V5B/Reciver/Reciver/codes.h +++ b/V5B/Reciver/Reciver/codes.h @@ -12,7 +12,7 @@ #ifndef ALL #define ALL 0 #define GROUP 240 -#define DEVICE 50 +#define DEVICE 40 #define MASTER 1 #endif