diff --git a/Tangible/tangibleInterface b/Tangible/tangibleInterface index bf4a1ac..b52b3f9 100755 Binary files a/Tangible/tangibleInterface and b/Tangible/tangibleInterface differ diff --git a/Tangible/tangibleInterface.c b/Tangible/tangibleInterface.c index 78ade1a..952a9ef 100644 --- a/Tangible/tangibleInterface.c +++ b/Tangible/tangibleInterface.c @@ -12,48 +12,38 @@ int main(void) { - uint8_t mac[MAC_SIZE] = {0xA0,0xBD,0xCD,0xDD,0xED,0xFD}; + uint8_t little_mac[MAC_SIZE] = {0xA0,0xBD,0xCD,0xDD,0xED,0xFD}; uint8_t ip[IPV4_SIZE] = {172,26,145,205}; - uint8_t gateway[4] = {172,26,145,254}; - uint8_t mask[4] = {255,255,255,0}; - - const char * answer = "I'm ok"; - + uint8_t gateway[IPV4_SIZE] = {172,26,145,254}; + uint8_t mask[IPV4_SIZE] = {255,255,255,0}; + uint16 size; + const char answer [15]= "I'M OK"; uint8 buf[16]; // Message à stocker. uint8_t addr[IPV4_SIZE]; // Adresse source du message reçu. + uint8_t addr2[IPV4_SIZE]={172,26,145,35}; uint16_t port; // Port source du message reçu. - SOCKET sUDP=0; SOCKET sTCP=1; - init_printf(); // On active la liaison série (9600 BD). - // On assimile une adresse MAC et IP au shield + Indication de la passerelle et du masque de sous-réseau. - ethernet_init(mac,ip,gateway,mask); - - if (!socket(sTCP,Sn_MR_TCP,2020,0)) + int test = 0; + init_printf(); + ethernet_init(little_mac,ip,gateway,mask); + test = socket(sUDP,Sn_MR_UDP,2020,0); + while(test) { - return -1; - } - while(1) - { - printf("BOUCLE\n"); - if(listen(sTCP)) //Repondre je vais bien à un client - { - send(sTCP,(uint8 *)answer,sizeof(answer)); - } - + //sendto(sUDP,answer,sizeof(answer),addr2,2020); + recvfrom(sUDP,buf,sizeof(buf),addr,&port); } - close(sTCP); - close(sUDP); + printf("Sortie boucle\n"); return 0; } - - /* if (recvfrom(sUDP,buf,sizeof(buf),addr,&port) != -1) //Reception via UDP (infos de la sonde) */ - /* { */ - /* } */ - /* if (!socket(sUDP,Sn_MR_UDP,2020,0)) */ +/* if(listen(sTCP)) //Repondre je vais bien à un client */ +/* { */ +/* send(sTCP,(uint8 *)answer,sizeof(answer)); */ +/* } */ + /* if (!socket(sTCP,Sn_MR_TCP,2020,0)) */ /* { */ /* return -1; */ /* } */ diff --git a/Tangible/tangibleInterface.hex b/Tangible/tangibleInterface.hex index 5379fff..845d4e2 100644 --- a/Tangible/tangibleInterface.hex +++ b/Tangible/tangibleInterface.hex @@ -5,18 +5,18 @@ :100040000C9451000C9451000C9451000C945100EC :100050000C9451000C9451000C9451000C945100DC :100060000C9451000C94510011241FBECFEFD8E026 -:10007000DEBFCDBF13E0A0E0B1E0E4E1FEE102C0ED -:1000800005900D92A830B107D9F723E0A8E0B3E0BE -:1000900001C01D92A434B207E1F70E948E0B0C94AC -:1000A000080F0C940000E82FF0E0E85CFC4F808122 -:1000B0000895E82FF0E0E85CFC4F60830895E82F96 -:1000C000F0E0EE0FFF1FE85EFC4F80819181089504 -:1000D000E82FF0E0EE0FFF1FE05EFC4F8081918182 -:1000E0000895E82FF0E0EE0FFF1FE85DFC4F8081E0 -:1000F00091810895E82FF0E0EE0FFF1FE05DFC4FC7 -:10010000808191810895E82FF0E0EE0FFF1FE85FF6 -:10011000FC4F808191810895E82FF0E0EE0FFF1FE2 -:10012000E05FFC4F80819181089524B12C6224B955 +:10007000DEBFCDBF12E0A0E0B1E0ECE1FEE102C0E6 +:1000800005900D92AE3FB107D9F723E0AEEFB2E095 +:1000900001C01D92AA33B207E1F70E948E0B0C94A7 +:1000A0000C0F0C940000E82FF0E0E25DFC4F808123 +:1000B0000895E82FF0E0E25DFC4F60830895E82F9B +:1000C000F0E0EE0FFF1FE25FFC4F80819181089509 +:1000D000E82FF0E0EE0FFF1FEA5EFC4F8081918178 +:1000E0000895E82FF0E0EE0FFF1FE25EFC4F8081E5 +:1000F00091810895E82FF0E0EE0FFF1FEA5DFC4FBD +:10010000808191810895E82FF0E0EE0FFF1FE2500B +:10011000FD4F808191810895E82FF0E0EE0FFF1FE1 +:10012000EA5FFC4F80819181089524B12C6224B94B :100130002A9A25B1277D25B920E52CBD2A9820EFE4 :100140002EBD0DB407FEFDCF9EBD0DB407FEFDCF45 :100150008EBD0DB407FEFDCF6EBD0DB407FEFDCF05 @@ -37,13 +37,13 @@ :10024000CA0108952F923F924F925F926F927F92D0 :100250008F929F92AF92BF92CF92DF92EF92FF92D6 :100260000F931F93CF93DF93CDB7DEB728970FB6C9 -:10027000F894DEBF0FBECDBF282E362E8DE291E062 -:100280000E94230C622D8BE190E00E949500632D6B -:100290008AE190E00E94950080E090E49093110341 -:1002A0008093100380E090E6909309038093080305 -:1002B00088E391E00E94230C88E0882E83E0982E4A -:1002C00090E1A92E93E0B92E20E233E038872F8306 -:1002D00008E113E028E2C22E23E0D22E30E3E32E21 +:10027000F894DEBF0FBECDBF282E362E82E291E06D +:100280000E94270C622D8BE190E00E949500632D67 +:100290008AE190E00E94950080E090E4909307034B +:1002A0008093060380E090E69093FF028093FE0225 +:1002B0008DE291E00E94270C8EEF882E82E0982E2E +:1002C00096E0A92E93E0B92E26E133E038872F83FC +:1002D0000EE013E02EE1C22E23E0D22E36E2E32E12 :1002E00033E0F32E1A821982412C512C1C821B827E :1002F000612C712C222D30E03E832D83232C312C58 :10030000AF81B88511961C921E92F801118210825D @@ -70,7 +70,7 @@ :100450004D935C93F40160817181F2E08F0E911CE9 :10046000D5014C9111965C91B2E0AB0EB11C3F935B :100470002F939F938F937F936F935F934F937F926D -:100480006F92A1E6B1E0BF93AF930E940D0CFFEF16 +:100480006F92A6E5B1E0BF93AF930E94110CFFEF0E :100490006F1A7F0A29813A812E5F3F4F3A83298361 :1004A00032E0C30ED11C42E0E40EF11C0FB6F8940A :1004B000DEBF0FBECDBF94E06916710409F020CFF6 @@ -164,9 +164,9 @@ :100A3000080F111D0C151D0511F7C801DF91CF918D :100A40001F910F91FF90EF90DF90CF900895CF927C :100A5000DF92EF92FF920F931F93CF93DF93E82FD4 -:100A6000F0E0EE0FFF1FDF01A05DBC4F8D919C9168 -:100A7000DA01A823B923EF01C05FDC4FE880F980D9 -:100A8000CD018E0D9F1DE05EFC4FC081D181AD0177 +:100A6000F0E0EE0FFF1FDF01AA5DBC4F8D919C915E +:100A7000DA01A823B923EF01CA5FDC4FE880F980CF +:100A8000CD018E0D9F1DEA5EFC4FC081D181AD016D :100A9000420F531FC417D50778F489016B01CA1B95 :100AA000DB0BAE010E94D100A8014C1B5D0BB6010F :100AB0006C0F7D1FC70101C0A901DF91CF911F916C @@ -181,9 +181,9 @@ :100B40000F90DF91CF911F910F91FF90EF90DF9069 :100B5000CF90BF909F908F900C949500AF92BF92D2 :100B6000CF92DF92EF92FF920F931F93CF93DF9379 -:100B7000DA01A901E82FF0E0EE0FFF1FEF01C85DD9 -:100B8000DC4F888199816B01C822D922EF01C85FAF -:100B9000DC4FE880F980C6018E0D9F1DE85EFC4F9A +:100B7000DA01A901E82FF0E0EE0FFF1FEF01C25EDE +:100B8000DC4F888199816B01C822D922EF01C250C4 +:100B9000DD4FE880F980C6018E0D9F1DE25FFC4F9E :100BA000C081D1819601240F351FC217D30780F46D :100BB0008A015D01CC19DD09AE01BD010E94F90079 :100BC000A8014C1B5D0BB5016C0F7D1FC70101C057 @@ -193,41 +193,41 @@ :100C0000982E6B017A01082F10E00C5F1F4F102FF8 :100C10000027580188E2A80EB11CC5010E94B3004C :100C2000C82FD0E0DC2FCC27075D1F4FC8010E94E2 -:100C3000B300C80FD11DDF93CF9382E891E09F935B -:100C40008F930E940D0C9701A601BE01892D0E9471 +:100C3000B300C80FD11DDF93CF9387E791E09F9357 +:100C40008F930E94110C9701A601BE01892D0E946D :100C5000AE05CE0DDF1D6D2FC5010E9495000F90D2 :100C60000F900F900F906C2FC801DF91CF911F91C3 :100C70000F91FF90EF90DF90CF90BF90AF909F903B -:100C80000C9495000F931F93CF93DF93C82F8AE99D -:100C900091E00E94230CD0E02496DC2FCC278E011B +:100C80000C9495000F931F93CF93DF93C82F8FE899 +:100C900091E00E94270CD0E02496DC2FCC278E0117 :100CA0000F5F1F4F60E1C8010E949500C8010E94BC :100CB000B3008111FBCF6FEFCE010296DF91CF9190 :100CC0001F910F910C949500CF92DF92EF92FF92BB :100CD0000F931F93CF93DF93C82FC62E8A01D22E76 -:100CE00083EA91E00E94230C8FEF8C0DEC2EF12C07 +:100CE00088E991E00E94270C8FEF8C0DEC2EF12CFF :100CF0008530D0F58C2F0E944206E7012496DC2F28 :100D0000CC276C2D6D29CE010E949500CE01049652 :100D10009E012B5F3F4F69010115110529F0612FDD -:100D20000E949500602F0FC020913C0330913D033D -:100D30002F5F3F4F30933D0320933C03632F0E946E -:100D4000950060913C03C6010E9495008E010F5FE3 +:100D20000E949500602F0FC0209132033091330351 +:100D30002F5F3F4F3093330320933203632F0E9482 +:100D4000950060913203C6010E9495008E010F5FED :100D50001F4F61E0C8010E949500C8010E94B300C6 :100D60008111FBCF11E001C010E0E7012496DC2FD8 :100D7000CC27CE010E94B300082FCE0103960E941B -:100D8000B3001F920F931F928F938DEA91E09F9370 -:100D90008F930E940D0C0F900F900F900F900F905B +:100D8000B3001F920F931F928F9382EA91E09F937B +:100D90008F930E94110C0F900F900F900F900F9057 :100DA0000F90812FDF91CF911F910F91FF90EF90C6 -:100DB000DF90CF900895CF93DF93C82F8EEC91E012 -:100DC0000E94230CD0E02496DC2FCC27CE01039682 +:100DB000DF90CF900895CF93DF93C82F83EC91E01D +:100DC0000E94270CD0E02496DC2FCC27CE0103967E :100DD0000E94B300833161F4219662E0CE010E944B :100DE0009500CE010E94B3008111FBCF81E005C0C8 -:100DF00088ED91E00E94230C80E0DF91CF9108956F +:100DF0008DEC91E00E94270C80E0DF91CF91089567 :100E0000EF92FF920F931F93CF93DF93C82F8B0125 -:100E10007A0182EF91E00E94230CF80160816F3F1C +:100E10007A0187EE91E00E94270CF80160816F3F14 :100E200051F481818F3F99F482818F3F81F48381D6 :100E30008F3F69F40FC061110AC0F80181818111EF :100E400006C08281811103C08381882319F0E114D7 -:100E5000F10431F488ED91E00E94230C80E02FC072 +:100E5000F10431F48DEC91E00E94270C80E02FC06A :100E6000D0E02496DC2FCC27CE010C960E94950072 :100E7000F8016181CE010D960E949500F801628112 :100E8000CE010E960E949500F8016381CE010F9667 @@ -235,43 +235,43 @@ :100EA000CE0141960E949500219664E0CE010E94F9 :100EB0009500CE010E94B3008111FBCF81E0DF914C :100EC000CF911F910F91FF90EF900895CF93DF93F3 -:100ED000C82F8FEE91E00E94230CD0E0DC2FCC27AE +:100ED000C82F84EE91E00E94270CD0E0DC2FCC27B5 :100EE000CF5FDB4F68E0CE010E949500CE010E94EB :100EF000B3008111FBCFDF91CF9108955F926F9284 :100F00007F928F929F92AF92BF92CF92DF92EF9299 :100F1000FF920F931F93CF93DF93582E3B018A01CB -:100F200082EE92E00E94230C852D0E9468008017BB +:100F200087ED92E00E94270C852D0E9468008017B3 :100F3000910720F4852D0E9468008C01C52CD12CCE :100F4000E6012496DC2FCC275E0183E0A80EB11CBD -:100F50009DEF892E91E0992E852D0E94AF047C0192 +:100F500092EF892E91E0992E852D0E94AF047C019D :100F6000C5010E94B300873111F08C3191F4FF92DA -:100F7000EF92DF92CF929F928F920E940D0C0F9072 +:100F7000EF92DF92CF929F928F920E94110C0F906E :100F80000F900F900F900F900F90E016F10620F346 :100F900002C000E010E0A801B301852D0E946705A2 :100FA0007E018FEFE81AF80A60E2C7010E949500FF :100FB000C7010E94B3008111FBCF2296CE010E948F :100FC000B30084FD0FC0C5010E94B3008111F6CFAC -:100FD00085E292E00E94230C852D0E94420680E06B +:100FD0008AE192E00E94270C852D0E94420680E063 :100FE00090E005C060E1CE010E949500C801DF914C :100FF000CF911F910F91FF90EF90DF90CF90BF9016 :10100000AF909F908F907F906F905F900895EF9238 :10101000FF920F931F93CF93DF9300D0CDB7DEB72E -:10102000F82E8A0183E392E069837A830E94230C7D +:10102000F82E8A0188E292E069837A830E94270C75 :1010300069817A8101151105A9F0A8018F2D0E94FF :10104000F5058F2D90E0982F88279C012F5F3B4F4F :10105000790160E4C9010E949500C7010E94B300B4 :101060008111FBCFC8010F900F90DF91CF911F919D :101070000F91FF90EF9008958F929F92BF92CF9221 :10108000DF92EF92FF920F931F93CF93DF93B82ECF -:101090004B01EA0179018BE392E00E94230C8B2D36 +:101090004B01EA01790180E392E00E94270C8B2D3D :1010A0000E9468008C179D0728F48B2D0E94680011 :1010B0006C0101C06E01F7016081611109C081817D :1010C000811106C08281811103C08381882331F0A0 :1010D0000115110519F0C114D10429F5DF93CF933F :1010E0001F930F93F70183811F928F9382811F9229 :1010F0008F9381811F928F931F926F931F92BF9244 -:1011000085E492E09F938F930E940D0C88ED91E00F -:101110000E94230C8DB79EB740960FB6F8949EBFE1 +:101100008AE392E09F938F930E94110C8DEC91E003 +:101110000E94270C8DB79EB740960FB6F8949EBFDD :101120000FBE8DBF49C0CB2DD0E02496DC2FCC273D :10113000CE010C960E949500F7016181CE010D96BB :101140000E949500F7016281CE010E960E949500E3 @@ -280,39 +280,39 @@ :10117000A601B4018B2D0E9467058E010F5F1F4FE2 :1011800060E2C8010E949500C8010E94B30081116D :10119000FBCF2296CE010E94B30084FD10C0CE0189 -:1011A0000E94B30083FFF6CF8CEF92E00E94230CE5 +:1011A0000E94B30083FFF6CF81EF92E00E94270CEC :1011B00068E1CE010E94950080E090E005C060E10A :1011C000CE010E949500C601DF91CF911F910F9132 :1011D000FF90EF90DF90CF90BF909F908F900895F9 :1011E0002F923F924F925F927F928F929F92AF92F7 :1011F000BF92CF92DF92EF92FF920F931F93CF9304 :10120000DF93CDB7DEB72A970FB6F894DEBF0FBED7 -:10121000CDBF782E4B016A0179011A8709878DE6C7 -:1012200092E00E94230CCD2809F40FC1472C512CC9 +:10121000CDBF782E4B016A0179011A87098782E6D2 +:1012200092E00E94270CCD2809F40FC1472C512CC5 :1012300084E0480E511C542C4424520198E2A90E1B :10124000B11CC5010E94B300082F10E0102F002729 :101250006201E9E2CE0ED11CC6010E94B300080F64 -:10126000111D1F930F9382E891E09F938F930E942B -:101270000D0CC2010E94B3000F900F900F900F90C1 +:10126000111D1F930F9387E791E09F938F930E9427 +:10127000110CC2010E94B3000F900F900F900F90BD :101280008770833009F460C0843009F4A7C08230CD :1012900009F0CCC028E030E0AE014F5F5F4FB801ED :1012A000872D0E94AE051801F8E02F0E311C8981B0 :1012B000F70180838A8181838B8182838C81838300 :1012C0008D8190E0982F88272E81820F911DE985CE :1012D000FA85918380830F8110E0102F0027888585 -:1012E000080F111D89E792E00E94230CE985FA8519 -:1012F00081818F9380818F938AE892E09F938F936F -:101300000E940D0CF70183811F928F9382811F929F -:101310008F9381811F928F9380811F928F938DE98C -:1013200092E09F938F930E940D0C9801A401B1014C +:1012E000080F111D8EE692E00E94270CE985FA8511 +:1012F00081818F9380818F938FE792E09F938F936B +:101300000E94110CF70183811F928F9382811F929B +:101310008F9381811F928F9380811F928F9382E997 +:1013200092E09F938F930E94110C9801A401B10148 :10133000872D0E94AE057101E00EF11E6F2DC501D3 :101340000E9495006E2D41C026E030E0AE014F5F57 :101350005F4FB801872D0E94AE05180196E0290E57 :10136000311C8981F70180838A8181838B8182830B :101370008C8183830D8110E0102F00278E81080F50 -:10138000111D87EB92E00E94230CF70183811F92CD +:10138000111D8CEA92E00E94270CF70183811F92C5 :101390008F9382811F928F9381811F928F9380817F -:1013A0001F928F938DE992E09F938F930E940D0C73 +:1013A0001F928F9382E992E09F938F930E94110C7A :1013B0009801A401B101872D0E94AE05200E311EB7 :1013C000632DC5010E949500622DC6010E94950003 :1013D0000FB6F894DEBF0FBECDBF2AC022E030E0CA @@ -322,22 +322,22 @@ :10141000872D0E94AE05E00EF11E6F2DC5010E94C2 :1014200095006E2DC6010E94950002C000E010E0FC :10143000EFEF4E1A5E0A60E4C2010E949500C201FD -:101440000E94B3008111FBCF02C000E010E08BECE2 -:1014500092E00E94230CC8012A960FB6F894DEBFD2 +:101440000E94B3008111FBCF02C000E010E080ECED +:1014500092E00E94270CC8012A960FB6F894DEBFCE :101460000FBECDBFDF91CF911F910F91FF90EF90F5 :10147000DF90CF90BF90AF909F908F907F905F90C4 :101480004F903F902F900895CF92DF92FF920F934D -:101490001F93CF93DF93F82E6B01EA018EED92E05C -:1014A0000E94230C8F2D0E9468008C179D0728F442 +:101490001F93CF93DF93F82E6B01EA0183ED92E067 +:1014A0000E94270C8F2D0E9468008C179D0728F43E :1014B0008F2D0E9468008C0101C08E01011511055D -:1014C00089F41F921F92DF93CF938AEE92E09F934D -:1014D0008F930E940D0C0F900F900F900F900F9014 +:1014C00089F41F921F92DF93CF938FED92E09F9349 +:1014D0008F930E94110C0F900F900F900F900F9010 :1014E0000F9030C0A801B6018F2D0E946705CF2D47 :1014F000D0E02496DC2FCC276E018FEFC81AD80AD3 :1015000060E2C6010E949500C6010E94B3008111ED :10151000FBCF6E0182E0C80ED11C2396C6010E944B :10152000B30084FD12C0CE010E94B300C6010E9428 -:10153000B30083FFF3CF88EF92E00E94230C8F2D3E +:10153000B30083FFF3CF8DEE92E00E94270C8F2D36 :101540000E94420680E090E005C060E1C6010E9472 :101550009500C801DF91CF911F910F91FF90DF900F :10156000CF900895CF92DF92EF92FF920F931F9347 @@ -360,157 +360,156 @@ :10167000887F883221F784E98093BC0081E0DF9184 :10168000CF910895092E000CAA0BBB0B9C01AD0154 :1016900084E0220F331F441F551F8A95D1F760E065 -:1016A00074E284EF90E00E94EB0B215031093093FB +:1016A00074E284EF90E00E94EF0B215031093093F7 :1016B000C5002093C40088E18093C10086E0809338 :1016C000C200E0ECF0E080818D7F808308959091EE :1016D000C00095FFFCCF8093C6000895CF93C82F1C :1016E0008A3019F48DE00E94670B8C2F0E94670BE3 :1016F00080E090E0CF9108958091C00087FFFCCFFB :101700008091C600089580E895E20E94420B80E037 -:1017100091E090934103809340030895CF93DF932A -:10172000CDB7DEB762970FB6F894DEBF0FBECDBF60 -:1017300086E0EEE0F1E0DE01119601900D928A95CF -:10174000E1F72CEA2F879AE1988B81E9898B3DECB0 -:101750003A8B2B879C878D878EEF8E878FEF8F83B9 -:10176000888789871A860E94830B9E01295F3F4FD5 -:10177000AE01455F5F4FBE01615F7F4FCE010196B5 -:101780000E94B20A20E044EE57E061E081E00E944E -:1017900064068823A9F084E191E00E94230C81E093 -:1017A0000E94DB068823B9F38BE191E00E94230CB1 -:1017B00042E050E066E271E081E00E947E07EBCFFC -:1017C0008FEF9FEF62960FB6F894DEBF0FBECDBFCE -:1017D000DF91CF910895A1E21A2EAA1BBB1BFD0138 -:1017E0000DC0AA1FBB1FEE1FFF1FA217B307E40700 -:1017F000F50720F0A21BB30BE40BF50B661F771F58 -:10180000881F991F1A9469F7609570958095909537 -:101810009B01AC01BD01CF010895A0E0B0E0E3E180 -:10182000FCE00C94E10EAE014B5F5F4FFA01619159 -:101830007191AF0180914003909141030E94530C3C -:10184000E2E00C94FD0E0F931F93CF93DF93E09192 -:101850004003F0914103238121FF1BC08C01D0E0A4 -:10186000C0E0F80181918F016091400370914103C4 -:10187000DB011896ED91FC911997882331F00995B9 -:10188000892B79F3DFEFCFEFECCF8AE00995892B35 -:1018900019F08FEF9FEF02C08D2F9C2FDF91CF911A -:1018A0001F910F910895ACE0B0E0E9E5FCE00C94E5 -:1018B000D10E7C016B018A01FC01178216828381A3 -:1018C00081FFBDC1CE0101964C01F7019381F60164 -:1018D00093FD859193FF81916F01882309F4ABC13A -:1018E000853239F493FD859193FF81916F018532A3 -:1018F00029F4B70190E00E943B0EE7CF512C312C28 -:1019000020E02032A0F48B3269F030F4803259F0BC -:10191000833269F420612CC08D3239F0803339F480 -:10192000216026C02260246023C0286021C027FDDA -:1019300027C030ED380F3A3078F426FF06C0FAE0C1 -:101940005F9E300D1124532E13C08AE0389E300D57 -:101950001124332E20620CC08E3221F426FD6BC17F -:10196000206406C08C3611F4206802C0883641F429 -:10197000F60193FD859193FF81916F018111C1CF94 -:10198000982F9F7D9554933028F40C5F1F4FFFE3F1 -:10199000F9830DC0833631F0833771F0833509F058 -:1019A0005BC022C0F801808189830E5F1F4F4424F1 -:1019B0004394512C540115C03801F2E06F0E711C94 -:1019C000F801A080B18026FF03C0652D70E002C041 -:1019D0006FEF7FEFC5012C870E94300E2C01830131 -:1019E0002C852F77222E17C03801F2E06F0E711C64 -:1019F000F801A080B18026FF03C0652D70E002C011 -:101A00006FEF7FEFC5012C870E94250E2C012C85DE -:101A10002068222E830123FC1BC0832D90E04816F2 -:101A20005906B0F4B70180E290E00E943B0E3A9470 -:101A3000F4CFF50127FC859127FE81915F01B70165 -:101A400090E00E943B0E31103A94F1E04F1A510899 -:101A50004114510471F7E5C0843611F0893639F527 -:101A6000F80127FF07C060817181828193810C5F3B -:101A70001F4F08C060817181072E000C880B990BE5 -:101A80000E5F1F4F2F76722E97FF09C0909580959D -:101A9000709561957F4F8F4F9F4F2068722E2AE07F -:101AA00030E0A4010E94730EA82EA81844C0853708 -:101AB00029F42F7EB22E2AE030E025C0F22FF97FE4 -:101AC000BF2E8F36C1F018F4883579F0B4C0803756 -:101AD00019F0883721F0AFC02F2F2061B22EB4FE4D -:101AE0000DC08B2D8460B82E09C024FF0AC09F2F23 -:101AF0009660B92E06C028E030E005C020E130E055 -:101B000002C020E132E0F801B7FE07C060817181B8 -:101B1000828193810C5F1F4F06C06081718180E0DC -:101B200090E00E5F1F4FA4010E94730EA82EA8180C -:101B3000FB2DFF777F2E76FE0BC0372D3E7FA51441 -:101B400050F474FE0AC072FC08C0372D3E7E05C0FA -:101B5000BA2C372D03C0BA2C01C0B52C34FF0DC0F0 -:101B6000FE01EA0DF11D8081803311F4397E09C038 -:101B700032FF06C0B394B39404C0832F867809F073 -:101B8000B39433FD13C030FF06C05A2CB31418F4BD -:101B9000530C5B18B32CB31468F4B70180E290E0E7 -:101BA0003C870E943B0EB3943C85F5CFB31410F4F0 -:101BB0003B1801C0312C34FF12C0B70180E390E024 -:101BC0003C870E943B0E3C8532FF17C031FD03C0AD -:101BD00088E790E002C088E590E0B7010CC0832F51 -:101BE000867859F031FF02C08BE201C080E237FDF8 -:101BF0008DE2B70190E00E943B0EA51438F4B701C6 -:101C000080E390E00E943B0E5A94F7CFAA94F4012F -:101C1000EA0DF11D8081B70190E00E943B0EA110FA -:101C2000F5CF332009F451CEB70180E290E00E9455 -:101C30003B0E3A94F6CFF7018681978102C08FEF71 -:101C40009FEF2C96E2E10C94ED0EFC0105906150A3 -:101C500070400110D8F7809590958E0F9F1F0895C2 -:101C6000FC016150704001900110D8F7809590956B -:101C70008E0F9F1F08950F931F93CF93DF93FB0148 -:101C8000238121FD03C08FEF9FEF28C022FF16C0E4 -:101C900046815781248135814217530744F4A0813E -:101CA000B1819D012F5F3F4F318320838C9326812B -:101CB00037812F5F3F4F3783268310C0EB01092FF9 -:101CC000182F0084F185E02D0995892BE1F68E818E -:101CD0009F8101969F838E83812F902FDF91CF91DB -:101CE0001F910F910895FA01AA27283051F1203150 -:101CF00081F1E8946F936E7F6E5F7F4F8F4F9F4FA0 -:101D0000AF4FB1E03ED0B4E03CD0670F781F891FE1 -:101D10009A1FA11D680F791F8A1F911DA11D6A0FAF -:101D2000711D811D911DA11D20D009F468943F9162 -:101D30002AE0269F11243019305D3193DEF6CF0161 -:101D40000895462F4770405D4193B3E00FD0C9F727 -:101D5000F6CF462F4F70405D4A3318F0495D31FD94 -:101D60004052419302D0A9F7EACFB4E0A6959795E7 -:101D7000879577956795BA95C9F7009761057105BD -:101D800008959B01AC010A2E069457954795379507 -:101D90002795BA95C9F7620F731F841F951FA01D61 -:101DA00008952F923F924F925F926F927F928F92FF -:101DB0009F92AF92BF92CF92DF92EF92FF920F93DA -:101DC0001F93CF93DF93CDB7DEB7CA1BDB0B0FB6E4 -:101DD000F894DEBF0FBECDBF09942A8839884888A1 -:101DE0005F846E847D848C849B84AA84B984C88437 -:101DF000DF80EE80FD800C811B81AA81B981CE0F2E -:101E0000D11D0FB6F894DEBF0FBECDBFED01089512 -:041E1000F894FFCF74 -:101E140000000002000000006E0B00000000A0BDE6 -:101E2400CDDDEDFD424F55434C45006A652072659A -:101E3400706F6E64730049276D206F6B0073797344 -:101E4400696E697428290D004368616E6E656C20A3 -:101E54003A2053454E44204D454D2053495A452080 -:101E64003A2052454356204D454D2053495A450D7D -:101E7400002564203A20252E3478203A20252E345B -:101E840078203A20252E3478203A20252E34780DD7 -:101E94000A004953525F52583A2072645F70747258 -:101EA400203A20252E34780D0A00636C6F73652860 -:101EB400290D00736F636B657428290D00536E5FE1 -:101EC4005352203D20252E3278202C2050726F74DE -:101ED4006F636F6C203D20252E32780D0A006C69EB -:101EE4007374656E28290D004661696C5B696E76B2 -:101EF400616C69642069702C706F72745D0D00648C -:101F04006973636F6E6E65637428290D00736F6364 -:101F14006B6574202564206672656573697A65282B -:101F240025642920656D707479206F722065727242 -:101F34006F720D0A00534F434B5F434C4F5345445C -:101F44002E0D007265637628290D0073656E647426 -:101F54006F28290D002564204661696C5B252E32AB -:101F6400782E252E32782E252E32782E252E327874 -:101F74002C20252E642C2025645D0D0A00726563D7 -:101F84007666726F6D28290D00554450206D736775 -:101F940020617272697665640D00736F7572636592 -:101FA40020506F7274203A2025640D0A00736F75F7 -:101FB400726365204950203A2025642E25642E251D -:101FC400642E25640D0A00495020524157206D7338 -:101FD4006720617272697665640D00726563766666 -:101FE400726F6D282920656E64202E2E0D0069679E -:101FF4006D7073656E6428290D002564204661693F -:102004006C5B25645D0D0A0069676D7073656E64B1 -:08201400206661696C2E0D00CD +:1017100091E090933703809336030895FF920F93DF +:101720001F93CF93DF93CDB7DEB7A4970FB6F8948E +:10173000DEBF0FBECDBF86E0EEE0F1E0DE015196E8 +:1017400001900D928A95E1F72CEA2F8F9AE198A3E8 +:1017500081E989A33DEC3AA32B8F9C8F8D8F8EEF6F +:101760008E8F8FEF8F8B888F898F1A8E0E94830BBD +:101770009E01295E3F4FAE01455E5F4FBE01615E37 +:101780007F4FCE0141960E94B20A20E044EE57E01E +:1017900062E080E00E946406F82EFF2071F08E0166 +:1017A0000D5D1F4F20E030E040E150E0BE016F5F73 +:1017B0007F4F80E00E94F008F0CF84E191E00E942A +:1017C000270C80E090E0A4960FB6F894DEBF0FBE21 +:1017D000CDBFDF91CF911F910F91FF900895A1E2AE +:1017E0001A2EAA1BBB1BFD010DC0AA1FBB1FEE1F9B +:1017F000FF1FA217B307E407F50720F0A21BB30BE6 +:10180000E40BF50B661F771F881F991F1A9469F761 +:1018100060957095809590959B01AC01BD01CF01BD +:101820000895A0E0B0E0E7E1FCE00C94E50EAE0125 +:101830004B5F5F4FFA0161917191AF018091360367 +:10184000909137030E94570CE2E00C94010F0F9324 +:101850001F93CF93DF93E0913603F09137032381F9 +:1018600021FF1BC08C01D0E0C0E0F80181918F0105 +:101870006091360370913703DB011896ED91FC916E +:101880001997882331F00995892B79F3DFEFCFEF92 +:10189000ECCF8AE00995892B19F08FEF9FEF02C0FA +:1018A0008D2F9C2FDF91CF911F910F910895ACE068 +:1018B000B0E0EDE5FCE00C94D50E7C016B018A01F3 +:1018C000FC0117821682838181FFBDC1CE01019682 +:1018D0004C01F7019381F60193FD859193FF81916E +:1018E0006F01882309F4ABC1853239F493FD8591EA +:1018F00093FF81916F01853229F4B70190E00E9436 +:101900003F0EE7CF512C312C20E02032A0F48B3257 +:1019100069F030F4803259F0833269F420612CC0D0 +:101920008D3239F0803339F4216026C02260246082 +:1019300023C0286021C027FD27C030ED380F3A3082 +:1019400078F426FF06C0FAE05F9E300D1124532E76 +:1019500013C08AE0389E300D1124332E20620CC053 +:101960008E3221F426FD6BC1206406C08C3611F442 +:10197000206802C0883641F4F60193FD859193FFFB +:1019800081916F018111C1CF982F9F7D9554933024 +:1019900028F40C5F1F4FFFE3F9830DC0833631F04D +:1019A000833771F0833509F05BC022C0F801808174 +:1019B00089830E5F1F4F44244394512C540115C05A +:1019C0003801F2E06F0E711CF801A080B18026FF93 +:1019D00003C0652D70E002C06FEF7FEFC5012C875B +:1019E0000E94340E2C0183012C852F77222E17C0E4 +:1019F0003801F2E06F0E711CF801A080B18026FF63 +:101A000003C0652D70E002C06FEF7FEFC5012C872A +:101A10000E94290E2C012C852068222E830123FC94 +:101A20001BC0832D90E048165906B0F4B70180E240 +:101A300090E00E943F0E3A94F4CFF50127FC859187 +:101A400027FE81915F01B70190E00E943F0E3110A7 +:101A50003A94F1E04F1A51084114510471F7E5C06E +:101A6000843611F0893639F5F80127FF07C0608107 +:101A70007181828193810C5F1F4F08C060817181E9 +:101A8000072E000C880B990B0E5F1F4F2F76722EBE +:101A900097FF09C090958095709561957F4F8F4F06 +:101AA0009F4F2068722E2AE030E0A4010E94770E3A +:101AB000A82EA81844C0853729F42F7EB22E2AE01C +:101AC00030E025C0F22FF97FBF2E8F36C1F018F419 +:101AD000883579F0B4C0803719F0883721F0AFC06D +:101AE0002F2F2061B22EB4FE0DC08B2D8460B82E36 +:101AF00009C024FF0AC09F2F9660B92E06C028E0B7 +:101B000030E005C020E130E002C020E132E0F80121 +:101B1000B7FE07C060817181828193810C5F1F4F86 +:101B200006C06081718180E090E00E5F1F4FA401CC +:101B30000E94770EA82EA818FB2DFF777F2E76FE29 +:101B40000BC0372D3E7FA51450F474FE0AC072FC02 +:101B500008C0372D3E7E05C0BA2C372D03C0BA2CE5 +:101B600001C0B52C34FF0DC0FE01EA0DF11D8081CE +:101B7000803311F4397E09C032FF06C0B394B394A8 +:101B800004C0832F867809F0B39433FD13C030FF6F +:101B900006C05A2CB31418F4530C5B18B32CB314AE +:101BA00068F4B70180E290E03C870E943F0EB39456 +:101BB0003C85F5CFB31410F43B1801C0312C34FF31 +:101BC00012C0B70180E390E03C870E943F0E3C8545 +:101BD00032FF17C031FD03C088E790E002C088E5FE +:101BE00090E0B7010CC0832F867859F031FF02C016 +:101BF0008BE201C080E237FD8DE2B70190E00E94E8 +:101C00003F0EA51438F4B70180E390E00E943F0E28 +:101C10005A94F7CFAA94F401EA0DF11D8081B7011F +:101C200090E00E943F0EA110F5CF332009F451CE71 +:101C3000B70180E290E00E943F0E3A94F6CFF701A0 +:101C40008681978102C08FEF9FEF2C96E2E10C9482 +:101C5000F10EFC010590615070400110D8F780959D +:101C600090958E0F9F1F0895FC0161507040019068 +:101C70000110D8F7809590958E0F9F1F08950F93B0 +:101C80001F93CF93DF93FB01238121FD03C08FEFCF +:101C90009FEF28C022FF16C04681578124813581DD +:101CA0004217530744F4A081B1819D012F5F3F4F3C +:101CB000318320838C93268137812F5F3F4F378379 +:101CC000268310C0EB01092F182F0084F185E02D29 +:101CD0000995892BE1F68E819F8101969F838E83E2 +:101CE000812F902FDF91CF911F910F910895FA01CD +:101CF000AA27283051F1203181F1E8946F936E7F4B +:101D00006E5F7F4F8F4F9F4FAF4FB1E03ED0B4E03B +:101D10003CD0670F781F891F9A1FA11D680F791F7C +:101D20008A1F911DA11D6A0F711D811D911DA11D8D +:101D300020D009F468943F912AE0269F112430199D +:101D4000305D3193DEF6CF010895462F4770405D38 +:101D50004193B3E00FD0C9F7F6CF462F4F70405DE7 +:101D60004A3318F0495D31FD4052419302D0A9F742 +:101D7000EACFB4E0A6959795879577956795BA953C +:101D8000C9F700976105710508959B01AC010A2E02 +:101D900006945795479537952795BA95C9F7620FD9 +:101DA000731F841F951FA01D08952F923F924F927D +:101DB0005F926F927F928F929F92AF92BF92CF92DB +:101DC000DF92EF92FF920F931F93CF93DF93CDB7E4 +:101DD000DEB7CA1BDB0B0FB6F894DEBF0FBECDBF5C +:101DE00009942A88398848885F846E847D848C842D +:101DF0009B84AA84B984C884DF80EE80FD800C8136 +:101E00001B81AA81B981CE0FD11D0FB6F894DEBF18 +:0C1E10000FBECDBFED010895F894FFCF88 +:101E1C0000000002000000006E0B00000000A0BDDE +:101E2C00CDDDEDFD536F7274696520626F75636C67 +:101E3C006500737973696E697428290D00436861B4 +:101E4C006E6E656C203A2053454E44204D454D2016 +:101E5C0053495A45203A2052454356204D454D2072 +:101E6C0053495A450D002564203A20252E347820FC +:101E7C003A20252E3478203A20252E3478203A200A +:101E8C00252E34780D0A004953525F52583A20726D +:101E9C00645F707472203A20252E34780D0A00632A +:101EAC006C6F736528290D00736F636B657428293B +:101EBC000D00536E5F5352203D20252E3278202C7E +:101ECC002050726F746F636F6C203D20252E32781A +:101EDC000D0A006C697374656E28290D00466169E2 +:101EEC006C5B696E76616C69642069702C706F72C2 +:101EFC00745D0D00646973636F6E6E65637428297D +:101F0C000D00736F636B65742025642066726565C4 +:101F1C0073697A652825642920656D707479206F42 +:101F2C0072206572726F720D0A00534F434B5F4300 +:101F3C004C4F5345442E0D007265637628290D00D5 +:101F4C0073656E64746F28290D00256420466169E1 +:101F5C006C5B252E32782E252E32782E252E32785B +:101F6C002E252E32782C20252E642C2025645D0DF8 +:101F7C000A007265637666726F6D28290D005544F0 +:101F8C0050206D736720617272697665640D007301 +:101F9C006F7572636520506F7274203A2025640D42 +:101FAC000A00736F75726365204950203A202564CE +:101FBC002E25642E25642E25640D0A0049502052CE +:101FCC004157206D736720617272697665640D00EC +:101FDC007265637666726F6D282920656E64202E9B +:101FEC002E0D0069676D7073656E6428290D0025D0 +:101FFC0064204661696C5B25645D0D0A0069676D40 +:0E200C007073656E64206661696C2E0D0000B5 :00000001FF diff --git a/Tangible/tangibleInterface.o b/Tangible/tangibleInterface.o index 7a929ea..cddb5cb 100644 Binary files a/Tangible/tangibleInterface.o and b/Tangible/tangibleInterface.o differ -- libgit2 0.21.2