diff --git a/CMakeFiles/rgbcontroller.dir/main.cpp.o b/CMakeFiles/rgbcontroller.dir/main.cpp.o index 78da093..8a12142 100644 Binary files a/CMakeFiles/rgbcontroller.dir/main.cpp.o and b/CMakeFiles/rgbcontroller.dir/main.cpp.o differ diff --git a/CMakeFiles/rgbcontroller.dir/serial.cpp.o b/CMakeFiles/rgbcontroller.dir/serial.cpp.o index 6aa15a6..64077dc 100644 Binary files a/CMakeFiles/rgbcontroller.dir/serial.cpp.o and b/CMakeFiles/rgbcontroller.dir/serial.cpp.o differ diff --git a/main.cpp b/main.cpp index 4f18d18..61072f2 100644 --- a/main.cpp +++ b/main.cpp @@ -15,6 +15,7 @@ struct WirelessRelayStore { WirelessRelay array[MAX_RELAYS]; bool states[MAX_RELAYS]={}; + bool printState = true; uint8_t count; }; @@ -24,8 +25,9 @@ inline static void printHelp(Serial* serial) help : Show this prompt \n\ relay add [id] : Add Wireless Relay\n\ relay list : Print list of saved Wireless Relays \n\ + relay machine [on/off] : Get machine readable relay state when state changes\n\ relay [on/off] [nn] : Turn on/off nth relay\n\ - relay state : Get full machine readable relay state\n\ + relay state : Get machine readable relay state\n\ erase : Erase epprom\n\ rgb [on/off] : Turn on/off RGB leds at current value.\n\ rgb print : Print current RGB value.\n\ @@ -36,6 +38,18 @@ inline static void printHelp(Serial* serial) version : Print Version.\n"); } +void writeState( WirelessRelayStore* relays, Serial* serial ) +{ + serial->write("ST"); + serial->write(relays->count); + for(uint8_t i = 0; i < relays->count; i++) + { + serial->putChar(','); + relays->array[i].getExpectedState() ? serial->putChar('1') : serial->putChar('0'); + } + serial->putChar('\n'); +} + void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial) { if( strncmp(inBuffer, "add", 3) == 0 && inBuffer[3] != '\0') @@ -78,6 +92,7 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial) char buffer[64]; sprintf(buffer, "RELAY: %u turned on\n", selected); serial->write(buffer, 64); + if(relays->printState) writeState(relays, serial); } else serial->write("No sutch Relay\n"); } @@ -91,16 +106,23 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial) char buffer[64]; sprintf(buffer, "RELAY: %u turned off\n", selected); serial->write(buffer, 64); + if(relays->printState) writeState(relays, serial); } else serial->write("No sutch Relay\n"); } else if( strncmp(inBuffer, "state", 5) == 0 && inBuffer[3] != '\0') { - serial->write("ST"); - serial->write(relays->count); - serial->putChar(','); - for(uint8_t i = 0; i < relays->count; i++) relays->array[i].getExpectedState() ? serial->putChar('1') : serial->putChar('0'); - serial->putChar('\n'); + writeState(relays, serial); + } + else if( strncmp(inBuffer, "machine on", 7) == 0 ) + { + relays->printState = true; + serial->write("Turned on State printing\n"); + } + else if( strncmp(inBuffer, "machine off", 8) == 0 ) + { + relays->printState = false; + serial->write("Turned off State printing\n"); } else { @@ -173,7 +195,7 @@ void serialDispatch(Serial* serial , WirelessRelayStore* relays, RgbLed* rgbled) if(serial->dataIsWaiting()) { char buffer[COMMAND_BUFFER_SIZE]; - const int length = serial->getString(buffer, COMMAND_BUFFER_SIZE); + unsigned int length = serial->getString(buffer, COMMAND_BUFFER_SIZE); if(length != 0) { if(length > 4 && strncmp(buffer, "relay", 5) == 0) diff --git a/rgbcontroller b/rgbcontroller index 5f1fdb9..1b2f961 100755 Binary files a/rgbcontroller and b/rgbcontroller differ diff --git a/rgbcontroller.hex b/rgbcontroller.hex index f10c23f..2738a50 100644 --- a/rgbcontroller.hex +++ b/rgbcontroller.hex @@ -2,13 +2,13 @@ :100010000C9451000C9451000C9451000C9451001C :100020000C9451000C9451000C9451000C9451000C :100030000C9451000C9451000C9451000C945100FC -:100040000C9451000C9451000C94AA040C9451008F +:100040000C9451000C9451000C94F4040C94510045 :100050000C9451000C9451000C9451000C945100DC :100060000C9451000C94510011241FBECFEFD8E026 -:10007000DEBFCDBF16E0A0E0B1E0ECECFEE102C0D7 -:1000800005900D92AC3FB107D9F72BE0ACEFB6E08D -:1000900001C01D92A630B207E1F70E9422040C9421 -:1000A000640F0C940000F999FECF92BD81BD60BD34 +:10007000DEBFCDBF17E0A0E0B1E0E0EEFFE102C0DF +:1000800005900D92A63AB107D9F72BE0A6EAB7E0A2 +:1000900001C01D92A03BB207E1F70E9462040C94DC +:1000A000EE0F0C940000F999FECF92BD81BD60BDAA :1000B000FA9AF99A0895F999FECF92BD81BDF89AFE :1000C00080B50895EF92FF920F931F93CF93DF9324 :1000D0008C01EB017B01E40EF51ECE15DF0539F036 @@ -17,574 +17,602 @@ :100100000F931F93CF93DF938B01040F151FEB0108 :100110007C01E61AF70AC017D10739F0C7018C0F26 :100120009D1F0E945B008993F6CFDF91CF911F91B5 -:100130000F91FF90EF9008956F927F928F929F9210 -:10014000AF92BF92CF92DF92EF92FF920F931F93E5 -:10015000CF93DF93CDB7DEB7C254D1090FB6F89471 -:10016000DEBF0FBECDBF6C017B018A0143E050E0D2 -:1001700060E071E0C7010E94510C892B09F081C039 -:10018000F7018381882309F47CC040E150E070E0EE -:1001900060E0C70104960E94140B23967FAF6EAFF8 -:1001A00023976115710509F466C07601F0EEEF0E34 -:1001B000F11CF7015081503208F05DC09B0145E011 -:1001C00065E270E0C601F6E05F9F800D911D11248D -:1001D0000E944C08F70160816F5F90E080E00E9410 -:1001E0005300F701808190E0880F991F42E050E0B2 -:1001F000BE016F5B7F4F01960E94620023968FAD18 -:1002000023978F9322968FAD22978F93F70180814A -:100210001F928F9384E091E09F938F939E012F5FB5 -:100220003F4F69013F932F930E94670C40E450E0D9 -:10023000B601C8010E942105F70180818F5F80838C -:100240000FB6F894DEBF0FBECDBFCE5BDF4F0FB64B -:10025000F894DEBF0FBECDBFDF91CF911F910F91FC -:10026000FF90EF90DF90CF90BF90AF909F908F90D6 -:100270007F906F90089564E271E0C8010E943D058F -:10028000E4CF44E050E06DE571E0C7010E94510CFD -:10029000892BD1F562E671E0C8010E943D05712C01 -:1002A000460130EE830E911C96E0692E21E1A22ECC -:1002B00021E0B22ECE0101967C01F40180817816F6 -:1002C000F0F4C601769C800D911D11240E94450812 -:1002D0009F938F931F927F92BF92AF92FF92EF9264 -:1002E0000E94670C40E450E0B701C8010E9421055C -:1002F00073940FB6F894DEBF0FBECDBFDECF6AE0B9 -:10030000C8010E941A05A1CF42E050E06FE872E0F8 -:10031000C7010E94510C892BB1F5F7018281882316 -:1003200091F1C70102960E942A0CF601E052FF4F9C -:100330002081281728F17C01FF24960146E0849F44 -:10034000200D311D1124C9010E940808FF92EF926F -:100350008BE691E09F938F93CE0101967C019F9352 -:100360008F930E94670C40E450E0B701C8010E94DF -:1003700021050F900F900F900F900F900F9065CF69 -:1003800060E871E07ACF43E050E067EA72E0C701CD -:100390000E94510C892BF1F4F70183818823D1F05D -:1003A000C70103960E942A0CF601E052FF4F2081FC -:1003B000281730F37C01FF24960146E0849F200D2E -:1003C000311D1124C9010E942708FF92EF9280E994 -:1003D00091E0C0CF45E050E066EA71E0C7010E94BD -:1003E000510C892B89F5F7018381882369F16CEA27 -:1003F00071E0C8010E943D055601F0EEAF0EB11C40 -:10040000F501408150E070E060E0C8010E946105A4 -:100410006CE2C8010E941A05F12C86E0E82EF50175 -:100420008081F81608F06BCFC601FE9C800D911DEF -:1004300011240E94490861E3811101C060E3C801F1 -:100440000E941A05F394EBCF4BE150E0B701C801CD -:100450000E9421056FEA71E010CFAF92BF92CF9258 -:10046000DF92EF92FF920F931F93CF93DF93CDB75D -:10047000DEB7C054D1090FB6F894DEBF0FBECDBFB2 -:100480006C018B017A0142E050E06FE872E0C80134 -:100490000E94510C892B49F4C6010E94D80864EED1 -:1004A00071E0C7010E943D053FC043E050E067EAAC -:1004B00072E0C8010E94510C892B31F4C6010E94E0 -:1004C000050963EF71E0EDCF45E050E063E072E0D5 -:1004D000C8010E94510C892BC9F5C6010E94C80AA7 -:1004E000082FC6010E94CB0A182FC6010E94C60A17 -:1004F0001F920F931F921F931F928F9389E092E098 -:100500009F938F938E010F5F1F4F1F930F930E9436 -:10051000670C40E450E0B801C7010E9421050FB606 -:10052000F894DEBF0FBECDBFC05CDF4F0FB6F894AE -:10053000DEBF0FBECDBFDF91CF911F910F91FF9016 -:10054000EF90DF90CF90BF90AF90089543E050E0E0 -:100550006AE772E0C8010E94510C892B41F5F8014D -:1005600080E09191992321F08C3139F08F5FF9CFA0 -:1005700060E472E08F3008F494CFF801178213869C -:10058000C8010C960E942A0CA82EC80108960E9449 -:100590002A0CB82EC80104960E942A0C2A2D4B2D35 -:1005A000682FC6010E94130960E372E07ACF47E02A -:1005B00050E062E672E0C8010E94510C892B59F4A8 -:1005C000C80108960E942A0C682FC6010E94E708FD -:1005D0006AE672E066CF46E050E067E772E0C80185 -:1005E0000E94510C892B59F4C80107960E942A0CCD -:1005F000682FC6010E9427096EE772E052CF47E0DC -:1006000050E06AE872E0C8010E94510C892B39F46D -:1006100061E0C6010E94790962E972E042CF48E0D8 -:1006200050E062EA72E0C8010E94510C892B39F453 -:1006300060E0C6010E9479096BEA72E032CF4CE1BA -:1006400050E0B801C7010E9421056CEB72E029CF90 -:10065000AF92BF92CF92DF92EF92FF920F931F93D0 -:10066000CF93DF93CDB7DEB7A0970FB6F894DEBF78 -:100670000FBECDBF8C016B015A010E94EB05882390 -:1006800001F140E250E0BE016F5F7F4FC8010E9460 -:1006900033067C01892BA9F085E0E816F10414F1FA -:1006A00045E050E060E073E0CE0101960E94510CFD -:1006B000892BE9F4A801BE01695F7F4FC6010E9442 -:1006C0009C00A0960FB6F894DEBF0FBECDBFDF91A1 -:1006D000CF911F910F91FF90EF90DF90CF90BF903F -:1006E000AF90089583E0E816F1040CF441C043E0B4 -:1006F00050E066E073E0CE0101960E94510C892B18 -:1007000041F4A801BE016B5F7F4FC5010E942D021D -:10071000D8CF85E0E816F1045CF143E050E066EAEA -:1007200071E0CE0101960E94510C892B51F345E0F6 -:1007300050E06AE073E0CE0101960E94510C892BD3 -:10074000B9F4F12CE12C60E0C7010E9453008FEF57 -:10075000E81AF80A81E4E816F104A9F760E173E009 -:10076000C8010E943D05F601E052FF4F1082A9CF5B -:1007700089818F3371F084E0E816F10484F044E05D -:1007800050E06FE173E0CE0101960E94510C892B7D -:1007900031F464E273E0C8010E943D0592CF6AEC37 -:1007A00076E0F9CFCF92DF92EF92FF920F931F93F3 -:1007B000CF93DF9300D0CDB7DEB76C0190E080E03F -:1007C0000E945B00760190EEE90EF11CF701808338 -:1007D000813268F010E000E060E0C8010E94530040 -:1007E0000F5F1F4F01341105B9F7F701108210E0B8 -:1007F00006E0F70180818117D0F0812F90E0880F0B -:10080000991F42E050E0BE016F5F7F4F01960E944A -:100810007E0029813A8145E065E270E0C601109FC3 -:10082000800D911D11240E944C081F5FE2CF0F9094 -:100830000F90DF91CF911F910F91FF90EF90DF907C -:10084000CF900895CF93DF93CDB7DEB7DA950FB68B -:10085000F894DEBF0FBECDBF82E284B988E68AB9C4 -:1008600015B87894CE0193950E9407051F92812CAC -:10087000AA24A394CC24C39483E0E82E08E410E0D7 -:1008800027E430E045E450E064E470E0CE018850B5 -:100890009F4F0E9456081F92C12C95E0E92E04EB51 -:1008A00010E023EB30E041EB50E060EB70E0CE0174 -:1008B00080519F4F0E945608CE0188509F4F0E9442 -:1008C0009B08CE0180519F4F0E949B08AE01405172 -:1008D0005F4FBE0168507F4FCE018E519F4F0E94E7 -:1008E000C6088E010F5F1F4F6E0181ECC80ED11C30 -:1008F0000F900F907801C8010E9453080A5F1F4FA4 -:100900000C151D05C1F780E2F80111928A95E9F7EF -:10091000CF51DF4F1882C15ED040C7010E94D20381 -:100920006FED76E0CE0193950E943D05AE014E51EC -:100930005F4FB701CE0193950E942803CE018E51DF -:100940009F4F0E944C0A8FE39FE10197F1F700C08F -:100950000000ECCF1F920F920FB60F9211242F932D -:100960004F935F936F937F938F939F93AF93BF93B7 -:10097000EF93FF932091C6008091000790910107AB -:10098000A0910207B09103079370AA27BB278C5F41 -:10099000984FFC0120838091000790910107A0915E -:1009A0000207B09103074091FC065091FD0660914B -:1009B000FE067091FF06841B950BA60BB70B8115E5 -:1009C0009440A105B10598F480910007909101072A -:1009D000A0910207B09103070196A11DB11D80935C -:1009E000000790930107A0930207B0930307FF91BC -:1009F000EF91BF91AF919F918F917F916F915F9197 -:100A00004F912F910F900FBE0F901F9018952AE0D5 -:100A1000FC0120831092C50083E38093C40086E02C -:100A20008093C200E1ECF0E088E1808380818068FF -:100A3000808308958091C00085FFFCCF6093C6003D -:100A40000895EF92FF920F931F93CF93DF937C0152 -:100A5000EB018B01040F151FC017D10739F0699105 -:100A6000662321F0C7010E941A05F6CFDF91CF91CE -:100A70001F910F91FF90EF900895EF92FF920F93C7 -:100A80001F93CF93DF937C01EB018B01FE0101905B -:100A90000020E9F73197EC1BFD0BC8018C1B9D0B67 -:100AA0008E179F0738F4F80161918F01C7010E94EA -:100AB0001A05ECCFDF91CF911F910F91FF90EF902E -:100AC00008954F925F926F927F929F92AF92BF92E2 -:100AD000CF92DF92EF92FF920F931F93CF93DF930A -:100AE000CDB7DEB7C054D1090FB6F894DEBF0FBE44 -:100AF000CDBF5C014115510561057105D1F460E37D -:100B00000E941A05C05CDF4F0FB6F894DEBF0FBE1F -:100B1000CDBFDF91CF911F910F91FF90EF90DF90AC -:100B2000CF90BF90AF909F907F906F905F904F90CD -:100B30000895CE0101967C0180E4F70111928A9517 -:100B4000E9F7912C77FF0DC0CA0157FF04C0882731 -:100B50009927841B950BAC01990F660B770B992491 -:100B6000939467010EE310E08AE0482E512C612C2B -:100B7000712C4115510561057105B9F0F1E0CF1AED -:100B8000D1080115110589F001501109CB01BA01F5 -:100B9000A30192010E94CD0A942F852F605DF6017A -:100BA00067AFA901692F782FE4CF992039F0F701B9 -:100BB000E00FF11F8DE28083015011094FE350E0F7 -:100BC000401B510B0F5F1F4FB701600F711FC50115 -:100BD0000E94210597CF0F931F930091000710915A -:100BE000010720910207309103074091FC065091C4 -:100BF000FD066091FE067091FF0681E040175107E7 -:100C00006207730708F080E01F910F9108950E941A -:100C1000EB05882331F18091FC069091FD06A091AF -:100C2000FE06B091FF060196A11DB11D8093FC0642 -:100C30009093FD06A093FE06B093FF068091FC06FC -:100C40009091FD06A091FE06B091FF060197A109C3 -:100C5000B1099370AA27BB278C5F984FFC01808154 -:100C6000089580E008954F925F926F927F928F92E5 -:100C70009F92AF92BF92CF92DF92EF92FF920F932B -:100C80001F93CF93DF938C017B01BA0180E090E04A -:100C9000DC01EC018090000790900107A090020712 -:100CA000B09003074090FC065090FD066090FE0651 -:100CB0007090FF0684189508A608B708881699064C -:100CC000AA06BB0628F1813024E09207A105B105F0 -:100CD00009F4A9C02091FC063091FD064091FE0662 -:100CE0005091FF064C015D01EFEF8E1A9E0AAE0A8D -:100CF000BE0A280F391F4A1F5B1F33704427552730 -:100D00002C5F384FF9013081F8012081321388C0FF -:100D10008090000790900107A0900207B090030711 -:100D20004090FC065090FD066090FE067090FF0615 -:100D300084189508A608B70888159905AA05BB0563 -:100D400008F076C0209781F1570190E080E04B01D8 -:100D5000F1E08F1A91086C012FEFC21AD20A8815A0 -:100D6000990508F063C0C8010E940706F501819348 -:100D70005F01C601CC16DD0671F7EC0CFD1CF70116 -:100D800011828091FC069091FD06A091FE06B09123 -:100D9000FF060196A11DB11D8093FC069093FD06F0 -:100DA000A093FE06B093FF068091FC069091FD068D -:100DB000A091FE06B091FF068C0F9D1FA11DB11DD5 -:100DC0009370AA27BB278C5F984FFC019081F80194 -:100DD0008081981313C08091FC069091FD06A0912C -:100DE000FE06B091FF060196A11DB11D8093FC0681 -:100DF0009093FD06A093FE06B093FF06CE01DF910F -:100E0000CF911F910F91FF90EF90DF90CF90BF9007 -:100E1000AF909F908F907F906F905F904F900895CC -:100E2000D501C40136CFC1E0D4E072CF6C01A5CFAB -:100E3000D0E0C0E0B9CFDC011396ED91FC9114979E -:100E400015968C91159721E030E0A90101C0440F5F -:100E50008A95EAF7942F90958081892380838081F9 -:100E6000842B8083613009F04DC087EE93E00197B9 -:100E7000F1F700C000001396ED91FC9114974081AA -:100E800015968C911597B90102C0660F771F8A9548 -:100E9000E2F7CB0180958423808387EB9BE0019769 -:100EA000F1F700C000001396ED91FC91149780813A -:100EB00015969C911597A90101C0440F9A95EAF7E0 -:100EC000942F9095982390838081842B808387EE44 -:100ED00093E00197F1F700C000001396ED91FC91AB -:100EE0001497808115969C9101C0220F9A95EAF77C -:100EF00020952823208387EB9BE00197F1F700C022 -:100F00000000089587EB9BE00197F1F700C0000017 -:100F10001396ED91FC911497808115969C911597ED -:100F2000A90101C0440F9A95EAF7409548234083F0 -:100F300087EE93E00197F1F7B4CFEF92FF920F9312 -:100F40001F93CF93DF93EC01EB81FC8120813D81E6 -:100F500081E090E0AC0101C0440F3A95EAF7342FEC -:100F60003095322330832081242B2083E7EEF3E079 -:100F70003197F1F700C00000EB81FC8120813D81B9 -:100F800001C0880F3A95EAF780958223808387EB2A -:100F90009BE00197F1F700C000000FE010E0EE24A5 -:100FA000E394F12C29813A81C701002E02C0880FF9 -:100FB000991F0A94E2F78223932361E0892B09F4B5 -:100FC00060E0CE010E941B07015011090530110598 -:100FD00049F7DF91CF911F910F91FF90EF90089506 -:100FE000DC011396ED91FC911497208115963C91AC -:100FF00081E090E001C0880F3A95EAF7809582235E -:10100000808387E199E70197F1F700C00000089518 -:101010000F931F93CF93DF93EC010AE010E0CE0112 -:101020000E949D0761E0CE010E941B0760E0CE0197 -:101030000E941B07CE010E94F0070150110979F7A9 -:1010400081E08883DF91CF911F910F9108950F93D5 -:101050001F93CF93DF93EC010AE010E0CE010E94D2 -:101060009D0760E0CE010E941B0761E0CE010E9457 -:101070001B07CE010E94F0070150110979F7188271 -:10108000DF91CF911F910F910895FC018181928191 -:101090000895FC0180810895FC0174836383328389 -:1010A000218345830895FC0110820895AF92CF9269 -:1010B000EF920F931F93CF93DF93CDB7DEB7FC0171 -:1010C000718360833383228315830483C682A7825E -:1010D000DB011C92DA011C928681882331F0208189 -:1010E0003181D9018C9180688C938781882331F07C -:1010F00020813181D9018C9180628C932081318152 -:10110000D9018C9183608C93DA018C91BE2DB770DC -:10111000EB2EE82ADA01EC92A281B3811C920480C2 -:10112000F581E02D1082DF91CF911F910F91EF900B -:10113000CF90AF900895DC01ED91FC918081837098 -:1011400080830895CF93DF93EC010E949B088E81EA -:10115000882329F0E881F9818081806880838F81EC -:10116000882329F0E881F981808180628083DF9182 -:10117000CF910895DC011296ED91FC916083089562 -:10118000DC011496ED91FC9160830895FC0171835C -:1011900060835383428314821682158217821086DD -:1011A0001186128681E0838787E0848715860895FB -:1011B000CF93DF93EC0181E08D87888199810E9434 -:1011C000A2088A819B81DF91CF910C94A208CF93D2 -:1011D000DF93EC016C836623A9F060E0888199813C -:1011E0000E94C00860E0888199810E94BA0860E08E -:1011F0008A819B810E94C008CE010E94D8081F826C -:101200001E821D82DF91CF910895CF93DF93EC0171 -:101210001D86888199810E949B088A819B81DF912C -:10122000CF910C949B08FC01148260874187228730 -:10123000338531110AC0620F7727771F460F572F6A -:10124000511D452B11F40C9405090C94D8086150DC -:10125000603108F04BC0E62FF0E0EF5CF64F0C94E5 -:10126000EC0A410946094A094E095209550958092B -:101270005B095E095B09620966096A096E09720900 -:10128000740920E54FEF60EA0C94130924E14FEF55 -:1012900068ECFACF2CE84FEF64EBF6CF20E040E0AB -:1012A0006FEFF2CF2AE04CE3FBCF2EE14EE1F8CF17 -:1012B00020E04BE9F5CF20E04FEF0AC02AE04FEFE6 -:1012C00067E3E2CF27E040E568E0DECF2FEF40E0C4 -:1012D00060E0DACF2FEF4FEF62E3D6CF26E940E5AB -:1012E0006AE0D2CF2CEDE8CF20E0D1CF24E14DE26F -:1012F000D7CFFC0163870895CF93DF93EC018C81F6 -:10130000813041F58D819E812F8121111CC0019674 -:101310009E838D836D817E816F3F7105B1F481E085 -:101320008F83888199810E94C0086D816095888132 -:1013300099810E94BA086D8160548A819B81DF91F6 -:10134000CF910C94C0080197E3CF6115710549F75F -:101350001F82E7CF823021F58D819E812F8121115F -:1013600018C001969E838D836D817E816E3F21E042 -:10137000720789F481E08F837695679588819981DA -:101380000E94C00860E0888199810E94BA0860E0EC -:10139000D4CF0197E7CF6115710571F71F82ECCFAC -:1013A000833069F58D819E812F81211121C00196A5 -:1013B0009E838D836D817E8161158FEF7807D1F4D7 -:1013C00081E08F8346E0769567954A95E1F78881BD -:1013D00099810E94C0086E81888199810E94BA0813 -:1013E0006D817E8153E0769567955A95E1F7A5CF9B -:1013F0000197DECF6115710529F71F82E3CF843095 -:10140000F1F56D817E8188819981611520E27207F5 -:10141000C8F536E0769567953A95E1F70E94C008E1 -:101420006D817E81613080E2780770F088819981DA -:10143000611520E4720760F5705226E07695679595 -:101440002A95E1F70E94BA086D817E81613080E4BF -:10145000780768F064E0769F612D7727112484E196 -:10146000689F602D11248A819B810E94C0088D8114 -:101470009E818F3F980719F001969E838D83DF919F -:10148000CF910895672F6695669566956058C6CF8B -:10149000672F66956058D6CFCF93DF93EC010E94FB -:1014A0007C098C8181116FC08B85882309F45FC012 -:1014B0008D819E8101969E838D839C8501C0880FBE -:1014C0009A95EAF781115FC098B588858917B1F0C0 -:1014D00068B528B5281B330B81E090E0121613067F -:1014E00014F090E080E0232F221F2227221F821B6E -:1014F0009109681B888199810E94C00897B58985E8 -:101500008917B1F067B527B5281B330B81E090E050 -:101510001216130614F090E080E0232F221F2227DA -:10152000221F821B9109681B888199810E94BA0839 -:101530009091B4008A85891731F16091B4002091AF -:10154000B400281B330B81E090E01216130614F050 -:1015500090E080E0232F221F2227221F821B910967 -:10156000681B8A819B81DF91CF910C94C0086985AB -:10157000888199810E94BA086885888199810E9432 -:10158000C0086A85EECFDF91CF91089588B50895A0 -:101590008091B400089587B50895052E97FB1EF439 -:1015A00000940E94E40A57FD07D00E94F20A07FC4B -:1015B00003D04EF40C94E40A509540953095219553 -:1015C0003F4F4F4F5F4F089590958095709561956F -:1015D0007F4F8F4F9F4F0895EE0FFF1F0590F4919F -:1015E000E02D0994A1E21A2EAA1BBB1BFD010DC020 -:1015F000AA1FBB1FEE1FFF1FA217B307E407F507C3 -:1016000020F0A21BB30BE40BF50B661F771F881F9E -:10161000991F1A9469F760957095809590959B0134 -:10162000AC01BD01CF010895A0E0B0E0EAE1FBE02C -:101630000C941F0F5C016B017A016115710519F0A3 -:10164000FB0191838083E114F10429F0C701029723 -:10165000839708F0E5C0E5012196F5011081812FFF -:1016600090E00E94480C892B11F05E01F4CF1D32EE -:1016700029F42196F501118101E007C01B3221F404 -:10168000E5012296F501118100E0E114F10409F170 -:10169000F0E1EF16F10429F43FC010E3E114F10486 -:1016A00021F128E0E216F10401F154F4E2E0EE1633 -:1016B000F10421F5812C912CA12CB0E4BB2E3EC06D -:1016C000FAE0EF16F10439F020E1E216F104B1F48A -:1016D00030C0103319F1FAE0EF2EF12CACEC8A2E69 -:1016E000982CA82CACE0BA2E29C078E0E72EF12C7B -:1016F000812C912CA12CE0E1BE2E20C060E070E096 -:1017000080E090E897010F2C000C440B550B0E94D1 -:10171000F20A49015A0112C0103359F488818F7DB1 -:10172000883509F0BACF19812296026080E1E82E4F -:10173000F12C812C912CA12C68E0B62E40E060E0C9 -:1017400070E0CB0127010F2C000C66087708FE0122 -:1017500050ED352E310E29E0231570F42FEB210FBB -:101760002A3118F439EC332E06C02FE9210F2A3123 -:1017700018F529EA322E310E232D30E02E153F05C3 -:10178000DCF447FD16C086169706A806B90670F069 -:10179000A30192010E94030F630D711D811D911D14 -:1017A00061307105810520E8920710F04FEF01C00C -:1017B00041E021961081CBCF202F2170C114D1049C -:1017C00071F0442329F02197F601D183C08307C02B -:1017D00001FF19C02297F601D183C08314C047FFCF -:1017E00012C0222329F060E070E080E090E804C09D -:1017F0006FEF7FEF8FEF9FE722E230E03093050B32 -:101800002093040B09C0222381F090958095709558 -:1018100061957F4F8F4F9F4F462F372F282F12C034 -:1018200040E030E020E090E00DC097FFF5CF82E28D -:1018300090E09093050B8093040B6FEF7FEF8FEF99 -:101840009FE7EACF642F732F822FCDB7DEB7E1E198 -:101850000C943B0FFC0188279927E89421912032B2 -:10186000E9F3293010F02E30C8F32B3241F02D323D -:1018700039F4689404C00E945F0C820F911D21917D -:1018800020532A30C0F31EF4909581959F4F089500 -:1018900091110C945C0E803219F089508550C8F774 -:1018A0000895FB01DC014150504030F08D910190D2 -:1018B000801919F40020B9F7881B990B08957AE074 -:1018C000979F902D879F802D910D11240895AEE054 -:1018D000B0E0EDE6FCE00C942C0F0D891E8986E04B -:1018E0008C831A8309838FEF9FE79E838D83AE01DC -:1018F000475E5F4F6F89788DCE0101960E94890CFB -:10190000EF81F885E00FF11F10822E96E4E00C9431 -:10191000480FACE0B0E0EFE8FCE00C941E0F6C0167 -:101920007B018A01FC0117821682838181FFBEC17F -:10193000CE0101964C01F6019381F70193FD85914B -:1019400093FF81917F01882309F4ACC1853239F47A -:1019500093FD859193FF81917F01853229F4B60132 -:1019600090E00E94750EE7CF512C312C20E0203200 -:10197000A0F48B3269F030F4803259F0833269F48C -:1019800020612CC08D3239F0803339F4216026C0BB -:101990002260246023C0286021C027FD27C030EDCD -:1019A000380F3A3078F426FF06C0FAE05F9E300D1B -:1019B0001124532E13C08AE0389E300D1124332E8B -:1019C00020620CC08E3221F426FD6CC1206406C05A -:1019D0008C3611F4206802C0883641F4F70193FD7B -:1019E000859193FF81917F018111C1CF982F9F7DB8 -:1019F0009554933028F40C5F1F4F9FE399830DC0DB -:101A0000833631F0833771F0833509F05BC022C033 -:101A1000F801808189830E5F1F4F44244394512C29 -:101A2000540115C03801F2E06F0E711CF801A0805E -:101A3000B18026FF03C0652D70E002C06FEF7FEF1D -:101A4000C5012C870E946A0E2C0183012C852F77FB -:101A5000222E17C03801F2E06F0E711CF801A08031 -:101A6000B18026FF03C0652D70E002C06FEF7FEFED -:101A7000C5012C870E945F0E2C012C852068222E28 -:101A8000830123FC1BC0832D90E048165906B0F457 -:101A9000B60180E290E00E94750E3A94F4CFF50111 -:101AA00027FC859127FE81915F01B60190E00E949D -:101AB000750E31103A94F1E04F1A51084114510457 -:101AC00071F7E6C0843611F0893639F5F80127FF41 -:101AD00007C060817181828193810C5F1F4F08C0B4 -:101AE00060817181072E000C880B990B0E5F1F4FD0 -:101AF0002F76722E97FF09C090958095709561950D -:101B00007F4F8F4F9F4F2068722E2AE030E0A40154 -:101B10000E94A50EA82EA81844C0853729F42F7E50 -:101B2000B22E2AE030E025C0F22FF97FBF2E8F368B -:101B3000C1F018F4883579F0B5C0803719F08837CE -:101B400021F0B0C02F2F2061B22EB4FE0DC08B2D1E -:101B50008460B82E09C024FF0AC09F2F9660B92E5A -:101B600006C028E030E005C020E130E002C020E1FE -:101B700032E0F801B7FE07C06081718182819381F4 -:101B80000C5F1F4F06C06081718180E090E00E5FA6 -:101B90001F4FA4010E94A50EA82EA818FB2DFF77A9 -:101BA0007F2E76FE0BC0372D3E7FA51450F474FEB9 -:101BB0000AC072FC08C0372D3E7E05C0BA2C372DF6 -:101BC00003C0BA2C01C0B52C34FF0DC0FE01EA0DD4 -:101BD000F11D8081803311F4397E09C032FF06C0C7 -:101BE000B394B39404C0832F867809F0B39433FD83 -:101BF00013C030FF06C0B31498F43A0C532C5B1892 -:101C000010C0B31470F4B60180E290E03C870E94EB -:101C1000750EB3943C85F5CFB31418F43B1802C08D -:101C20005A2C312C34FF12C0B60180E390E03C877F -:101C30000E94750E3C8532FF17C031FD03C088E756 -:101C400090E002C088E590E0B6010CC0832F867852 -:101C500059F031FF02C08BE201C080E237FD8DE216 -:101C6000B60190E00E94750EA51438F4B60180E329 -:101C700090E00E94750E5A94F7CFAA94F401EA0DF1 -:101C8000F11D8081B60190E00E94750EA110F5CF84 -:101C9000332009F450CEB60180E290E00E94750E28 -:101CA0003A94F6CFF6018681978102C08FEF9FEFBD -:101CB0002C96E2E10C943A0F992788270895FC01AD -:101CC0000590615070400110D8F7809590958E0F67 -:101CD0009F1F0895FC016150704001900110D8F7DA -:101CE000809590958E0F9F1F08950F931F93CF930C -:101CF000DF93182F092FEB018B8181FD03C08FEF3C -:101D00009FEF1EC082FF0FC02E813F818C819D817D -:101D10002817390774F4E881F981CF010196998376 -:101D20008883108306C0E885F985812F0995892B62 -:101D300031F78E819F8101969F838E83812F902F13 -:101D4000DF91CF911F910F910895FA01AA272830B2 -:101D500051F1203181F1E8946F936E7F6E5F7F4F78 -:101D60008F4F9F4FAF4FB1E03ED0B4E03CD0670FF4 -:101D7000781F891F9A1FA11D680F791F8A1F911D47 -:101D8000A11D6A0F711D811D911DA11D20D009F497 -:101D900068943F912AE0269F11243019305D3193D9 -:101DA000DEF6CF010895462F4770405D4193B3E0C2 -:101DB0000FD0C9F7F6CF462F4F70405D4A3318F069 -:101DC000495D31FD4052419302D0A9F7EACFB4E01A -:101DD000A6959795879577956795BA95C9F70097D2 -:101DE0006105710508959B01AC010A2E0694579573 -:101DF000479537952795BA95C9F7620F731F841FCA -:101E0000951FA01D0895DB018F939F930E94130FD0 -:101E1000BF91AF91A29F800D911DA39F900DB29F86 -:101E2000900D112408950E94550FA59F900DB49F09 -:101E3000900DA49F800D911D112408952F923F9223 -:101E40004F925F926F927F928F929F92AF92BF92CA -:101E5000CF92DF92EF92FF920F931F93CF93DF9376 -:101E6000CDB7DEB7CA1BDB0B0FB6F894DEBF0FBED3 -:101E7000CDBF09942A88398848885F846E847D8420 -:101E80008C849B84AA84B984C884DF80EE80FD8022 -:101E90000C811B81AA81B981CE0FD11D0FB6F89498 -:101EA000DEBF0FBECDBFED010895A29FB001B39F6D -:101EB000C001A39F700D811D1124911DB29F700D53 -:0C1EC000811D1124911D0895F894FFCF9E -:101ECC006164640052656C6179207361766564218C -:101EDC00204E554D4245523A2025752049443A2012 -:101EEC0025580A0055736167653A2072656C6179F3 -:101EFC0020616464205B69645D202020205B696440 -:101F0C005D206265696E67206120313662697420DC -:101F1C00686578206E756D6D6265720A006C697308 -:101F2C00740052656C6179733A0A0052454C415900 -:101F3C003A202575207475726E6564206F6E0A00E8 -:101F4C004E6F2073757463682052656C61790A005A -:101F5C0052454C41593A202575207475726E656452 -:101F6C00206F66660A007374617465005354002018 -:101F7C006973206E6F7420612076616C69642073C4 -:101F8C007562636F6D6D616E643A2072656C617918 -:101F9C00205B6164642F6C6973742F6F6E2F6F6696 -:101FAC00665D0A00524742206C6967687473206F43 -:101FBC006E0A00524742206C6967687473206F6622 -:101FCC00660A007072696E740043757272656E7485 -:101FDC00205247422076616C7565733A0A523A205A -:101FEC00257520473A20257520423A2025750A0090 -:101FFC00536574205247422076616C7565730A00F4 -:10200C0055736167653A2072676220736574205B53 -:10201C005252525D205B4747475D205B4242425D16 -:10202C000A007061747465726E005365742050619F -:10203C00747465726E0A0070726573657400536512 -:10204C0074205072657365740A0066616465206F54 -:10205C006E005475726E6564206F6E204661646507 -:10206C000A0066616465206F6666005475726E6561 -:10207C0064206F666620466164650A0020697320DF -:10208C006E6F7420612076616C6964207375626375 -:10209C006F6D6D616E643A20726762205B2F6F6E9C -:1020AC002F6F66662F7072696E742F7365742F7044 -:1020BC0061747465726E2F7072657365745D0A005D -:1020CC0072656C617900726762006572617365009C -:1020DC00454550524F4D206572617365640A006826 -:1020EC00656C7000417661696C61626C6520436F50 -:1020FC006D6D616E64733A200A2020202020202010 -:10210C0020202020202020202068656C702020209A -:10211C0020202020202020202020202020202020B3 -:10212C00202020203A202053686F77207468697330 -:10213C002070726F6D7074200A20202020202020C7 -:10214C0020202020202020202072656C61792061C5 -:10215C006464205B69645D202020202020202020E6 -:10216C00202020203A202041646420576972656C3D -:10217C006573732052656C61790A20202020202021 -:10218C002020202020202020202072656C617920C6 -:10219C006C697374202020202020202020202020F7 -:1021AC0020202020203A20205072696E74206C6907 -:1021BC007374206F6620736176656420576972654D -:1021CC006C6573732052656C617973200A20202032 -:1021DC002020202020202020202020202072656C10 -:1021EC006179205B6F6E2F6F66665D205B6E6E5D36 -:1021FC0020202020202020203A20205475726E2090 -:10220C006F6E2F6F6666206E74682072656C6179D4 -:10221C000A202020202020202020202020202020C8 -:10222C002072656C617920737461746520202020A4 -:10223C002020202020202020202020203A20204751 -:10224C0065742066756C6C206D616368696E6520C1 -:10225C007265616461626C652072656C6179207372 -:10226C00746174650A20202020202020202020204A -:10227C0020202020206572617365202020202020E2 -:10228C002020202020202020202020202020202042 -:10229C003A2020457261736520657070726F6D0A0B -:1022AC002020202020202020202020202020202022 -:1022BC00726762205B6F6E2F6F66665D2020202038 -:1022CC0020202020202020202020203A202054755F -:1022DC00726E206F6E2F6F666620524742206C65BF -:1022EC0064732061742063757272656E74207661FC -:1022FC006C75652E0A2020202020202020202020F4 -:10230C002020202020726762207072696E74202059 -:10231C0020202020202020202020202020202020B1 -:10232C003A20205072696E742063757272656E74F7 -:10233C00205247422076616C75652E0A20202020A1 -:10234C0020202020202020202020202072676220A6 -:10235C00736574205B5252525D205B4747475D208A -:10236C005B4242425D20203A202053657420524744 -:10237C00422076616C75652C207061747465726E88 -:10238C00206D75737420626520302E0A2020202069 -:10239C002020202020202020202020207267622056 -:1023AC007061747465726E205B69645D20202020FE -:1023BC00202020202020203A2020524742207061EB -:1023CC00747465726E0A202020202020202020208A -:1023DC002020202020207267622070726573657443 -:1023EC00205B69645D2020202020202020202020DC -:1023FC00203A2020736574207072657365742063B5 -:10240C006F6C6F720A20202020202020202020209A -:10241C0020202020207267622066616465205B6F3B -:10242C006E2F6F66665D202020202020202020202B -:10243C003A20207475726E20436F6C6F7266616403 -:10244C0065206F6E206F72206F66660A2020202038 -:10245C002020202020202020202020207665727330 -:10246C00696F6E202020202020202020202020207A -:10247C00202020202020203A20205072696E7420C9 -:10248C0056657273696F6E2E0A004E6F7420612050 -:10249C0076616C696420636F6D6D616E640A0052C5 -:1024AC004742436F6E74726F6C6C65722076302E7F -:0C24BC0034207374617274696E670A004A +:100130000F91FF90EF900895CF92DF92EF92FF9290 +:100140000F931F93CF93DF937C01EB0160E071E08D +:10015000CE010E94C705670181EEC80ED11CF601D1 +:10016000408150E070E060E0CE010E94EB0510E0BD +:1001700006E0F60180811817A0F46CE2CE010E941F +:10018000A405C701109F800D911D11240E94D30862 +:1001900061E3811101C060E3CE010E94A4051F5FED +:1001A000E8CF6AE0CE01DF91CF911F910F91FF90D0 +:1001B000EF90DF90CF900C94A4056F927F928F9276 +:1001C0009F92AF92BF92CF92DF92EF92FF920F93E6 +:1001D0001F93CF93DF93CDB7DEB7C254D1090FB6CB +:1001E000F894DEBF0FBECDBF8C016B017A0143E0F6 +:1001F00050E063E071E0C6010E94DB0C892B09F03E +:1002000080C0F6018381882309F47BC040E150E07F +:1002100070E060E0C60104960E949E0B23967FAFBB +:100220006EAF23976115710509F465C06801F1EEA1 +:10023000CF0ED11CF6015081503208F05CC09B01FA +:1002400045E065E270E0C801F6E05F9F800D911D1A +:1002500011240E94D608F60160816F5F90E080E073 +:100260000E945300F601808190E0880F991F42E0C0 +:1002700050E0BE016F5B7F4F01960E9462002396A3 +:100280008FAD23978F9322968FAD22978F93F60190 +:1002900080811F928F9387E091E09F938F938E01CF +:1002A0000F5F1F4F1F930F930E94F10C40E450E02B +:1002B000B801C7010E94AB05F60180818F5F808382 +:1002C0000FB6F894DEBF0FBECDBFCE5BDF4F0FB6CB +:1002D000F894DEBF0FBECDBFDF91CF911F910F917C +:1002E000FF90EF90DF90CF90BF90AF909F908F9056 +:1002F0007F906F90089567E271E0C7010E94C70583 +:10030000E4CF44E050E060E671E0C6010E94DB0CFF +:10031000892BD1F565E671E0C7010E94C705712CF4 +:10032000480131EE830E911C86E0682E94E1A92EDF +:1003300091E0B92ECE0101966C01F401808178160E +:10034000F0F4C801769C800D911D11240E94CF0805 +:100350009F938F931F927F92BF92AF92DF92CF9223 +:100360000E94F10C40E450E0B601C7010E94AB05C9 +:1003700073940FB6F894DEBF0FBECDBFDECF6AE038 +:10038000C7010E94A405A1CF42E050E06BED72E0EE +:10039000C6010E94DB0C892B09F041C0F601828165 +:1003A0008823E9F1C60102960E94B40CF801EF51CE +:1003B000FF4F2081281780F16C01DD24980146E071 +:1003C000849F200D311D1124C9010E949208DF92E3 +:1003D000CF928EE691E09F938F93CE0101966C01B0 +:1003E0009F938F930E94F10C40E450E0B601C70147 +:1003F0000E94AB050F900F900F900F900F900F90F1 +:10040000F801E052FF4F8081882309F45ECFB701E5 +:10041000C8010E949C0059CF63E871E06ECF43E0B1 +:1004200050E063EF72E0C6010E94DB0C892BF1F40F +:10043000F60183818823D1F0C60103960E94B40C93 +:10044000F801EF51FF4F2081281730F36C01DD24B4 +:10045000980146E0849F200D311D1124C9010E949E +:10046000B108DF92CF9283E991E0B5CF45E050E04B +:1004700069EA71E0C6010E94DB0C892B21F4F601C8 +:1004800083818111C4CF47E050E06FEA71E0C6017B +:100490000E94DB0C892B41F4F801E052FF4F81E010 +:1004A00080836AEB71E029CF48E050E064ED71E0B1 +:1004B000C6010E94DB0C892B39F4F801E052FF4F92 +:1004C000108260EE71E019CF4BE150E0B601C70138 +:1004D0000E94AB056BEF71E010CFAF92BF92CF924D +:1004E000DF92EF92FF920F931F93CF93DF93CDB7DD +:1004F000DEB7C054D1090FB6F894DEBF0FBECDBF32 +:100500006C018B017A0142E050E06BED72E0C801B2 +:100510000E94DB0C892B49F4C6010E94620960E34A +:1005200072E0C7010E94C7053FC043E050E063EF9F +:1005300072E0C8010E94DB0C892B31F4C6010E94D5 +:100540008F096FE372E0EDCF45E050E06FE472E0B9 +:10055000C8010E94DB0C892BC9F5C6010E94520B11 +:10056000082FC6010E94550B182FC6010E94500B80 +:100570001F920F931F921F931F928F9385E592E016 +:100580009F938F938E010F5F1F4F1F930F930E94B6 +:10059000F10C40E450E0B801C7010E94AB050FB672 +:1005A000F894DEBF0FBECDBFC05CDF4F0FB6F8942E +:1005B000DEBF0FBECDBFDF91CF911F910F91FF9096 +:1005C000EF90DF90CF90BF90AF90089543E050E060 +:1005D00066EC72E0C8010E94DB0C892B41F5F80142 +:1005E00080E09191992321F08C3139F08F5FF9CF20 +:1005F0006CE872E08F3008F494CFF801178213860C +:10060000C8010C960E94B40CA82EC80108960E943E +:10061000B40CB82EC80104960E94B40C2A2D4B2DA0 +:10062000682FC6010E949D096CE772E07ACF47E00F +:1006300050E06EEA72E0C8010E94DB0C892B59F48D +:10064000C80108960E94B40C682FC6010E94710967 +:1006500066EB72E066CF46E050E063EC72E0C80102 +:100660000E94DB0C892B59F4C80107960E94B40C38 +:10067000682FC6010E94B1096AEC72E052CF47E0D0 +:1006800050E066ED72E0C8010E94DB0C892B39F462 +:1006900061E0C6010E94030A6EED72E042CF48E0BD +:1006A00050E06EEE72E0C8010E94DB0C892B39F439 +:1006B00060E0C6010E94030A67EF72E032CF4CE1AE +:1006C00050E0B801C7010E94AB0568E073E029CF94 +:1006D000AF92BF92CF92DF92EF92FF920F931F9350 +:1006E000CF93DF93CDB7DEB7A0970FB6F894DEBFF8 +:1006F0000FBECDBF8C016B015A010E947506882385 +:1007000001F140E250E0BE016F5F7F4FC8010E94DF +:10071000BD067C01892BA9F085E0E816F10410F1F3 +:1007200045E050E06CE473E0CE0101960E94DB0CE2 +:10073000892BE9F4A801BE01695F7F4FC6010E94C1 +:10074000DD00A0960FB6F894DEBF0FBECDBFDF91DF +:10075000CF911F910F91FF90EF90DF90CF90BF90BE +:10076000AF90089583E0E816F10408F441C043E037 +:1007700050E062E573E0CE0101960E94DB0C892B0C +:1007800041F4A801BE016B5F7F4FC5010E946D025D +:10079000D8CF85E0E816F10458F143E050E069EA6B +:1007A00071E0CE0101960E94DB0C892B51F345E0EC +:1007B00050E066E573E0CE0101960E94DB0C892BC8 +:1007C000B9F4F12CE12C60E0C7010E9453008FEFD7 +:1007D000E81AF80A81E4E816F104A9F76CE573E079 +:1007E000C8010E94C705F601EF51FF4F1082A9CF43 +:1007F00089818F3371F084E0E816F10480F044E0E1 +:1008000050E06BE673E0CE0101960E94DB0C892B71 +:1008100031F460E773E0C8010E94C70592CF63E737 +:1008200077E0F9CFCF92DF92EF92FF920F931F9371 +:10083000CF93DF9300D0CDB7DEB76C0190E080E0BE +:100840000E945B00760191EEE90EF11CF7018083B6 +:10085000813268F010E000E060E0C8010E945300BF +:100860000F5F1F4F01341105B9F7F701108210E037 +:1008700006E0F70180818117D0F0812F90E0880F8A +:10088000991F42E050E0BE016F5F7F4F01960E94CA +:100890007E0029813A8145E065E270E0C601109F43 +:1008A000800D911D11240E94D6081F5FE2CF0F908A +:1008B0000F90DF91CF911F910F91FF90EF90DF90FC +:1008C000CF900895CF93DF93CDB7DEB7C150D1401D +:1008D0000FB6F894DEBF0FBECDBF82E284B988E6C2 +:1008E0008AB915B87894CE018F5F9E4F0E9491050A +:1008F0001F92812CAA24A394CC24C39483E0E82ED5 +:1009000008E410E027E430E045E450E064E470E0FF +:10091000CE0187509F4F0E94E0081F92C12C95E0A6 +:10092000E92E04EB10E023EB30E041EB50E060EB0C +:1009300070E0CE018F509F4F0E94E008CE0187509B +:100940009F4F0E942509CE018F509F4F0E9425097D +:10095000AE014F505F4FBE0167507F4FCE018D51AA +:100960009F4F0E9450098E010F5F1F4F6E0181EC57 +:10097000C80ED11C0F900F907801C8010E94DD08AD +:100980000A5F1F4F0C151D05C1F780E2F801119297 +:100990008A95E9F781E0CF51DF4F8883C15ED0406F +:1009A000CE51DF4F1882C25ED040C7010E941204B0 +:1009B00068E877E0CE018F5F9E4F0E94C705AE01C9 +:1009C0004D515F4FB701CE018F5F9E4F0E9468036C +:1009D000CE018D519F4F0E94D60A8FE39FE1019770 +:1009E000F1F700C00000EBCF1F920F920FB60F92ED +:1009F00011242F934F935F936F937F938F939F93C4 +:100A0000AF93BF93EF93FF932091C6008091AA0705 +:100A10009091AB07A091AC07B091AD079370AA2756 +:100A2000BB278255984FFC0120838091AA079091A3 +:100A3000AB07A091AC07B091AD0781159440A1051B +:100A4000B10599F18091A6079091A707A091A807F9 +:100A5000B091A90781159440A105B10531F18091AC +:100A6000AA079091AB07A091AC07B091AD07945045 +:100A7000A109B1098093AA079093AB07A093AC0793 +:100A8000B093AD078091A6079091A707A091A80702 +:100A9000B091A9079450A109B1098093A60790933A +:100AA000A707A093A807B093A9078091AA079091E0 +:100AB000AB07A091AC07B091AD074091A60750914C +:100AC000A7076091A8077091A907841B950BA60B37 +:100AD000B70B81159440A105B10598F48091AA0740 +:100AE0009091AB07A091AC07B091AD070196A11D05 +:100AF000B11D8093AA079093AB07A093AC07B09366 +:100B0000AD07FF91EF91BF91AF919F918F917F9131 +:100B10006F915F914F912F910F900FBE0F901F908B +:100B200018952AE0FC0120831092C50089E180938A +:100B3000C40086E08093C200E1ECF0E088E18083AD +:100B400080818068808308958091C00085FFFCCFFC +:100B50006093C6000895EF92FF920F931F93CF9377 +:100B6000DF937C01EB018B01040F151FC017D10728 +:100B700039F06991662321F0C7010E94A405F6CFE0 +:100B8000DF91CF911F910F91FF90EF900895EF9219 +:100B9000FF920F931F93CF93DF937C01EB018B01A7 +:100BA000FE0101900020E9F73197EC1BFD0BC80115 +:100BB0008C1B9D0B8E179F0738F4F80161918F01F4 +:100BC000C7010E94A405ECCFDF91CF911F910F9137 +:100BD000FF90EF9008954F925F926F927F929F9255 +:100BE000AF92BF92CF92DF92EF92FF920F931F933B +:100BF000CF93DF93CDB7DEB7C054D1090FB6F894C9 +:100C0000DEBF0FBECDBF5C01411551056105710509 +:100C1000D1F460E30E94A405C05CDF4F0FB6F894E6 +:100C2000DEBF0FBECDBFDF91CF911F910F91FF901F +:100C3000EF90DF90CF90BF90AF909F907F906F909C +:100C40005F904F900895CE0101967C0180E4F701FA +:100C500011928A95E9F7912C77FF0DC0CA0157FFD1 +:100C600004C088279927841B950BAC01990F660B4C +:100C7000770B9924939467010EE310E08AE0482EE5 +:100C8000512C612C712C4115510561057105B9F08C +:100C9000F1E0CF1AD1080115110589F001501109B1 +:100CA000CB01BA01A30192010E94570B942F852F0B +:100CB000605DF60167AFA901692F782FE4CF992015 +:100CC00039F0F701E00FF11F8DE280830150110927 +:100CD0004FE350E0401B510B0F5F1F4FB701600FF8 +:100CE000711FC5010E94AB0597CF0F931F93009111 +:100CF000AA071091AB072091AC073091AD07409146 +:100D0000A6075091A7076091A8077091A90781E0F5 +:100D1000401751076207730708F080E01F910F9199 +:100D200008950E947506882331F18091A60790915D +:100D3000A707A091A807B091A9070196A11DB11D11 +:100D40008093A6079093A707A093A807B093A9073D +:100D50008091A6079091A707A091A807B091A90735 +:100D60000197A109B1099370AA27BB278255984F13 +:100D7000FC018081089580E008954F925F926F9208 +:100D80007F928F929F92AF92BF92CF92DF92EF921B +:100D9000FF920F931F93CF93DF938C017B01BA01D6 +:100DA00080E090E0DC01EC018090AA079090AB0716 +:100DB000A090AC07B090AD074090A6075090A70751 +:100DC0006090A8077090A90784189508A608B7082E +:100DD00088169906AA06BB0628F1813024E09207FE +:100DE000A105B10509F4A9C02091A6073091A70774 +:100DF0004091A8075091A9074C015D01EFEF8E1AB1 +:100E00009E0AAE0ABE0A280F391F4A1F5B1F3370A5 +:100E1000442755272255384FF9013081F8012081A8 +:100E2000321388C08090AA079090AB07A090AC07BF +:100E3000B090AD074090A6075090A7076090A80714 +:100E40007090A90784189508A608B7088815990511 +:100E5000AA05BB0508F076C0209781F1570190E004 +:100E600080E04B01F1E08F1A91086C012FEFC21A5C +:100E7000D20A8815990508F063C0C8010E9491063E +:100E8000F50181935F01C601CC16DD0671F7EC0C0C +:100E9000FD1CF70111828091A6079091A707A091F0 +:100EA000A807B091A9070196A11DB11D8093A607BF +:100EB0009093A707A093A807B093A9078091A607CE +:100EC0009091A707A091A807B091A9078C0F9D1F2B +:100ED000A11DB11D9370AA27BB278255984FFC0115 +:100EE0009081F8018081981313C08091A60790919A +:100EF000A707A091A807B091A9070196A11DB11D50 +:100F00008093A6079093A707A093A807B093A9077B +:100F1000CE01DF91CF911F910F91FF90EF90DF9065 +:100F2000CF90BF90AF909F908F907F906F905F9089 +:100F30004F900895D501C40136CFC1E0D4E072CFFF +:100F40006C01A5CFD0E0C0E0B9CFDC011396ED91E4 +:100F5000FC91149715968C91159721E030E0A9012A +:100F600001C0440F8A95EAF7942F909580818923D8 +:100F700080838081842B8083613009F04DC087EEAF +:100F800093E00197F1F700C000001396ED91FC91FA +:100F90001497408115968C911597B90102C0660F80 +:100FA000771F8A95E2F7CB0180958423808387EBB6 +:100FB0009BE00197F1F700C000001396ED91FC91C2 +:100FC0001497808115969C911597A90101C0440F33 +:100FD0009A95EAF7942F9095982390838081842B9B +:100FE000808387EE93E00197F1F700C0000013962D +:100FF000ED91FC911497808115969C9101C0220F70 +:101000009A95EAF720952823208387EB9BE00197A8 +:10101000F1F700C00000089587EB9BE00197F1F71E +:1010200000C000001396ED91FC91149780811596F5 +:101030009C911597A90101C0440F9A95EAF7409534 +:101040004823408387EE93E00197F1F7B4CFEF9206 +:10105000FF920F931F93CF93DF93EC01EB81FC8101 +:1010600020813D8181E090E0AC0101C0440F3A95C0 +:10107000EAF7342F3095322330832081242B2083CC +:10108000E7EEF3E03197F1F700C00000EB81FC815F +:1010900020813D8101C0880F3A95EAF7809582232F +:1010A000808387EB9BE00197F1F700C000000FE021 +:1010B00010E0EE24E394F12C29813A81C701002E3F +:1010C00002C0880F991F0A94E2F78223932361E0FC +:1010D000892B09F460E0CE010E94A5070150110997 +:1010E0000530110549F7DF91CF911F910F91FF90C6 +:1010F000EF900895DC011396ED91FC9114972081F7 +:1011000015963C9181E090E001C0880F3A95EAF78E +:1011100080958223808387E199E70197F1F700C0EA +:10112000000008950F931F93CF93DF93EC010AE023 +:1011300010E0CE010E94270861E0CE010E94A507C1 +:1011400060E0CE010E94A507CE010E947A080150FE +:10115000110979F781E08883DF91CF911F910F9179 +:1011600008950F931F93CF93DF93EC010AE010E0F3 +:10117000CE010E94270860E0CE010E94A50761E031 +:10118000CE010E94A507CE010E947A0801501109E4 +:1011900079F71882DF91CF911F910F910895FC018B +:1011A000818192810895FC0180810895FC017483FE +:1011B00063833283218345830895FC01108208955F +:1011C000AF92CF92EF920F931F93CF93DF93CDB750 +:1011D000DEB7FC017183608333832283158304832C +:1011E000C682A782DB011C92DA011C9286818823C9 +:1011F00031F020813181D9018C9180688C93878175 +:10120000882331F020813181D9018C9180628C93C7 +:1012100020813181D9018C9183608C93DA018C918A +:10122000BE2DB770EB2EE82ADA01EC92A281B381D1 +:101230001C920480F581E02D1082DF91CF911F91E7 +:101240000F91EF90CF90AF900895DC01ED91FC915C +:101250008081837080830895CF93DF93EC010E9497 +:1012600025098E81882329F0E881F98180818068B1 +:1012700080838F81882329F0E881F98180818062D1 +:101280008083DF91CF910895DC011296ED91FC915E +:1012900060830895DC011496ED91FC9160830895BC +:1012A000FC0171836083538342831482168215820A +:1012B000178210861186128681E0838787E08487F3 +:1012C00015860895CF93DF93EC0181E08D878881A7 +:1012D00099810E942C098A819B81DF91CF910C9486 +:1012E0002C09CF93DF93EC016C836623A9F060E0B7 +:1012F000888199810E944A0960E0888199810E94D1 +:10130000440960E08A819B810E944A09CE010E94C3 +:1013100062091F821E821D82DF91CF910895CF93B3 +:10132000DF93EC011D86888199810E9425098A81BD +:101330009B81DF91CF910C942509FC011482608779 +:1013400041872287338531110AC0620F7727771FC3 +:10135000460F572F511D452B11F40C948F090C94F7 +:1013600062096150603108F04BC0E62FF0E0E554AF +:10137000F64F0C94760BCB09D009D409D809DC09B7 +:10138000DF09E209E509E809E509EC09F009F409D2 +:10139000F809FC09FE0920E54FEF60EA0C949D096D +:1013A00024E14FEF68ECFACF2CE84FEF64EBF6CF77 +:1013B00020E040E06FEFF2CF2AE04CE3FBCF2EE1DC +:1013C0004EE1F8CF20E04BE9F5CF20E04FEF0AC027 +:1013D0002AE04FEF67E3E2CF27E040E568E0DECFA9 +:1013E0002FEF40E060E0DACF2FEF4FEF62E3D6CF90 +:1013F00026E940E56AE0D2CF2CEDE8CF20E0D1CF5E +:1014000024E14DE2D7CFFC0163870895CF93DF93AA +:10141000EC018C81813041F58D819E812F812111DC +:101420001CC001969E838D836D817E816F3F710507 +:10143000B1F481E08F83888199810E944A096D818E +:101440006095888199810E9444096D8160548A81E8 +:101450009B81DF91CF910C944A090197E3CF6115ED +:10146000710549F71F82E7CF823021F58D819E817A +:101470002F81211118C001969E838D836D817E81FD +:101480006E3F21E0720789F481E08F83769567953E +:10149000888199810E944A0960E0888199810E942F +:1014A000440960E0D4CF0197E7CF6115710571F76A +:1014B0001F82ECCF833069F58D819E812F812111B0 +:1014C00021C001969E838D836D817E8161158FEF92 +:1014D0007807D1F481E08F8346E0769567954A9549 +:1014E000E1F7888199810E944A096E8188819981FA +:1014F0000E9444096D817E8153E0769567955A95E7 +:10150000E1F7A5CF0197DECF6115710529F71F829D +:10151000E3CF8430F1F56D817E81888199816115F9 +:1015200020E27207C8F536E0769567953A95E1F7BF +:101530000E944A096D817E81613080E2780770F0F7 +:1015400088819981611520E4720760F5705226E068 +:10155000769567952A95E1F70E9444096D817E8111 +:10156000613080E4780768F064E0769F612D77272A +:10157000112484E1689F602D11248A819B810E943F +:101580004A098D819E818F3F980719F001969E83AD +:101590008D83DF91CF910895672F66956695669547 +:1015A0006058C6CF672F66956058D6CFCF93DF932C +:1015B000EC010E94060A8C8181116FC08B85882303 +:1015C00009F45FC08D819E8101969E838D839C85E9 +:1015D00001C0880F9A95EAF781115FC098B5888598 +:1015E0008917B1F068B528B5281B330B81E090E06E +:1015F0001216130614F090E080E0232F221F2227FA +:10160000221F821B9109681B888199810E944A09C7 +:1016100097B589858917B1F067B527B5281B330BB6 +:1016200081E090E01216130614F090E080E0232F82 +:10163000221F2227221F821B9109681B8881998102 +:101640000E9444099091B4008A85891731F1609114 +:10165000B4002091B400281B330B81E090E01216F7 +:10166000130614F090E080E0232F221F2227221F70 +:10167000821B9109681B8A819B81DF91CF910C9419 +:101680004A096985888199810E9444096885888111 +:1016900099810E944A096A85EECFDF91CF91089522 +:1016A00088B508958091B400089587B50895052EF2 +:1016B00097FB1EF400940E946E0B57FD07D00E940A +:1016C0007C0B07FC03D04EF40C946E0B50954095A8 +:1016D000309521953F4F4F4F5F4F089590958095DE +:1016E000709561957F4F8F4F9F4F0895EE0FFF1FAD +:1016F0000590F491E02D0994A1E21A2EAA1BBB1BC0 +:10170000FD010DC0AA1FBB1FEE1FFF1FA217B307CD +:10171000E407F50720F0A21BB30BE40BF50B661FE3 +:10172000771F881F991F1A9469F7609570958095A7 +:1017300090959B01AC01BD01CF010895A0E0B0E000 +:10174000E4EAFBE00C94A90F5C016B017A016115DE +:10175000710519F0FB0191838083E114F10429F0F4 +:10176000C7010297839708F0E5C0E5012196F501CE +:101770001081812F90E00E94D20C892B11F05E0124 +:10178000F4CF1D3229F42196F501118101E007C043 +:101790001B3221F4E5012296F501118100E0E114EC +:1017A000F10409F1F0E1EF16F10429F43FC010E370 +:1017B000E114F10421F128E0E216F10401F154F4FE +:1017C000E2E0EE16F10421F5812C912CA12CB0E47D +:1017D000BB2E3EC0FAE0EF16F10439F020E1E2162C +:1017E000F104B1F430C0103319F1FAE0EF2EF12C0E +:1017F000ACEC8A2E982CA82CACE0BA2E29C078E04C +:10180000E72EF12C812C912CA12CE0E1BE2E20C0E2 +:1018100060E070E080E090E897010F2C000C440B32 +:10182000550B0E947C0B49015A0112C0103359F428 +:1018300088818F7D883509F0BACF198122960260A0 +:1018400080E1E82EF12C812C912CA12C68E0B62EA1 +:1018500040E060E070E0CB0127010F2C000C66082F +:101860007708FE0150ED352E310E29E0231570F476 +:101870002FEB210F2A3118F439EC332E06C02FE953 +:10188000210F2A3118F529EA322E310E232D30E0AE +:101890002E153F05DCF447FD16C086169706A806F0 +:1018A000B90670F0A30192010E948D0F630D711DA6 +:1018B000811D911D61307105810520E8920710F0AE +:1018C0004FEF01C041E021961081CBCF202F217036 +:1018D000C114D10471F0442329F02197F601D1837A +:1018E000C08307C001FF19C02297F601D183C083CE +:1018F00014C047FF12C0222329F060E070E080E0AE +:1019000090E804C06FEF7FEF8FEF9FE722E230E0B7 +:101910003093AF0B2093AE0B09C0222381F090953A +:101920008095709561957F4F8F4F9F4F462F372F32 +:10193000282F12C040E030E020E090E00DC097FF7B +:10194000F5CF82E290E09093AF0B8093AE0B6FEFF8 +:101950007FEF8FEF9FE7EACF642F732F822FCDB7F2 +:10196000DEB7E1E10C94C50FFC0188279927E894C4 +:1019700021912032E9F3293010F02E30C8F32B32B8 +:1019800041F02D3239F4689404C00E94E90C820FB2 +:10199000911D219120532A30C0F31EF4909581951A +:1019A0009F4F089591110C94E60E803219F08950E2 +:1019B0008550C8F70895FB01DC014150504030F0DC +:1019C0008D910190801919F40020B9F7881B990BAB +:1019D00008957AE0979F902D879F802D910D112477 +:1019E0000895AEE0B0E0E7EFFCE00C94B60F0D898F +:1019F0001E8986E08C831A8309838FEF9FE79E837D +:101A00008D83AE01475E5F4F6F89788DCE01019661 +:101A10000E94130DEF81F885E00FF11F10822E96C2 +:101A2000E4E00C94D20FACE0B0E0E9E1FDE00C940E +:101A3000A80F6C017B018A01FC0117821682838149 +:101A400081FFBEC1CE0101964C01F6019381F701E1 +:101A500093FD859193FF81917F01882309F4ACC1A7 +:101A6000853239F493FD859193FF81917F01853211 +:101A700029F4B60190E00E94FF0EE7CF512C312CE3 +:101A800020E02032A0F48B3269F030F4803259F03B +:101A9000833269F420612CC08D3239F0803339F4FF +:101AA000216026C02260246023C0286021C027FD59 +:101AB00027C030ED380F3A3078F426FF06C0FAE040 +:101AC0005F9E300D1124532E13C08AE0389E300DD6 +:101AD0001124332E20620CC08E3221F426FD6CC1FD +:101AE000206406C08C3611F4206802C0883641F4A8 +:101AF000F70193FD859193FF81917F018111C1CF02 +:101B0000982F9F7D9554933028F40C5F1F4F9FE3CF +:101B100099830DC0833631F0833771F0833509F036 +:101B20005BC022C0F801808189830E5F1F4F44246F +:101B30004394512C540115C03801F2E06F0E711C12 +:101B4000F801A080B18026FF03C0652D70E002C0BF +:101B50006FEF7FEFC5012C870E94F40E2C018301EB +:101B60002C852F77222E17C03801F2E06F0E711CE2 +:101B7000F801A080B18026FF03C0652D70E002C08F +:101B80006FEF7FEFC5012C870E94E90E2C012C8599 +:101B90002068222E830123FC1BC0832D90E0481671 +:101BA0005906B0F4B60180E290E00E94FF0E3A942C +:101BB000F4CFF50127FC859127FE81915F01B601E5 +:101BC00090E00E94FF0E31103A94F1E04F1A510854 +:101BD0004114510471F7E6C0843611F0893639F5A5 +:101BE000F80127FF07C060817181828193810C5FBA +:101BF0001F4F08C060817181072E000C880B990B64 +:101C00000E5F1F4F2F76722E97FF09C0909580951B +:101C1000709561957F4F8F4F9F4F2068722E2AE0FD +:101C200030E0A4010E942F0FA82EA81844C08537C9 +:101C300029F42F7EB22E2AE030E025C0F22FF97F62 +:101C4000BF2E8F36C1F018F4883579F0B5C08037D3 +:101C500019F0883721F0B0C02F2F2061B22EB4FECA +:101C60000DC08B2D8460B82E09C024FF0AC09F2FA1 +:101C70009660B92E06C028E030E005C020E130E0D3 +:101C800002C020E132E0F801B7FE07C06081718137 +:101C9000828193810C5F1F4F06C06081718180E05B +:101CA00090E00E5F1F4FA4010E942F0FA82EA818CE +:101CB000FB2DFF777F2E76FE0BC0372D3E7FA514C0 +:101CC00050F474FE0AC072FC08C0372D3E7E05C079 +:101CD000BA2C372D03C0BA2C01C0B52C34FF0DC06F +:101CE000FE01EA0DF11D8081803311F4397E09C0B7 +:101CF00032FF06C0B394B39404C0832F867809F0F2 +:101D0000B39433FD13C030FF06C0B31498F43A0CFB +:101D1000532C5B1810C0B31470F4B60180E290E04D +:101D20003C870E94FF0EB3943C85F5CFB31418F4A2 +:101D30003B1802C05A2C312C34FF12C0B60180E38C +:101D400090E03C870E94FF0E3C8532FF17C031FDBA +:101D500003C088E790E002C088E590E0B6010CC0BF +:101D6000832F867859F031FF02C08BE201C080E2F8 +:101D700037FD8DE2B60190E00E94FF0EA51438F405 +:101D8000B60180E390E00E94FF0E5A94F7CFAA9428 +:101D9000F401EA0DF11D8081B60190E00E94FF0E72 +:101DA000A110F5CF332009F450CEB60180E290E0C7 +:101DB0000E94FF0E3A94F6CFF6018681978102C009 +:101DC0008FEF9FEF2C96E2E10C94C40F99278827A0 +:101DD0000895FC010590615070400110D8F780957E +:101DE00090958E0F9F1F0895FC01615070400190E7 +:101DF0000110D8F7809590958E0F9F1F08950F932F +:101E00001F93CF93DF93182F092FEB018B8181FD57 +:101E100003C08FEF9FEF1EC082FF0FC02E813F8156 +:101E20008C819D812817390774F4E881F981CF01ED +:101E3000019699838883108306C0E885F985812FF0 +:101E40000995892B31F78E819F8101969F838E831F +:101E5000812F902FDF91CF911F910F910895FA015B +:101E6000AA27283051F1203181F1E8946F936E7FD9 +:101E70006E5F7F4F8F4F9F4FAF4FB1E03ED0B4E0CA +:101E80003CD0670F781F891F9A1FA11D680F791F0B +:101E90008A1F911DA11D6A0F711D811D911DA11D1C +:101EA00020D009F468943F912AE0269F112430192C +:101EB000305D3193DEF6CF010895462F4770405DC7 +:101EC0004193B3E00FD0C9F7F6CF462F4F70405D76 +:101ED0004A3318F0495D31FD4052419302D0A9F7D1 +:101EE000EACFB4E0A6959795879577956795BA95CB +:101EF000C9F700976105710508959B01AC010A2E91 +:101F000006945795479537952795BA95C9F7620F67 +:101F1000731F841F951FA01D0895DB018F939F934E +:101F20000E949D0FBF91AF91A29F800D911DA39F15 +:101F3000900DB29F900D112408950E94DF0FA59F70 +:101F4000900DB49F900DA49F800D911D11240895B4 +:101F50002F923F924F925F926F927F928F929F92B9 +:101F6000AF92BF92CF92DF92EF92FF920F931F93A7 +:101F7000CF93DF93CDB7DEB7CA1BDB0B0FB6F89458 +:101F8000DEBF0FBECDBF09942A88398848885F8498 +:101F90006E847D848C849B84AA84B984C884DF8009 +:101FA000EE80FD800C811B81AA81B981CE0FD11DED +:101FB0000FB6F894DEBF0FBECDBFED010895A29F0E +:101FC000B001B39FC001A39F700D811D1124911D0D +:101FD000B29F700D811D1124911D0895F894FFCFBB +:101FE0005354006164640052656C617920736176BA +:101FF000656421204E554D4245523A2025752049B1 +:10200000443A2025580A0055736167653A20726585 +:102010006C617920616464205B69645D202020200C +:102020005B69645D206265696E672061203136629C +:10203000697420686578206E756D6D6265720A003E +:102040006C6973740052656C6179733A0A00524589 +:102050004C41593A202575207475726E6564206F65 +:102060006E0A004E6F2073757463682052656C6150 +:10207000790A0052454C41593A20257520747572F1 +:102080006E6564206F66660A007374617465006D26 +:10209000616368696E65206F6E005475726E656469 +:1020A000206F6E205374617465207072696E74695C +:1020B0006E670A006D616368696E65206F66660011 +:1020C0005475726E6564206F666620537461746522 +:1020D000207072696E74696E670A00206973206EE1 +:1020E0006F7420612076616C696420737562636F20 +:1020F0006D6D616E643A2072656C6179205B61641C +:10210000642F6C6973742F6F6E2F6F66665D0A00A3 +:10211000524742206C6967687473206F6E0A0052E0 +:102120004742206C6967687473206F66660A0070A6 +:1021300072696E740043757272656E742052474204 +:102140002076616C7565733A0A523A2025752047EE +:102150003A20257520423A2025750A0053657420DF +:102160005247422076616C7565730A00557361674A +:10217000653A2072676220736574205B5252525D2B +:10218000205B4747475D205B4242425D0A00706129 +:10219000747465726E005365742050617474657256 +:1021A0006E0A007072657365740053657420507216 +:1021B000657365740A0066616465206F6E0054750E +:1021C000726E6564206F6E20466164650A00666108 +:1021D0006465206F6666005475726E6564206F6674 +:1021E0006620466164650A00206973206E6F742062 +:1021F000612076616C696420737562636F6D6D61D7 +:102200006E643A20726762205B2F6F6E2F6F666676 +:102210002F7072696E742F7365742F70617474659A +:10222000726E2F7072657365745D0A0072656C6101 +:1022300079007267620065726173650045455052AE +:102240004F4D206572617365640A0068656C7000AB +:10225000417661696C61626C6520436F6D6D616E82 +:1022600064733A200A2020202020202020202020D3 +:10227000202020202068656C702020202020202035 +:10228000202020202020202020202020202020204E +:102290003A202053686F7720746869732070726FDA +:1022A0006D7074200A202020202020202020202053 +:1022B000202020202072656C617920616464205B9D +:1022C00069645D2020202020202020202020202044 +:1022D0003A202041646420576972656C65737320ED +:1022E00052656C61790A20202020202020202020A7 +:1022F00020202020202072656C6179206C69737425 +:1023000020202020202020202020202020202020CD +:10231000203A20205072696E74206C697374206FAB +:102320006620736176656420576972656C657373A6 +:102330002052656C617973200A2020202020202003 +:1023400020202020202020202072656C6179206DC3 +:10235000616368696E65205B6F6E2F6F66665D20D6 +:10236000202020203A2020476574206D6163686931 +:102370006E65207265616461626C652072656C6176 +:1023800079207374617465207768656E2073746159 +:102390007465206368616E6765730A2020202020C1 +:1023A000202020202020202020202072656C6179B0 +:1023B000205B6F6E2F6F66665D205B6E6E5D20200A +:1023C0002020202020203A20205475726E206F6E2D +:1023D0002F6F6666206E74682072656C61790A20C2 +:1023E000202020202020202020202020202020729B +:1023F000656C617920737461746520202020202031 +:10240000202020202020202020203A2020476574F2 +:10241000206D616368696E65207265616461626CDC +:10242000652072656C61792073746174650A20207F +:102430002020202020202020202020202020657205 +:1024400061736520202020202020202020202020B3 +:102450002020202020202020203A20204572617357 +:102460006520657070726F6D0A202020202020206A +:10247000202020202020202020726762205B6F6EA9 +:102480002F6F66665D202020202020202020202025 +:10249000202020203A20205475726E206F6E2F6FFE +:1024A000666620524742206C656473206174206325 +:1024B000757272656E742076616C75652E0A2020C7 +:1024C0002020202020202020202020202020726773 +:1024D00062207072696E742020202020202020202D +:1024E0002020202020202020203A20205072696EB9 +:1024F000742063757272656E742052474220766153 +:102500006C75652E0A2020202020202020202020ED +:10251000202020202072676220736574205B525255 +:10252000525D205B4747475D205B4242425D202071 +:102530003A2020536574205247422076616C7565BD +:102540002C207061747465726E206D7573742062D6 +:102550006520302E0A20202020202020202020202E +:102560002020202020726762207061747465726E72 +:10257000205B69645D202020202020202020202056 +:102580003A2020524742207061747465726E0A20AE +:1025900020202020202020202020202020202072E9 +:1025A000676220707265736574205B69645D2020CA +:1025B000202020202020202020203A202073657415 +:1025C0002070726573657420636F6C6F720A2020CF +:1025D0002020202020202020202020202020726762 +:1025E000622066616465205B6F6E2F6F66665D209A +:1025F0002020202020202020203A20207475726E78 +:1026000020436F6C6F7266616465206F6E206F721D +:10261000206F66660A2020202020202020202020F5 +:10262000202020202076657273696F6E2020202084 +:10263000202020202020202020202020202020209A +:102640003A20205072696E742056657273696F6EFD +:102650002E0A004E6F7420612076616C69642063DD +:102660006F6D6D616E640A00524742436F6E747203 +:102670006F6C6C65722076302E34207374617274C6 +:06268000696E670A00000C :00000001FF diff --git a/serial.cpp b/serial.cpp index 45bef10..3f19a03 100644 --- a/serial.cpp +++ b/serial.cpp @@ -9,11 +9,11 @@ bool stopped = false; ISR (USART_RX_vect) //I have seen worse interrupt sintax { rxBuffer[interruptIndex % BUFFER_SIZE] = UDR0; - /*if (interruptIndex - BUFFER_SIZE > 0 && _rxIndex - BUFFER_SIZE > 0) + if (interruptIndex - BUFFER_SIZE > 0 && _rxIndex - BUFFER_SIZE > 0) { interruptIndex -= BUFFER_SIZE; _rxIndex -= BUFFER_SIZE; - }*/ + } if(serialFlowControl && !stopped && interruptIndex - _rxIndex > BUFFER_SIZE - 64) { loop_until_bit_is_set(UCSR0A, UDRE0); diff --git a/serial.h b/serial.h index a262893..a1576f9 100644 --- a/serial.h +++ b/serial.h @@ -1,7 +1,7 @@ #ifndef SERIAL_H #define SERIAL_H -#define BAUD 19200 +#define BAUD 38400 #define BUFFER_SIZE 1024 #include