From f2906202918c1bb7577121a52c64f183a7dad550 Mon Sep 17 00:00:00 2001 From: ukw Date: Thu, 1 Jul 2010 11:00:26 +0000 Subject: [PATCH] Version 1.7.2: deactivate protcols requiring higher values of F_INTERRUPTS git-svn-id: svn://mikrocontroller.net/irmp@42 aeb2e35e-bfc4-4214-b83c-9e8de998ed28 --- README.txt | 2 +- irsnd.aps | 2 +- irsnd.exe | Bin 13824 -> 13312 bytes irsndconfig.h | 65 +++++++++++++++++++++++++++++--------------------- 4 files changed, 40 insertions(+), 29 deletions(-) diff --git a/README.txt b/README.txt index 0050468..36d8795 100644 --- a/README.txt +++ b/README.txt @@ -2,7 +2,7 @@ IRMP - Infrared Multi Protocol Decoder -------------------------------------- Version IRMP: 1.7.2 01.07.2010 -Version IRSND: 1.7.0 25.06.2010 +Version IRSND: 1.7.2 01.07.2010 Dokumentation: diff --git a/irsnd.aps b/irsnd.aps index 06570bc..65d785d 100644 --- a/irsnd.aps +++ b/irsnd.aps @@ -1 +1 @@ -irsnd07-Jan-2010 20:23:4928-Apr-2010 16:49:57241007-Jan-2010 20:23:4944, 18, 0, 670AVR GCCdefault\irsnd.elfC:\avr\irmp\AVR SimulatorATmega88.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000irsndmain.cirsnd.cirmp.hirsnd.hirsndconfig.hdefault\irsnd.lssdefault\irsnd.mapdefaultNOatmega88111irsnd.elfdefault\0-Wall -gdwarf-2 -std=gnu99 -DF_CPU=8000000UL -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\Program Files\WinAVR-20090313\bin\avr-gcc.exeC:\Program Files\WinAVR-20090313\utils\bin\make.exe00000irsndmain.c100001irmp.h100002irsnd.c100003irsnd.h100004irsndconfig.h1 +irsnd07-Jan-2010 20:23:4901-Jul-2010 12:58:34241007-Jan-2010 20:23:4944, 18, 0, 670AVR GCCdefault\irsnd.elfC:\avr\irmp\AVR SimulatorATmega88.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000irsndmain.cirsnd.cirmp.hirsnd.hirsndconfig.hdefault\irsnd.lssdefault\irsnd.mapdefaultNOatmega88111irsnd.elfdefault\0-Wall -gdwarf-2 -std=gnu99 -DF_CPU=8000000UL -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\Program Files\WinAVR-20100110\bin\avr-gcc.exeC:\Program Files\WinAVR-20100110\utils\bin\make.exe00000irsndmain.c100001irmp.h100002irsnd.c100003irsnd.h100004irsndconfig.h1 diff --git a/irsnd.exe b/irsnd.exe index df93d48fee6e12899b420d023b035da16eb28cd8..60a983b3743c269d1365190e87df113899d20a10 100644 GIT binary patch delta 2481 zcmZ8h3se=y8J=Bv!{zc80fCDUu83rpot@pCz56&wd|)(Itf@p(HF_is)))97jTZ$B z@sR>!P*WeA#3V*-)LyOBgNiRSCzu*zt$H+YYE=+l9Ai_7ayxs)CheT_{WJgTyZ`*N z|E(ygD6ai?+U?TpmqGvP04x*A1Ot#n4KdG*PcldXlf#bhCIw7EaI+r(9UKj)b0m@` zMh?*vX;=hB66s}zF{$JQHj{CZ@oeVMtY-wzr3rwUvv79Fyf**{@u$}56af@Do~`T~ z%&-qfn4qeqEU?wzIx#2O{&zJ#^OstFlI@olyq9tmdehfsdzSd^VwrN{4vZuB0~KbA zXK2tVhP)a)nAk#!m|D`|H<(m~OmnaCmPeSNjbcHh2{uKUz!CQhsnI4_OkwFs)NaLC z=X2E7OYvfi32G@UTV|{Ywo*JVuW=bIx3H?kUiD1~02NxiX#%f@-8Nt+rKCii*b(_Ud_5wg1`HK-xo7V@6S>)!)b0 z>c5yY&_4XaFiM1SE zCuyy#W3Bt*bN}bBBg>@uUBTu47F%2X?CY$q7`bxGa`?>m=eUzPz54_%=cu8Z-@?;;Q&AODm zatCFs`jTF({XV_eu^L-Fam8*P=_`O*Ct6ltIo13Ctpz>GJ+9*UwtCLoE=P)pB8`}KgI*&`E7Fq7ga zMOc4q0^Q%DI7e|l*#tKFp4MVn2C!5Dz%W$!MxydgMB$pL>G736`jwKTfo)l{?s~nx zA*pI9wRbi=^mEtE@odE;u({2nyF7~jxHKvTIs%(m|=qPnP#0MHtzW!8?6f2yihz@-L$WDxogzxGCHf9twdl8YaRt=!CDq zVps;>ft9cZUV+!)1Naz*iZNn>m?HjGEEUVeDshciCpL&I8i)p?At)Ph2qGD|kcslq zX!J6gfF_||p{Zy(nuUr{37U^e(F#+ zBT*?TgK>3C8x-v`ojj}*ls<@R^O1-j4X;eN_zEBP*t;$*DTjjFSuG~=W zC=Zohg~35M7AIl{9)>xLu!i&TSUeF=!E^9JycD}}HC~JB@h04eKf`ss&H=K8{Q$aU29jq9T8mg|nI&ow~9 znyHP|3bi85Jx?ps%C%M6ZtbAftR2_RXlJ#*X;-uk?WWePJ=C6Pj2@te>Ct+;?$Dij zjt=!v`b2$>zDO_ESL(I;Mt!TkUEi&H^h5eF{fvG=zoOsJyY+wRPxS#ts1a!lHZqOj zhGvW~#u^iiB4fHyY|Jwj8!L_X+(xaj+1P39H?A8G43G-Ieg=RbE}YBYI8Nd6xpCYi zZXUOoBitw4E^Z%pkUP$u<1TUEaXs8)E|9nLv3v@j!4KypUgz`q0=|$h;%D%4`Gvfj zui|U@_54PDGvCN>=XdbC`MvypzKL( zgxr$cn%rx-cXGppG{Gt43ZsO{!fV28p+s0HED?SutPoZSYlZc~4mvk&!Y!dk@PpxW zYT_Y=1{@8?!6Nt;TmYBCwXhCufZO0Fa2ITXN8o9A6W)VAz^Bk(jC6}b#2gWd?}(Lj zjOxV=;ui5^ahJGHY!Z)(e--~OUK6{-@5Lw-kCIV3%A&(1AsxL$$Epw&p&95+v;Zwb z)#!ah&?Y)kyU{^(0-ZsZd^6RByeL3=h0f9I(rjtIv{+g#ZIgCN$E8cs4Jl2|%aljU zPRZoSLMjsZKRVg(_A( LU&CC6w6O3$E^KS03|M>z^Fg6Sx?mzll86Qj3* zQDqD8RoUjjly(he=EU%BVS!sa=O`E)W-bfQNHihju`h!jpcd7j{O9c*3ljkjSGghC ztPAJKPtE9vG}33P5g7FMBUox^khv|Q8yM#!dWXEA2x8wQvc=Qeo=R>sU$>{ZKLxtb z=G8klWcmI6otd8a!oY%VtB;=_&=&^u1<+U7EQqTa65bFCkY+%Y%>tw}BdTl`0;v8E z646lK~GECArIhZ;iFux-M`V*!eN2Ga}Yl;B~R!xgQzfZ&qw;EW5~Q z9V>QPvuAWHIG1ay-_+>$Hy!c>0u4tfxHzYE=(y&8;+C^v1H>KWwgS){<<5ELoc7La zD~Bdu%ayLPENrv#$c=2S4mdo^34`@w$SRwa0$3Iy(a<-r;(xMo6mBI5V$Cx1PWyrI zsCsqCpaYbFtyz>UTvo-kQq~tevJSVE*DUHVFCoBaxAy7C-wcce)v(vntneXF2GtDV7DJyFw<=797V1$Cpgom z6c=|kh(?gHF$NLV#UQrC8H54jMv#jwb~(f>{|vBGV-4bckc%M6;IsTR$VVV|Kd@=tSzmeb0SMtaC8vY{RUC0m^K@s{1gM=($pKw~ZApBjpCDaQKght_s z@Jx6q5GWY6MG#dx(rEim!-+#Zlr|F-LqyoGH!`mx#;672;ZPtGH9#BUXrq#cJ__ zcwM|JelI>3DJfKHFU3fSQmW*pC0Xht4V1E^Y-zldBTbcZrMc34X^~Vcl}VpV+oTHV zh;%|aE7eMM(rxL1^jLZ!kvI}Z<1RP}r{UgM!2NM1ehp{iH}C{J3FqQDcs};vk8vqp zi8tfzxExpDBlrZqioeAT_z`}Jf5em=Do45HPI7{rF1utT_mKz4ugb&Z(eijXN1iHw zD0}2T%BAuOd7Zpj-Y%ER74p~e3Hh>IC*PBw$}i<0B}{3j#3(6BPlZ7@~WW@QHQHj z)Kc}&>Q?nj^@v)dUR3X@57eJjN{iNFwAZw3ZM-%~o2C_Ni?w2HrFKX=rJd7iwL0xv z?Y`Ei{h+gq8}+~HyY>D0A-&qI z*XWn^I{lvBsQ;)FiBM@I)F&N5cc5eFBs!I5X_f9r52HuXJHDX2vm-m}$%`CZF*zrA!&Kf!WObh1tREX7(}%86R_mImVo1 zYM2X5EpwH*&fH?^nFmZG^MrZE^kiukv)Sx8b}qY|eaOCK6F7zwxxU=%+*?pVx!hcC zKDUrt!j*8JKpk!1_HyUBtK7dhl8<&n8Fl5;_)LBXKawBAPv+iRh7vd0xiW-Qr&1a0k2rWXTP+9KvXbbW}aUDhHQ7x)R57A>NFNfF> z%IQrgr(7{lTp*T-+r|CjIk8@RDl!t1MoMF#N;>0sc>RO%c>Ff5!I$tg`~nYzCtM=$ rmMi5`@ 14500! - *--------------------------------------------------------------------------------------------------------------------------------------------------- - */ -#if F_INTERRUPTS >= 14500 -#define IRSND_SUPPORT_SIEMENS_PROTOCOL 1 // flag: support Siemens, e.g. Gigaset uses ~150 bytes -#else -#define IRSND_SUPPORT_SIEMENS_PROTOCOL 0 // DO NOT CHANGE! F_INTERRUPTS too low! -#endif - +// Protocol Enable Remarks F_INTERRUPTS Program Space +#define IRSND_SUPPORT_SIRCS_PROTOCOL 1 // Sony SIRCS >= 10000 uses ~150 bytes +#define IRSND_SUPPORT_NEC_PROTOCOL 1 // NEC + APPLE >= 10000 uses ~100 bytes +#define IRSND_SUPPORT_SAMSUNG_PROTOCOL 1 // Samsung + Samsung32 >= 10000 uses ~300 bytes +#define IRSND_SUPPORT_MATSUSHITA_PROTOCOL 1 // Matsushita >= 10000 uses ~150 bytes +#define IRSND_SUPPORT_KASEIKYO_PROTOCOL 0 // Kaseikyo NOT SUPPORTED YET! +#define IRSND_SUPPORT_RC5_PROTOCOL 1 // RC5 >= 10000 uses ~150 bytes +#define IRSND_SUPPORT_DENON_PROTOCOL 1 // DENON >= 10000 uses ~200 bytes +#define IRSND_SUPPORT_RC6_PROTOCOL 0 // RC6 NOT SUPPORTED YET! +#define IRSND_SUPPORT_NUBERT_PROTOCOL 1 // NUBERT >= 10000 uses ~100 bytes +#define IRSND_SUPPORT_BANG_OLUFSEN_PROTOCOL 1 // Bang&Olufsen >= 10000 uses ~250 bytes +#define IRSND_SUPPORT_GRUNDIG_PROTOCOL 1 // Grundig >= 10000 uses ~300 bytes +#define IRSND_SUPPORT_NOKIA_PROTOCOL 1 // Nokia >= 10000 uses ~400 bytes +#define IRSND_SUPPORT_FDC_PROTOCOL 1 // FDC IR keyboard >= 10000 (better 15000) uses ~150 bytes +#define IRSND_SUPPORT_RCCAR_PROTOCOL 1 // RC CAR >= 10000 (better 15000) uses ~150 bytes +#define IRSND_SUPPORT_SIEMENS_PROTOCOL 0 // Siemens, Gigaset >= 15000 uses ~150 bytes +#define IRSND_SUPPORT_RECS80_PROTOCOL 0 // RECS80 >= 20000 uses ~100 bytes +#define IRSND_SUPPORT_RECS80EXT_PROTOCOL 0 // RECS80EXT >= 20000 uses ~100 bytes /*--------------------------------------------------------------------------------------------------------------------------------------------------- * Change hardware pin here: @@ -70,3 +61,23 @@ #define IRSND_DDR DDRB // ddr B #define IRSND_BIT 3 // OC2A #endif // __AVR... + + +#if IRSND_SUPPORT_SIEMENS_PROTOCOL == 1 && F_INTERRUPTS < 15000 +#warning F_INTERRUPTS too low, SIEMENS protocol disabled (should be at least 15000) +#undef IRSND_SUPPORT_SIEMENS_PROTOCOL +#define IRSND_SUPPORT_SIEMENS_PROTOCOL 0 // DO NOT CHANGE! F_INTERRUPTS too low! +#endif + +#if IRSND_SUPPORT_RECS80_PROTOCOL == 1 && F_INTERRUPTS < 20000 +#warning F_INTERRUPTS too low, RECS80 protocol disabled (should be at least 20000) +#undef IRSND_SUPPORT_RECS80_PROTOCOL +#define IRSND_SUPPORT_RECS80_PROTOCOL 0 +#endif + +#if IRSND_SUPPORT_RECS80EXT_PROTOCOL == 1 && F_INTERRUPTS < 20000 +#warning F_INTERRUPTS too low, RECS80EXT protocol disabled (should be at least 20000) +#undef IRSND_SUPPORT_RECS80EXT_PROTOCOL +#define IRSND_SUPPORT_RECS80EXT_PROTOCOL 0 +#endif + -- 2.39.2