diff --git a/firmware/B15F.elf b/firmware/B15F.elf index 8e35e47..d8fe0ab 100755 Binary files a/firmware/B15F.elf and b/firmware/B15F.elf differ diff --git a/firmware/B15F.hex b/firmware/B15F.hex index 5b0c277..4b2a03d 100644 --- a/firmware/B15F.hex +++ b/firmware/B15F.hex @@ -2,486 +2,487 @@ :100010000C948B000C948B000C948B000C948B0034 :100020000C948B000C948B000C948B000C948B0024 :100030000C948B000C948B000C948B000C948B0014 -:100040000C948B000C948B000C948B000C945C0E25 -:100050000C94080E0C948B000C94320E0C948B00B4 +:100040000C948B000C948B000C948B000C94600E21 +:100050000C940C0E0C948B000C94360E0C948B00AC :100060000C948B000C948B000C948B000C948B00E4 :100070000C948B000C948B000C948B000C948B00D4 :100080000C948B000C948B000C948B00EE00F10010 :10009000F400F700FA00FD00000103010601090168 -:1000A000E800EB00D600C90ED20ECF0EC60EC30E6E -:1000B000C00EBD0EBA0EB70EB40EA20ECC0ED50EEB -:1000C000D80E11241FBECFEFD0E4DEBFCDBF11E0AC -:1000D000A0E0B1E0E2E2FEE100E00BBF02C0079069 +:1000A000E800EB00D600CD0ED60ED30ECA0EC70E5A +:1000B000C40EC10EBE0EBB0EB80EA60ED00ED90ECB +:1000C000DC0E11241FBECFEFD0E4DEBFCDBF11E0A8 +:1000D000A0E0B1E0E4E3FEE100E00BBF02C0079066 :1000E0000D92A033B107D9F722E0A0E3B1E001C03F -:1000F0001D92A839B207E1F710E0C1E6D0E004C0D4 -:100100002197FE010E94060FC036D107C9F70E9451 -:10011000860E0C940F0F0C94000084B7877F84BF69 +:1000F0001D92AD39B207E1F710E0C1E6D0E004C0CF +:100100002197FE010E940F0FC036D107C9F70E9448 +:100110008A0E0C94180F0C94000084B7877F84BF5C :10012000109260000FB6F894A895809160008861E5 -:1001300080936000109260000FBE78948DE892E08A -:100140000E94110160E08AE892E00E94D6016FEF00 -:100150008AE892E00E94F20160E087E892E00E9463 -:10016000D6016FEF87E892E00E94F2016FEF84E81A -:1001700092E00E94F2018DE792E00E94BA0281E3D0 -:1001800091E00E94B20381E391E00C94D20381E3F9 -:1001900091E00E94FB08A89590E0FC013197ED30BA -:1001A000F10530F4EA5BFF4F0C94060F0E94930DAB -:1001B00081E391E00E94D2030FB6F894A895809154 +:1001300080936000109260000FBE789482E992E094 +:100140000E940C0160E08EE892E00E94D2016FEF05 +:100150008EE892E00E94EF0160E08AE892E00E945F +:10016000D2016FEF8AE892E00E94EF016FEF86E81C +:1001700092E00E94EF018DE792E00E94BE0281E3CF +:1001800091E00E94B60381E391E00C94D60381E3F1 +:1001900091E00E94FF08A89590E0FC013197ED30B6 +:1001A000F10530F4EA5BFF4F0C940F0F0E94970D9E +:1001B00081E391E00E94D6030FB6F894A895809150 :1001C0006000886180936000109260000FBE089507 -:1001D0000E94670DEDCF0E947D0DEACF0E94820C38 -:1001E000E7CF0E949B0CE4CF0E94C20CE1CF0E949B -:1001F000D70CDECF0E94F20CDBCF0E94080DD8CFC7 -:100200000E941E0DD5CF0E942F0DD2CF0E94400D0F -:10021000CFCF0E94510DCCCFFC01108611861286E3 -:10022000089584B1806B84B926988AB18C618AB9AB -:1002300080ED8CBD81E88DBD8BB1837E8BB95A9AE0 -:100240005B9A5C9A0895FC0182858823B1F08085D1 -:10025000DF01A80FB11D9C91808521E0280F208728 -:100260002EB5DF01A80FB11D2C932085818528179D -:1002700010F0108612869EBD08958BB1837E8BB9D7 -:100280005A9A5B9A5C9A0895FC0180858823A9F1AB -:1002900082858111FDCF81E082878BB1837E8BB90E -:1002A0009BB160FD2BC080E0892B8BB99BB161FDB8 -:1002B0002BC080E0892B8BB99BB162FD2BC080E005 -:1002C000892B8BB98085818710868285882359F197 -:1002D0008085DF01A80FB11D9C91808521E0280F4A -:1002E00020872EB5DF01A80FB11D2C9320858185B5 -:1002F000281710F0108612869EBD089584E0892B81 -:100300008BB99BB161FFD5CF88E0892B8BB99BB1AD -:1003100062FFD5CF80E1892B8BB9808581871086DC -:1003200082858111D5CF8BB1837E8BB95A9A5B9A26 -:100330005C9A0895FC0192859111FDCF808591E032 -:10034000980F9087E80FF11D60830895FC01928556 -:100350009111FDCF08958BB1837E8BB98BB160FD78 -:1003600010C090E0892B8BB98BB161FD10C090E07B -:10037000892B8BB98BB162FD10C090E0892B8BB9B2 -:10038000089594E0892B8BB98BB161FFF0CF98E091 -:10039000892B8BB98BB162FFF0CF90E1892B8BB9A0 -:1003A0000895FC0171836083428308951F93CF9366 -:1003B000DF93EC01162F8881998160E40E949A01F5 -:1003C0008881998160E00E949A0188819981612FDA -:1003D0000E949A016A8188819981DF91CF911F9152 -:1003E0000C9444011F93CF93DF93EC01162F888167 -:1003F000998160E40E949A018881998161E00E945C -:100400009A0188819981612F0E949A016A8188816D -:100410009981DF91CF911F910C9444011F93CF9349 -:10042000DF93EC01162F8881998160E40E949A0184 -:100430008881998162E10E949A0188819981612F66 -:100440000E949A016A8188819981DF91CF911F91E1 -:100450000C9444011F93CF93DF93EC01162F8881F6 -:10046000998160E40E949A018881998163E10E94E8 -:100470009A0188819981612F0E949A016A818881FD -:100480009981DF91CF911F910C944401CF93DF9319 -:10049000EC018881998161E40E949A0188819981A7 -:1004A00062E10E949A018881998160E00E949A012C -:1004B0008881998160E00E949A016A81888199818E -:1004C0000E944401888199810E94A601E881F981F6 -:1004D0008381DF91CF910895CF93DF93EC018881E1 -:1004E000998161E40E949A018881998163E10E9467 -:1004F0009A018881998160E00E949A01888199819E -:1005000060E00E949A016A81888199810E94440179 -:10051000888199810E94A601E881F9818381DF9118 -:10052000CF910895FC0171836083428308950F93F6 -:100530001F93CF93DF93EC018B0188819981002475 -:10054000660F771F001C660F771F001C672F702D2A -:100550000E949A0188819981602F660F660F0E9420 -:100560009A016A8188819981DF91CF911F910F91C2 -:100570000C94440110927C0087E880937A000895DF -:1005800080917C00807E682B60937C0080917A0053 -:10059000806480937A0083EA91E00197F1F700C0CC -:1005A000000080917A0086FDFCCF809178009091C8 -:1005B000790008950F931F93CF93DF9361E08AE84A -:1005C00092E00E940E02C1E0D0E001E010E02FEFC7 -:1005D00084E39CE0215080409040E1F700C000009F -:1005E000B8010C2E01C0660F0A94EAF78AE892E07F -:1005F0000E940E022196C930D10549F7DF91CF91B3 -:100600001F910F9108950F931F93CF93DF9361E094 -:1006100087E892E00E940E02C1E0D0E001E010E025 -:100620002FEF84E39CE0215080409040E1F700C030 -:100630000000B8010C2E01C0660F0A94EAF787E8A3 -:1006400092E00E940E022196C930D10549F7DF9150 -:10065000CF911F910F910895CF93DF93C0E0D0E029 -:10066000BE0181E892E00E94970287E893E101973A -:10067000F1F700C000002196C11594E0D90781F779 -:100680002FE78AE196E0215080409040E1F700C0DA -:10069000000060E070E081E892E0DF91CF910C947F -:1006A0009702CF93DF93C0E0D0E0BE018EE792E0E7 -:1006B0000E94970287E893E10197F1F700C00000DC -:1006C0002196C11594E0D90781F72FE78AE196E0DA -:1006D000215080409040E1F700C0000060E070E0F1 -:1006E0008EE792E0DF91CF910C9497020FB6F894C9 -:1006F000A8958091600088618093600010926000EE -:100700000FBE60E08DE792E00E94C002BC0181E86C -:1007100092E00E94970261E08DE792E00E94C002A1 -:10072000BC018EE792E00E9497028AE892E00E9464 -:100730006C02682F8AE892E00E940E0284E892E040 -:100740000E946C02682F87E892E00E940E02D9CFC7 -:100750000E94DA020E9403030E942C030E945103AC -:100760000E94760322E02093C00028ED2093C10070 -:1007700026E02093C2001092C50024E12093C4001B -:10078000855B9E4FFC01108208958091C6008FE723 -:1007900092E00197F1F700C000008091C00087FD52 -:1007A000F4CF089589539F4FFC01108208959C0156 -:1007B000FC01E55BFE4F90819111FDCFF901E85BF3 -:1007C000FE4F1082329610820895DC01A953BF4F6C -:1007D0002C9131E0320F3C933091C600FC01E20FC6 -:1007E000F11DE95BFF4F30832C91213081F02C917A -:1007F000FC01E95BFF4FE081F0E0E050FF4F8081BA -:10080000281720F01C9281E080933001089538E091 -:1008100028E10FB6F894A895209360000FBE30939E -:100820006000A895E4CF0F931F93CF93DF93EC0163 -:100830008C01085B1E4FF80160818AE892E00E94FB -:100840000E02F801908131968081981740F0C55BC7 -:10085000DE4F1882DF91CF911F910F910895809103 -:10086000C00085FFFCCFF801808191E0980F908354 -:10087000C80FD11DC853DF4F88818093C600DF9118 -:10088000CF911F910F910895CF92DF92EF92FF9237 -:100890000F931F93CF93DF93EC01C85BDE4F28814A -:1008A000211109C0DF91CF911F910F91FF90EF901F -:1008B000DF90CF9008958C018881780197EBE91A39 -:1008C0009EEFF90AF701808318826801F5EBCF1AD1 -:1008D000FEEFDF0A81E0F601808368818AE892E01A -:1008E0000E940E029881F7018081981788F49091F8 -:1008F000C00095FFFCCF888191E0980F9883E801B4 -:10090000C80FD11DC853DF4F88818093C600CACF5E -:10091000F6011082C7CFFC01E85BFE4F208131E079 -:10092000320F3083FC01E20FF11DE853FF4F60836B -:10093000FC01E65BFE4F808168276083808180FF39 -:1009400004C0908181E989278083808190E095951A -:1009500087958083808180FF04C0908181E9892709 -:100960008083808190E0959587958083808180FF4A -:1009700004C0908181E989278083808190E09595EA -:1009800087958083808180FF04C0908181E98927D9 -:100990008083808190E0959587958083808180FF1A -:1009A00004C0908181E989278083808190E09595BA -:1009B00087958083808180FF04C0908181E98927A9 -:1009C0008083808190E0959587958083808180FFEA -:1009D00004C0908181E989278083808190E095958A -:1009E00087958083808180FF04C0908181E9892779 -:1009F0008083808190E09595879580830895DC01C0 -:100A0000A85BBE4F2C9131E0320F3C93FC01E20F0A -:100A1000F11DE853FF4F6083FC01E65BFE4F208130 -:100A200062276083208120FF04C0308121E92327D1 -:100A30002083208130E0359527952083208120FF79 -:100A400004C0308121E923272083208130E03595BF -:100A500027952083208120FF04C0308121E92327AE -:100A60002083208130E0359527952083208120FF49 -:100A700004C0308121E923272083208130E035958F -:100A800027952083208120FF04C0308121E923277E -:100A90002083208130E0359527952083208120FF19 -:100AA00004C0308121E923272083208130E035955F -:100AB00027952083208120FF04C0308121E923274E -:100AC0002083208130E0359527952083208120FFE9 -:100AD00004C0308121E923272083208130E035952F -:100AE000279520832C9131E0320F3C93820F911D8A -:100AF000DC01A853BF4F7C9380817827708380816D -:100B000080FF04C0908181E989278083808190E003 -:100B1000959587958083808180FF04C0908181E9CD -:100B200089278083808190E0959587958083808157 -:100B300080FF04C0908181E989278083808190E0D3 -:100B4000959587958083808180FF04C0908181E99D -:100B500089278083808190E0959587958083808127 -:100B600080FF04C0908181E989278083808190E0A3 -:100B7000959587958083808180FF04C0908181E96D -:100B800089278083808190E09595879580838081F7 -:100B900080FF04C0908181E989278083808190E073 -:100BA000959587958083808180FF04C0908181E93D -:100BB00089278083808190E095958795808308952B -:100BC0000F931F93CF93DF93DC01A85BBE4F2C9153 -:100BD00031E0320F3C93FC01E20FF11DE853FF4F6F -:100BE0004083FC01E65BFE4F208124272083208187 -:100BF00020FF04C0308121E923272083208130E0B9 -:100C0000359527952083208120FF04C0308121E97C -:100C100023272083208130E035952795208320816C -:100C200020FF04C0308121E923272083208130E088 -:100C3000359527952083208120FF04C0308121E94C -:100C400023272083208130E035952795208320813C -:100C500020FF04C0308121E923272083208130E058 -:100C6000359527952083208120FF04C0308121E91C -:100C700023272083208130E035952795208320810C -:100C800020FF04C0308121E923272083208130E028 -:100C9000359527952083208120FF04C0308121E9EC -:100CA00023272083208130E03595279520835FEF2F -:100CB000540F442309F46EC08B0141E9E8013991D6 -:100CC0008E012C9161E0620F6C93BC01620F711D6B -:100CD00068537F4FEB0138832081232720832081B5 -:100CE00020FF03C0208124272083208130E0359518 -:100CF00027952083208120FF03C020812427208383 -:100D0000208130E0359527952083208120FF03C086 -:100D1000208124272083208130E03595279520836A -:100D2000208120FF03C0208124272083208130E000 -:100D3000359527952083208120FF03C0208124271B -:100D40002083208130E0359527952083208120FF66 -:100D500003C0208124272083208130E0359527950A -:100D60002083208120FF03C020812427208320812D -:100D700030E0359527952083208120FF03C0208116 -:100D800024272083208130E03595279520835150FA -:100D900008F094CFDF91CF911F910F910895FC013E -:100DA000E65BFE4F2081DC01A85BBE4F3C9141E039 -:100DB000430F4C93830F911DDC01A853BF4F2C931D -:100DC000808182278083808180FF04C0908181E9B7 -:100DD00089278083808190E09595879580838081A5 -:100DE00080FF04C0908181E989278083808190E021 -:100DF000959587958083808180FF04C0908181E9EB -:100E000089278083808190E0959587958083808174 -:100E100080FF04C0908181E989278083808190E0F0 -:100E2000959587958083808180FF04C0908181E9BA -:100E300089278083808190E0959587958083808144 -:100E400080FF04C0908181E989278083808190E0C0 -:100E5000959587958083808180FF04C0908181E98A -:100E600089278083808190E0959587958083808114 -:100E700080FF04C0908181E989278083808190E090 -:100E80009595879580830895CF92DF92EF92FF9298 -:100E90000F931F93CF93DF936C018C01085B1E4F60 -:100EA000D8018C9191E0980F9C93F601E80FF11D09 -:100EB000E853FF4F4083F601E65BFE4F80818427B5 -:100EC0008083808180FF04C0908181E989278083AD -:100ED000808190E0959587958083808180FF04C014 -:100EE000908181E989278083808190E0959587951D -:100EF0008083808180FF04C0908181E9892780837D -:100F0000808190E0959587958083808180FF04C0E3 -:100F1000908181E989278083808190E095958795EC -:100F20008083808180FF04C0908181E9892780834C -:100F3000808190E0959587958083808180FF04C0B3 -:100F4000908181E989278083808190E095958795BC -:100F50008083808180FF04C0908181E9892780831C -:100F6000808190E0959587958083808180FF04C083 -:100F7000908181E989278083808190E0959587958C -:100F800080835FEF540F442309F433C1DB0120E079 -:100F900041E9BD019C91E801888131E0380F388337 -:100FA0007601E80EF11CD8ECED0EF11CE7019883F8 -:100FB000808189278083808180FF03C0808184278E -:100FC0008083808190E0959587958083808180FFE4 -:100FD00003C0808184278083808190E095958795E8 -:100FE0008083808180FF03C080818427808380810B -:100FF00090E0959587958083808180FF03C08081F4 -:1010000084278083808190E0959587958083808177 -:1010100080FF03C0808184278083808190E0959544 -:1010200087958083808180FF03C0808184278083AF -:10103000808190E0959587958083808180FF03C0B3 -:10104000808184278083808190E095958795808337 -:10105000808180FF03C0808184278083808190E02D -:101060009595879580831196EB019881292720FD1E -:10107000242730E035952795822F20FF02C0842F4A -:10108000822790E095958795282F80FF02C0242F16 -:10109000282730E035952795822F20FF02C0842F26 -:1010A000822790E095958795282F80FF02C0242FF6 -:1010B000282730E035952795822F20FF02C0842F06 -:1010C000822790E095958795682F80FF02C0642F56 -:1010D000682770E075956795262F60FF02C0242F62 -:1010E00026272695515008F054CFD8018C9191E0D5 -:1010F000980F9C93D601A80FB11DA853BF4F2C93F6 -:10110000808128272083808180FF04C0908181E92D -:1011100089278083808190E0959587958083808161 -:1011200080FF04C0908181E989278083808190E0DD -:10113000959587958083808180FF04C0908181E9A7 -:1011400089278083808190E0959587958083808131 -:1011500080FF04C0908181E989278083808190E0AD -:10116000959587958083808180FF04C0908181E977 -:1011700089278083808190E0959587958083808101 -:1011800080FF04C0908181E989278083808190E07D -:10119000959587958083808180FF04C0908181E947 -:1011A00089278083808190E09595879580838081D1 -:1011B00080FF04C0908181E989278083808190E04D -:1011C000959587958083F601E953FF4F808191E0E3 -:1011D000980F9083E601C80FD11DC95BDF4F88814E -:1011E000DF91CF911F910F91FF90EF90DF90CF9003 -:1011F000089520E07ACFFC01E953FF4F208131E0D0 -:10120000320F3083820F911DFC01E95BFF4F80811B -:101210000895FC01E953FF4F208131E0320F308304 -:10122000DC01A20FB11DA95BBF4F2C91308141E0C1 -:10123000430F4083830F911DFC01E95BFF4F308119 -:10124000822F90E0932B0895CF93DF93DC01EC0184 -:10125000CB5BDF4F888199818230910509F446C1CB -:10126000A0F4009709F41BC1019749F48C91FD018A -:10127000E80FF11D618382E090E0998388838C916F -:101280008F5F8C93DF91CF9108958330910509F49E -:1012900091C00497A1F78091C6008FE792E0019773 -:1012A000F1F700C000008091C00087FDF4CFFD0180 -:1012B000EC5BFF4F8081882309F49DC19EEFFD0107 -:1012C000E85BFE4F808121E0280F2083FD01E80FBD -:1012D000F11DE853FF4F9083FD01E65BFE4F8081D7 -:1012E00089278083808180FF04C0908181E98927DC -:1012F0008083808190E0959587958083808180FFB1 -:1013000004C0908181E989278083808190E0959550 -:1013100087958083808180FF04C0908181E989273F -:101320008083808190E0959587958083808180FF80 -:1013300004C0908181E989278083808190E0959520 -:1013400087958083808180FF04C0908181E989270F -:101350008083808190E0959587958083808180FF50 -:1013600004C0908181E989278083808190E09595F0 -:1013700087958083808180FF04C0908181E98927DF -:101380008083808190E0959587958083808180FF20 -:1013900004C0908181E989278083808190E09595C0 -:1013A00087958083198218828C918F5F8C93DF914F -:1013B000CF9108958C91FD01E80FF11D6183FD012E -:1013C000EC5BFF4F808168276083808180FF04C0D1 -:1013D000908181E989278083808190E09595879528 -:1013E0008083808180FF04C0908181E98927808388 -:1013F000808190E0959587958083808180FF04C0EF -:10140000908181E989278083808190E095958795F7 -:101410008083808180FF04C0908181E98927808357 -:10142000808190E0959587958083808180FF04C0BE -:10143000908181E989278083808190E095958795C7 -:101440008083808180FF04C0908181E98927808327 -:10145000808190E0959587958083808180FF04C08E -:10146000908181E989278083808190E09595879597 -:101470008083808180FF04C0908181E989278083F7 -:10148000808190E095958795808384E090E09983B2 -:1014900088838C918F5F8C93DF91CF910895613415 -:1014A00008F4ABC08091C6008FE792E00197F1F796 -:1014B00000C000008091C00087FDF4CFFD01E85B13 -:1014C000FE4F808191E0980F9083FD01E80FF11DA0 -:1014D000E853FF4F8EEF8083FD01E65BFE4F908166 -:1014E00089278083808180FF04CFFFCE8C91FD010E -:1014F000E80FF11D6183FD01EC5BFF4F80816827E0 -:101500006083808180FF04C0908181E98927808386 -:10151000808190E0959587958083808180FF04C0CD -:10152000908181E989278083808190E095958795D6 -:101530008083808180FF04C0908181E98927808336 -:10154000808190E0959587958083808180FF04C09D -:10155000908181E989278083808190E095958795A6 -:101560008083808180FF04C0908181E98927808306 -:10157000808190E0959587958083808180FF04C06D -:10158000908181E989278083808190E09595879576 -:101590008083808180FF04C0908181E989278083D6 -:1015A000808190E0959587958083808180FF04C03D -:1015B000908181E989278083808190E09595879546 -:1015C00080839C9111968C911197981719F19C9199 -:1015D00011968C911197981708F451CE8091C600FE -:1015E0008FE792E00197F1F700C000008091C00002 -:1015F00087FDF4CF63CF9FEF62CE11966C93119766 -:10160000FD01EC5BFF4F10821C9281E090E099831A -:10161000888335CE83E090E09983888330CE8F92A3 -:101620009F92AF92BF92DF92EF920F931F93CF934F -:10163000DF93DC01A953BF4F9C01285B3E4F49015A -:10164000FC01E65BFE4F11E95B01A40EB11C2EEF1D -:10165000D22E2C9131E0320F3C93AC01420F511D40 -:101660009A01295B3F4FE9016881603809F4DBC0CA -:10167000613408F060E000E020E03C9141E0430F7D -:101680004C93AC01430F511DEA01C95BDF4FE88069 -:101690002E2520FD212730E035952795422F20FF6C -:1016A00002C0412F4227242F30E035952795422F45 -:1016B00020FF02C0412F422750E055954795242F27 -:1016C00040FF02C0212F242730E035952795422F77 -:1016D00020FF02C0412F422750E055954795242F07 -:1016E00040FF02C0212F242730E035952795422F57 -:1016F00020FF02C0412F422750E055954795242FE7 -:1017000040FF02C0212F24272695061708F4F4C0B5 -:101710000F5F601708F0B1CF3091C600CFE7D2E07D -:101720002197F1F700C000003091C00037FDF4CFE1 -:10173000222309F476C00EEFE401488131E0340F32 -:101740003883BC01640F711DAB0148535F4FEA0140 -:101750000883308130273083308130FF03C03081EF -:1017600031273083408150E0559547954083308143 -:1017700030FF03C0308131273083408150E05595E0 -:1017800047954083308130FF03C03081312730835B -:10179000408150E0559547954083308130FF03C02C -:1017A000308131273083408150E055954795408303 -:1017B000308130FF03C0308131273083408150E0D9 -:1017C000559547954083308130FF03C030813127E4 -:1017D0003083408150E0559547954083308130FFFC -:1017E00003C0308131273083408150E055954795C3 -:1017F0004083308130FF03C0308131273083408106 -:1018000050E0559547954083211123CFDF91CF912B -:101810001F910F91EF90DF90BF90AF909F908F90AE -:1018200008950FEF89CFE401288131E0320F38832A -:10183000AC01420F511D9A0128533F4FE901D88254 -:1018400020812D252083208120FF03C02081212796 -:101850002083208130E0359527952083208120FF4B -:1018600003C0208121272083208130E035952795F2 -:101870002083208120FF03C0208121272083208115 -:1018800030E0359527952083208120FF03C02081FB -:1018900021272083208130E03595279520832081E2 -:1018A00020FF03C0208121272083208130E035954F -:1018B00027952083208120FF03C0208121272083BA -:1018C000208130E0359527952083208120FF03C0BB -:1018D000208121272083208130E0359527952083A2 -:1018E000208120FF03C0208121272083208130E038 -:1018F000359527952083ADCEA501400F511DEA01F6 -:10190000E88206CFCF9381E391E00E94D70381E381 -:1019100091E00E94FB08C82F6FEF81E391E00E94E5 -:101920008B046C2F81E391E00E948B0481E391E0B2 -:10193000CF910C94440481E391E00E94D70363E0CB -:1019400081E391E00E948B044CE063E271E081E36B -:1019500091E00E94E00549E06AE171E081E391E0F5 -:101960000E94E0054CE06EE071E081E391E00E94AE -:10197000E0056FEF81E391E00E948B0481E391E049 -:101980000C94440481E391E00E94D70381E391E049 -:101990000E940909BC01660F771F680F791F81E358 -:1019A00091E00E94FF0481E391E00C94440481E300 -:1019B00091E00E94D7036FEF81E391E00E948B04D6 -:1019C00081E391E00E9444040FB6F894A8958091B9 -:1019D0006000886180936000109260000FBE0E94DA -:1019E000A803FDCF81E391E00E94D70381E391E05A -:1019F0000E94FB08682F8AE892E00E940E026FEFB7 -:101A000081E391E00E948B0481E391E00C94440413 -:101A100081E391E00E94D70381E391E00E94FB08FB -:101A2000682F87E892E00E940E026FEF81E391E059 -:101A30000E948B0481E391E00C94440481E391E0E3 -:101A40000E94D7038AE892E00E946C02682F81E32B -:101A500091E00E948B0481E391E00C94440481E3C3 -:101A600091E00E94D70387E892E00E946C02682F01 -:101A700081E391E00E948B0481E391E00C944404A3 -:101A800081E391E00E94D70384E892E00E946C0217 -:101A9000682F81E391E00E948B0481E391E00C9434 -:101AA000440481E391E00E94D70381E391E00E9426 -:101AB0000909BC0181E892E00E9497026FEF81E37F -:101AC00091E00E948B0481E391E00C94440481E353 -:101AD00091E00E94D70381E391E00E940909BC01D3 -:101AE0008EE792E00E9497026FEF81E391E00E94FF -:101AF0008B0481E391E00C94440481E391E00E9423 -:101B0000D70381E391E00E94FB08682F8DE792E004 -:101B10000E94C002BC0181E391E00E94FF0481E3C6 -:101B200091E00C9444048F929F92AF92BF92CF9217 -:101B3000DF92EF92FF920F931F93CF93DF9381E396 -:101B400091E00E94FB08882E81E391E00E94FB084F -:101B5000982E81E391E00E940909EC0181E391E074 -:101B60000E9409095C0181E391E00E940909A89E95 -:101B70006001A99ED00CB89ED00C11246FEF87E8AD -:101B800092E00E940E02CC15DD054CF5BE0181E805 -:101B900092E00E949702A895682D8DE792E00E943E -:101BA000C0027C01692D8DE792E00E94C0028C0189 -:101BB00081E391E00E94D703B70181E391E00E94A5 -:101BC000FF04B80181E391E00E94FF0481E391E00A -:101BD0000E944404CA0DDB1DCC15DD05BCF281E377 -:101BE00091E00E94D7036FEF81E391E00E948B04A4 -:101BF00081E391E0DF91CF911F910F91FF90EF90E2 -:101C0000DF90CF90BF90AF909F908F900C94440442 -:101C10001F920F920FB60F9211240BB60F922F93B3 -:101C20003F934F935F936F937F938F939F93AF9364 -:101C3000BF93EF93FF9381E391E00E94E503FF914F -:101C4000EF91BF91AF919F918F917F916F915F9134 -:101C50004F913F912F910F900BBE0F900FBE0F90A1 -:101C60001F9018951F920F920FB60F9211240BB66A -:101C70000F922F933F934F935F936F937F938F9325 -:101C80009F93AF93BF93EF93FF9381E391E00E9403 -:101C90001304FF91EF91BF91AF919F918F917F912D -:101CA0006F915F914F913F912F910F900BBE0F90CD -:101CB0000FBE0F901F9018951F920F920FB60F92A4 -:101CC00011240BB60F922F933F934F935F936F9313 -:101CD0007F938F939F93AF93BF93EF93FF938DE881 -:101CE00092E00E942301FF91EF91BF91AF919F91EC -:101CF0008F917F916F915F914F913F912F910F90B5 -:101D00000BBE0F900FBE0F901F9018950E948D0074 -:101D100004C086E08A95F1F700C0809130018823E5 -:101D2000C1F31092300181E391E00E94FB08A89575 -:101D300090E0FC013197ED30F10530F4ED5AFF4FA2 -:101D40000C94060F0E94670D81E391E00E94D2037C -:101D50000FB6F894A8958091600088618093600028 -:101D6000109260000FBED5CF0E94510DEDCF0E94A2 -:101D7000400DEACF0E942F0DE7CF0E941E0DE4CF49 -:101D80000E94080DE1CF0E94F20CDECF0E94D70C1A -:101D9000DBCF0E94820CD8CF0E947D0DD5CF0E9450 -:101DA000C20CD2CF0E949B0CCFCF0E94930DCCCF00 -:101DB0008DE892E00E940C0142E06DE872E08AE852 -:101DC00092E00E94D10143E06DE872E087E892E082 -:101DD0000E94D10145E06DE872E084E892E00E9443 -:101DE000D10140E06DE872E081E892E00E94920249 -:101DF00041E06DE872E08EE792E00E94920210925C -:101E0000310110927701109276010895EE0FFF1FB5 -:101E10000024001C0BBE0790F691E02D0994F89465 -:021E2000FFCFF2 -:101E22000102010301020201010103030209626FBF -:101E3200617264696E666F2E680031313A35363AE6 -:101E420035320041707220203320323031390000A7 +:1001D0000E946B0DEDCF0E94810DEACF0E94860C2C +:1001E000E7CF0E949F0CE4CF0E94C60CE1CF0E9493 +:1001F000DB0CDECF0E94F60CDBCF0E940C0DD8CFBB +:100200000E94220DD5CF0E94330DD2CF0E94440D03 +:10021000CFCF0E94550DCCCF84B1806B84B9269886 +:100220008AB18C618AB980ED8CBD81E88DBD8BB1BE +:10023000837E8BB95A9A5B9A5C9A0895FC018285F9 +:100240008823B1F08085DF01A80FB11D9C918085C6 +:1002500021E0280F20872EB5DF01A80FB11D2C93B8 +:1002600020858185281710F0108612869EBD08957E +:100270008BB1837E8BB95A9A5B9A5C9A0895FC0184 +:1002800092859111FDCF808591E0980F9087E80FBE +:10029000F11D60830895FC0180858823A9F1828582 +:1002A0008111FDCF81E082878BB1837E8BB99BB1B9 +:1002B00060FD2BC080E0892B8BB99BB161FD2BC009 +:1002C00080E0892B8BB99BB162FD2BC080E0892B2C +:1002D0008BB98085818710868285882359F1808536 +:1002E000DF01A80FB11D9C91808521E0280F208798 +:1002F0002EB5DF01A80FB11D2C932085818528170D +:1003000010F0108612869EBD089584E0892B8BB96B +:100310009BB161FFD5CF88E0892B8BB99BB162FF80 +:10032000D5CF80E1892B8BB9808581871086828526 +:100330008111D5CF8BB1837E8BB95A9A5B9A5C9A27 +:100340000895FC0192859111FDCF08958BB1837EB4 +:100350008BB98BB160FD10C090E0892B8BB98BB14C +:1003600061FD10C090E0892B8BB98BB162FD10C08C +:1003700090E0892B8BB9089594E0892B8BB98BB1D0 +:1003800061FFF0CF98E0892B8BB98BB162FFF0CF82 +:1003900090E1892B8BB90895FC01718360835383AD +:1003A000428308951F93CF93DF93EC01162F88812A +:1003B000998160E40E943F018881998160E00E94F8 +:1003C0003F0188819981612F0E943F016A817B8171 +:1003D00088819981DF91CF911F910C944B011F93DC +:1003E000CF93DF93EC01162F8881998160E40E94FE +:1003F0003F018881998161E00E943F018881998154 +:10040000612F0E943F016A817B8188819981DF9100 +:10041000CF911F910C944B011F93CF93DF93EC016D +:10042000162F8881998160E40E943F01888199811B +:1004300062E10E943F0188819981612F0E943F0102 +:100440006A817B8188819981DF91CF911F910C9482 +:100450004B011F93CF93DF93EC01162F8881998175 +:1004600060E40E943F018881998163E10E943F011D +:1004700088819981612F0E943F016A817B818881F7 +:100480009981DF91CF911F910C944B01CF93DF9312 +:10049000EC018881998161E40E943F018881998102 +:1004A00062E10E943F018881998160E00E943F01E2 +:1004B0008881998160E00E943F016A817B81888107 +:1004C00099810E944B01888199810E94A101E88154 +:1004D000F9818381DF91CF910895CF93DF93EC0170 +:1004E0008881998161E40E943F018881998163E15B +:1004F0000E943F018881998160E00E943F018881CC +:10050000998160E00E943F016A817B8188819981A5 +:100510000E944B01888199810E94A101E881F981A3 +:100520008381DF91CF910895FC01718360835383B0 +:10053000428308950F931F93CF93DF93EC018B01B8 +:10054000888199810024660F771F001C660F771F32 +:10055000001C672F702D0E943F0188819981602FB8 +:10056000660F660F0E943F016A817B8188819981B5 +:10057000DF91CF911F910F910C944B0110927C0051 +:1005800087E880937A00089580917C00807E682BB4 +:1005900060937C0080917A00806480937A0083EA83 +:1005A00091E00197F1F700C0000080917A0086FD8C +:1005B000FCCF809178009091790008950F931F935C +:1005C000CF93DF9361E08EE892E00E940C02C1E0DD +:1005D000D0E001E010E02FEF84E39CE02150804068 +:1005E0009040E1F700C00000B8010C2E01C0660F7A +:1005F0000A94EAF78EE892E00E940C022196C93034 +:10060000D10549F7DF91CF911F910F9108950F9375 +:100610001F93CF93DF9361E08AE892E00E940C027F +:10062000C1E0D0E001E010E02FEF84E39CE0215036 +:1006300080409040E1F700C00000B8010C2E01C0DE +:10064000660F0A94EAF78AE892E00E940C0221966B +:10065000C930D10549F7DF91CF911F910F910895CE +:10066000CF93DF93C0E0D0E0BE0182E892E00E9429 +:100670009A0287E893E10197F1F700C00000219604 +:10068000C11594E0D90781F72FE78AE196E0215060 +:1006900080409040E1F700C0000060E070E082E838 +:1006A00092E0DF91CF910C949A02CF93DF93C0E058 +:1006B000D0E0BE018EE792E00E949A0287E893E1C3 +:1006C0000197F1F700C000002196C11594E0D90709 +:1006D00081F72FE78AE196E0215080409040E1F7D2 +:1006E00000C0000060E070E08EE792E0DF91CF9103 +:1006F0000C949A020FB6F894A895809160008861D6 +:1007000080936000109260000FBE60E08DE792E081 +:100710000E94C402BC0182E892E00E949A0261E059 +:100720008DE792E00E94C402BC018EE792E00E9435 +:100730009A028EE892E00E946D02682F8EE892E0A5 +:100740000E940C0286E892E00E946D02682F8AE8FF +:1007500092E00E940C02D9CF0E94DE020E940703A1 +:100760000E9430030E9455030E947A0322E02093E6 +:10077000C00028ED2093C10026E02093C200109213 +:10078000C50024E12093C400855B9E4FFC011082CC +:1007900008958091C6008FE792E00197F1F700C0BD +:1007A00000008091C00087FDF4CF089589539F4FCA +:1007B000FC01108208959C01FC01E55BFE4F9081D5 +:1007C0009111FDCFF901E85BFE4F10823296108245 +:1007D0000895DC01A953BF4F2C9131E0320F3C93B7 +:1007E0003091C600FC01E20FF11DE95BFF4F308341 +:1007F0002C91213081F02C91FC01E95BFF4FE081CD +:10080000F0E0E050FF4F8081281720F01C9281E03B +:1008100080933001089538E028E10FB6F894A89548 +:10082000209360000FBE30936000A895E4CF0F9333 +:100830001F93CF93DF93EC018C01085B1E4FF801EF +:1008400060818EE892E00E940C02F801908131965E +:100850008081981740F0C55BDE4F1882DF91CF9101 +:100860001F910F9108958091C00085FFFCCFF80182 +:10087000808191E0980F9083C80FD11DC853DF4F3E +:1008800088818093C600DF91CF911F910F910895C9 +:10089000CF92DF92EF92FF920F931F93CF93DF934C +:1008A000EC01C85BDE4F2881211109C0DF91CF9197 +:1008B0001F910F91FF90EF90DF90CF9008958C01E2 +:1008C0008881780197EBE91A9EEFF90AF701808396 +:1008D00018826801F5EBCF1AFEEFDF0A81E0F6011E +:1008E000808368818EE892E00E940C029881F70173 +:1008F0008081981788F49091C00095FFFCCF888183 +:1009000091E0980F9883E801C80FD11DC853DF4FBD +:1009100088818093C600CACFF6011082C7CFFC0140 +:10092000E85BFE4F208131E0320F3083FC01E20FA3 +:10093000F11DE853FF4F6083FC01E65BFE4F8081B1 +:1009400068276083808180FF04C0908181E98927C6 +:100950008083808190E0959587958083808180FF5A +:1009600004C0908181E989278083808190E09595FA +:1009700087958083808180FF04C0908181E98927E9 +:100980008083808190E0959587958083808180FF2A +:1009900004C0908181E989278083808190E09595CA +:1009A00087958083808180FF04C0908181E98927B9 +:1009B0008083808190E0959587958083808180FFFA +:1009C00004C0908181E989278083808190E095959A +:1009D00087958083808180FF04C0908181E9892789 +:1009E0008083808190E0959587958083808180FFCA +:1009F00004C0908181E989278083808190E095956A +:100A0000879580830895DC01A85BBE4F2C9131E06F +:100A1000320F3C93FC01E20FF11DE853FF4F60835E +:100A2000FC01E65BFE4F208162276083208120FF6E +:100A300004C0308121E923272083208130E03595CF +:100A400027952083208120FF04C0308121E92327BE +:100A50002083208130E0359527952083208120FF59 +:100A600004C0308121E923272083208130E035959F +:100A700027952083208120FF04C0308121E923278E +:100A80002083208130E0359527952083208120FF29 +:100A900004C0308121E923272083208130E035956F +:100AA00027952083208120FF04C0308121E923275E +:100AB0002083208130E0359527952083208120FFF9 +:100AC00004C0308121E923272083208130E035953F +:100AD00027952083208120FF04C0308121E923272E +:100AE0002083208130E03595279520832C9131E0BB +:100AF000320F3C93820F911DDC01A853BF4F7C93B2 +:100B0000808178277083808180FF04C0908181E993 +:100B100089278083808190E0959587958083808167 +:100B200080FF04C0908181E989278083808190E0E3 +:100B3000959587958083808180FF04C0908181E9AD +:100B400089278083808190E0959587958083808137 +:100B500080FF04C0908181E989278083808190E0B3 +:100B6000959587958083808180FF04C0908181E97D +:100B700089278083808190E0959587958083808107 +:100B800080FF04C0908181E989278083808190E083 +:100B9000959587958083808180FF04C0908181E94D +:100BA00089278083808190E09595879580838081D7 +:100BB00080FF04C0908181E989278083808190E053 +:100BC00095958795808308950F931F93CF93DF9317 +:100BD000DC01A85BBE4F2C9131E0320F3C93FC014D +:100BE000E20FF11DE853FF4F4083FC01E65BFE4F2F +:100BF000208124272083208120FF04C0308121E927 +:100C000023272083208130E035952795208320817C +:100C100020FF04C0308121E923272083208130E098 +:100C2000359527952083208120FF04C0308121E95C +:100C300023272083208130E035952795208320814C +:100C400020FF04C0308121E923272083208130E068 +:100C5000359527952083208120FF04C0308121E92C +:100C600023272083208130E035952795208320811C +:100C700020FF04C0308121E923272083208130E038 +:100C8000359527952083208120FF04C0308121E9FC +:100C900023272083208130E03595279520832081EC +:100CA00020FF04C0308121E923272083208130E008 +:100CB0003595279520835FEF540F442309F46EC0C8 +:100CC0008B0141E9E80139918E012C9161E0620FBD +:100CD0006C93BC01620F711D68537F4FEB01388329 +:100CE000208123272083208120FF03C02081242707 +:100CF0002083208130E0359527952083208120FFB7 +:100D000003C0208124272083208130E0359527955A +:100D10002083208120FF03C020812427208320817D +:100D200030E0359527952083208120FF03C0208166 +:100D300024272083208130E035952795208320814A +:100D400020FF03C0208124272083208130E03595B7 +:100D500027952083208120FF03C020812427208322 +:100D6000208130E0359527952083208120FF03C026 +:100D7000208124272083208130E03595279520830A +:100D8000208120FF03C0208124272083208130E0A0 +:100D9000359527952083515008F094CFDF91CF915E +:100DA0001F910F910895FC01E65BFE4F2081DC014D +:100DB000A85BBE4F3C9141E0430F4C93830F911DC4 +:100DC000DC01A853BF4F2C938081822780838081D0 +:100DD00080FF04C0908181E989278083808190E031 +:100DE000959587958083808180FF04C0908181E9FB +:100DF00089278083808190E0959587958083808185 +:100E000080FF04C0908181E989278083808190E000 +:100E1000959587958083808180FF04C0908181E9CA +:100E200089278083808190E0959587958083808154 +:100E300080FF04C0908181E989278083808190E0D0 +:100E4000959587958083808180FF04C0908181E99A +:100E500089278083808190E0959587958083808124 +:100E600080FF04C0908181E989278083808190E0A0 +:100E7000959587958083808180FF04C0908181E96A +:100E800089278083808190E0959587958083089558 +:100E9000CF92DF92EF92FF920F931F93CF93DF9346 +:100EA0006C018C01085B1E4FD8018C9191E0980F6A +:100EB0009C93F601E80FF11DE853FF4F4083F601C4 +:100EC000E65BFE4F808184278083808180FF04C0A1 +:100ED000908181E989278083808190E0959587952D +:100EE0008083808180FF04C0908181E9892780838D +:100EF000808190E0959587958083808180FF04C0F4 +:100F0000908181E989278083808190E095958795FC +:100F10008083808180FF04C0908181E9892780835C +:100F2000808190E0959587958083808180FF04C0C3 +:100F3000908181E989278083808190E095958795CC +:100F40008083808180FF04C0908181E9892780832C +:100F5000808190E0959587958083808180FF04C093 +:100F6000908181E989278083808190E0959587959C +:100F70008083808180FF04C0908181E989278083FC +:100F8000808190E09595879580835FEF540F44238F +:100F900009F433C1DB0120E041E9BD019C91E80186 +:100FA000888131E0380F38837601E80EF11CD8ECE7 +:100FB000ED0EF11CE7019883808189278083808171 +:100FC00080FF03C0808184278083808190E0959595 +:100FD00087958083808180FF03C080818427808300 +:100FE000808190E0959587958083808180FF03C004 +:100FF000808184278083808190E095958795808388 +:10100000808180FF03C0808184278083808190E07D +:10101000959587958083808180FF03C08081842798 +:101020008083808190E0959587958083808180FF83 +:1010300003C0808184278083808190E09595879587 +:101040008083808180FF03C08081842780838081AA +:1010500090E0959587958083808180FF03C0808193 +:1010600084278083808190E0959587958083119671 +:10107000EB019881292720FD242730E0359527951D +:10108000822F20FF02C0842F822790E095958795BC +:10109000282F80FF02C0242F282730E03595279580 +:1010A000822F20FF02C0842F822790E0959587959C +:1010B000282F80FF02C0242F282730E03595279560 +:1010C000822F20FF02C0842F822790E0959587957C +:1010D000682F80FF02C0642F682770E075956795C0 +:1010E000262F60FF02C0242F26272695515008F096 +:1010F00054CFD8018C9191E0980F9C93D601A80F02 +:10110000B11DA853BF4F2C93808128272083808155 +:1011100080FF04C0908181E989278083808190E0ED +:10112000959587958083808180FF04C0908181E9B7 +:1011300089278083808190E0959587958083808141 +:1011400080FF04C0908181E989278083808190E0BD +:10115000959587958083808180FF04C0908181E987 +:1011600089278083808190E0959587958083808111 +:1011700080FF04C0908181E989278083808190E08D +:10118000959587958083808180FF04C0908181E957 +:1011900089278083808190E09595879580838081E1 +:1011A00080FF04C0908181E989278083808190E05D +:1011B000959587958083808180FF04C0908181E927 +:1011C00089278083808190E0959587958083F601BB +:1011D000E953FF4F808191E0980F9083E601C80F9B +:1011E000D11DC95BDF4F8881DF91CF911F910F9196 +:1011F000FF90EF90DF90CF90089520E07ACFFC0130 +:10120000E953FF4F208131E0320F3083820F911D6F +:10121000FC01E95BFF4F80810895FC01E953FF4F1A +:10122000208131E0320F3083DC01A20FB11DA95BB8 +:10123000BF4F2C91308141E0430F4083830F911DBC +:10124000FC01E95BFF4F3081822F90E0932B0895E2 +:10125000CF93DF93DC01EC01CB5BDF4F8881998179 +:101260008230910509F446C1A0F4009709F41BC12E +:10127000019749F48C91FD01E80FF11D618382E033 +:1012800090E0998388838C918F5F8C93DF91CF91CD +:1012900008958330910509F491C00497A1F78091D6 +:1012A000C6008FE792E00197F1F700C0000080913F +:1012B000C00087FDF4CFFD01EC5BFF4F80818823E8 +:1012C00009F49DC19EEFFD01E85BFE4F808121E0A6 +:1012D000280F2083FD01E80FF11DE853FF4F908395 +:1012E000FD01E65BFE4F808189278083808180FF3E +:1012F00004C0908181E989278083808190E0959561 +:1013000087958083808180FF04C0908181E989274F +:101310008083808190E0959587958083808180FF90 +:1013200004C0908181E989278083808190E0959530 +:1013300087958083808180FF04C0908181E989271F +:101340008083808190E0959587958083808180FF60 +:1013500004C0908181E989278083808190E0959500 +:1013600087958083808180FF04C0908181E98927EF +:101370008083808190E0959587958083808180FF30 +:1013800004C0908181E989278083808190E09595D0 +:1013900087958083808180FF04C0908181E98927BF +:1013A0008083808190E0959587958083198218824B +:1013B0008C918F5F8C93DF91CF9108958C91FD017B +:1013C000E80FF11D6183FD01EC5BFF4F8081682711 +:1013D0006083808180FF04C0908181E989278083B8 +:1013E000808190E0959587958083808180FF04C0FF +:1013F000908181E989278083808190E09595879508 +:101400008083808180FF04C0908181E98927808367 +:10141000808190E0959587958083808180FF04C0CE +:10142000908181E989278083808190E095958795D7 +:101430008083808180FF04C0908181E98927808337 +:10144000808190E0959587958083808180FF04C09E +:10145000908181E989278083808190E095958795A7 +:101460008083808180FF04C0908181E98927808307 +:10147000808190E0959587958083808180FF04C06E +:10148000908181E989278083808190E09595879577 +:10149000808384E090E0998388838C918F5F8C9324 +:1014A000DF91CF910895613408F4ABC08091C600FC +:1014B0008FE792E00197F1F700C000008091C00033 +:1014C00087FDF4CFFD01E85BFE4F808191E0980F2E +:1014D0009083FD01E80FF11DE853FF4F8EEF8083ED +:1014E000FD01E65BFE4F908189278083808180FF2C +:1014F00004CFFFCE8C91FD01E80FF11D6183FD014A +:10150000EC5BFF4F808168276083808180FF04C08F +:10151000908181E989278083808190E095958795E6 +:101520008083808180FF04C0908181E98927808346 +:10153000808190E0959587958083808180FF04C0AD +:10154000908181E989278083808190E095958795B6 +:101550008083808180FF04C0908181E98927808316 +:10156000808190E0959587958083808180FF04C07D +:10157000908181E989278083808190E09595879586 +:101580008083808180FF04C0908181E989278083E6 +:10159000808190E0959587958083808180FF04C04D +:1015A000908181E989278083808190E09595879556 +:1015B0008083808180FF04C0908181E989278083B6 +:1015C000808190E09595879580839C9111968C9170 +:1015D0001197981719F19C9111968C911197981762 +:1015E00008F451CE8091C6008FE792E00197F1F7A1 +:1015F00000C000008091C00087FDF4CF63CF9FEF53 +:1016000062CE11966C931197FD01EC5BFF4F108237 +:101610001C9281E090E09983888335CE83E090E04E +:101620009983888330CE8F929F92AF92BF92DF9240 +:10163000EF920F931F93CF93DF93DC01A953BF4F1A +:101640009C01285B3E4F4901FC01E65BFE4F11E91E +:101650005B01A40EB11C2EEFD22E2C9131E0320F83 +:101660003C93AC01420F511D9A01295B3F4FE901A8 +:101670006881603809F4DBC0613408F060E000E0A4 +:1016800020E03C9141E0430F4C93AC01430F511DCE +:10169000EA01C95BDF4FE8802E2520FD212730E0DD +:1016A00035952795422F20FF02C0412F4227242F36 +:1016B00030E035952795422F20FF02C0412F422769 +:1016C00050E055954795242F40FF02C0212F242735 +:1016D00030E035952795422F20FF02C0412F422749 +:1016E00050E055954795242F40FF02C0212F242715 +:1016F00030E035952795422F20FF02C0412F422729 +:1017000050E055954795242F40FF02C0212F2427F4 +:101710002695061708F4F4C00F5F601708F0B1CFE4 +:101720003091C600CFE7D2E02197F1F700C000006A +:101730003091C00037FDF4CF222309F476C00EEFBC +:10174000E401488131E0340F3883BC01640F711D1E +:10175000AB0148535F4FEA01088330813027308363 +:10176000308130FF03C0308131273083408150E029 +:10177000559547954083308130FF03C03081312734 +:101780003083408150E0559547954083308130FF4C +:1017900003C0308131273083408150E05595479513 +:1017A0004083308130FF03C0308131273083408156 +:1017B00050E0559547954083308130FF03C030811C +:1017C00031273083408150E05595479540833081E3 +:1017D00030FF03C0308131273083408150E0559580 +:1017E00047954083308130FF03C0308131273083FB +:1017F000408150E0559547954083308130FF03C0CC +:10180000308131273083408150E0559547954083A2 +:10181000211123CFDF91CF911F910F91EF90DF9096 +:10182000BF90AF909F908F9008950FEF89CFE40104 +:10183000288131E0320F3883AC01420F511D9A01EB +:1018400028533F4FE901D88220812D252083208114 +:1018500020FF03C0208121272083208130E035959F +:1018600027952083208120FF03C02081212720830A +:10187000208130E0359527952083208120FF03C00B +:10188000208121272083208130E0359527952083F2 +:10189000208120FF03C0208121272083208130E088 +:1018A000359527952083208120FF03C020812127A3 +:1018B0002083208130E0359527952083208120FFEB +:1018C00003C0208121272083208130E03595279592 +:1018D0002083208120FF03C02081212720832081B5 +:1018E00030E0359527952083208120FF03C020819B +:1018F00021272083208130E0359527952083ADCEA8 +:10190000A501400F511DEA01E88206CFCF9381E384 +:1019100091E00E94DB0381E391E00E94FF08C82F61 +:101920006FEF81E391E00E948F046C2F81E391E0DF +:101930000E948F0481E391E0CF910C94480481E3ED +:1019400091E00E94DB0363E081E391E00E948F0459 +:101950004CE063E271E081E391E00E94E40549E03C +:101960006AE171E081E391E00E94E4054CE06EE001 +:1019700071E081E391E00E94E4056FEF81E391E083 +:101980000E948F0481E391E00C94480481E391E08C +:101990000E94DB0381E391E00E940D09BC01660F08 +:1019A000771F680F791F81E391E00E94030581E3AF +:1019B00091E00C94480481E391E00E94DB036FEF17 +:1019C00081E391E00E948F0481E391E00E9448044A +:1019D0000FB6F894A89580916000886180936000AC +:1019E000109260000FBE0E94AC03FDCF81E391E036 +:1019F0000E94DB0381E391E00E94FF08682F8EE8DC +:101A000092E00E940C026FEF81E391E00E948F044C +:101A100081E391E00C94480481E391E00E94DB03B0 +:101A200081E391E00E94FF08682F8AE892E00E941B +:101A30000C026FEF81E391E00E948F0481E391E05B +:101A40000C94480481E391E00E94DB038EE892E06D +:101A50000E946D02682F81E391E00E948F0481E370 +:101A600091E00C94480481E391E00E94DB038AE852 +:101A700092E00E946D02682F81E391E00E948F0442 +:101A800081E391E00C94480481E391E00E94DB0340 +:101A900086E892E00E946D02682F81E391E00E9447 +:101AA0008F0481E391E00C94480481E391E00E946B +:101AB000DB0381E391E00E940D09BC0182E892E022 +:101AC0000E949A026FEF81E391E00E948F0481E30C +:101AD00091E00C94480481E391E00E94DB0381E3F0 +:101AE00091E00E940D09BC018EE792E00E949A02EB +:101AF0006FEF81E391E00E948F0481E391E00C9409 +:101B0000480481E391E00E94DB0381E391E00E94BD +:101B1000FF08682F8DE792E00E94C402BC0181E3B8 +:101B200091E00E94030581E391E00C9448048F92B8 +:101B30009F92AF92BF92CF92DF92EF92FF920F935C +:101B40001F93CF93DF9381E391E00E94FF08882EDB +:101B500081E391E00E94FF08982E81E391E00E94CA +:101B60000D09EC0181E391E00E940D095C0181E324 +:101B700091E00E940D09A89E6001A99ED00CB89E1C +:101B8000D00C11246FEF8AE892E00E940C02CC1571 +:101B9000DD054CF5BE0182E892E00E949A02A8950C +:101BA000682D8DE792E00E94C4027C01692D8DE7CB +:101BB00092E00E94C4028C0181E391E00E94DB0369 +:101BC000B70181E391E00E940305B80181E391E050 +:101BD0000E94030581E391E00E944804CA0DDB1DC9 +:101BE000CC15DD05BCF281E391E00E94DB036FEFD1 +:101BF00081E391E00E948F0481E391E0DF91CF9136 +:101C00001F910F91FF90EF90DF90CF90BF90AF901A +:101C10009F908F900C9448041F920F920FB60F92D2 +:101C200011240BB60F922F933F934F935F936F93B3 +:101C30007F938F939F93AF93BF93EF93FF9381E332 +:101C400091E00E94E903FF91EF91BF91AF919F91C5 +:101C50008F917F916F915F914F913F912F910F9055 +:101C60000BBE0F900FBE0F901F9018951F920F92F2 +:101C70000FB60F9211240BB60F922F933F934F93F1 +:101C80005F936F937F938F939F93AF93BF93EF93E4 +:101C9000FF9381E391E00E941704FF91EF91BF91C0 +:101CA000AF919F918F917F916F915F914F913F91F4 +:101CB0002F910F900BBE0F900FBE0F901F90189595 +:101CC0001F920F920FB60F9211240BB60F922F9303 +:101CD0003F934F935F936F937F938F939F93AF93B4 +:101CE000BF93EF93FF9382E992E00E941E01FF9160 +:101CF000EF91BF91AF919F918F917F916F915F9184 +:101D00004F913F912F910F900BBE0F900FBE0F90F0 +:101D10001F9018950E948D0004C086E08A95F1F707 +:101D200000C0809130018823C1F31092300181E31B +:101D300091E00E94FF08A89590E0FC013197ED30FA +:101D4000F10530F4ED5AFF4F0C940F0F0E946B0D0C +:101D500081E391E00E94D6030FB6F894A895809194 +:101D60006000886180936000109260000FBED5CF44 +:101D70000E94550DEDCF0E94440DEACF0E94330D15 +:101D8000E7CF0E94220DE4CF0E940C0DE1CF0E940C +:101D9000F60CDECF0E94DB0CDBCF0E94860CD8CF86 +:101DA0000E94810DD5CF0E94C60CD2CF0E949F0CFD +:101DB000CFCF0E94970DCCCFE2E9F2E010861186DA +:101DC000128642E050E0BF018EE892E00E94CC0112 +:101DD00043E050E062E972E08AE892E00E94CC01C0 +:101DE00045E050E062E972E086E892E00E94CC01B2 +:101DF00040E050E062E972E082E892E00E949402E2 +:101E000041E050E062E972E08EE792E00E949402C5 +:101E10001092310110927701109276010895EE0F21 +:101E2000FF1F0024001C0BBE0790F691E02D0994C3 +:041E3000F894FFCF54 +:101E34000102010301020201010103030209626FAD +:101E4400617264696E666F2E680031333A33303ADA +:101E54003339004170722020332032303139000090 :00000001FF diff --git a/firmware/mcp23s17.cpp b/firmware/mcp23s17.cpp index fd02181..e4ee6a3 100644 --- a/firmware/mcp23s17.cpp +++ b/firmware/mcp23s17.cpp @@ -1,6 +1,6 @@ #include "mcp23s17.h" -MCP23S17::MCP23S17(volatile SPI& spi, uint8_t adr) : spi(spi), adr(adr) +MCP23S17::MCP23S17(volatile SPI& spi, SPIADR adr) : spi(spi), adr(adr) { } diff --git a/firmware/mcp23s17.h b/firmware/mcp23s17.h index c25491a..cbac1aa 100644 --- a/firmware/mcp23s17.h +++ b/firmware/mcp23s17.h @@ -8,7 +8,7 @@ class MCP23S17 { public: - MCP23S17(volatile SPI&, uint8_t); + MCP23S17(volatile SPI&, SPIADR adr); void setDirA(uint8_t dir) const volatile; void setDirB(uint8_t dir) const volatile; void writePortA(uint8_t) const volatile; @@ -18,7 +18,7 @@ public: private: volatile SPI& spi; - const uint8_t adr; + const SPIADR adr; // constants constexpr static uint8_t MCP23S17_DIRA = 0x00; diff --git a/firmware/spi.cpp b/firmware/spi.cpp index 4390cec..24579db 100644 --- a/firmware/spi.cpp +++ b/firmware/spi.cpp @@ -1,10 +1,6 @@ #include "spi.h" -SPI::SPI(void) -{ -} - -void SPI::init(void) const volatile +void SPI::init() const volatile { // Konfiguriere SPI DDRs DDRB |= _BV(SLSL) | _BV(MOSI) | _BV(SCLK); @@ -42,7 +38,13 @@ void SPI::handleTransfer() volatile SPDR = next; } -void SPI::transfer(uint8_t adr) volatile +void SPI::addByte(uint8_t b) volatile +{ + wait(); + buffer[index++] = b; +} + +void SPI::transfer(SPIADR adr) volatile { if(!index) return; @@ -58,18 +60,12 @@ void SPI::transfer(uint8_t adr) volatile handleTransfer(); } -void SPI::addByte(uint8_t b) volatile -{ - wait(); - buffer[index++] = b; -} - void SPI::wait() volatile { while(active); } -void SPI::setAdr(uint8_t adr) const volatile +void SPI::setAdr(SPIADR adr) const volatile { PORTD &= ~(_BV(DMUX1) | _BV(DMUX2) | _BV(DMUX3)); PORTD |= (adr & 0x01) ? _BV(DMUX1) : 0; diff --git a/firmware/spi.h b/firmware/spi.h index 4245ec3..dbdaa93 100644 --- a/firmware/spi.h +++ b/firmware/spi.h @@ -1,18 +1,7 @@ #ifndef SPI_H #define SPI_H -#include #include -#include - -#define SLSL PB4 -#define MOSI PB5 -#define MISO PB6 -#define SCLK PB7 - -#define DMUX1 PD2 -#define DMUX2 PD3 -#define DMUX3 PD4 enum SPIADR { AA0 = 0, @@ -27,22 +16,68 @@ enum SPIADR { class SPI { public: - SPI(void); + + /** + * Initialisiert die SPI Register + */ void init(void) const volatile; - void handleTransfer() volatile; - void transfer(uint8_t adr) volatile; + + /** + * Behandlungsroutine für SPI_STC interrupt + */ + void handleTransfer(void) volatile; + + /** + * Fügt ein Byte dem SPI Puffer an + */ void addByte(uint8_t b) volatile; + + /** + * Startet die Übertragung SPI Puffers + * Die Werte im Puffer werden mit den empfangen Werten überschrieben + * \param adr Adressierung des Empfängers (Slave Device) + */ + void transfer(SPIADR adr) volatile; + + /** + * Blockiert, bis laufende SPI Vorgänge beendet sind + * Ist SPI gerade inaktiv, wird die Methode sofort beendet + */ void wait(void) volatile; + /** + * SPI Puffer Größe + * Maximale Anzahl an Bytes, die auf einmal an ein Gerät + * gesendet & empfangen werden können + */ constexpr static uint8_t BUFFER_SIZE = 8; + + /** + * SPI Puffer + * Vor Zugriff unbedingt wait() aufrufen + * Es sollte nur lesend zugegriffen werden, für schreiben siehe addByte() + */ volatile uint8_t buffer[BUFFER_SIZE]; private: - void setAdr(uint8_t) const volatile; + /** + * Setzt die CS Leitung für den gewünschten Slave + */ + void setAdr(SPIADR adr) const volatile; + // Variablen für die Pufferverwaltung volatile uint8_t index = 0; volatile uint8_t length = 0; volatile bool active = false; + + // Constants + constexpr static uint8_t SLSL = PB4; + constexpr static uint8_t MOSI = PB5; + constexpr static uint8_t MISO = PB6; + constexpr static uint8_t SCLK = PB7; + constexpr static uint8_t DMUX1 = PD2; + constexpr static uint8_t DMUX2 = PD3; + constexpr static uint8_t DMUX3 = PD4; }; #endif // SPI_H diff --git a/firmware/tlc5615.cpp b/firmware/tlc5615.cpp index b9f31fc..5adacbb 100644 --- a/firmware/tlc5615.cpp +++ b/firmware/tlc5615.cpp @@ -1,6 +1,6 @@ #include "tlc5615.h" -TLC5615::TLC5615(volatile SPI& spi, uint8_t adr) : spi(spi), adr(adr) +TLC5615::TLC5615(volatile SPI& spi, SPIADR adr) : spi(spi), adr(adr) { } diff --git a/firmware/tlc5615.h b/firmware/tlc5615.h index 6194c8d..e680339 100644 --- a/firmware/tlc5615.h +++ b/firmware/tlc5615.h @@ -6,13 +6,13 @@ class TLC5615 { public: - TLC5615(volatile SPI&, uint8_t); + TLC5615(volatile SPI&, SPIADR adr); void setValue(uint16_t) const volatile; private: volatile SPI& spi; - const uint8_t adr; + const SPIADR adr; }; #endif // TLC5615_H