From 5957c2e6196476760a5f768ac7820b8bf8663d5b Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Mon, 2 Jun 2014 16:09:57 +0000 Subject: [PATCH] 20140602-181002 --- .../Zeitschaltung_V6/Zeitschaltung_V6.atsuo | Bin 36352 -> 36352 bytes .../Debug/Zeitschaltung_V6.elf | Bin 42207 -> 42207 bytes .../Debug/Zeitschaltung_V6.hex | 8 +- .../Debug/Zeitschaltung_V6.lss | 14 ++-- .../Debug/Zeitschaltung_V6.map | 4 +- .../Debug/Zeitschaltung_V6.srec | 8 +- .../Zeitschaltung_V6/comunication/Snap.hpp | 2 +- V6/Program/rfm12_rs232/Zeitschaltung_V6.atsuo | Bin 37888 -> 39936 bytes .../Zeitschaltung_V6/Debug/Makefile | 4 +- .../Zeitschaltung_V6/Debug/Zeitschaltung_V6.d | 73 ------------------ .../Zeitschaltung_V6/Zeitschaltung_V6.cppproj | 4 +- .../Zeitschaltung_V6/comunication/Snap.hpp | 2 +- 12 files changed, 23 insertions(+), 96 deletions(-) delete mode 100644 V6/Program/rfm12_rs232/Zeitschaltung_V6/Debug/Zeitschaltung_V6.d diff --git a/V6/Program/Zeitschaltung_V6/Zeitschaltung_V6.atsuo b/V6/Program/Zeitschaltung_V6/Zeitschaltung_V6.atsuo index ee32bb2e8005fb7414db83872d91c61cdd373550..3decfae8ea38cfcaf67a7e3d51eb8182ead8921f 100644 GIT binary patch delta 665 zcmY+CT}V@57{}lD>^;Y`xew>o%9Pe9Ye?7Y|XnMkNso7YyuTkVF?jLKGEVo{PHZ<2f-8^&SqK|L^%fABX2vW&~wM zm=7|#9X!k}&EI_f?aderv$xDZ2!W|KFDNpDl-O&ezwy-Qw2txb;<9L@8xYA=%+=bE z0hZXFoE?*FLD_`?vmUfn1UT&QiHk^<;YWQBELl51aU3#I6C$f_bUYHE;41OKjVn|< zNfIQ+yBgXBI>*zEJydJJ)us?LQah%&*VB@oidjB@%BGXnFqOBU+O|&A-Kxw!pyF$O zGZlYnKgEBxAHiCikv3O-kn9Z04Jf=-z}3#6t#OF7k~kT{r^))YZ}IMAe6_nA`nYys zhXmOc2jq{{%O>(lBE&!-HsHTkJYEYgBM;$f^gY~&JciQ|A0(m{jD6y#`b9yTUq2T7 z@<9K^{l#aL_>A%( zAb2UfqF9SwKQ?KLU`V_Z+Zkh+s`eqS3&hkmEQ%_`bA()1U#oVuL7}H5(##6l?A$`G zG@8z(L#}|HO|^4V=2}*COXW!u^%Es8@XOtbMRyg9yr4BjntAsXRiR%DH#~3UaQ;iK zhS^0Hkw*&a6h0?Mi(0vz+eom*6492@+!+*hmP_TX3^KgSPW=#7j!jb0!Sx+f?a2`H zfT;^>CHbS)$<+1I5k>s*>9Ph3hQ|m(5dgo?!g7Vguyc>uo^6r z4VPjHhQ^oiXzUp-_uRqF_%;~fS@cxr&=~~}$L`7F31R=g8)1iq5w3C5i>uUmDYbV= R%!lL^joLinU(h))@fVNs=1Two diff --git a/V6/Program/Zeitschaltung_V6/Zeitschaltung_V6/Debug/Zeitschaltung_V6.elf b/V6/Program/Zeitschaltung_V6/Zeitschaltung_V6/Debug/Zeitschaltung_V6.elf index 66cfc8419bafd4d09c061fa64fe6ee5f85c96440..bd0321c084e97f519aa2e077c74bc21183ebcc5c 100644 GIT binary patch delta 2185 zcmZWq3rv$&6h5~tzhE~z5G(>>QD~8eQ=mW#LTyW5vNbaTnNBvu=zOw76El|yqH&uc z=saXF5+xx_of>EC;x@;KGtMD%56vFLJ#=E+%;Izp&EnMTyY(+x*W@(keBXB-_x!hi z&!5tqKczWzLTFk?_@r2=agKzFG^Y_3vPL%_XsBK{GFIe-oQ8pTQ4kUtR};kFe67%~ z)x;KXZc&bso<$@~yr3vmY~Xc8)%6UZMtPpaG8URPqS~(n(cXu^x?zBwnM5a}i5js) z6jSYGu-`{BRC^cTbicRZ;x=JQ1T4R`A2)`Zl4p`ij)fOV3X2LyaJ0Oug zm9vVw!~q^CE>Z4)_Ri&hi(ToB$UCZ*jkEZcsbRm&vCQFTO4?!$q1O+5wZzeU6Q1bI zA(}gSj$Q=^AbjeL0}0%)0>jGXUYLCf(D936nDiA<%rjFe@MmIk#ekSizkYIW8O2veO&kns?F7 zSE)iB;hM(*`Te6cr8Z2A)~sP&Wk4+8VC4$ys+pK}DGtzsleij?)dhV&EH23{S1NJe z$_%1i!1^RU^LM^h=`gf_l<{tf6;yMDV}n@BA31UiTfoQ)12AQhj&C}GhBja_J|?mB zMLchI(BHjpKhhdKx?(l`#HHn)FL0Ho65rZIvrIh{7*Ah)d^4K7T z0G@T3aGLuGF`t*aD@7mgbDKpspK(t~{?Uqior6150CVod z*&3zS&HAd0Fk65d}aE$71 zVKm8XiekQNp*oGs1hX@W*?*ks#;VMFQOw36s!LFrGb}twsWSVwC=Cr#F1^(wHJ8Yz$0Qv}IW7AUgskF~AK0lVvpkPbqi@ z?EZT`g5Z5!4&oB;4XhEVp|m-l=|jKP4ws1O{Bir#n5H>IH#mOVc)s2Km{=Toblcga F{{WD<+qD1y delta 2250 zcmZWq3s6*L6h8khtRUC|%0rN+u!{($yjjp)_jy^2H4An!A1RHIqD`YSm5qWlj#&&o zPNOiB@1%!XDvjj}wNXTK${Z&(YZPfTn^7spoH2Cz{^hQ?wlinvobUV2D!beBHD?fxV@=RhpzSk)dIpP8?N)t9q)2KPskfrUUA~iN(uhjV z&d<^%W)O*Fo|c~=mhjv8lj_$3sM6K4c%6l&iKzOlAo}zv(0dW!`gEcbfkc&jqWU@{h>!YW^Zw9><7MeESNTg_D`k~c; zL}nTr3R}buK2lhu>jUk2p8E=INwbl6KrI_;RBF}mkjychHl5 z>#~TZJYL6E9no~cZ$|7;qL5_CYMO*1m-7Hc=4gSY92iAZejJe2v0whLS+vP6%jyOZ zy*vVvY8XT0Itz3z&}svaIv|gau7L(obs^AY{B^NGe8!iH$BJ4GFG&%@Ij5u%$Gy8G zN7se{X0>roNygwFxHa)Xa{4G!hREPzlS?o+n39YuM-w?yKxM+LGvcuK8G!sqP^>2% zL=T@ZWr_&CZAujnIifUSd`vd-ETG&0d42?WPML?s_$m6~{ldw>!soiUwsfp`k6TOK znBw=+#Uh($mKnv1yrL{MctH-)JG`qbSM1`eWeN4C5Esb%Ai|m>QLN;i9vgQ7=r!1r z7il{PO)tQI1Bps0>_+ZVw4V}8)Eh!Hd<-hSP();x8OgYViZPz336iz2kVxmV;0oe- z@%VIG1SFDK4SOd35>k~I6>0_~3>yHIrvM^bN_4;0N2FM@5CYBS?(uGs%h?m=iMiY| zAp{x6O=7tfY_=>F3%SFRrC$z4R_K7~619Ba z;?aKyOvXngmNbj2CccrVmHX9--Zy2ByExTOuoq$B`abTSST(FM4}@_n3# zT{$c{AA}jiX@F;Z#Cg79eOJ%8Za*MC4-3j$!f)C<)7PN4jAiAZd}X~F{)|u<4x&=| z7C>a%i8qMU`G^$jK7>Gbfs=^L76x1Uli|?v!<=Y;PQ1kP>}Iizci0W0mCxDJ;(jf_ zjn2aD$c0%qU~M(hYvpi9s)*(>ju;3Xj?}oyLI_P#B<)8jlwK<@b;Q=UVl}l8_@7p7 z*wv%teSk?M(-^>9XdtgfW`g-RfZ6dKc?YY^z5r&~Y4S#?%-H~ju97$2sZxIiQe9M& zrZNMA-9IjOOOel)oPQE5B&tZB@CBagoTQr%S6t_v&b(wf;a-FT$z6@)ovoHU!;hSD zbD~}8Ix0qzgUzmd0E+<3l)yIL=<2UBP=R*K_9cgg;A!3i(Qn-Avgqzh`5#=Um`87e z`#xG^EO?x56-8C!7}P9E7u9I(vAt5+ke3CC!NwDc@$zH$YfGWxSpQOVt=~N{Zen|p8v)Zs6bUN+VoKrOmcyoDl zjco3@rb3?Us>t)VANj|RXs`itSsoo6-^kCX$Vq=QUoS$hC{urCsuqP)_$Y< fQjy5vW6dLj7gP}4 12c: 00 c0 rjmp .+0 ; 0x12e <_ZN4FunkI5Rfm12I3SpiIN6avrlib5portcELi4ELi3ELi0ELi1ELi1EELh1ELh0ELh7ELm433920ELj9600ELh0ELh6EE5InputINS2_5portdELi2EES6_IS7_Li3EE5ServoINS2_5portbELi2ELi1ELj640ELj105ELj210ELh8EE3LedIS7_Li7ELi6EEE9hook_turnEv+0x22> 12e: 00 00 nop - 130: 8e e1 ldi r24, 0x1E ; 30 + 130: 82 e3 ldi r24, 0x32 ; 50 132: ef e0 ldi r30, 0x0F ; 15 134: f7 e2 ldi r31, 0x27 ; 39 136: 31 97 sbiw r30, 0x01 ; 1 @@ -404,7 +404,7 @@ namespace avrlib { 198: 04 84 ldd r0, Z+12 ; 0x0c 19a: f5 85 ldd r31, Z+13 ; 0x0d 19c: e0 2d mov r30, r0 - 19e: 4e e1 ldi r20, 0x1E ; 30 + 19e: 42 e3 ldi r20, 0x32 ; 50 1a0: 61 e0 ldi r22, 0x01 ; 1 1a2: 09 94 ijmp @@ -749,7 +749,7 @@ namespace avrlib { 366: 89 81 ldd r24, Y+1 ; 0x01 368: 88 23 and r24, r24 36a: 29 f0 breq .+10 ; 0x376 <_ZN4FunkI5Rfm12I3SpiIN6avrlib5portcELi4ELi3ELi0ELi1ELi1EELh1ELh0ELh7ELm433920ELj9600ELh0ELh6EE5InputINS2_5portdELi2EES6_IS7_Li3EE5ServoINS2_5portbELi2ELi1ELj640ELj105ELj210ELh8EE3LedIS7_Li7ELi6EEE6workerEv+0x96> - 36c: 8e 31 cpi r24, 0x1E ; 30 + 36c: 82 33 cpi r24, 0x32 ; 50 36e: 19 f0 breq .+6 ; 0x376 <_ZN4FunkI5Rfm12I3SpiIN6avrlib5portcELi4ELi3ELi0ELi1ELi1EELh1ELh0ELh7ELm433920ELj9600ELh0ELh6EE5InputINS2_5portdELi2EES6_IS7_Li3EE5ServoINS2_5portbELi2ELi1ELj640ELj105ELj210ELh8EE3LedIS7_Li7ELi6EEE6workerEv+0x96> 370: 80 3f cpi r24, 0xF0 ; 240 372: 09 f0 breq .+2 ; 0x376 <_ZN4FunkI5Rfm12I3SpiIN6avrlib5portcELi4ELi3ELi0ELi1ELi1EELh1ELh0ELh7ELm433920ELj9600ELh0ELh6EE5InputINS2_5portdELi2EES6_IS7_Li3EE5ServoINS2_5portbELi2ELi1ELj640ELj105ELj210ELh8EE3LedIS7_Li7ELi6EEE6workerEv+0x96> @@ -817,7 +817,7 @@ namespace avrlib { 3c2: f1 f7 brne .-4 ; 0x3c0 <_ZN4FunkI5Rfm12I3SpiIN6avrlib5portcELi4ELi3ELi0ELi1ELi1EELh1ELh0ELh7ELm433920ELj9600ELh0ELh6EE5InputINS2_5portdELi2EES6_IS7_Li3EE5ServoINS2_5portbELi2ELi1ELj640ELj105ELj210ELh8EE3LedIS7_Li7ELi6EEE6workerEv+0xe0> 3c4: 00 c0 rjmp .+0 ; 0x3c6 <_ZN4FunkI5Rfm12I3SpiIN6avrlib5portcELi4ELi3ELi0ELi1ELi1EELh1ELh0ELh7ELm433920ELj9600ELh0ELh6EE5InputINS2_5portdELi2EES6_IS7_Li3EE5ServoINS2_5portbELi2ELi1ELj640ELj105ELj210ELh8EE3LedIS7_Li7ELi6EEE6workerEv+0xe6> 3c6: 00 00 nop - 3c8: 8e e1 ldi r24, 0x1E ; 30 + 3c8: 82 e3 ldi r24, 0x32 ; 50 3ca: af e0 ldi r26, 0x0F ; 15 3cc: b7 e2 ldi r27, 0x27 ; 39 3ce: 11 97 sbiw r26, 0x01 ; 1 diff --git a/V6/Program/Zeitschaltung_V6/Zeitschaltung_V6/Debug/Zeitschaltung_V6.map b/V6/Program/Zeitschaltung_V6/Zeitschaltung_V6/Debug/Zeitschaltung_V6.map index 14f37b7..27dadf3 100644 --- a/V6/Program/Zeitschaltung_V6/Zeitschaltung_V6/Debug/Zeitschaltung_V6.map +++ b/V6/Program/Zeitschaltung_V6/Zeitschaltung_V6/Debug/Zeitschaltung_V6.map @@ -484,9 +484,9 @@ LOAD c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8 .debug_pubnames *(.debug_pubnames) -.debug_info 0x00000000 0x3c2d +.debug_info 0x00000000 0x3c2e *(.debug_info) - .debug_info 0x00000000 0x3c2d Zeitschaltung_V6.o + .debug_info 0x00000000 0x3c2e Zeitschaltung_V6.o *(.gnu.linkonce.wi.*) .debug_abbrev 0x00000000 0x5f5 diff --git a/V6/Program/Zeitschaltung_V6/Zeitschaltung_V6/Debug/Zeitschaltung_V6.srec b/V6/Program/Zeitschaltung_V6/Zeitschaltung_V6/Debug/Zeitschaltung_V6.srec index 7ddae23..f18c0f7 100644 --- a/V6/Program/Zeitschaltung_V6/Zeitschaltung_V6/Debug/Zeitschaltung_V6.srec +++ b/V6/Program/Zeitschaltung_V6/Zeitschaltung_V6/Debug/Zeitschaltung_V6.srec @@ -18,13 +18,13 @@ S11300F0089580FF02C05E9A01C05E98569A81FFFF S113010002C05F9A01C05F98579A0895CF93DF9316 S1130110EC018A818630C9F186E08A831D82299A9E S11301200E945F008FE19EE40197F1F700C0000098 -S11301308EE1EFE0F7E23197F1F700C00000815063 +S113013082E3EFE0F7E23197F1F700C0000081506D S1130140C1F7FFEF23EC89E0F15020408040E1F754 S113015000C0000089E68D839FEFE2E5F7E091504F S1130160E040F040E1F700C0000082ED8D832FEF06 S113017086E191E1215080409040E1F700C0000009 S11301802998DF91CF910C945F00DF91CF9108956E -S1130190262FDC01ED91FC910484F585E02D4EE1E0 +S1130190262FDC01ED91FC910484F585E02D42E3EA S11301A061E00994CF93DF93EC018A818330D9F421 S11301B04A9919C0E881F9810680F781E02DCE01C2 S11301C00995E881F9810190F081E02DCE0109952E @@ -53,13 +53,13 @@ S1130320E02DC8010995D801ED91FC910084F18577 S1130330E02DC8010995D801ED91FC918111EECF12 S11303400284F385E02DC8010995F70181937F01AB S1130350EC15FD0541F7D801ED91FC910680F7817C -S1130360E02DC80109958981882329F08E3119F07F +S1130360E02DC80109958981882329F0823319F089 S1130370803F09F042C08A81813009F03EC08B8100 S1130380843049F018F48130C1F518C0853039F053 S1130390873099F509C082E0F80182830FC083E0B9 S11303A0D80112968C930AC0D801ED91FC9101906A S11303B0F081E02DC801099566E011C0EFE1FEE48B -S11303C03197F1F700C000008EE1AFE0B7E211977A +S11303C03197F1F700C0000082E3AFE0B7E2119784 S11303D0F1F700C000008150C1F7F8016281C80143 S11303E00F900F900F90DF91CF911F910F91FF907D S11303F0EF90DF90CF900C94C8000F900F900F9067 diff --git a/V6/Program/Zeitschaltung_V6/Zeitschaltung_V6/comunication/Snap.hpp b/V6/Program/Zeitschaltung_V6/Zeitschaltung_V6/comunication/Snap.hpp index bdb0f83..10fdc79 100644 --- a/V6/Program/Zeitschaltung_V6/Zeitschaltung_V6/comunication/Snap.hpp +++ b/V6/Program/Zeitschaltung_V6/Zeitschaltung_V6/comunication/Snap.hpp @@ -11,7 +11,7 @@ class Snap { public: - static const uint8_t DEVICE = 30; + static const uint8_t DEVICE = 50; static const uint8_t ALL = 0; static const uint8_t GROUP = 240; diff --git a/V6/Program/rfm12_rs232/Zeitschaltung_V6.atsuo b/V6/Program/rfm12_rs232/Zeitschaltung_V6.atsuo index a9b98abe76988719f6c3eb0be315868a91bc5856..2d0fcb4307d13f1688d2f8f4339f12a678fda9d0 100644 GIT binary patch delta 1179 zcmZWpYe*DP6ux(y8E1FX)!pr7ZmwCl)l#dKRM=)|FEe(uh{!c}`_aQ-OPk8nYp~h#K%_JlDkf%AiV25APC z?yZ0}aX^`fDW`C%)DHQkXU_Ad+2JoE#^PQHXt%mXb4@9FdG5RJ<85p{ic5Eyx#om$;Hu^ zc`JNC{=|)zh#*eG$3axf7t45((0p_FMVNwQDk6a3oX2#`gNPDDDPjgUlUk-rYf-+_*QVho}DLi`nlm}lVI zH?WF!+)JT7q&I)f{@q;a_hO=hLdBj1;EM0nJ1hC1%agG|f}7b{&H6jbDRjlBN=1Av zc0X>Xj-k7}Uo+tT5jU*a=a-U6LO$ZLx5I?>$H2EFhvgl2$@CRGjTOU&f^7Eg$as2V ze=o(6cmll#?m%7a5}ZBcf!?F%AzGS)p8x@R4qRnx4!^MB|C$e}rA7Q|d_d5ZR50kQDMEf-X-LT_|FM@F6>6qXZ3nGw1uh^Z)0cIcL;6ygI-S zM)|DY)6>%ijH{UAxDrAsp^UJWP)=A!sKD}=7d^5|6RH`Hbio@padBLJsEo51a@8ud z2+yQ=3YQSjou3I+67*)vm>>jZ6t7=%2xzudS=oFNa%a<`wh$f(c~D}*lChO!8hSJ~ z6k|A=o0d7Nr6e-!bEY%I<564@+Tu&3G*V+tM|?{`vK3SD>&Y*K>M6A{8)J0R6xvW+Pac6?zFHJGXY8VX<*)Z_x3J(Yk+ho}|Ws3#IO$lp-X*^dG_fsMi4ep`RMW2MESa0j^vikn*X zmOamyw3^N*%$>SEj51rUn8rBnJBO+IN~w^%;GEwu(|2(R`8?C78lEr=)n5MRRlM-3 zc8k#yhn}n27&SkS$lnX2yR)t}F$7zG#NDN7UCq_ey^-6=4IilE1!JTkD`|fNRq-We zQ5{2FMo&Lsxxt4vRx#}mO^C6vgJ4Xqt{mFTP+_C)9j<0@XOuy%bs*SS&UVgxqu$0u zZT}nhulrS>SKPk!=_{P)UVTWN6p0pA)JZs8gBHrrv}m47{WglX-nc8rP?Q325` zB4$&4j-k(6sXsneKrgap5nRQ_FCgMX#|;ej&Sx*dcJ0H~u7TmxBMc`y?qTH21V(zU zLe6&~dubAU?dS2aGl9H*eQVdG)d6.1 com.Atmel.AVRGCC8.CPP {ec267909-c732-4cef-b754-bd8ce5ebd85c} - ATmega16A + ATmega168A none Executable CPP @@ -52,7 +52,7 @@ 249000 1000000 - 150000 + 250000 false false 0 diff --git a/V6/Program/rfm12_rs232/Zeitschaltung_V6/comunication/Snap.hpp b/V6/Program/rfm12_rs232/Zeitschaltung_V6/comunication/Snap.hpp index bdb0f83..43eb2af 100644 --- a/V6/Program/rfm12_rs232/Zeitschaltung_V6/comunication/Snap.hpp +++ b/V6/Program/rfm12_rs232/Zeitschaltung_V6/comunication/Snap.hpp @@ -11,7 +11,7 @@ class Snap { public: - static const uint8_t DEVICE = 30; + static const uint8_t DEVICE = 10; static const uint8_t ALL = 0; static const uint8_t GROUP = 240;