From af1bddb3d81c79d67063184219ec21f8249dffd0 Mon Sep 17 00:00:00 2001 From: Portisch Date: Tue, 26 Mar 2019 12:34:05 +0100 Subject: [PATCH] adjust HT12 values for FRM87 #103 --- .../RF-Bridge-EFM8BB1.hex | 814 +++++++++--------- inc/RF_Config.h | 4 +- inc/RF_Protocols.h | 2 +- 3 files changed, 401 insertions(+), 419 deletions(-) diff --git a/Keil 8051 v9.53 - Release/RF-Bridge-EFM8BB1.hex b/Keil 8051 v9.53 - Release/RF-Bridge-EFM8BB1.hex index f396e2b..1575f3e 100644 --- a/Keil 8051 v9.53 - Release/RF-Bridge-EFM8BB1.hex +++ b/Keil 8051 v9.53 - Release/RF-Bridge-EFM8BB1.hex @@ -1,22 +1,22 @@ :020000040000FA -:10000000021168A2029290A2029280AD40AC3F7FA2 +:100000000210D8A2029290A2029280AD40AC3F7F33 :100010000A7E0012002E12001DA202B322E59120DA -:10002000E2FB220210D87597A5222202143D8E41D0 -:100030008F428C438D441216551218B2E54424BFEA +:10002000E2FB220210487597A5222202141B8E4182 +:100030008F428C438D4412163112188EE54424BF32 :100040009000E8F0E54334FF9000E7F09000E3E52E -:1000500041F0A3E542F043910422220211F7121964 -:100060004653D87853DAFE121917E4900087F0222D -:10007000D2DE220214901217E4C290C296C280E42B -:10008000FBFD7F101218FE12053174A4F0D2AF12DE -:10009000172ED2969000ECE004F070069000EBE092 +:1000500041F0A3E542F043910422220211671219F4 +:100060002253D87853DAFE1218F3E4900087F02276 +:10007000D2DE2202146E1217C0C290C296C280E471 +:10008000FBFD7F101218DA12053174A4F0D2AF1202 +:10009000170AD2969000ECE004F070069000EBE0B6 :1000A00004F09000EBE0B427E9A3E0B410E4C296BA -:1000B0001200263003091216D58E228F2380067572 +:1000B0001200263003091216B18E228F2380067596 :1000C0002201752300E5237004E522640170469047 -:1000D00000DEE0700612172F0202959000EBE47527 +:1000D00000DEE0700612170B0202959000EBE4754B :1000E000F001120807FED3E5F09410EE94274002C9 :1000F000D296D39000ECE094309000EBE0947550F1 :1001000003020295E4F0A3F09000DEF0900099F075 -:10011000C29602029512172E9000DEE014602A1497 +:10011000C29602029512170A9000DEE014602A14BB :1001200070030202591470030202171470030202D2 :100130003024046003020295E52364AA60030202EE :10014000959000DE04F0020295E523900099F0906E @@ -26,11 +26,11 @@ :10018000051EE490008AF07FA1806512054E900064 :10019000EA7408F0E4F52575240902029512054E6B :1001A000E4F52575240202029590008A7401F07F1F -:1001B000A61215CA90007974A6F0020295120531B4 +:1001B000A61215A690007974A6F0020295120531D8 :1001C00074A4F00202959000EA7408F09000DE74C6 :1001D00003F00202957FB112056202029512051E1C :1001E00090008AE09000E9F090008A7401F07FA905 -:1001F0001205627D307C757F017E001217BB020202 +:1001F0001205627D307C757F017E00121797020226 :100200009512056B900079EFF0E48005E490009979 :10021000F09000DEF0807EE4F525E523F524E5246A :10022000D39400402C12005E9000DE7404F08065D0 @@ -39,87 +39,87 @@ :10025000709000DE7402F0803CE5236455703690A7 :1002600000DEF0C203900099E02460601B24FC6073 :100270001224FE600E14600B24F760101460042436 -:100280001070127FA0121899D2038009900004E028 +:100280001070127FA0121875D2038009900004E04C :10029000049000EAF0900099E012092F02BEA10339 :1002A00033A40377A50333A60447A802BEA9047CA0 :1002B000B004E5B1041EC00442FF000000B090008D :1002C00086E030E73F7DC87C0012053F900099E052 -:1002D0002457600E2408701F12056B7FA31216109E +:1002D0002457600E2408701F12056B7FA31215ECC3 :1002E00080159000E9E090008AF0900079E0FF121C -:1002F00015CA7FAB12057CE4900086F043DA01D288 -:10030000030200B012190F50207DE87C0312053F54 +:1002F00015A67FAB12057CE4900086F043DA01D2AC +:10030000030200B01218EB50207DE87C0312053F79 :10031000900099E02457600C240860030200B07F2D :10032000A20204D77FAA0204D71205744003020078 :10033000B0802E900086E030E71F900099E0245AAC -:10034000600F240260030204F17FA412161002045D +:10034000600F240260030204F17FA41215EC020482 :10035000F17FA612057C0204F1120574400302002D -:10036000B012170BC006C00712171A9200D007D0A0 +:10036000B01216E7C006C0071216F69200D007D0EA :10037000061209810200B09000DEE060030200B0C6 -:100380001217367003020411240560030200B01234 +:100380001217127003020411240560030200B01258 :100390000558900005E0FFA3E090008BCFF0A3EF9D :1003A000F0900007E0FFA3E090008DCFF0A3EFF006 :1003B000900003E0FFA3E090008FCFF0A3EFF07B6D -:1003C000017A00798B901A56E493FC740193FD90A6 -:1003D0001A58E493F52E1217268E2FF530901A5BDB -:1003E000E493F5311217268E32F533901A5EE493BA -:1003F000F5341217268E35F536901A61E493F537E9 -:10040000A3E493F538753900753A09120EB8020065 +:1003C000017A00798B901A0EE493FC740193FD90EE +:1003D0001A10E493F52E1217028E2FF530901A138F +:1003E000E493F5311217028E32F533901A16E49326 +:1003F000F5341217028E35F536901A19E493F53755 +:10040000A3E493F538753900753A09120EBC020061 :10041000B09000EAE07063C2807FA00204D7900031 :10042000DEE060030200B0900003E0FCA3E0FD7F8B -:10043000017E001217BBD29612001DC2967FA00249 +:10043000017E00121797D29612001DC2967FA0026D :1004400004D77F030204D79000DEE060030200B00F -:100450001217366019240560030200B01205589087 -:100460000003E0FF7C007D041210440200B0900005 +:100450001217126019240560030200B012055890AB +:100460000003E0FF7C007D041213570200B09000EF :10047000EAE07006C2807FA0805D80619000DEE0CF -:1004800060030200B01217366043240560030200C7 +:1004800060030200B01217126043240560030200EB :10049000B09000EAE014F012005E7E007F05C00616 :1004A000C007900003E0FB25E0FFE433FE74052F56 :1004B000F58274003EAD82FCEB25E0FFE52424FECE -:1004C000C39FFBD007D006120FA30200B09000EA32 -:1004D000E0700AC2807FA012188C0200B0E4900085 -:1004E00087F00200B0900086E030E7107FB1121272 -:1004F0007CE4900086F043DA010200B07E007FEDDC -:1005000012157F40030200B012170BC006C007127D -:10051000171A9200D007D006120D120200B07D32D9 -:100520007C007F017E001217BBD29612001DC2967E -:1005300022E490008AF07FA41215CA900079227FED -:10054000017E001217BBD29612001DC29622120025 +:1004C000C39FFBD007D006120FA70200B09000EA2E +:1004D000E0700AC2807FA01218680200B0E49000A9 +:1004E00087F00200B0900086E030E7107FB1121173 +:1004F000ECE4900086F043DA010200B07E007FED6C +:1005000012151040030200B01216E7C006C0071211 +:1005100016F69200D007D006120D160200B07D32FA +:100520007C007F017E00121797D29612001DC296A2 +:1005300022E490008AF07FA41215A6900079227F11 +:10054000017E00121797D29612001DC29622120049 :100550005E9000DE7404F0229000EAE014F01200D5 -:100560005E221215CA900079EFF022900079E0FF28 -:100570001215CA227E007FED12157F22900086E0C0 -:10058000547FFD121532228F29E4F536EF25E02540 +:100560005E221215A6900079EFF022900079E0FF4C +:100570001215A6227E007FED12151022900086E053 +:10058000547FFD12155B228F29E4F536EF25E02517 :10059000E02468F8E6701EEF25E025E02469F8768F :1005A000087E007F707D007B017A00790312095577 -:1005B000E490007AF0AB2CAA2DA92EC001120B7684 -:1005C0002466F9E7540F120CB5120B95D0011214E2 -:1005D000E3503D120B762466F9E7540FFF120CB579 -:1005E000120C6E300101B34031EF700A900077E5D4 -:1005F0002AF0A3E52BF0120B76120CC12401FFEFB9 -:10060000FEEC54F04EFEEDFF120B76120C78800AD1 -:10061000120B762466F874F056F6AB2CAA2DA92E90 -:10062000C001120B76120CCD120BE2120CD9120B78 -:1006300095D0011214E35052120B76120CCD120B0E -:10064000E2FF120CD95408FE120C70300101B340C5 +:1005B000E490007AF0AB2CAA2DA92EC001120B6793 +:1005C0002466F9E7540F120CA3120B86D001121403 +:1005D000C1503D120B672466F9E7540FFF120CA3BC +:1005E000120C90300101B34031EF700A900077E5B2 +:1005F0002AF0A3E52BF0120B67120CAF2401FFEFDA +:10060000FEEC54F04EFEEDFF120B67120C9A800ABE +:10061000120B672466F874F056F6AB2CAA2DA92E9F +:10062000C001120B67120CBB120BD1120CC7120BBC +:1006300086D0011214C15052120B67120CBB120B60 +:10064000D1FF120CC75408FE120C92300101B340C6 :1006500043EF700A900088E52AF0A3E52BF0120B17 -:1006600076120BD32401FFE433FEEFC4F8540FC815 +:1006600067120BC22401FFE433FEEFC4F8540FC835 :1006700068FFEEC454F048FEED540FFDEC4EFEED65 -:100680004FFF120B76120C78800A120B762467F853 -:10069000740F56F6120B76120CC1FB700F120BDBA7 -:1006A000700A120B5C2469F8E4F6C322120B76245C +:100680004FFF120B67120C9A800A120B672467F84F +:10069000740F56F6120B67120CAFFB700F120BCAD9 +:1006A000700A120B4D2469F8E4F6C322120B67247A :1006B00068F8E53514667003753601C3E531953683 -:1006C0006B7020D290120B762466F874F056F67494 -:1006D0000F0856120B752468F806120B762469F879 -:1006E00016804C120B76120BD3FFC3E53495366F90 -:1006F000703DD290120B762466F8EC54F0FEED5467 -:100700000FA60608120B752468F806120B762469EA -:10071000F816120B76120BE9E0FF120B762469F83B +:1006C0006B7020D290120B672466F874F056F674A3 +:1006D0000F0856120B662468F806120B672469F897 +:1006E00016804C120B67120BC2FFC3E53495366FB0 +:1006F000703DD290120B672466F8EC54F0FEED5476 +:100700000FA60608120B662468F806120B67246908 +:10071000F816120B67120BD8E0FF120B672469F86A :10072000E6FE7401A806088002C333D8FC4FF0121D -:100730000B762469F8E67017120B76120BE9120C8F -:1007400066FF121851EFF0120B762469F876081242 -:100750000B762468F8E6C395354031121907500529 -:10076000E4900085F0120C6360181219177D207C4C -:10077000037F017E00121792120CE5A3E529F044D5 -:1007800080F0120B5C2469F8E4F6D322C322BB018B +:100730000B672469F8E67017120B67120BD8120CBE +:100740004CFF12182DEFF0120B672469F87608128F +:100750000B672468F8E6C3953540311218E350055D +:10076000E4900085F0120C4960181218F37D207C8B +:10077000037F017E0012176E120CD3A3E529F0440B +:1007800080F0120B4D2469F8E4F6D322C322BB019A :100790000689828A83F0225002F722BBFE01F322EF :1007A000EF8DF0A4A8F0CF8CF0A428CE8DF0A42E6D :1007B000FE22BC000BBE0029EF8DF084FFADF022BD @@ -152,358 +152,340 @@ :100960000B89828A83F0A3DFFCDEFA2289F050072C :10097000F709DFFCA9F022BBFEFCF309DFFCA9F0BC :10098000228E268F27E4F528C3E5279464E5269474 -:10099000005017E4F528E528120BA12469F8E4F6C5 -:1009A0000528E528B412EFC2902290008AE0147066 -:1009B00003020A6F046003020B5B7866E6C4540FFF +:10099000005017E4F528E528120B922469F8E4F6D4 +:1009A0000528E528B40FEFC2902290008AE0147069 +:1009B00003020A6F046003020B4C7866E6C4540F0E :1009C000F97065D3E5279494E52694115003020B42 -:1009D0005B300003020B5BE9120C45E6540FFC0888 -:1009E000E6FDEC4E18F6ED08F618120C3CEC540F30 +:1009D0004C300003020B4CE9120C32E6540FFC08B9 +:1009E000E6FDEC4E18F6ED08F618120C29EC540F43 :1009F0004E18F6ED08F6900001E526F0A3E527F085 :100A0000AE26FF7C007D1F1207B290008BEEF0A394 :100A1000EFF07C007D031207A0A3EEF0A3EFF0A39C :100A2000E526F0A3E527F0227866E6C4540F6402B9 -:100A30006003020B5B120CFD752C01752D00752EE9 -:100A40008B901C7393FE7401938E2FF530901C7560 -:100A5000E493F531A3120BCC8E32F533901C78E47D -:100A600093F534901C7CE493F535E4FF020587E4AC -:100A7000F528120BB7120D08FF120C4E120C81F95B -:100A8000EFC399506DE528120C0AF5828C832FF57F -:100A900082E43583F583E493FF120C6E300001B3DA -:100AA0005003020B4F120C4E246DF582E5F0341CFE -:100AB000120C16F5828C83EF540775F0021209238D -:100AC000120C18FDAF27AE261214EDE5285019259B -:100AD000E025E02466F8120C3CEC540F4EFEEDFFCE -:100AE000120BB7120C788067120BA12469F8E4F698 -:100AF000805D120BB7120D08697054120CFDE528C9 -:100B0000120BBEAA06752CFF8A2DF52E120C4E2450 -:100B100073F582E5F0341C120BCA8E2FF530120CDF -:100B20004E120C8EF531120C4E2476F582E5F0341F -:100B30001C120BCA8E32F533120C4E120C9BF5347C -:100B4000120C4E120CA8F535AF28120587400C0583 -:100B500028E528C394125003020A7222C290E529A4 -:100B600025E025E02466F8E4F608F6E52925E025E9 -:100B7000E02468F8E4F6E52925E025E022F583E4A1 -:100B800093FF5408FE131313541F24FF9202AB2942 -:100B9000AA2AA92BEF540775F002A4F58285F083E9 -:100BA0002225E025E02466F8E4F608F6E52825E0AD -:100BB00025E02468F8E4F6E52825E025E02275F034 -:100BC00010A4246DF582E5F0341CF583E493FE74E3 -:100BD0000193222466F8E6FC08E6FDECC4F854F024 -:100BE000C8EDC4540F48540F222468F8E6141313B8 -:100BF00013541F2403F582E43400F58322E52925EC -:100C00002BF582E43528F583E02275F010A42470DA -:100C1000F582E5F0341CF583E493FC74019322A281 -:100C200000E433C433333354804526FFE527900076 -:100C300074CFF0A3EFF0E490007BF022E6FC08E62E -:100C4000FDECC4540F2401FFEFC454F0FE2275F0F4 -:100C500010E528A422E52E25E0248BF582E434005B -:100C6000F58322900085E0FF90007AE06F2254081F -:100C7000131313541F24FF222466F8A60608A607A0 -:100C8000222472F582E5F0341CF583E49322247566 -:100C9000F582E5F0341CF583E493222478F582E5AF -:100CA000F0341CF583E49322247CF582E5F0341CB7 -:100CB000F583E493222530F582E4352FF583E49320 -:100CC000222466F8E6FC08E6FDEC540F222466F9BF -:100CD000E7C4F854F0C809E7222533F582E4353239 -:100CE000F583E4932290007AE0900085F053DAFED9 -:100CF0002225E0247DF582E43400F58322A20092CF -:100D00000185262A85272B222466F8E6FEEEC454A8 -:100D10000F228E268F27C3E5279464E52694005082 -:100D200003020EA6900087E024FE602514700302E3 -:100D30000DB324036003020EABC290AF27AE2612A0 -:100D4000187E4003020EAB120C1F9000877402F055 -:100D500022120EAC503090007BE094044021D290DF -:100D6000E4900000F0900073F0C20490007CF090DA -:100D7000007AF0900003F09000877403F08025E47F -:100D8000900087F0801E900074E0547FFEA3E0FF87 -:100D9000D3E5279FE5269E4005120C1F8006900094 -:100DA0007BE004F090007BE0C394E05003020EABC4 -:100DB000020EA690007CE004F090007BE0FFA3E030 -:100DC000D39F4003020E547B007A007928AF27AEF0 -:100DD0002612136F4022900000E0FF120C57E52608 -:100DE000F0A3E527F08F28900000E004F0E0D39412 -:100DF000074005E4900087F030041DA200E433C4EE -:100E00003333335480FFE528C454F04FFF90007310 -:100E1000E0120BF3EFF08039900073E0FF120BF358 -:100E2000E0FEA200E43333333354F84528FDEE4DA1 -:100E3000F074032F120BF5120C66FF121851EFF02D -:100E4000900073E004F0E0D394704005E4900087D4 -:100E5000F0B20422120EAC504D1219075005E49066 -:100E60000085F0120C63603A1219177D207C037F15 -:100E7000017E00121792120CE5900003E0FD900035 -:100E800074E05480FF900000E0C454F04FFFED4F39 -:100E9000900003F0900074E0547FF0900086E044EE -:100EA00080F0C2908000E4900087F022A2009201BE -:100EB000AF27AE26121768228B298A2A892B8C2C01 -:100EC0008D2DE4F53D753E80F53BE53BC3952E50F9 -:100ED00010E52D253BF582E4352C120F68053B808B -:100EE000E9E4F53BE53BC395385057E53A253DF538 -:100EF00082E43539F583E0553E7019F53CE53CC395 -:100F00009531502DE530253CF582E4352F120F68E0 -:100F1000053C80E9E4F53CE53CC395345013E533EA -:100F2000253CF582E43532120B7D120F97053C808B -:100F3000E6E53EC313F53E7005053D753E80053B75 -:100F400080A2E4F53BE53BC395375013E536253BDE -:100F5000F582E43535120B7D120F97053B80E6C212 -:100F6000909000877405F022F583E493FF5408FE07 -:100F7000131313541F24FF9202AB29AA2AA92BEFA3 -:100F8000540775F002A4F58285F08312081DF54020 -:100F900085F03F1200032212081DF54085F03F1234 -:100FA0000003228E268F278C288D298B2AD200C2FF -:100FB00001852982852883E05488D394004003D397 -:100FC0008001C39201E4F52BE52BC3952A505930DB -:100FD000010D120BFDC4131313540124FF8002A250 -:100FE000009202852782852683C083C082120BFD72 -:100FF000FFC45407D082D08312103130010C120B81 -:10100000FDFF131313541F138002A20092028527C1 -:1010100082852683C083C082120BFD5407D082D004 -:1010200083121031052B80A0C2909000877405F0C8 -:101030002275F002120923E0F53FA3E0F54012000B -:10104000039200228F268C278D28EF120BBEAA0652 -:10105000F97BFFEF120C0AFD75F010EFA4120C8162 -:10106000F52E75F010EFA42473F582E5F0341C1210 -:101070000BCA8E2FF53075F010EFA4120C8EF531DF -:1010800075F010EFA42476F582E5F0341C120BCA3B -:101090008E32F53375F010EFA4120C9BF53475F019 -:1010A00010EFA42479F582E5F0341C120BCA8E35BA -:1010B000F53675F010EFA4247BF582E5F0341CF5CD -:1010C00083E493F53775F010EFA4120CA8F538857A -:1010D000273985283A020EB8C0E0C0F0C083C0822C -:1010E000C0D075D000C000C001C002C003C004C0A1 -:1010F00005C006C007E5985403F545F45298E54548 -:1011000030E01712194F9000DD12175DEFF09000DC -:10111000DDE004F0E0B44002E4F0E54530E12E907B -:1011200000E0E0D39400401A9000DCE02446F8E6AA -:10113000FF12194C9000DCE004F09000E0E014F0A5 -:101140008002D2059000DCE0B42002E4F0D007D0A9 -:1011500006D005D004D003D002D001D000D0D0D02A -:1011600082D083D0F0D0E03212005A787FE4F6D8F3 -:10117000FD7581AD0211B2020076E493A3F8E49309 -:10118000A34003F68001F208DFF48029E493A3F87A -:101190005407240CC8C333C4540F4420C8834004EC -:1011A000F456800146F6DFE4800B010204081020AB -:1011B00040809012F6E47E019360BCA3FF543F3060 -:1011C000E509541FFEE493A360010ECF54C025E04F -:1011D00060A840B8E493A3FAE493A3F8E493A3C807 -:1011E000C582C8CAC583CAF0A3C8C582C8CAC58398 -:1011F000CADFE9DEE780BEC0E0C0F0C083C082C0C5 -:10120000D075D000C000C001C002C003C004C0053A -:10121000C006C007E5D85487F521F452D8E5F73069 -:10122000E508E5F730E60312195653F7DFE52130FC -:10123000E708E5D930E003121955E52130E008E56B -:10124000DA30E003121699E52130E108E5DB30E001 -:1012500003121957E52130E208E5DC30E0031219EA -:1012600058D007D006D005D004D003D002D001D08A -:1012700000D0D0D082D083D0F0D0E032AE07E4F5F9 -:101280002612182E900000E004FF1218351212EFFB -:10129000900000E0FFE526C39F501412174FE05462 -:1012A0007FFF12183512174F121749052680E1905B -:1012B0000074E0547FFF1218359000741217491221 -:1012C00012EFE4F526900073E0FFE526C39F501768 -:1012D0007403252612173D0526E526541F70E612D5 -:1012E000194912194280DE7F551218350219491228 -:1012F0001949121942224200E500004200E10000B3 -:101300004200E700004200E30000C1834100860084 -:101310004100870041008A0041007900420001003D -:101320000042008800004200770000C104410073C1 -:10133000004100850041007A004100000048007D26 -:101340000000000000000000410076004100DD00C8 -:101350004100DF004100DB004100DC004100E00013 -:101360004100DA00C1054100DE0041009900008E15 -:10137000298F2A8B2B8A2C892DE4F52E900000E0F2 -:10138000FFE52EC39F505EE52AAE297803CEC31336 -:10139000CE13D8F9FDAC06E52AAE297802CEC313E8 -:1013A000CE13D8F92DFFEE3CAB07FA120C55E0FE38 -:1013B000A3E0FFC39BEE9A50028004AE02AF03AAE3 -:1013C00006AB07120C55E0FCA3E0FDAF2AAE2912D4 -:1013D000180B500DAB2BAA2CA92DE52E12078ED37E -:1013E00022052E8097C322900076E0FDC4540F247E -:1013F00001FBE433FAED540FF96B7001EA603DE94B -:101400007010E0C4540F2401FDE433FCED64044C7F -:10141000602A900076E0C4540FFD540F120CF1EED8 -:10142000F0A3EFF0ED04C454F049900076F0E0FF33 -:10143000C4540FC394044004EF540FF022C0E0C022 -:1014400083C082C0D075D000C004C005C006C007EC -:1014500053C87F9000E5E0FEA3E0FF4E700353C841 -:10146000FB9000E112168E50099000E5E4F0A3F025 -:10147000800DC39000E6E09DF09000E5E09CF0D088 -:1014800007D006D005D004D0D0D082D083D0E032AF -:10149000C0E0C083C082C0D075D000C004C005C009 -:1014A00006C00753917F9000E7E0FEA3E0FF4E7077 -:1014B000035391FB9000E312168E50099000E7E46D -:1014C000F0A3F0800DC39000E8E09DF09000E7E00D -:1014D0009CF0D007D006D005D004D0D0D082D083E5 -:1014E000D0E03212081DFDACF0AF2BAE2A8F828EF9 -:1014F00083AF05AE041218CAAB07AA06D3EB94F467 -:10150000EA940140067E017FF48004AE02AF03AA94 -:1015100006AB07C3EB9464EA940050067E007F6438 -:101520008004AE02AF03AA06AB07AF82AE831218E7 -:101530000B22AE05AD07E4FCFB7FAA121835AF0500 -:1015400012183575F010EEA42496F582E5F0341EDD -:10155000F583E493FFECC39F500774082CFC0B80C9 -:10156000F4EB04FF121830E4FCECC39B5009740345 -:101570002C12173D0C80F27F55121835021949AD17 -:1015800007AC06ABDA900076E0FEC4540FFFEE54D1 -:101590000FFEB50702C32253DAFE900076E0FAEEA2 -:1015A000120CF1E0FFA3E08D828C83CFF0A3EFF06B -:1015B000EA54F0FF900076E0044FF0540FC3940417 -:1015C0004004E054F0F08BDAD3228F26900079E0CB -:1015D000F5277E007F487D007B007A00796612093E -:1015E000557F0B12195243DA011200707D0A7C00FC -:1015F0007F017E001217BB12001DE4900087F0905F -:101600000086F0900099E526F0900079F0AF27224F -:10161000AE07E4FDF52612182E900001E0FF121827 -:1016200035900001121749900077E0FF12183590AD -:101630000077121749900088E0FF12183590008853 -:1016400012174974032D12173D0DBD03F67F551275 -:101650001835021949AB07AA06E4F9F87F407E4223 -:101660007D0FFC120891A804A905AA06AB077F20EC -:101670007ED77D757C01120891C3E49FFFE49EFE36 -:1016800022AB07AA06E4F9F87FE87E03FD22E0FC1E -:10169000A3E0FDC3EF9DEE9C22AFFBAEFC7C007D82 -:1016A0000A1207A0AD07AC06AFD953D9BFE4F5FACB -:1016B000F5F98FD9C3EC948050157F002093027FF9 -:1016C00001EFC433333354804CFEEDFF0213E7E4E3 -:1016D000900076F0229000DDE0FF9000DBE0B5079F -:1016E000057E017F00229000DB12175DE0FD7C008B -:1016F0009000DBE004F0E0B44002E4F09000DAE0B7 -:10170000FEEE4204E4F0AE04AF05229000EDE0FCF2 -:10171000A3E0FDEC547FFEAF0522EC5480C413130C -:1017200013540124FF22A3E493FE74019322E49056 -:1017300000EBF0A3F022900087E024FB22F582E486 -:101740003400F583E0FF021835A3E0FF021835E509 -:101750002625E0248BF582E43400F58322E0249AE8 -:10176000F582E43400F58322AD07AC06900074E006 -:10177000FAA3E0FBEA5480C413131354017005303C -:101780000102C322AF05AE04EA547FFCAD0312147C -:10179000ED228E378F388C398D3A121681121662EF -:1017A0001218A69000E5E539F0A3E53AF09000E1C3 -:1017B000E537F0A3E538F043C804228E288F298C42 -:1017C0002A8D2B1216811216621218B29000E7E5CC -:1017D0002AF0A3E52BF09000E3E528F0A3E529F03B -:1017E0004391042212002A12191E1219251218D62A -:1017F00012193A1218681218F41218E01218EA12A4 -:1018000018BE12192C12193E021933C3ED9BF58232 -:10181000EC9AF583C3E5829FE5839E500FED2BFD87 -:10182000EC3AFCC3EF9DEE9C50028001C3227FAADC -:10183000121835AF06C2059000DFE0B42002E4F0D4 -:101840009000DFE02446F8A607E004F0A3E004F0EF -:10185000227E1DE4FDEF30E70625E06EFF8004EFF9 -:1018600025E0FF0DBD08EE22AF885388AF758CA030 -:10187000758DCBEF5440FEEF54104E428822C3EFDB -:10188000942CEE94014003D38001C322121899D204 -:1018900003900079E0FF0215CAAE0712182E7F559B -:1018A000121835021949AD07AC06ECF5CBAF058F20 -:1018B000CA22AD07AC06ECF593AF058F9222C2DECB -:1018C00075D90575F9FF75960122EF7802CEC3131D -:1018D000CE13D8F9FF2275E34075E10175E20122CC -:1018E000E59154045391FB429122758E54758922DF -:1018F00043885022E5C8540453C8FB42C822539879 -:101900004FEB4F4DF59822E5C8C320E201D322E505 -:1019100091C320E201D32253C8FB53C87F2275A490 -:101920001175D4CF2275A54175D5772253F77F75F0 -:10193000DA302275E69075A8B022E4F5A922439822 -:1019400010223005FD22C2DE22D299228F9922AFC9 -:1019500099228F8C2222222222015E041A2A6208F6 -:101960000208010900019004B00BB81C520A0308D8 -:1019700001090001C20384286E0208000901080061 -:10198000D201A41D8802080009010800C8017C1BBF -:1019900026020800090108015E028A32C802080016 -:1019A000090108015E02BC3D22020800090108028B -:1019B0008A1E82071C0F8C080108020803016802B6 -:1019C000D012C005DC0A0308010900024E05DC0143 -:1019D000AE348A0A0308010900012C0A00008C04B5 -:1019E0007E27F6080108030802080208030804011C -:1019F000040A9A051428A008010800080208020831 -:101A00000008030172043819820208010800090263 -:101A10009407D00FA0232808030801080208010634 -:101A20001802D000D208010A0109020A0101D603F6 -:101A3000FC0BFE020801080009019002D0132E01E0 -:101A40000A00090108023007760F322274030801E8 -:101A5000080208195903195F02196102196302008B -:101A6000000018196504196D02196F02197102003E -:101A7000000018197303197902197B02197D0200FD -:101A8000000018197F0319850219870219890200BD -:101A900000000C198B031991021993021995020089 -:101AA00000000C199703199D02199F0219A1020049 -:101AB00000000C19A30319A90219AB0219AD020009 -:101AC00000001219AF0419B70219B90219BB0200BC -:101AD00000002819BD0419C50219C70219C902005E -:101AE00000002819CB0419D30219D50219D7020016 -:101AF00000001819D90519E30219E50419E90419B8 -:101B0000ED022019EF0419F70219F90419FD041A5E -:101B10000102201A03031A09021A0B021A0D02000D -:101B20000000111A0F041A17021A19021A1B021ABE -:101B30001D02241A1F031A25021A27021A29021A43 -:101B40002B02281A2D031A33021A35021A37020003 -:101B50000000141A39031A3F021A41021A43020004 -:101B60000000271A45041A4D021A4F021A510200AA -:101B7000000024015E041A2A62080208010900011B -:101B80009004B00BB81C520A030801090001C203FB -:101B900084286E02080009010800D201A41D8802F1 -:101BA000080009010800C8017C1B26020800090181 -:101BB00008015E028A32C8020800090108015E02BB -:101BC000BC3D22020800090108028A1E82071C0F80 -:101BD0008C080108020803016802D012C005DC0A63 -:101BE0000308010900024E05DC01AE348A0A03082D -:101BF000010900012C0A00008C047E27F608010868 -:101C000003080208020803080401040A9A051428BC -:101C1000A008010800080208020800080301720475 -:101C2000381982020801080009029407D00FA02386 -:101C3000280803080108020801061802D000D2088B -:101C4000010A0109020A0101D603FC0BFE02080188 -:101C5000080009019002D0132E010A0009010802B0 -:101C60003007760F3222740308010802081B730341 -:101C70001B79021B7B021B7D02000000181B7F04E6 -:101C80001B87021B89021B8B02000000181B8D039F -:101C90001B93021B95021B9702000000181B99035F -:101CA0001B9F021BA1021BA3020000000C1BA5032B -:101CB0001BAB021BAD021BAF020000000C1BB103EB -:101CC0001BB7021BB9021BBB020000000C1BBD03AB -:101CD0001BC3021BC5021BC702000000121BC90464 -:101CE0001BD1021BD3021BD502000000281BD70406 -:101CF0001BDF021BE1021BE302000000281BE504BE -:101D00001BED021BEF021BF102000000181BF30584 -:101D10001BFD021BFF041C03041C0702201C0904FA -:101D20001C11021C13041C17041C1B02201C1D0385 -:101D30001C23021C25021C2702000000111C290480 -:101D40001C31021C33021C35021C3702241C3903CF -:101D50001C3F021C41021C43021C4502281C470375 -:101D60001C4D021C4F021C5102000000141C5303A6 -:101D70001C59021C5B021C5D02000000271C5F0452 -:101D80001C67021C69021C6B0200000024015E0437 -:101D90001A2A62080208010900019004B00BB81C5D -:101DA000520A030801090001C20384286E020800D8 -:101DB00009010800D201A41D8802080009010800D9 -:101DC000C8017C1B26020800090108015E028A3254 -:101DD000C8020800090108015E02BC3D2202080099 -:101DE000090108028A1E82071C0F8C0801080208DC -:101DF00003016802D012C005DC0A030801090002D1 -:101E00004E05DC01AE348A0A0308010900012C0AE0 -:101E100000008C047E27F608010803080208020867 -:101E200003080401040A9A051428A0080108000800 -:101E3000020802080008030172043819820208012E -:101E4000080009029407D00FA023280803080108FE -:101E5000020801061802D000D208010A0109020A8C -:101E60000101D603FC0BFE020801080009019002E3 -:101E7000D0132E010A00090108023007760F322222 -:101E8000740308010802081D8D031D93021D9502AD -:101E90001D9702000000181D99041DA1021DA30238 -:101EA0001DA502000000181DA7031DAD021DAF02F5 -:101EB0001DB102000000181DB3031DB9021DBB02B5 -:101EC0001DBD020000000C1DBF031DC5021DC70281 -:101ED0001DC9020000000C1DCB031DD1021DD30241 -:101EE0001DD5020000000C1DD7031DDD021DDF0201 -:101EF0001DE102000000121DE3041DEB021DED02B6 -:101F00001DEF02000000281DF1041DF9021DFB0257 -:101F10001DFD02000000281DFF041E07021E09020D -:101F20001E0B02000000181E0D051E17021E1904CC -:101F30001E1D041E2102201E23041E2B021E2D0422 -:101F40001E31041E3502201E37031E3D021E3F02B5 -:101F50001E4102000000111E43041E4B021E4D02D2 -:101F60001E4F021E5102241E53031E59021E5B0205 -:101F70001E5D021E5F02281E61031E67021E6902AB -:101F80001E6B02000000141E6D031E73021E7502FC -:101F90001E7702000000271E79041E81021E8302A4 -:071FA0001E85020000002471 +:100A30006003020B4C120CEB752C01752D00752E0A +:100A40008B901BD793FE7401938E2FF530901BD99A +:100A5000E493F531A3120BBB8E32F533901BDCE42B +:100A600093F534901BE0E493F535E4FF020587E449 +:100A7000F528120BA8120D0CFFE528120C54F9EF03 +:100A8000C399506EE528120C16F5828C832FF582DF +:100A9000E43583F583E493FF120C90300001B350EA +:100AA00003020B40E528C454F024D1F582E4341B42 +:100AB000120C20F5828C83EF540775F00212092383 +:100AC000120C22FDAF27AE261214CBE528501925B3 +:100AD000E025E02466F8120C29EC540F4EFEEDFFE1 +:100AE000120BA8120C9A8058120B922469F8E4F6A3 +:100AF000804E120BA8120D0C697045120CEBE52804 +:100B0000120BAFAA06752CFF8A2DF52EE528120CC4 +:100B1000F6120BB98E2FF530E528120C63F531E58E +:100B200028120D01120BB98E32F533E528120C7222 +:100B3000F534E528120C81F535AF28120587400CF5 +:100B40000528E528C3940F5003020A7222C290E5DB +:100B50002925E025E02466F8E4F608F6E52925E0F5 +:100B600025E02468F8E4F6E52925E025E022F58370 +:100B7000E493FF5408FE131313541F24FF9202AB97 +:100B800029AA2AA92BEF540775F002A4F58285F053 +:100B9000832225E025E02466F8E4F608F6E528251A +:100BA000E025E02468F8E4F6E52825E025E022C405 +:100BB00054F024D1F582E4341BF583E493FE7401F0 +:100BC00093222466F8E6FC08E6FDECC4F854F0C86D +:100BD000EDC4540F48540F222468F8E6141313137D +:100BE000541F2403F582E43400F58322E529252BE4 +:100BF000F582E43528F583E022A200E433C43333E0 +:100C00003354804526FFE527900074CFF0A3EFF022 +:100C1000E490007BF022C454F024D4F582E4341B29 +:100C2000F583E493FC74019322E6FC08E6FDECC432 +:100C3000540F2401FFEFC454F0FE22E52E25E024DA +:100C40008BF582E43400F58322900085E0FF90006C +:100C50007AE06F22C454F024D6F582E4341BF58385 +:100C6000E49322C454F024D9F582E4341BF583E4E0 +:100C70009322C454F024DCF582E4341BF583E4931E +:100C800022C454F024E0F582E4341BF583E493227B +:100C90005408131313541F24FF222466F8A60608D1 +:100CA000A607222530F582E4352FF583E49322242C +:100CB00066F8E6FC08E6FDEC540F222466F9E7C46A +:100CC000F854F0C809E7222533F582E43532F5837C +:100CD000E4932290007AE0900085F053DAFE22251A +:100CE000E0247DF582E43400F58322A200920185A0 +:100CF000262A85272B22C454F024D7F582E4341BFE +:100D000022C454F024DAF582E4341B222466F8E687 +:100D1000FEEEC4540F228E268F27C3E5279464E588 +:100D20002694005003020EAA900087E024FE60255E +:100D3000147003020DB724036003020EAFC290AF1C +:100D400027AE2612185A4003020EAF120BF990007C +:100D5000877402F022120EB0503090007BE09404B1 +:100D60004021D290E4900000F0900073F0C2049013 +:100D7000007CF090007AF0900003F09000877403FC +:100D8000F08025E4900087F0801E900074E0547F8E +:100D9000FEA3E0FFD3E5279FE5269E4005120BF951 +:100DA000800690007BE004F090007BE0C394E0506C +:100DB00003020EAF020EAA90007CE004F090007BCC +:100DC000E0FFA3E0D39F4003020E587B007A007936 +:100DD00028AF27AE261212DF4022900000E0FF125B +:100DE0000C3DE526F0A3E527F08F28900000E004F5 +:100DF000F0E0D394074005E4900087F030041DA292 +:100E000000E433C43333335480FFE528C454F04F37 +:100E1000FF900073E0120BE2EFF08039900073E076 +:100E2000FF120BE2E0FEA200E43333333354F84503 +:100E300028FDEE4DF074032F120BE4120C4CFF1240 +:100E4000182DEFF0900073E004F0E0D394704005AB +:100E5000E4900087F0B20422120EB0504D1218E355 +:100E60005005E4900085F0120C49603A1218F37DA9 +:100E7000207C037F017E0012176E120CD3900003BA +:100E8000E0FD900074E05480FF900000E0C454F056 +:100E90004FFFED4F900003F0900074E0547FF0900E +:100EA0000086E04480F0C2908000E4900087F02249 +:100EB000A2009201AF27AE26121744228B298A2A5C +:100EC000892B8C2C8D2DE4F53D753E80F53BE53B63 +:100ED000C3952E5010E52D253BF582E4352C120FDD +:100EE0006C053B80E9E4F53BE53BC395385057E59D +:100EF0003A253DF582E43539F583E0553E7019F524 +:100F00003CE53CC39531502DE530253CF582E43578 +:100F10002F120F6C053C80E9E4F53CE53CC39534A9 +:100F20005013E533253CF582E43532120B6E120F77 +:100F30009B053C80E6E53EC313F53E7005053D7517 +:100F40003E80053B80A2E4F53BE53BC3953750135B +:100F5000E536253BF582E43535120B6E120F9B0505 +:100F60003B80E6C2909000877405F022F583E493FD +:100F7000FF5408FE131313541F24FF9202AB29AA37 +:100F80002AA92BEF540775F002A4F58285F083128D +:100F9000081DF54085F03F1200032212081DF540A0 +:100FA00085F03F120003228E268F278C288D298BF7 +:100FB0002AD200C201852982852883E05488D394EF +:100FC000004003D38001C39201E4F52BE52BC395C8 +:100FD0002A505930010D120BECC413131354012481 +:100FE000FF8002A2009202852782852683C083C0EB +:100FF00082120BECFFC45407D082D083121035301C +:10100000010C120BECFF131313541F138002A200E8 +:101010009202852782852683C083C082120BEC54FE +:1010200007D082D083121035052B80A0C29090008B +:10103000877405F02275F002120923E0F53FA3E062 +:10104000F540120003920022C0E0C0F0C083C082CD +:10105000C0D075D000C000C001C002C003C004C031 +:1010600005C006C007E5985403F545F45298E545D8 +:1010700030E01712192B9000DD121739EFF09000B5 +:10108000DDE004F0E0B44002E4F0E54530E12E900C +:1010900000E0E0D39400401A9000DCE02446F8E63B +:1010A000FF1219289000DCE004F09000E0E014F05A +:1010B0008002D2059000DCE0B42002E4F0D007D03A +:1010C00006D005D004D003D002D001D000D0D0D0BB +:1010D00082D083D0F0D0E03212005A787FE4F6D884 +:1010E000FD7581A1021122020076E493A3F8E49336 +:1010F000A34003F68001F208DFF48029E493A3F80B +:101100005407240CC8C333C4540F4420C88340047C +:10111000F456800146F6DFE4800B0102040810203B +:101120004080901266E47E019360BCA3FF543F3080 +:10113000E509541FFEE493A360010ECF54C025E0DF +:1011400060A840B8E493A3FAE493A3F8E493A3C897 +:10115000C582C8CAC583CAF0A3C8C582C8CAC58328 +:10116000CADFE9DEE780BEC0E0C0F0C083C082C055 +:10117000D075D000C000C001C002C003C004C005CB +:10118000C006C007E5D85487F521F452D8E5F730FA +:10119000E508E5F730E60312193253F7DFE52130B1 +:1011A000E708E5D930E003121931E52130E008E520 +:1011B000DA30E003121675E52130E108E5DB30E0B6 +:1011C00003121933E52130E208E5DC30E00312199F +:1011D00034D007D006D005D004D003D002D001D03F +:1011E00000D0D0D082D083D0F0D0E032AE07E4F58A +:1011F0002612180A900000E004FF12181112125F64 +:10120000900000E0FFE526C39F501412172BE05416 +:101210007FFF12181112172B121725052680E19057 +:101220000074E0547FFF12181190007412172512F9 +:10123000125FE4F526900073E0FFE526C39F501788 +:10124000740325261217190526E526541F70E61289 +:10125000192512191E80DE7F551218110219251248 +:10126000192512191E224200E500004200E100008B +:101270004200E700004200E30000C1834100860015 +:101280004100870041008A004100790042000100CE +:101290000042008800004200770000C10441007352 +:1012A000004100850041007A004100000048007DB7 +:1012B0000000000000000000410076004100DD0059 +:1012C0004100DF004100DB004100DC004100E000A4 +:1012D0004100DA00C1054100DE0041009900008EA6 +:1012E000298F2A8B2B8A2C892DE4F52E900000E083 +:1012F000FFE52EC39F505EE52AAE297803CEC313C7 +:10130000CE13D8F9FDAC06E52AAE297802CEC31378 +:10131000CE13D8F92DFFEE3CAB07FA120C3BE0FEE2 +:10132000A3E0FFC39BEE9A50028004AE02AF03AA73 +:1013300006AB07120C3BE0FCA3E0FDAF2AAE29127E +:1013400017E7500DAB2BAA2CA92DE52E12078ED333 +:1013500022052E8097C3228F268C278D28EF120B13 +:10136000AFAA06F97BFFEF120C16FDEF120C54F535 +:101370002EEF120CF6120BB98E2FF530EF120C6314 +:10138000F531EF120D01120BB98E32F533EF120C5D +:1013900072F534EFC454F024DDF582E4341B120BF3 +:1013A000B98E35F536EFC454F024DFF582E4341BF2 +:1013B000F583E493F537EF120C81F53885273985ED +:1013C000283A020EBC900076E0FDC4540F2401FBC5 +:1013D000E433FAED540FF96B7001EA603DE97010E7 +:1013E000E0C4540F2401FDE433FCED64044C602A96 +:1013F000900076E0C4540FFD540F120CDFEEF0A302 +:10140000EFF0ED04C454F049900076F0E0FFC454CE +:101410000FC394044004EF540FF022C0E0C083C017 +:1014200082C0D075D000C004C005C006C00753C834 +:101430007F9000E5E0FEA3E0FF4E700353C8FB90F1 +:1014400000E112166A50099000E5E4F0A3F0800D67 +:10145000C39000E6E09DF09000E5E09CF0D007D05E +:1014600006D005D004D0D0D082D083D0E032C0E006 +:10147000C083C082C0D075D000C004C005C006C003 +:101480000753917F9000E7E0FEA3E0FF4E70035307 +:1014900091FB9000E312166A50099000E7E4F0A374 +:1014A000F0800DC39000E8E09DF09000E7E09CF034 +:1014B000D007D006D005D004D0D0D082D083D0E0E1 +:1014C0003212081DFDACF0AF2BAE2A8F828E83AF97 +:1014D00005AE041218A6AB07AA06D3EB94F4EA945F +:1014E0000140067E017FF48004AE02AF03AA06AB82 +:1014F00007C3EB9464EA940050067E007F64800486 +:10150000AE02AF03AA06AB07AF82AE831217E72283 +:10151000AD07AC06ABDA900076E0FEC4540FFFEEE8 +:10152000540FFEB50702C32253DAFE900076E0FAAC +:10153000EE120CDFE0FFA3E08D828C83CFF0A3EFEF +:10154000F0EA54F0FF900076E0044FF0540FC3949B +:10155000044004E054F0F08BDAD322AE05AD07E48A +:10156000FCFB7FAA121811AF05121811EEC454F03B +:1015700024A6F582E4341DF583E493FFECC39F5069 +:101580000774082CFC0B80F4EB04FF12180CE4FC2D +:10159000ECC39B500974032C1217190C80F27F5571 +:1015A0001218110219258F26900079E0F5277E0088 +:1015B0007F3C7D007B007A0079661209557F0B1213 +:1015C000192E43DA011200707D0A7C007F017E0033 +:1015D00012179712001DE4900087F0900086F0909B +:1015E0000099E526F0900079F0AF2722AE07E4FDE0 +:1015F000F52612180A900001E0FF12181190000160 +:10160000121725900077E0FF12181190007712173B +:1016100025900088E0FF1218119000881217257499 +:10162000032D1217190DBD03F67F5512181102195B +:1016300025AB07AA06E4F9F87F407E427D0FFC1235 +:101640000891A804A905AA06AB077F207ED77D755F +:101650007C01120891C3E49FFFE49EFE22AB07AA1F +:1016600006E4F9F87FE87E03FD22E0FCA3E0FDC379 +:10167000EF9DEE9C22AFFBAEFC7C007D0A1207A022 +:10168000AD07AC06AFD953D9BFE4F5FAF5F98FD958 +:10169000C3EC948050157F002093027F01EFC43388 +:1016A000333354804CFEEDFF0213C5E4900076F016 +:1016B000229000DDE0FF9000DBE0B507057E017FB2 +:1016C00000229000DB121739E0FD7C009000DBE087 +:1016D00004F0E0B44002E4F09000DAE0FEEE4204F0 +:1016E000E4F0AE04AF05229000EDE0FCA3E0FDECD9 +:1016F000547FFEAF0522EC5480C41313135401240D +:10170000FF22A3E493FE74019322E49000EBF0A384 +:10171000F022900087E024FB22F582E43400F58378 +:10172000E0FF021811A3E0FF021811E52625E024CE +:101730008BF582E43400F58322E0249AF582E434C8 +:1017400000F58322AD07AC06900074E0FAA3E0FB3D +:10175000EA5480C413131354017005300102C322EC +:10176000AF05AE04EA547FFCAD031214CB228E37D2 +:101770008F388C398D3A12165D12163E12188290EF +:1017800000E5E539F0A3E53AF09000E1E537F0A394 +:10179000E538F043C804228E288F298C2A8D2B121D +:1017A000165D12163E12188E9000E7E52AF0A3E5AA +:1017B0002BF09000E3E528F0A3E529F04391042203 +:1017C00012002A1218FA1219011218B2121916125E +:1017D00018441218D01218BC1218C612189A1219EE +:1017E0000812191A02190FC3ED9BF582EC9AF583C2 +:1017F000C3E5829FE5839E500FED2BFDEC3AFCC3C1 +:10180000EF9DEE9C50028001C3227FAA121811AFF7 +:1018100006C2059000DFE0B42002E4F09000DFE0B3 +:101820002446F8A607E004F0A3E004F0227E1DE4BD +:10183000FDEF30E70625E06EFF8004EF25E0FF0DA9 +:10184000BD08EE22AF885388AF758CA0758DCBEFA5 +:101850005440FEEF54104E428822C3EF942CEE9475 +:10186000014003D38001C322121875D2039000797E +:10187000E0FF0215A6AE0712180A7F5512181102D2 +:101880001925AD07AC06ECF5CBAF058FCA22AD0725 +:10189000AC06ECF593AF058F9222C2DE75D90575C3 +:1018A000F9FF75960122EF7802CEC313CE13D8F953 +:1018B000FF2275E34075E10175E20122E5915404D0 +:1018C0005391FB429122758E547589224388502290 +:1018D000E5C8540453C8FB42C82253984FEB4F4D00 +:1018E000F59822E5C8C320E201D322E591C320E2A6 +:1018F00001D32253C8FB53C87F2275A41175D4CFDE +:101900002275A54175D5772253F77F75DA30227598 +:10191000E69075A8B022E4F5A9224398102230057C +:10192000FD22C2DE22D299228F9922AF99228F8C7A +:101930002222222222015E041A2A620802080109D8 +:1019400000019004B00BB81C520A03080109000101 +:10195000C20384286E020800090108014A02762A9F +:101960004E020800090108028A1E82071C0F8C081B +:101970000108020803016802D012C005DC0A03084E +:10198000010900024E05DC01AE348A0A0308010990 +:1019900000012C0A00008C047E27F60801080308C9 +:1019A0000208020803080401040A9A051428A00882 +:1019B000010800080208020800080301720438192F +:1019C00082020801080009029407D00FA02328080A +:1019D00003080108020801061802D000D208010A13 +:1019E0000109020A0101D603FC0BFE0208010800EE +:1019F00009019002D0132E010A00090108023007E4 +:101A0000760F322274030801080208193503193BC6 +:101A100002193D02193F020000001819410419493A +:101A200002194B02194D0200000018194F031955F5 +:101A30000219570219590200000018195B031961B5 +:101A4000021963021965020000000C196704196F7E +:101A50000219710219730200000028197504197D1A +:101A600002197F0219810200000028198304198BD2 +:101A700002198D02198F0200000018199105199B97 +:101A800002199D0419A10419A5022019A70419AF70 +:101A90000219B10419B50419B9022019BB0319C1FF +:101AA0000219C30219C5020000001119C70419CF99 +:101AB0000219D10219D30219D5022419D70319DD4D +:101AC0000219DF0219E10219E3022819E50319EBF3 +:101AD0000219ED0219EF020000001419F10319F7C1 +:101AE0000219F90219FB020000002719FD041A056A +:101AF000021A07021A090200000024015E041A2AD1 +:101B000062080208010900019004B00BB81C520AD7 +:101B1000030801090001C20384286E0208000901BC +:101B200008014A02762A4E020800090108028A1EAC +:101B300082071C0F8C080108020803016802D012FA +:101B4000C005DC0A0308010900024E05DC01AE34C1 +:101B50008A0A0308010900012C0A00008C047E2770 +:101B6000F608010803080208020803080401040A31 +:101B70009A051428A00801080008020802080008B5 +:101B8000030172043819820208010800090294074F +:101B9000D00FA02328080308010802080106180234 +:101BA000D000D208010A0109020A0101D603FC0B88 +:101BB000FE020801080009019002D0132E010A005C +:101BC000090108023007760F322274030801080267 +:101BD000081AFB031B01021B03021B050200000085 +:101BE000181B07041B0F021B11021B13020000002D +:101BF000181B15031B1B021B1D021B1F02000000EC +:101C0000181B21031B27021B29021B2B02000000AB +:101C10000C1B2D041B35021B37021B390200000070 +:101C2000281B3B041B43021B45021B47020000000C +:101C3000281B49041B51021B53021B5502000000C4 +:101C4000181B57051B61021B63041B67041B6B02F7 +:101C5000201B6D041B75021B77041B7B041B7F027A +:101C6000201B81031B87021B89021B8B02000000C3 +:101C7000111B8D041B95021B97021B99021B9B02D3 +:101C8000241B9D031BA3021BA5021BA7021BA90269 +:101C9000281BAB031BB1021BB3021BB502000000E3 +:101CA000141BB7031BBD021BBF021BC102000000B7 +:101CB000271BC3041BCB021BCD021BCF020000005D +:101CC00024015E041A2A6208020801090001900436 +:101CD000B00BB81C520A030801090001C203842892 +:101CE0006E020800090108014A02762A4E02080025 +:101CF000090108028A1E82071C0F8C0801080208CD +:101D000003016802D012C005DC0A030801090002C1 +:101D10004E05DC01AE348A0A0308010900012C0AD1 +:101D200000008C047E27F608010803080208020858 +:101D300003080401040A9A051428A00801080008F1 +:101D4000020802080008030172043819820208011F +:101D5000080009029407D00FA023280803080108EF +:101D6000020801061802D000D208010A0109020A7D +:101D70000101D603FC0BFE020801080009019002D4 +:101D8000D0132E010A00090108023007760F322213 +:101D9000740308010802081CC1031CC7021CC90205 +:101DA0001CCB02000000181CCD041CD5021CD7025D +:101DB0001CD902000000181CDB031CE1021CE3021A +:101DC0001CE502000000181CE7031CED021CEF02DA +:101DD0001CF1020000000C1CF3041CFB021CFD02A1 +:101DE0001CFF02000000281D01041D09021D0B023A +:101DF0001D0D02000000281D0F041D17021D1902F1 +:101E00001D1B02000000181D1D051D27021D2904B1 +:101E10001D2D041D3102201D33041D3B021D3D04F8 +:101E20001D41041D4502201D47031D4D021D4F028B +:101E30001D5102000000111D53041D5B021D5D02B7 +:101E40001D5F021D6102241D63031D69021D6B02DB +:101E50001D6D021D6F02281D71031D77021D790281 +:101E60001D7B02000000141D7D031D83021D8502E1 +:101E70001D8702000000271D89041D91021D930289 +:071E80001D95020000002483 :00000001FF diff --git a/inc/RF_Config.h b/inc/RF_Config.h index f436b02..bf14dad 100644 --- a/inc/RF_Config.h +++ b/inc/RF_Config.h @@ -25,8 +25,8 @@ #define EFM8BB1_SUPPORT_SP45_PROTOCOL 1 // Meteo SPxx - Weather station (PHU Metrex) #define EFM8BB1_SUPPORT_DC90_PROTOCOL 1 // Dooya DC90 remote #define EFM8BB1_SUPPORT_DG_HOSA_PROTOCOL 1 // Digoo DG-HOSA Smart 433MHz Wireless Household Carbon Monoxide Sensor -#define EFM8BB1_SUPPORT_HT12a_PROTOCOL 1 // HT12A/HT12E chips - Generic Doorbell -#define EFM8BB1_SUPPORT_HT12_Atag_PROTOCOL 1 // HT12A/HT12E chips - Atag Extractor - Plus/Minus/Lights/Timer +#define EFM8BB1_SUPPORT_HT12a_PROTOCOL 0 // HT12A/HT12E chips - Generic Doorbell +#define EFM8BB1_SUPPORT_HT12_Atag_PROTOCOL 0 // HT12A/HT12E chips - Atag Extractor - Plus/Minus/Lights/Timer #define EFM8BB1_SUPPORT_Kaku_PROTOCOL 1 // KaKu wall sockets #define EFM8BB1_SUPPORT_DIO_PROTOCOL 1 // DIO Chacon RF 433Mhz, Issue #95 #define EFM8BB1_SUPPORT_1BYONE_PROTOCOL 1 // 1ByOne Doorbell, PR #97 diff --git a/inc/RF_Protocols.h b/inc/RF_Protocols.h index 2d008f2..0d29da5 100644 --- a/inc/RF_Protocols.h +++ b/inc/RF_Protocols.h @@ -149,7 +149,7 @@ SI_SEGMENT_VARIABLE(PROTOCOL_BIT1(HT6P20X)[], static uint8_t, SI_SEG_CODE) = { L */ #if EFM8BB1_SUPPORT_HT12_PROTOCOL == 1 #define HT12 -SI_SEGMENT_VARIABLE(PROTOCOL_BUCKETS(HT12)[], static uint16_t, SI_SEG_CODE) = { 210, 420, 7560}; +SI_SEGMENT_VARIABLE(PROTOCOL_BUCKETS(HT12)[], static uint16_t, SI_SEG_CODE) = { 330, 630, 10830}; SI_SEGMENT_VARIABLE(PROTOCOL_START(HT12)[], static uint8_t, SI_SEG_CODE) = { LOW(2), HIGH(0) }; SI_SEGMENT_VARIABLE(PROTOCOL_BIT0(HT12)[], static uint8_t, SI_SEG_CODE) = { LOW(0), HIGH(1) }; SI_SEGMENT_VARIABLE(PROTOCOL_BIT1(HT12)[], static uint8_t, SI_SEG_CODE) = { LOW(1), HIGH(0) };