From d12f48f72db1ab60c39ffc81bdf7a81becf1379c Mon Sep 17 00:00:00 2001 From: pifou Date: Tue, 19 Mar 2019 15:12:42 +0000 Subject: [PATCH] Prise en compte de la commande --- Tangible/socket.c | 5 ++--- Tangible/socket.h | 2 ++ Tangible/tangibleInterface | Bin 14836 -> 0 bytes Tangible/tangibleInterface.c | 94 +++++++++++++++++++++++++++++++++++++++++----------------------------------------------------- Tangible/tangibleInterface.hex | 472 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Tangible/tangibleInterface.o | Bin 1752 -> 0 bytes 6 files changed, 285 insertions(+), 288 deletions(-) diff --git a/Tangible/socket.c b/Tangible/socket.c index 03aedef..52e2639 100644 --- a/Tangible/socket.c +++ b/Tangible/socket.c @@ -136,9 +136,8 @@ uint8 accept( #endif if (IINCHIP_READ(Sn_SR(s)) == SOCK_LISTEN) { - while( IINCHIP_READ(Sn_SR(s)) != SOCK_ESTABLISHED ); - /* ------- */ - ret = 1; + while( IINCHIP_READ(Sn_SR(s)) != SOCK_ESTABLISHED ) + ret = 1; #ifdef __DEF_IINCHIP_DBG__ printf("status = %x\r\n",IINCHIP_READ(Sn_SR(s))); #endif diff --git a/Tangible/socket.h b/Tangible/socket.h index 11c17d9..891ba81 100644 --- a/Tangible/socket.h +++ b/Tangible/socket.h @@ -22,3 +22,5 @@ extern uint16 recvfrom(SOCKET s, uint8 * buf, uint16 len, uint8 * addr, uint16 extern uint16 igmpsend(SOCKET s, const uint8 * buf, uint16 len); #endif /* _SOCKET_H_ */ + +//1110000000010100 diff --git a/Tangible/tangibleInterface b/Tangible/tangibleInterface index 417768b..ef93148 100755 Binary files a/Tangible/tangibleInterface and b/Tangible/tangibleInterface differ diff --git a/Tangible/tangibleInterface.c b/Tangible/tangibleInterface.c index e0e4bda..5ec2c4a 100644 --- a/Tangible/tangibleInterface.c +++ b/Tangible/tangibleInterface.c @@ -12,74 +12,62 @@ int main(void) { + uint8 com[4],per[14]; uint8_t 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}; - + int isUDP = 0; const char answer [16] = "I'm ok"; uint8 buf[16]; uint8_t addr[IPV4_SIZE]; uint16_t port; - + uint16 datasize; uint8_t addrpifou[IPV4_SIZE]={172,26,145,35}; uint16 size; SOCKET sUDP=0; SOCKET sTCP=1; init_printf(); ethernet_init(mac,ip,gateway,mask); - if (!socket(sUDP,Sn_MR_UDP,2020,0)) - { - return -1; - } - if (!socket(sTCP,Sn_MR_TCP,2020,0)) - { - return -1; - } - - while(1) - { - if (listen(sTCP)) - { - if (accept(sTCP)) - { - printf("test\n"); - /* if(recv(sTCP, buf,(uint16)sizeof(buf))!=-1) */ - /* { */ - send(sTCP,(uint8*)answer, (uint16)sizeof(answer)); - /* } */ - } - else - { - close(sTCP); - if (!socket(sTCP,Sn_MR_TCP,2020,0)) - { - return -1; - } - } - } - else + if (!socket(sUDP,Sn_MR_UDP,2020,0)) + { + return -1; + } + if (!socket(sTCP,Sn_MR_TCP,2020,0)) + { + return -1; + } + while(1) + { + if((datasize=recvfrom(sUDP,buf,sizeof(buf),addr,&port)) == 17) { - close(sTCP); - if (!socket(sTCP,Sn_MR_TCP,2020,0)) - { - return -1; - } - - } - } - close(sTCP); - close(sUDP); - return 0; + com[0]=buf[0]; + com[1]=buf[1]; + com[2]=buf[2]; + com[3]='\0'; + per[0]=buf[3]; + per[1]=buf[4]; + per[2]=buf[5]; + per[3]=buf[6]; + per[4]=buf[7]; + per[5]=buf[8]; + per[6]=buf[9]; + per[7]=buf[10]; + per[8]=buf[11]; + per[9]=buf[12]; + per[10]=buf[13]; + per[11]=buf[14]; + per[12]=buf[15]; + per[13]='\0'; + printf("Com : %s\n",com); + printf("Per : %s\n",per); + } + } + printf("RESET\n"); + close(sTCP); + close(sUDP); + return 0; } - - - -//sendto(sUDP,(uint8*)answer,(uint16)sizeof(answer), addrpifou, 2020); - /* if (recvfrom(sUDP,buf,sizeof(buf),addr,&port) !=0 ) */ - /* { */ - /* printf("Size : %d \n",size); */ - /* } */ - +//send(sTCP,(uint8*)answer, (uint16)sizeof(answer)); diff --git a/Tangible/tangibleInterface.hex b/Tangible/tangibleInterface.hex index aef58ea..e79474d 100644 --- a/Tangible/tangibleInterface.hex +++ b/Tangible/tangibleInterface.hex @@ -5,18 +5,18 @@ :100040000C9451000C9451000C9451000C945100EC :100050000C9451000C9451000C9451000C945100DC :100060000C9451000C94510011241FBECFEFD8E026 -:10007000DEBFCDBF13E0A0E0B1E0E0E4FFE102C0ED -:1000800005900D92AA36B107D9F723E0AAE6B3E0AE -:1000900001C01D92A63AB207E1F70E94050C0C942C -:1000A0009E0F0C940000E82FF0E0E656FC4F808194 -:1000B0000895E82FF0E0E656FC4F60830895E82F9E -:1000C000F0E0EE0FFF1FE658FC4F8081918108950C -:1000D000E82FF0E0EE0FFF1FEE57FC4F808191817B -:1000E0000895E82FF0E0EE0FFF1FE657FC4F8081E8 -:1000F00091810895E82FF0E0EE0FFF1FEE56FC4FC0 -:10010000808191810895E82FF0E0EE0FFF1FE659FE +:10007000DEBFCDBF13E0A0E0B1E0EEEBFFE102C0D8 +:1000800005900D92A836B107D9F723E0A8E6B3E0B2 +:1000900001C01D92A43AB207E1F70E94050C0C942E +:1000A000DD0F0C940000E82FF0E0E856FC4F808153 +:1000B0000895E82FF0E0E856FC4F60830895E82F9C +:1000C000F0E0EE0FFF1FE858FC4F8081918108950A +:1000D000E82FF0E0EE0FFF1FE058FC4F8081918188 +:1000E0000895E82FF0E0EE0FFF1FE857FC4F8081E6 +:1000F00091810895E82FF0E0EE0FFF1FE057FC4FCD +:10010000808191810895E82FF0E0EE0FFF1FE859FC :10011000FC4F808191810895E82FF0E0EE0FFF1FE2 -:10012000EE58FC4F80819181089524B12C6224B94E +:10012000E059FC4F80819181089524B12C6224B95B :100130002A9A25B1277D25B920E52CBD2A9820EFE4 :100140002EBD0DB407FEFDCF9EBD0DB407FEFDCF45 :100150008EBD0DB407FEFDCF6EBD0DB407FEFDCF05 @@ -37,13 +37,13 @@ :10024000CA0108952F923F924F925F926F927F92D0 :100250008F929F92AF92BF92CF92DF92EF92FF92D6 :100260000F931F93CF93DF93CDB7DEB728970FB6C9 -:10027000F894DEBF0FBECDBF282E362E89E291E066 -:100280000E94B90C622D8BE190E00E949500632DD5 -:100290008AE190E00E94950080E090E490937303DF -:1002A0008093720380E090E690936B0380936A03DF -:1002B00084E391E00E94B90C8AE6882E83E0982EB0 -:1002C00092E7A92E93E0B92E22E833E038872F83F6 -:1002D0000AE713E02AE8C22E23E0D22E32E9E32E09 +:10027000F894DEBF0FBECDBF282E362E88E291E067 +:100280000E94F80C622D8BE190E00E949500632D96 +:100290008AE190E00E94950080E090E490937103E1 +:1002A0008093700380E090E69093690380936803E5 +:1002B00083E391E00E94F80C88E6882E83E0982E74 +:1002C00090E7A92E93E0B92E20E833E038872F83FA +:1002D00008E713E028E8C22E23E0D22E30E9E32E0F :1002E00033E0F32E1A821982412C512C1C821B827E :1002F000612C712C222D30E03E832D83232C312C58 :10030000AF81B88511961C921E92F801118210825D @@ -70,7 +70,7 @@ :100450004D935C93F40160817181F2E08F0E911CE9 :10046000D5014C9111965C91B2E0AB0EB11C3F935B :100470002F939F938F937F936F935F934F937F926D -:100480006F92ADE5B1E0BF93AF930E94A30CFFEF75 +:100480006F92ACE5B1E0BF93AF930E94E20CFFEF37 :100490006F1A7F0A29813A812E5F3F4F3A83298361 :1004A00032E0C30ED11C42E0E40EF11C0FB6F8940A :1004B000DEBF0FBECDBF94E06916710409F020CFF6 @@ -164,9 +164,9 @@ :100A3000080F111D0C151D0511F7C801DF91CF918D :100A40001F910F91FF90EF90DF90CF900895CF927C :100A5000DF92EF92FF920F931F93CF93DF93E82FD4 -:100A6000F0E0EE0FFF1FDF01AE56BC4F8D919C9161 -:100A7000DA01A823B923EF01CE58DC4FE880F980D2 -:100A8000CD018E0D9F1DEE57FC4FC081D181AD0170 +:100A6000F0E0EE0FFF1FDF01A057BC4F8D919C916E +:100A7000DA01A823B923EF01C059DC4FE880F980DF +:100A8000CD018E0D9F1DE058FC4FC081D181AD017D :100A9000420F531FC417D50778F489016B01CA1B95 :100AA000DB0BAE010E94D100A8014C1B5D0BB6010F :100AB0006C0F7D1FC70101C0A901DF91CF911F916C @@ -181,9 +181,9 @@ :100B40000F90DF91CF911F910F91FF90EF90DF9069 :100B5000CF90BF909F908F900C949500AF92BF92D2 :100B6000CF92DF92EF92FF920F931F93CF93DF9379 -:100B7000DA01A901E82FF0E0EE0FFF1FEF01C657E1 -:100B8000DC4F888199816B01C822D922EF01C659B7 -:100B9000DC4FE880F980C6018E0D9F1DE658FC4FA2 +:100B7000DA01A901E82FF0E0EE0FFF1FEF01C857DF +:100B8000DC4F888199816B01C822D922EF01C859B5 +:100B9000DC4FE880F980C6018E0D9F1DE858FC4FA0 :100BA000C081D1819601240F351FC217D30780F46D :100BB0008A015D01CC19DD09AE01BD010E94F90079 :100BC000A8014C1B5D0BB5016C0F7D1FC70101C057 @@ -193,97 +193,97 @@ :100C0000982E6B017A01082F10E00C5F1F4F102FF8 :100C10000027580188E2A80EB11CC5010E94B3004C :100C2000C82FD0E0DC2FCC27075D1F4FC8010E94E2 -:100C3000B300C80FD11DDF93CF938EE791E09F9350 -:100C40008F930E94A30C9701A601BE01892D0E94DB +:100C3000B300C80FD11DDF93CF938DE791E09F9351 +:100C40008F930E94E20C9701A601BE01892D0E949C :100C5000AE05CE0DDF1D6D2FC5010E9495000F90D2 :100C60000F900F900F906C2FC801DF91CF911F91C3 :100C70000F91FF90EF90DF90CF90BF90AF909F903B -:100C80000C9495000F931F93CF93DF93C82F86E9A1 -:100C900091E00E94B90CD0E02496DC2FCC278E0185 +:100C80000C9495000F931F93CF93DF93C82F85E9A2 +:100C900091E00E94F80CD0E02496DC2FCC278E0146 :100CA0000F5F1F4F60E1C8010E949500C8010E94BC :100CB000B3008111FBCF6FEFCE010296DF91CF9190 :100CC0001F910F910C949500CF92DF92EF92FF92BB :100CD0000F931F93CF93DF93C82FC62E8A01D22E76 -:100CE0008FE991E00E94B90C8FEF8C0DEC2EF12C66 +:100CE0008EE991E00E94F80C8FEF8C0DEC2EF12C28 :100CF0008530D0F58C2F0E944206E7012496DC2F28 :100D0000CC276C2D6D29CE010E949500CE01049652 :100D10009E012B5F3F4F69010115110529F0612FDD -:100D20000E949500602F0FC020919E0330919F0379 -:100D30002F5F3F4F30939F0320939E03632F0E94AA -:100D4000950060919E03C6010E9495008E010F5F81 +:100D20000E949500602F0FC020919C0330919D037D +:100D30002F5F3F4F30939D0320939C03632F0E94AE +:100D4000950060919C03C6010E9495008E010F5F83 :100D50001F4F61E0C8010E949500C8010E94B300C6 :100D60008111FBCF11E001C010E0E7012496DC2FD8 :100D7000CC27CE010E94B300082FCE0103960E941B -:100D8000B3001F920F931F928F9389EA91E09F9374 -:100D90008F930E94A30C0F900F900F900F900F90C5 +:100D8000B3001F920F931F928F9388EA91E09F9375 +:100D90008F930E94E20C0F900F900F900F900F9086 :100DA0000F90812FDF91CF911F910F91FF90EF90C6 :100DB000DF90CF9008950F931F93CF93DF93C82FA9 -:100DC0008AEC91E00E94B90CD0E02496DC2FCC276D +:100DC00089EC91E00E94F80CD0E02496DC2FCC272F :100DD0008E010D5F1F4FC8010E94B3008331D9F40B :100DE000219662E0CE010E949500CE010E94B300E0 -:100DF0008111FBCFC8010E94B3001F928F9384ED35 -:100E000091E09F938F930E94A30C0F900F900F90EF -:100E10000F9081E005C082EE91E00E94B90C80E065 +:100DF0008111FBCFC8010E94B3001F928F9383ED36 +:100E000091E09F938F930E94E20C0F900F900F90B0 +:100E10000F9081E005C081EE91E00E94F80C80E027 :100E2000DF91CF911F910F910895CF93DF93C82F3A -:100E300089EF91E00E94B90CD0E0DC2FCC27CD5F88 +:100E300088EF91E00E94F80CD0E0DC2FCC27CD5F4A :100E4000DB4FCE010E94B3008431B1F4CE010E9489 :100E5000B3008731D9F7CE010E94B3001F928F9360 -:100E600084ED91E09F938F930E94A30C0F900F90BD -:100E70000F900F9081E005C083E092E00E94B90CD2 +:100E600083ED91E09F938F930E94E20C0F900F907F +:100E70000F900F9081E005C082E092E00E94F80C94 :100E800080E0DF91CF910895EF92FF920F931F932F -:100E9000CF93DF93C82F8B017A018BE192E00E9400 -:100EA000B90CF80160816F3F51F481818F3F99F453 +:100E9000CF93DF93C82F8B017A018AE192E00E9401 +:100EA000F80CF80160816F3F51F481818F3F99F414 :100EB00082818F3F81F483818F3F69F40FC061117C :100EC0000AC0F8018181811106C08281811103C0AD -:100ED0008381882319F0E114F10431F482EE91E06A -:100EE0000E94B90C80E02FC0D0E02496DC2FCC27E4 +:100ED0008381882319F0E114F10431F481EE91E06B +:100EE0000E94F80C80E02FC0D0E02496DC2FCC27A5 :100EF000CE010C960E949500F8016181CE010D96FD :100F00000E949500F8016281CE010E960E94950024 :100F1000F8016381CE010F960E9495006F2DCE01DE :100F200040960E9495006E2DCE0141960E9495003C :100F3000219664E0CE010E949500CE010E94B3008C :100F40008111FBCF81E0DF91CF911F910F91FF9035 -:100F5000EF900895CF93DF93C82F88E192E00E942D -:100F6000B90CD0E0DC2FCC27CF5FDB4F68E0CE019F +:100F5000EF900895CF93DF93C82F87E192E00E942E +:100F6000F80CD0E0DC2FCC27CF5FDB4F68E0CE0160 :100F70000E949500CE010E94B3008111FBCFDF914A :100F8000CF9108958F929F92AF92BF92CF92DF92AE :100F9000EF92FF921F93CF93DF93182F4B017A01AB -:100FA00083E493E00E94B90C812F0E9468008E15A3 +:100FA00082E493E00E94F80C812F0E9468008E1565 :100FB0009F0520F4812F0E9468007C01C12FD0E0A2 :100FC0002496DC2FCC275E0183E0A80EB11C812F74 :100FD0000E94AF046C01C5010E94B3008731A9F0E3 -:100FE0008C3199F0DF92CF921F921F9386E292E0AC -:100FF0009F938F930E94A30C0F900F900F900F90D0 +:100FE0008C3199F0DF92CF921F921F9385E292E0AD +:100FF0009F938F930E94E20C0F900F900F900F9091 :101000000F900F90E12CF12C03C0CE14DF04F8F206 :10101000A701B401812F0E9467056E018FEFC81AE6 :10102000D80A60E2C6010E949500C6010E94B30082 :101030008111FBCF2296CE010E94B30084FD0FC028 -:10104000C5010E94B3008111F6CF8EE492E00E94A8 -:10105000B90C812F0E94420680E090E005C060E15B +:10104000C5010E94B3008111F6CF8DE492E00E94A9 +:10105000F80C812F0E94420680E090E005C060E11C :10106000CE010E949500C701DF91CF911F91FF90A3 :10107000EF90DF90CF90BF90AF909F908F900895AA :10108000BF92CF92DF92EF92FF920F931F93CF9375 :10109000DF93B82E6B018A01C82FD0E02496DC2F95 :1010A000CC277E0183E0E80EF11CC7010E94B3004B -:1010B000873191F0C7010E94B3001F928F938CE596 -:1010C00092E09F938F930E94A30C0F900F900F902C +:1010B000873191F0C7010E94B3001F928F938BE597 +:1010C00092E09F938F930E94E20C0F900F900F90ED :1010D0000F908FEF9FEF26C080E00E94EB047C0111 -:1010E00018161906ECF48FE692E00E94B90CE0168F +:1010E00018161906ECF48EE692E00E94F80CE01651 :1010F000F10620F00115110589F001C08701A80152 :10110000B6018B2D0E94F505219660E4CE010E9468 :101110009500CE010E94B3008111FBCFC80102C02F :1011200080E090E0DF91CF911F910F91FF90EF90C1 :10113000DF90CF90BF9008958F929F92BF92CF92F1 :10114000DF92EF92FF920F931F93CF93DF93B82E0E -:101150004B01EA01790187E792E00E94B90C8B2DDF +:101150004B01EA01790186E792E00E94F80C8B2DA1 :101160000E9468008C179D0728F48B2D0E94680050 :101170006C0101C06E01F7016081611109C08181BC :10118000811106C08281811103C08381882331F0DF :101190000115110519F0C114D10429F5DF93CF937E :1011A0001F930F93F70183811F928F9382811F9268 :1011B0008F9381811F928F931F926F931F92BF9283 -:1011C00081E892E09F938F930E94A30C82EE91E0BE -:1011D0000E94B90C8DB79EB740960FB6F8949EBF8B +:1011C00080E892E09F938F930E94E20C81EE91E081 +:1011D0000E94F80C8DB79EB740960FB6F8949EBF4C :1011E0000FBE8DBF49C0CB2DD0E02496DC2FCC277D :1011F000CE010C960E949500F7016181CE010D96FB :101200000E949500F7016281CE010E960E94950022 @@ -292,7 +292,7 @@ :10123000A601B4018B2D0E9467058E010F5F1F4F21 :1012400060E2C8010E949500C8010E94B3008111AC :10125000FBCF2296CE010E94B30084FD10C0CE01C8 -:101260000E94B30083FFF6CF8DE593E00E94B90C96 +:101260000E94B30083FFF6CF8CE593E00E94F80C58 :1012700068E1CE010E94950080E090E005C060E149 :10128000CE010E949500C601DF91CF911F910F9171 :10129000FF90EF90DF90CF90BF909F908F90089538 @@ -300,13 +300,13 @@ :1012B000AF92BF92CF92DF92EF92FF920F931F9364 :1012C000CF93DF93CDB7DEB72A970FB6F894DEBF82 :1012D0000FBECDBF782E4B016A0179011A870987AD -:1012E0000E94EB04892B09F42BC189EA92E00E9449 -:1012F000B90C872D0E94EB04682E392ECD2809F4F5 +:1012E0000E94EB04892B09F42BC188EA92E00E944A +:1012F000F80C872D0E94EB04682E392ECD2809F4B6 :1013000017C1472C512C84E0480E511C542C442406 :10131000520198E2A90EB11CC5010E94B300082F2A :1013200010E0102F00276201E9E2CE0ED11CC601A9 :101330000E94B300080F111D3F926F921F930F93ED -:1013400085EB92E09F938F930E94A30CC2010E94B1 +:1013400084EB92E09F938F930E94E20CC2010E9473 :10135000B3000F900F900F900F900F900F90877029 :10136000833009F464C0843009F4ABC0823009F0E2 :10137000D0C028E030E0AE014F5F5F4FB801872D4D @@ -314,20 +314,20 @@ :1013900080838A8181838B8182838C8183838D8109 :1013A00090E0982F88272E81820F911DE985FA857C :1013B000918380830F8110E0102F00278885080F0C -:1013C000111D1F930F9385ED92E09F938F930E94C1 -:1013D000A30CE985FA8581818F9380818F938BEEB1 -:1013E00092E09F938F930E94A30CF70183811F9239 +:1013C000111D1F930F9384ED92E09F938F930E94C2 +:1013D000E20CE985FA8581818F9380818F938AEE73 +:1013E00092E09F938F930E94E20CF70183811F92FA :1013F0008F9382811F928F9381811F928F9380811F -:101400001F928F938EEF92E09F938F930E94A30C75 +:101400001F928F938DEF92E09F938F930E94E20C37 :101410009801A401B101872D0E94AE057101E00E73 :10142000F11E6F2DC5010E9495006E2D41C026E072 :1014300030E0AE014F5F5F4FB801872D0E94AE05CF :10144000180196E0290E311C8981F70180838A8179 :1014500081838B8182838C8183830D8110E0102FA7 -:1014600000278E81080F111D88E193E00E94B90CBE +:1014600000278E81080F111D87E193E00E94F80C80 :10147000F70183811F928F9382811F928F938181C5 -:101480001F928F9380811F928F938EEF92E09F9394 -:101490008F930E94A30C9801A401B101872D0E9493 +:101480001F928F9380811F928F938DEF92E09F9395 +:101490008F930E94E20C9801A401B101872D0E9454 :1014A000AE05200E311E632DC5010E949500622DF0 :1014B000C6010E9495000FB6F894DEBF0FBECDBFE7 :1014C0002AC022E030E0AE014F5F5F4FB801872DA8 @@ -337,22 +337,22 @@ :101500006F2DC5010E9495006E2DC6010E949500A9 :1015100002C000E010E0EFEF4E1A5E0A60E4C20184 :101520000E949500C2010E94B3008111FBCF02C04E -:1015300000E010E08CE293E00E94B90CC80102C008 +:1015300000E010E08BE293E00E94F80CC80102C0CA :1015400080E090E02A960FB6F894DEBF0FBECDBFC4 :10155000DF91CF911F910F91FF90EF90DF90CF908F :10156000BF90AF909F908F907F906F905F904F90C3 :101570003F902F900895CF92DF92FF920F931F9389 -:10158000CF93DF93F82E6B01EA018FE393E00E9483 -:10159000B90C8F2D0E9468008C179D0728F48F2DA1 +:10158000CF93DF93F82E6B01EA018EE393E00E9484 +:10159000F80C8F2D0E9468008C179D0728F48F2D62 :1015A0000E9468008C0101C08E010115110589F4AB -:1015B0001F921F92DF93CF938BE493E09F938F93BF -:1015C0000E94A30C0F900F900F900F900F900F9010 +:1015B0001F921F92DF93CF938AE493E09F938F93C0 +:1015C0000E94E20C0F900F900F900F900F900F90D1 :1015D00030C0A801B6018F2D0E946705CF2DD0E045 :1015E0002496DC2FCC276E018FEFC81AD80A60E250 :1015F000C6010E949500C6010E94B3008111FBCF75 :101600006E0182E0C80ED11C2396C6010E94B30071 :1016100084FD12C0CE010E94B300C6010E94B30037 -:1016200083FFF3CF89E593E00E94B90C8F2D0E94D0 +:1016200083FFF3CF88E593E00E94F80C8F2D0E9492 :10163000420680E090E005C060E1C6010E9495008E :10164000C801DF91CF911F910F91FF90DF90CF9054 :101650000895CF92DF92EF92FF920F931F93CF9353 @@ -375,166 +375,174 @@ :10176000883221F784E98093BC0081E0DF91CF913A :101770000895092E000CAA0BBB0B9C01AD0184E05F :10178000220F331F441F551F8A95D1F760E074E282 -:1017900084EF90E00E94810C215031093093C50004 +:1017900084EF90E00E94C00C215031093093C500C5 :1017A0002093C40088E18093C10086E08093C2004A :1017B000E0ECF0E080818D7F808308959091C000FF :1017C00095FFFCCF8093C6000895CF93C82F8A3031 :1017D00019F48DE00E94DE0B8C2F0E94DE0B80E05E :1017E00090E0CF9108958091C00087FFFCCF809159 :1017F000C600089580E895E20E94B90B80E091E070 -:101800009093A3038093A2030895CF93DF93CDB762 -:10181000DEB7A2970FB6F894DEBF0FBECDBF86E04D -:10182000EEE0F1E0DE01519601900D928A95E1F72C -:101830002CEA2F8F9AE198A381E989A33DEC3AA382 -:101840002B8F9C8F8D8F8EEF8E8F8FEF8F8B888F4E -:10185000898F1A8E87E0E4E1F1E0DE0111960190B4 -:101860000D928A95E1F7FE01389689E0DF011D921D -:101870008A95E9F70E94FA0B9E01295E3F4FAE015F -:10188000455E5F4FBE01615E7F4FCE0141960E9473 -:10189000290B20E044EE57E062E080E00E946406FD -:1018A000882321F120E044EE57E061E081E00E94CE -:1018B00064068823D9F081E00E94DB06882391F03A -:1018C00081E00E941507882369F084E291E00E947C -:1018D000B90C40E150E0BE016F5F7F4F81E00E9494 -:1018E000C207E9CF81E00E944206DCCF8FEF9FEF75 -:1018F000A2960FB6F894DEBF0FBECDBFDF91CF9199 -:101900000895A1E21A2EAA1BBB1BFD010DC0AA1F40 -:10191000BB1FEE1FFF1FA217B307E407F50720F058 -:10192000A21BB30BE40BF50B661F771F881F991FD3 -:101930001A9469F760957095809590959B01AC011C -:10194000BD01CF010895A0E0B0E0E9EAFCE00C940D -:10195000770FAE014B5F5F4FFA0161917191AF015B -:101960008091A2039091A3030E94E90CE2E00C9401 -:10197000930F0F931F93CF93DF93E091A203F09106 -:10198000A303238121FF1BC08C01D0E0C0E0F8013C -:1019900081918F016091A2037091A303DB011896DE -:1019A000ED91FC911997882331F00995892B79F3F2 -:1019B000DFEFCFEFECCF8AE00995892B19F08FEF9D -:1019C0009FEF02C08D2F9C2FDF91CF911F910F9120 -:1019D0000895ACE0B0E0EFEEFCE00C94670F7C0102 -:1019E0006B018A01FC0117821682838181FFBDC1D0 -:1019F000CE0101964C01F7019381F60193FD85918B -:101A000093FF81916F01882309F4ABC1853239F4CA -:101A100093FD859193FF81916F01853229F4B70180 -:101A200090E00E94D10EE7CF512C312C20E02032E3 -:101A3000A0F48B3269F030F4803259F0833269F4CB -:101A400020612CC08D3239F0803339F4216026C0FA -:101A50002260246023C0286021C027FD27C030ED0C -:101A6000380F3A3078F426FF06C0FAE05F9E300D5A -:101A70001124532E13C08AE0389E300D1124332ECA -:101A800020620CC08E3221F426FD6BC1206406C09A -:101A90008C3611F4206802C0883641F4F60193FDBB -:101AA000859193FF81916F018111C1CF982F9F7D07 -:101AB0009554933028F40C5F1F4FFFE3F9830DC05A -:101AC000833631F0833771F0833509F05BC022C073 -:101AD000F801808189830E5F1F4F44244394512C69 -:101AE000540115C03801F2E06F0E711CF801A0809E -:101AF000B18026FF03C0652D70E002C06FEF7FEF5D -:101B0000C5012C870E94C60E2C0183012C852F77DE -:101B1000222E17C03801F2E06F0E711CF801A08070 -:101B2000B18026FF03C0652D70E002C06FEF7FEF2C -:101B3000C5012C870E94BB0E2C012C852068222E0B -:101B4000830123FC1BC0832D90E048165906B0F496 -:101B5000B70180E290E00E94D10E3A94F4CFF501F3 -:101B600027FC859127FE81915F01B70190E00E94DB -:101B7000D10E31103A94F1E04F1A5108411451043A -:101B800071F7E5C0843611F0893639F5F80127FF81 -:101B900007C060817181828193810C5F1F4F08C0F3 -:101BA00060817181072E000C880B990B0E5F1F4F0F -:101BB0002F76722E97FF09C090958095709561954C -:101BC0007F4F8F4F9F4F2068722E2AE030E0A40194 -:101BD0000E94090FA82EA81844C0853729F42F7E2B -:101BE000B22E2AE030E025C0F22FF97FBF2E8F36CB -:101BF000C1F018F4883579F0B4C0803719F088370F -:101C000021F0AFC02F2F2061B22EB4FE0DC08B2D5E -:101C10008460B82E09C024FF0AC09F2F9660B92E99 -:101C200006C028E030E005C020E130E002C020E13D -:101C300032E0F801B7FE07C0608171818281938133 -:101C40000C5F1F4F06C06081718180E090E00E5FE5 -:101C50001F4FA4010E94090FA82EA818FB2DFF7783 -:101C60007F2E76FE0BC0372D3E7FA51450F474FEF8 -:101C70000AC072FC08C0372D3E7E05C0BA2C372D35 -:101C800003C0BA2C01C0B52C34FF0DC0FE01EA0D13 -:101C9000F11D8081803311F4397E09C032FF06C006 -:101CA000B394B39404C0832F867809F0B39433FDC2 -:101CB00013C030FF06C05A2CB31418F4530C5B1831 -:101CC000B32CB31468F4B70180E290E03C870E9423 -:101CD000D10EB3943C85F5CFB31410F43B1801C07A -:101CE000312C34FF12C0B70180E390E03C870E94A2 -:101CF000D10E3C8532FF17C031FD03C088E790E06C -:101D000002C088E590E0B7010CC0832F867859F0B7 -:101D100031FF02C08BE201C080E237FD8DE2B701E6 -:101D200090E00E94D10EA51438F4B70180E390E052 -:101D30000E94D10E5A94F7CFAA94F401EA0DF11D36 -:101D40008081B70190E00E94D10EA110F5CF332021 -:101D500009F451CEB70180E290E00E94D10E3A948E -:101D6000F6CFF7018681978102C08FEF9FEF2C9607 -:101D7000E2E10C94830FFC0105906150704001106A -:101D8000D8F7809590958E0F9F1F0895FC016150A4 -:101D9000704001900110D8F7809590958E0F9F1F8D -:101DA00008950F931F93CF93DF93FB01238121FDB0 -:101DB00003C08FEF9FEF28C022FF16C046815781D6 -:101DC000248135814217530744F4A081B1819D01DC -:101DD0002F5F3F4F318320838C93268137812F5F84 -:101DE0003F4F3783268310C0EB01092F182F008443 -:101DF000F185E02D0995892BE1F68E819F81019671 -:101E00009F838E83812F902FDF91CF911F910F9110 -:101E10000895FA01AA27283051F1203181F1E89480 -:101E20006F936E7F6E5F7F4F8F4F9F4FAF4FB1E0CD -:101E30003ED0B4E03CD0670F781F891F9A1FA11DC8 -:101E4000680F791F8A1F911DA11D6A0F711D811DC9 -:101E5000911DA11D20D009F468943F912AE0269F8E -:101E600011243019305D3193DEF6CF010895462FED -:101E70004770405D4193B3E00FD0C9F7F6CF462FCE -:101E80004F70405D4A3318F0495D31FD4052419337 -:101E900002D0A9F7EACFB4E0A695979587957795F4 -:101EA0006795BA95C9F700976105710508959B017B -:101EB000AC010A2E06945795479537952795BA9504 -:101EC000C9F7620F731F841F951FA01D08952F92DD -:101ED0003F924F925F926F927F928F929F92AF92BA -:101EE000BF92CF92DF92EF92FF920F931F93CF9307 -:101EF000DF93CDB7DEB7CA1BDB0B0FB6F894DEBF9E -:101F00000FBECDBF09942A88398848885F846E84C3 -:101F10007D848C849B84AA84B984C884DF80EE800D -:101F2000FD800C811B81AA81B981CE0FD11D0FB616 -:101F3000F894DEBF0FBECDBFED010895F894FFCF3A -:101F40000000000200000000E50B00000000A0BD42 -:101F5000CDDDEDFD49276D206F6B00000000000016 -:101F6000000000007465737400737973696E69749E -:101F700028290D004368616E6E656C203A20534538 -:101F80004E44204D454D2053495A45203A20524554 -:101F90004356204D454D2053495A450D0025642098 -:101FA0003A20252E3478203A20252E3478203A20E5 -:101FB000252E3478203A20252E34780D0A004953F6 -:101FC000525F52583A2072645F707472203A202532 -:101FD0002E34780D0A00636C6F736528290D007329 -:101FE0006F636B657428290D00536E5F5352203D5B -:101FF00020252E3278202C2050726F746F636F6C06 -:10200000203D20252E32780D0A006C697374656EB0 -:1020100028290D00737461747573203D2025780D97 -:102020000A004661696C5B696E76616C696420695F -:10203000702C706F72745D0D00616363657074283D -:10204000290D004661696C5B6E6F74206C69737456 -:10205000656E696E675D0D00646973636F6E6E65B2 -:10206000637428290D00736F636B657420256420E9 -:102070006672656573697A652825642920656D70C7 -:102080007479206F72206572726F720D0A00534F5F -:10209000434B5F434C4F5345442E0D004261642037 -:1020A000737461747573203D20253032780A007294 -:1020B00065637628290D0073656E64746F28290D99 -:1020C000002564204661696C5B252E32782E252E12 -:1020D00032782E252E32782E252E32782C20252E61 -:1020E000642C2025645D0D0A007265637666726F4C -:1020F0006D28290D004953525F52583A2072645F8F -:10210000707472203A20252E34782073697A653DE8 -:1021100025640D0A00554450206D73672023256403 -:1021200020617272697665640D0A00736F7572635F -:102130006520506F7274203A2025750D0A00736F68 -:1021400075726365204950203A2025642E25642E3F -:1021500025642E25640D0A00495020524157206DF8 -:10216000736720617272697665640D0072656376CB -:1021700066726F6D282920656E64202E2E0D006911 -:10218000676D7073656E6428290D002564204661B3 -:10219000696C5B25645D0D0A0069676D7073656E1F -:0A21A00064206661696C2E0D0000DA +:101800009093A1038093A00308958F929F92AF922B +:10181000BF92CF92DF92EF92FF920F931F93CF93DD +:10182000DF93CDB7DEB7EA970FB6F894DEBF0FBEF1 +:10183000CDBF86E0EEE0F1E0DE015F9601900D9213 +:101840008A95E1F72CEA29AB9AE19AAB81E98BAB57 +:101850003DEC3CAB2DA79EA78FA78EEF88AB8FEFFB +:1018600089A78AA78BA71CA60E94FA0B9E01275D59 +:101870003F4FAE01435D5F4FBE016F5C7F4FCE01B6 +:101880004F960E94290B20E044EE57E062E080E092 +:101890000E946406882309F45EC020E044EE57E00D +:1018A00061E081E00E946406882309F454C04E017F +:1018B00085E3880E911C84E1A82E81E0B82E6E018C +:1018C00091E1C90ED11C9EE1E92E91E0F92E8E0125 +:1018D000075C1F4F9E012B5D3F4F40E150E0BE0172 +:1018E0006F5F7F4F80E00E945009419781F78981A7 +:1018F0008DAB8A818EAB8B818FAB18AE8C81898B3F +:101900008D818A8B8E818B8B8F818C8B88858D8B43 +:1019100089858E8B8A858F8B8B85888F8C85898F27 +:101920008D858A8F8E858B8F8F858C8F88898D8F03 +:101930001E8E9F928F92BF92AF920E94E20CDF9216 +:10194000CF92FF92EF920E94E20C0FB6F894DEBFA6 +:101950000FBECDBFBCCF8FEF9FEFEA960FB6F894C6 +:10196000DEBF0FBECDBFDF91CF911F910F91FF90D2 +:10197000EF90DF90CF90BF90AF909F908F900895A1 +:10198000A1E21A2EAA1BBB1BFD010DC0AA1FBB1F83 +:10199000EE1FFF1FA217B307E407F50720F0A21BF5 +:1019A000B30BE40BF50B661F771F881F991F1A9462 +:1019B00069F760957095809590959B01AC01BD018C +:1019C000CF010895A0E0B0E0E8EEFCE00C94B60F83 +:1019D000AE014B5F5F4FFA0161917191AF01809150 +:1019E000A0039091A1030E94280DE2E00C94D20F75 +:1019F0000F931F93CF93DF93E091A003F091A10386 +:101A0000238121FF1BC08C01D0E0C0E0F80181914F +:101A10008F016091A0037091A103DB011896ED91F5 +:101A2000FC911997882331F00995892B79F3DFEF21 +:101A3000CFEFECCF8AE00995892B19F08FEF9FEF5C +:101A400002C08D2F9C2FDF91CF911F910F91089590 +:101A5000ACE0B0E0EEE2FDE00C94A60F7C016B017F +:101A60008A01FC0117821682838181FFBDC1CE01EC +:101A700001964C01F7019381F60193FD859193FF47 +:101A800081916F01882309F4ABC1853239F493FD4C +:101A9000859193FF81916F01853229F4B70190E020 +:101AA0000E94100FE7CF512C312C20E02032A0F4FF +:101AB0008B3269F030F4803259F0833269F420615E +:101AC0002CC08D3239F0803339F4216026C0226079 +:101AD000246023C0286021C027FD27C030ED380FC7 +:101AE0003A3078F426FF06C0FAE05F9E300D1124EC +:101AF000532E13C08AE0389E300D1124332E2062FD +:101B00000CC08E3221F426FD6BC1206406C08C36D9 +:101B100011F4206802C0883641F4F60193FD8591E6 +:101B200093FF81916F018111C1CF982F9F7D9554B3 +:101B3000933028F40C5F1F4FFFE3F9830DC0833609 +:101B400031F0833771F0833509F05BC022C0F801B2 +:101B5000808189830E5F1F4F44244394512C54018C +:101B600015C03801F2E06F0E711CF801A080B18041 +:101B700026FF03C0652D70E002C06FEF7FEFC50147 +:101B80002C870E94050F2C0183012C852F77222E94 +:101B900017C03801F2E06F0E711CF801A080B1800F +:101BA00026FF03C0652D70E002C06FEF7FEFC50117 +:101BB0002C870E94FA0E2C012C852068222E83018E +:101BC00023FC1BC0832D90E048165906B0F4B701E2 +:101BD00080E290E00E94100F3A94F4CFF50127FCC8 +:101BE000859127FE81915F01B70190E00E94100F5F +:101BF00031103A94F1E04F1A51084114510471F731 +:101C0000E5C0843611F0893639F5F80127FF07C0A1 +:101C100060817181828193810C5F1F4F08C0608158 +:101C20007181072E000C880B990B0E5F1F4F2F76CA +:101C3000722E97FF09C090958095709561957F4FA2 +:101C40008F4F9F4F2068722E2AE030E0A4010E943F +:101C5000480FA82EA81844C0853729F42F7EB22E2D +:101C60002AE030E025C0F22FF97FBF2E8F36C1F079 +:101C700018F4883579F0B4C0803719F0883721F02E +:101C8000AFC02F2F2061B22EB4FE0DC08B2D84600B +:101C9000B82E09C024FF0AC09F2F9660B92E06C037 +:101CA00028E030E005C020E130E002C020E132E071 +:101CB000F801B7FE07C060817181828193810C5F5A +:101CC0001F4F06C06081718180E090E00E5F1F4F62 +:101CD000A4010E94480FA82EA818FB2DFF777F2E85 +:101CE00076FE0BC0372D3E7FA51450F474FE0AC05B +:101CF00072FC08C0372D3E7E05C0BA2C372D03C0BC +:101D0000BA2C01C0B52C34FF0DC0FE01EA0DF11D47 +:101D10008081803311F4397E09C032FF06C0B3944C +:101D2000B39404C0832F867809F0B39433FD13C0B5 +:101D300030FF06C05A2CB31418F4530C5B18B32CA4 +:101D4000B31468F4B70180E290E03C870E94100F62 +:101D5000B3943C85F5CFB31410F43B1801C0312C7B +:101D600034FF12C0B70180E390E03C870E94100F5F +:101D70003C8532FF17C031FD03C088E790E002C008 +:101D800088E590E0B7010CC0832F867859F031FFC9 +:101D900002C08BE201C080E237FD8DE2B70190E026 +:101DA0000E94100FA51438F4B70180E390E00E9460 +:101DB000100F5A94F7CFAA94F401EA0DF11D808117 +:101DC000B70190E00E94100FA110F5CF332009F465 +:101DD00051CEB70180E290E00E94100F3A94F6CF06 +:101DE000F7018681978102C08FEF9FEF2C96E2E189 +:101DF0000C94C20FFC010590615070400110D8F79F +:101E0000809590958E0F9F1F0895FC016150704042 +:101E100001900110D8F7809590958E0F9F1F08951F +:101E20000F931F93CF93DF93FB01238121FD03C009 +:101E30008FEF9FEF28C022FF16C046815781248173 +:101E400035814217530744F4A081B1819D012F5F72 +:101E50003F4F318320838C93268137812F5F3F4F03 +:101E60003783268310C0EB01092F182F0084F185DA +:101E7000E02D0995892BE1F68E819F8101969F8344 +:101E80008E83812F902FDF91CF911F910F91089515 +:101E9000FA01AA27283051F1203181F1E8946F939B +:101EA0006E7F6E5F7F4F8F4F9F4FAF4FB1E03ED041 +:101EB000B4E03CD0670F781F891F9A1FA11D680FDF +:101EC000791F8A1F911DA11D6A0F711D811D911D12 +:101ED000A11D20D009F468943F912AE0269F112487 +:101EE0003019305D3193DEF6CF010895462F4770EB +:101EF000405D4193B3E00FD0C9F7F6CF462F4F7046 +:101F0000405D4A3318F0495D31FD4052419302D0A3 +:101F1000A9F7EACFB4E0A695979587957795679549 +:101F2000BA95C9F700976105710508959B01AC0149 +:101F30000A2E06945795479537952795BA95C9F770 +:101F4000620F731F841F951FA01D08952F923F924B +:101F50004F925F926F927F928F929F92AF92BF92B9 +:101F6000CF92DF92EF92FF920F931F93CF93DF9365 +:101F7000CDB7DEB7CA1BDB0B0FB6F894DEBF0FBEC2 +:101F8000CDBF09942A88398848885F846E847D840F +:101F90008C849B84AA84B984C884DF80EE80FD8011 +:101FA0000C811B81AA81B981CE0FD11D0FB6F89487 +:0E1FB000DEBF0FBECDBFED010895F894FFCF48 +:101FBE000000000200000000E50B00000000A0BDC4 +:101FCE00CDDDEDFD436F6D203A2025730A0050657F +:101FDE0072203A2025730A00737973696E6974282A +:101FEE00290D004368616E6E656C203A2053454E94 +:101FFE0044204D454D2053495A45203A20524543E1 +:10200E0056204D454D2053495A450D002564203A22 +:10201E0020252E3478203A20252E3478203A20257B +:10202E002E3478203A20252E34780D0A004953524A +:10203E005F52583A2072645F707472203A20252ED7 +:10204E0034780D0A00636C6F736528290D00736F69 +:10205E00636B657428290D00536E5F5352203D202B +:10206E00252E3278202C2050726F746F636F6C2087 +:10207E003D20252E32780D0A006C697374656E282A +:10208E00290D00737461747573203D2025780D0A37 +:10209E00004661696C5B696E76616C69642069707B +:1020AE002C706F72745D0D00616363657074282906 +:1020BE000D004661696C5B6E6F74206C697374659C +:1020CE006E696E675D0D00646973636F6E6E656336 +:1020DE007428290D00736F636B6574202564206668 +:1020EE0072656573697A652825642920656D70743B +:1020FE0079206F72206572726F720D0A00534F4312 +:10210E004B5F434C4F5345442E0D00426164207388 +:10211E007461747573203D20253032780A00726523 +:10212E00637628290D0073656E64746F28290D007F +:10213E002564204661696C5B252E32782E252E3261 +:10214E00782E252E32782E252E32782C20252E64B0 +:10215E002C2025645D0D0A007265637666726F6DC4 +:10216E0028290D004953525F52583A2072645F700D +:10217E007472203A20252E34782073697A653D25B5 +:10218E00640D0A00554450206D736720232564208A +:10219E00617272697665640D0A00736F757263659C +:1021AE0020506F7274203A2025750D0A00736F75DA +:1021BE00726365204950203A2025642E25642E2511 +:1021CE00642E25640D0A00495020524157206D732C +:1021DE006720617272697665640D0072656376665A +:1021EE00726F6D282920656E64202E2E0D00696792 +:1021FE006D7073656E6428290D0025642046616933 +:10220E006C5B25645D0D0A0069676D7073656E64A5 +:08221E00206661696C2E0D00C1 :00000001FF diff --git a/Tangible/tangibleInterface.o b/Tangible/tangibleInterface.o index ce557da..53c583a 100644 Binary files a/Tangible/tangibleInterface.o and b/Tangible/tangibleInterface.o differ -- libgit2 0.21.2