From 436aa403b57dcfa793f45435b19bfce79f9f16d5 Mon Sep 17 00:00:00 2001 From: Portisch Date: Wed, 20 Feb 2019 09:42:10 +0100 Subject: [PATCH] added Kaku protocols --- .../RF-Bridge-EFM8BB1.hex | 175 +++++++++--------- inc/RF_Config.h | 1 + inc/RF_Protocols.h | 25 +++ 3 files changed, 117 insertions(+), 84 deletions(-) diff --git a/Keil 8051 v9.53 - Release/RF-Bridge-EFM8BB1.hex b/Keil 8051 v9.53 - Release/RF-Bridge-EFM8BB1.hex index 89b2aa0..7840f34 100644 --- a/Keil 8051 v9.53 - Release/RF-Bridge-EFM8BB1.hex +++ b/Keil 8051 v9.53 - Release/RF-Bridge-EFM8BB1.hex @@ -59,10 +59,10 @@ :100390000558900005E0FFA3E090008BCFF0A3EF9D :1003A000F0900007E0FFA3E090008DCFF0A3EFF006 :1003B000900003E0FFA3E090008FCFF0A3EFF07B6D -:1003C000017A00798B9019E4E493FC740193FD9019 -:1003D00019E6E493F52E1217028E2FF5309019E9E5 -:1003E000E493F5311217028E32F5339019ECE49351 -:1003F000F5341217028E35F5369019EFE493F53780 +:1003C000017A00798B9019FAE493FC740193FD9003 +:1003D00019FCE493F52E1217028E2FF5309019FFB9 +:1003E000E493F5311217028E32F533901A02E4933A +:1003F000F5341217028E35F536901A05E493F53769 :10040000A3E493F538753900753A09120EBC020061 :10041000B09000EAE07063C2807FA00204D7900031 :10042000DEE060030200B0900003E0FCA3E0FD7F8B @@ -153,7 +153,7 @@ :10097000F709DFFCA9F022BBFEFCF309DFFCA9F0BC :10098000228E268F27E4F528C3E5279464E5269474 :10099000005017E4F528E528120B922469F8E4F6D4 -:1009A0000528E528B40DEFC2902290008AE014706B +:1009A0000528E528B40EEFC2902290008AE014706A :1009B00003020A6F046003020B4C7866E6C4540F0E :1009C000F97065D3E5279494E52694115003020B42 :1009D0004C300003020B4CE9120C32E6540FFC08B9 @@ -163,13 +163,13 @@ :100A1000EFF07C007D031207A0A3EEF0A3EFF0A39C :100A2000E526F0A3E527F0227866E6C4540F6402B9 :100A30006003020B4C120CEB752C01752D00752E0A -:100A40008B901B6393FE7401938E2FF530901B6582 -:100A5000E493F531A3120BBB8E32F533901B68E49F -:100A600093F534901B6CE493F535E4FF020587E4BD +:100A40008B901B9F93FE7401938E2FF530901BA10A +:100A5000E493F531A3120BBB8E32F533901BA4E463 +:100A600093F534901BA8E493F535E4FF020587E481 :100A7000F528120BA8120D0CFFE528120C54F9EF03 :100A8000C399506EE528120C16F5828C832FF582DF :100A9000E43583F583E493FF120C90300001B350EA -:100AA00003020B40E528C454F0245DF582E4341BB6 +:100AA00003020B40E528C454F02499F582E4341B7A :100AB000120C20F5828C83EF540775F00212092383 :100AC000120C22FDAF27AE261214CBE528501925B3 :100AD000E025E02466F8120C29EC540F4EFEEDFFE1 @@ -179,35 +179,35 @@ :100B1000F6120BB98E2FF530E528120C63F531E58E :100B200028120D01120BB98E32F533E528120C7222 :100B3000F534E528120C81F535AF28120587400CF5 -:100B40000528E528C3940D5003020A7222C290E5DD +:100B40000528E528C3940E5003020A7222C290E5DC :100B50002925E025E02466F8E4F608F6E52925E0F5 :100B600025E02468F8E4F6E52925E025E022F58370 :100B7000E493FF5408FE131313541F24FF9202AB97 :100B800029AA2AA92BEF540775F002A4F58285F053 :100B9000832225E025E02466F8E4F608F6E528251A :100BA000E025E02468F8E4F6E52825E025E022C405 -:100BB00054F0245DF582E4341BF583E493FE740164 +:100BB00054F02499F582E4341BF583E493FE740128 :100BC00093222466F8E6FC08E6FDECC4F854F0C86D :100BD000EDC4540F48540F222468F8E6141313137D :100BE000541F2403F582E43400F58322E529252BE4 :100BF000F582E43528F583E022A200E433C43333E0 :100C00003354804526FFE527900074CFF0A3EFF022 -:100C1000E490007BF022C454F02460F582E4341B9D +:100C1000E490007BF022C454F0249CF582E4341B61 :100C2000F583E493FC74019322E6FC08E6FDECC432 :100C3000540F2401FFEFC454F0FE22E52E25E024DA :100C40008BF582E43400F58322900085E0FF90006C -:100C50007AE06F22C454F02462F582E4341BF583F9 -:100C6000E49322C454F02465F582E4341BF583E454 -:100C70009322C454F02468F582E4341BF583E49392 -:100C800022C454F0246CF582E4341BF583E49322EF +:100C50007AE06F22C454F0249EF582E4341BF583BD +:100C6000E49322C454F024A1F582E4341BF583E418 +:100C70009322C454F024A4F582E4341BF583E49356 +:100C800022C454F024A8F582E4341BF583E49322B3 :100C90005408131313541F24FF222466F8A60608D1 :100CA000A607222530F582E4352FF583E49322242C :100CB00066F8E6FC08E6FDEC540F222466F9E7C46A :100CC000F854F0C809E7222533F582E43532F5837C :100CD000E4932290007AE0900085F053DAFE22251A :100CE000E0247DF582E43400F58322A200920185A0 -:100CF000262A85272B22C454F02463F582E4341B72 -:100D000022C454F02466F582E4341B222466F8E6FB +:100CF000262A85272B22C454F0249FF582E4341B36 +:100D000022C454F024A2F582E4341B222466F8E6BF :100D1000FEEEC4540F228E268F27C3E5279464E588 :100D20002694005003020EAA900087E024FE60255E :100D3000147003020DB724036003020EAFC290AF1C @@ -269,7 +269,7 @@ :1010B0008002D2059000DCE0B42002E4F0D007D03A :1010C00006D005D004D003D002D001D000D0D0D0BB :1010D00082D083D0F0D0E03212005A787FE4F6D884 -:1010E000FD758199021122020076E493A3F8E4933E +:1010E000FD75819D021122020076E493A3F8E4933A :1010F000A34003F68001F208DFF48029E493A3F80B :101100005407240CC8C333C4540F4420C88340047C :10111000F456800146F6DFE4800B0102040810203B @@ -312,8 +312,8 @@ :10136000AFAA06F97BFFEF120C16FDEF120C54F535 :101370002EEF120CF6120BB98E2FF530EF120C6314 :10138000F531EF120D01120BB98E32F533EF120C5D -:1013900072F534EFC454F02469F582E4341B120B67 -:1013A000B98E35F536EFC454F0246BF582E4341B66 +:1013900072F534EFC454F024A5F582E4341B120B2B +:1013A000B98E35F536EFC454F024A7F582E4341B2A :1013B000F583E493F537EF120C81F53885273985ED :1013C000283A020EBC900076E0FDC4540F2401FBC5 :1013D000E433FAED540FF96B7001EA603DE97010E7 @@ -342,11 +342,11 @@ :10154000F0EA54F0FF900076E0044FF0540FC3949B :10155000044004E054F0F08BDAD322AE05AD07E48A :10156000FCFB7FAA121811AF05121811EEC454F03B -:1015700024E8F582E4341CF583E493FFECC39F5028 +:10157000244AF582E4341DF583E493FFECC39F50C5 :101580000774082CFC0B80F4EB04FF12180CE4FC2D :10159000ECC39B500974032C1217190C80F27F5571 :1015A0001218110219258F26900079E0F5277E0088 -:1015B0007F347D007B007A0079661209557F0B121B +:1015B0007F387D007B007A0079661209557F0B1217 :1015C000192E43DA011200707D0A7C007F017E0033 :1015D00012179712001DE4900087F0900086F0909B :1015E0000099E526F0900079F0AF2722AE07E4FDE0 @@ -413,65 +413,72 @@ :1019B00022020800090108028A1E82071C0F8C08F7 :1019C0000108020803016802D012C005DC0A0308FE :1019D000010900024E05DC01AE348A0A0308010940 -:1019E00000193503193B02193D02193F020000009E -:1019F00018194105194B02194D02194F02195101CD -:101A000028195204195A02195C02195E02000000DA -:101A100018196004196801196902196B02000000A5 -:101A200047196D041975021977021979020000002F -:101A300018197B031981021983021985020000001D -:101A400018198703198D02198F02199102000000DD -:101A50000C199303199902199B02199D02000000A9 -:101A60000C199F0319A50219A70219A90200000069 -:101A70000C19AB0319B10219B30219B50200000029 -:101A80001219B70419BF0219C10219C302000000DC -:101A90002819C50419CD0219CF0219D1020000007E -:101AA0002819D30419DB0219DD0219DF0200000036 -:101AB00018015E041A2A6208020801090001720274 -:101AC000E412C005DC20D00A030801090004017CEF -:101AD000044C0BB823280A030801090001F403E8A9 -:101AE00005DC733C030A010801019004B00BB81C2B -:101AF000520A030801090001C20384286E0208008B -:101B000009010800D201A41D88020800090108008B -:101B1000C8017C1B26020800090108015E028A3206 -:101B2000C8020800090108015E02BC3D220208004B -:101B3000090108028A1E82071C0F8C08010802088E -:101B400003016802D012C005DC0A03080109000283 -:101B50004E05DC01AE348A0A03080109001AB103FC -:101B60001AB7021AB9021ABB02000000181ABD0502 -:101B70001AC7021AC9021ACB021ACD01281ACE04BA -:101B80001AD6021AD8021ADA02000000181ADC0467 -:101B90001AE4011AE5021AE702000000471AE904F4 -:101BA0001AF1021AF3021AF502000000181AF703DC -:101BB0001AFD021AFF021B0102000000181B03039A -:101BC0001B09021B0B021B0D020000000C1B0F0364 -:101BD0001B15021B17021B19020000000C1B1B0324 -:101BE0001B21021B23021B25020000000C1B2703E4 -:101BF0001B2D021B2F021B3102000000121B33049D -:101C00001B3B021B3D021B3F02000000281B41043E -:101C10001B49021B4B021B4D02000000281B4F04F6 -:101C20001B57021B59021B5B0200000018015E04D7 -:101C30001A2A62080208010900017202E412C005B2 -:101C4000DC20D00A030801090004017C044C0BB815 -:101C500023280A030801090001F403E805DC733CAA -:101C6000030A010801019004B00BB81C520A0308D2 -:101C700001090001C20384286E020800090108005E -:101C8000D201A41D8802080009010800C8017C1BBC -:101C900026020800090108015E028A32C802080013 -:101CA000090108015E02BC3D220208000901080288 -:101CB0008A1E82071C0F8C080108020803016802B3 -:101CC000D012C005DC0A0308010900024E05DC0140 -:101CD000AE348A0A03080109001C2D031C33021CC0 -:101CE00035021C3702000000181C39051C43021C79 -:101CF00045021C47021C4901281C4A041C52021CB4 -:101D000054021C5602000000181C58041C60011CE0 -:101D100061021C6302000000471C65041C6D021C6C -:101D20006F021C7102000000181C73031C79021C56 -:101D30007B021C7D02000000181C7F031C85021C16 -:101D400087021C89020000000C1C8B031C91021CE2 -:101D500093021C95020000000C1C97031C9D021CA2 -:101D60009F021CA1020000000C1CA3031CA9021C62 -:101D7000AB021CAD02000000121CAF041CB7021C19 -:101D8000B9021CBB02000000281CBD041CC5021CBB -:101D9000C7021CC902000000281CCB041CD3021C73 -:091DA000D5021CD7020000001856 +:1019E00000012C0A00008C047E27F6080108030879 +:1019F00002080208030804193503193B02193D02C5 +:101A0000193F0200000018194105194B02194D0237 +:101A1000194F0219510128195204195A02195C026E +:101A2000195E0200000018196004196801196902A2 +:101A3000196B0200000047196D041975021977022D +:101A400019790200000018197B0319810219830219 +:101A500019850200000018198703198D02198F02D9 +:101A60001991020000000C199303199902199B02A5 +:101A7000199D020000000C199F0319A50219A70265 +:101A800019A9020000000C19AB0319B10219B30225 +:101A900019B5020000001219B70419BF0219C102DA +:101AA00019C3020000002819C50419CD0219CF027C +:101AB00019D1020000002819D30419DB0219DD0234 +:101AC00019DF020000001819E10519EB0219ED04F5 +:101AD00019F10419F50220015E041A2A62080208AD +:101AE000010900017202E412C005DC20D00A0308DB +:101AF00001090004017C044C0BB823280A030801E7 +:101B0000090001F403E805DC733C030A0108010144 +:101B10009004B00BB81C520A030801090001C2036B +:101B200084286E02080009010800D201A41D880261 +:101B3000080009010800C8017C1B260208000901F1 +:101B400008015E028A32C8020800090108015E022B +:101B5000BC3D22020800090108028A1E82071C0FF0 +:101B60008C080108020803016802D012C005DC0AD3 +:101B70000308010900024E05DC01AE348A0A03089D +:101B8000010900012C0A00008C047E27F6080108D8 +:101B90000308020802080308041AD7031ADD021A10 +:101BA000DF021AE102000000181AE3051AED021A1A +:101BB000EF021AF1021AF301281AF4041AFC021AAD +:101BC000FE021B0002000000181B02041B0A011B7E +:101BD0000B021B0D02000000471B0F041B17021B0A +:101BE00019021B1B02000000181B1D031B23021BF4 +:101BF00025021B2702000000181B29031B2F021BB4 +:101C000031021B33020000000C1B35031B3B021B7F +:101C10003D021B3F020000000C1B41031B47021B3F +:101C200049021B4B020000000C1B4D031B53021BFF +:101C300055021B5702000000121B59041B61021BB6 +:101C400063021B6502000000281B67041B6F021B58 +:101C500071021B7302000000281B75041B7D021B10 +:101C60007F021B8102000000181B83051B8D021BD5 +:101C70008F041B93041B970220015E041A2A62083A +:101C80000208010900017202E412C005DC20D00A3A +:101C9000030801090004017C044C0BB823280A0343 +:101CA0000801090001F403E805DC733C030A01089C +:101CB00001019004B00BB81C520A0308010900018D +:101CC000C20384286E02080009010800D201A41D85 +:101CD0008802080009010800C8017C1B26020800D0 +:101CE000090108015E028A32C802080009010801E0 +:101CF0005E02BC3D22020800090108028A1E82071A +:101D00001C0F8C080108020803016802D012C005EC +:101D1000DC0A0308010900024E05DC01AE348A0A20 +:101D20000308010900012C0A00008C047E27F60834 +:101D300001080308020802080308041C79031C7F39 +:101D4000021C81021C8302000000181C85051C8FE8 +:101D5000021C91021C93021C9501281C96041C9ED7 +:101D6000021CA0021CA202000000181CA4041CAC4F +:101D7000011CAD021CAF02000000471CB1041CB9DD +:101D8000021CBB021CBD02000000181CBF031CC5C6 +:101D9000021CC7021CC902000000181CCB031CD186 +:101DA000021CD3021CD5020000000C1CD7031CDD52 +:101DB000021CDF021CE1020000000C1CE3031CE912 +:101DC000021CEB021CED020000000C1CEF031CF5D2 +:101DD000021CF7021CF902000000121CFB041D0388 +:101DE000021D05021D0702000000281D09041D1127 +:101DF000021D13021D1502000000281D17041D1FDF +:101E0000021D21021D2302000000181D25051D2FA3 +:0B1E1000021D31041D35041D390220A5 :00000001FF diff --git a/inc/RF_Config.h b/inc/RF_Config.h index dd41b70..22acdfc 100644 --- a/inc/RF_Config.h +++ b/inc/RF_Config.h @@ -27,3 +27,4 @@ #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_Kaku_PROTOCOL 1 // KaKu wall sockets diff --git a/inc/RF_Protocols.h b/inc/RF_Protocols.h index 480eb2a..945be3a 100644 --- a/inc/RF_Protocols.h +++ b/inc/RF_Protocols.h @@ -225,6 +225,18 @@ SI_SEGMENT_VARIABLE(PROTOCOL_BIT0(DG_HOSA)[], static uint8_t, SI_SEG_CODE) = { H SI_SEGMENT_VARIABLE(PROTOCOL_BIT1(DG_HOSA)[], static uint8_t, SI_SEG_CODE) = { HIGH(1), LOW(0) }; #endif +/* + * KaKu wall sockets + */ +#if EFM8BB1_SUPPORT_Kaku_PROTOCOL == 1 +#define KaKu +SI_SEGMENT_VARIABLE(PROTOCOL_BUCKETS(KaKu)[], static uint16_t, SI_SEG_CODE) = { 300, 2560, 140, 1150, 10230 }; +SI_SEGMENT_VARIABLE(PROTOCOL_START(KaKu)[], static uint8_t, SI_SEG_CODE) = { HIGH(0), LOW(1) }; +SI_SEGMENT_VARIABLE(PROTOCOL_BIT0(KaKu)[], static uint8_t, SI_SEG_CODE) = { HIGH(0), LOW(3), HIGH(0), LOW(2) }; +SI_SEGMENT_VARIABLE(PROTOCOL_BIT1(KaKu)[], static uint8_t, SI_SEG_CODE) = { HIGH(0), LOW(2), HIGH(0), LOW(3) }; +SI_SEGMENT_VARIABLE(PROTOCOL_END(KaKu)[], static uint8_t, SI_SEG_CODE) = { HIGH(0), LOW(4) }; +#endif + SI_SEGMENT_VARIABLE(PROTOCOL_DATA[], static struct BUCKET_PROTOCOL_DATA, SI_SEG_CODE) = { #if EFM8BB1_SUPPORT_PT226X_PROTOCOL == 1 @@ -396,6 +408,19 @@ SI_SEGMENT_VARIABLE(PROTOCOL_DATA[], static struct BUCKET_PROTOCOL_DATA, SI_SEG_ 24 }, #endif +#if EFM8BB1_SUPPORT_Kaku_PROTOCOL == 1 + /* + * KaKu wall sockets + */ + { + { &PROTOCOL_BUCKETS(KaKu), ARRAY_LENGTH(PROTOCOL_BUCKETS(KaKu)) }, + { &PROTOCOL_START(KaKu), ARRAY_LENGTH(PROTOCOL_START(KaKu)) }, + { &PROTOCOL_BIT0(KaKu), ARRAY_LENGTH(PROTOCOL_BIT0(KaKu)) }, + { &PROTOCOL_BIT1(KaKu), ARRAY_LENGTH(PROTOCOL_BIT1(KaKu)) }, + { &PROTOCOL_END(KaKu), ARRAY_LENGTH(PROTOCOL_END(KaKu)) }, + 32 + }, +#endif }; #define PROTOCOLCOUNT (sizeof(PROTOCOL_DATA) / sizeof(PROTOCOL_DATA[0]))