From: Pascal Spring Date: Wed, 15 Jun 2022 21:40:44 +0000 (+0200) Subject: changes X-Git-Url: https://git.traxxnet.ch/?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=arm-f429-disco.git changes --- diff --git a/Release/arm-f429-disco.elf b/Release/arm-f429-disco.elf index 0620d56..106f9b9 100755 Binary files a/Release/arm-f429-disco.elf and b/Release/arm-f429-disco.elf differ diff --git a/Release/arm-f429-disco.hex b/Release/arm-f429-disco.hex index b3af5b3..becb4e8 100644 --- a/Release/arm-f429-disco.hex +++ b/Release/arm-f429-disco.hex @@ -24,13 +24,13 @@ :10016000DD020008DD020008DD020008DD020008F3 :10017000DD020008DD020008DD02000800000000CA :10018000DD020008DD020008DD020008DD020008D3 -:10019000DD02000819160008DD020008DD02000873 +:10019000DD020008A1180008DD020008DD020008E9 :1001A000DD020008DD020008DD02000807B500F0EE :1001B000B7F8274B2748834226D3274A27490020F0 :1001C0008A422DD300F0B8F8254D264C01A9684687 :1001D00000F09EF8641BA4100026B44229DC224DD6 :1001E000224C641BA4100026B44227DCDDE9000188 -:1001F00001F056F91E4D1F4C641B0646A410002C3E +:1001F00001F076FA1E4D1F4C641B0646A410002C1D :1002000021DC304600F080F8D3E900120C3353F8BB :10021000044C891A9442CED9555815600432F9E736 :1002200052F8083B52F8044C9C42C9D943F8040BDD @@ -45,7 +45,7 @@ :1002B0000CBFEFF30880EFF309807146064A104740 :1002C000FEE7FEE7FEE7FEE770470000AD0100082D :0E02D00093020008AB020008C1020008FEE71E -:1002E000981E00080000002010000020981E000842 +:1002E0005C2E000800000020100000205C2E00089A :1002F0000000001000000010100000206C00002022 :080300000000001000000010D5 :1003080008B500F017F8000001230360014B0B60EB @@ -61,7 +61,7 @@ :1003A800C2F3881200F03F004CBF0B4B084BB3FB65 :1003B800F0F35343044A5268C2F301420132520037 :1003C800B3FBF2F3DBE700BF00380240080000206F -:1003D8000024F4004C16000800127A00034B1A6837 +:1003D8000024F400A419000800127A00034B1A68DC :1003E80012B11A68013A1A60704700BF1400002061 :1003F80008B5FFF7B9FF0A4B4FF47A721B68B3FBD5 :10040800F2F3013BB3F1807F09D2064A5360064BF1 @@ -88,407 +88,660 @@ :10055800074A00231380074A1380074B1A88074B62 :100568001A80074B1A88074B1A80FFF767BF00BF2E :100578002C000020200000200E0000202600002073 -:100588000C00002024000020054B4FF480229A61C3 -:10059800044BC9B21970436843F080034360704745 -:1005A800000802406A000020034B4FF00052014649 -:1005B8009A610248FFF7E8BF000C02400050014072 -:1005C800034B4FF4005201469A610248FFF7DCBF23 -:1005D800000C024000500140F8B507462A200D469D -:1005E80016461C46FFF7E0FF380AFFF7E9FFF8B2A6 -:1005F800FFF7E6FF300AFFF7E3FFF0B2FFF7E0FF8F -:100608002B20FFF7D1FF280AFFF7DAFFE4B2E8B2A0 -:10061800FFF7D6FF2046FFF7D3FF2046FFF7D0FFAE -:100628002C20BDE8F840FFF7BFBF10B50446000A0C -:10063800FFF7C6FFE0B2BDE81040FFF7C1BF0000FA -:100648002DE9F0410F4C104D22882B880021013BE9 -:10065800013A80469BB292B20846FFF7BDFF0026DA -:100668002388B2B29A420BD3BDE8F0814046FFF727 -:10067800DCFF01372B88BAB29A42F7D30136EFE78D -:100688000027F7E70E0000200C00002038B51546BB -:100698000A4A128890420B460ED2094A12889142A1 -:1006A8000AD2421C01339BB292B2FFF795FF28464B -:1006B800BDE83840FFF7B9BF38BD00BF0E000020C5 -:1006C8000C00002070B51D46104B1B88984214463C -:1006D80016D20F4B1A88914212D21A880E199642D6 -:1006E800C2BF1C88641AA4B24B1E23449BB20246A4 -:1006F800FFF772FF4FF6FF76013CA4B2B44200D177 -:1007080070BD2846FFF791FFF6E700BF0E000020F6 -:100718000C00002070B51D46104B14461A889042F4 -:1007280016D20F4A1288914212D21A880619964296 -:10073800C2BF1C88241AA4B2421E22440B4692B29D -:10074800FFF74AFF4FF6FF76013CA4B2B44200D14E -:1007580070BD2846FFF769FFF6E700BF0E000020CE -:100768000C000020F8B51546184ABDF818701C464C -:10077800138898421DD2164B1E88B14219D216888A -:1007880000EB050CB445C8BF15881A8801EB0406B0 -:10079800C4BF2D1AADB29642C2BF1C88641AA4B257 -:1007A8004B1E421E23442A449BB292B2FFF714FF09 -:1007B80054B9F8BD3846FFF738FF013EB6B2002EEF -:1007C800F8D1013CA4B2F3E72E46F8E70E0000206A -:1007D8000C00002038B504463620FFF7E5FE04F08B -:1007E80003000228114D124C1BD003281BD00128EE -:1007F8000FD04820FFF7E4FEF0232B804FF4A073BE -:100808002380FFF71BFEFFF797FEBDE83840FFF790 -:100818009FBE2820FFF7D4FE4FF4A0732B80F0234F -:10082800EEE78820E6E7E820F4E700BF0E000020A6 -:100838000C00002010B500EBD10001F0070103689F -:10084800C1F12004944238BF00791BBA03FA01F3BE -:100858003EBFC1F1080140FA01F10B43C2F1200289 -:1008680023FA02F010BD000084B030B503AC84E870 -:100878000F0003AD0FCD054C0FC495E8070084E8C1 -:100888000700BDE8304004B0704700BF34000020C6 -:10089800024B1880024B1980704700BF600000208F -:1008A80050000020024B1880024B1980704700BF8F -:1008B80068000020660000202DE9F04F1F46964B87 -:1008C8001B888BB0984206469146BDF850B09DF8FB -:1008D80054509DF858404FDA904B1B8899424BDA98 -:1008E80005EB450C4FEA4C0C00EB0C03002B43DDE9 -:1008F800E2008B18002B3FDD5F4540F0138109EBC8 -:100908008903012D03931FFA81F940F0F280012C2D -:1009180040F0EF80DFF808B24FF0000A039B05258E -:100928005B444FF0000813F8012B224218BF48F02F -:100938000108013D4FEA4808ADB25FFA88F8002D7A -:10094800F1D14FEA5808B8F1000F0AD0B8F11F0FDB -:10095800ADB214D1A8193B460522494680B2FFF72B -:10096800D9FE0AF1010A640009F10109BAF1080F78 -:10097800E4B21FFA89F9D1D10BB0BDE8F08FB8F114 -:100988001E0F03D1A8193B460422E6E708F01C0312 -:100998001C2B0DD1A8193B460322494680B2FFF70C -:1009A800B9FE4FEA08185FFA88F804352DB2CAE78D -:1009B80008F01803182B0CD1A8193B460222494607 -:1009C80080B24FEAC808FFF7A5FE5FFA88F803353A -:1009D800ECE718F0100F0BD0A8193A46494680B238 -:1009E8004FEA8808FFF752FE5FFA88F80235DDE71C -:1009F8004FEA48085FFA88F80135D7E713F8012B62 -:100A080012EA0B0F18BF44F0010408F1FF38640024 -:100A18001FFA88F8E4B2B8F1000FEFD164086CB19E -:100A28001F2C1FFA88F81DD115FB08F0049A0097AF -:100A380030445346494680B2FFF794FE029B013B7F -:100A48004FEA4B0B9BB2D1445FFA8BFB02931FFA20 -:100A580089F9002B90D0039B314A4FF005081344C5 -:100A68000024CBE71E2C06D115FB08F03044009774 -:100A78005346059ADEE704F01C031C2B10D115FB26 -:100A880008F0304400975346069A494680B2FFF76B -:100A980069FE2401E4B208F104080FFA88F8BEE7F9 -:100AA80004F01803182B0ED115FB08F030440097FA -:100AB8005346079A494680B2E400FFF753FEE4B272 -:100AC80008F10308E9E7E3060ED515FB08F0304402 -:100AD800009753462A46494680B2A400FFF742FED3 -:100AE800E4B208F10208D8E76400E4B208F10108AA -:100AF800D3E7ADB26B009AB2EB180693AB0007923E -:100B08009AB2EB180493082305921FFA84FA029309 -:100B18004FF0010B9FE700BF0E0000200C000020E3 -:100B28007F190008654B1888654B304480B2B3F9CB -:100B380000A00FFA80F8C2457FF71EAF614B1B88F3 -:100B48001944614B89B2B3F900E00EB2B6457FF79C -:100B580013AF5E4BB3F90030C4449C457FF70CAF2C -:100B6800DFF86CC1BCF900C0324462457FF704AFBE -:100B7800ADB205EB4502520043450292A2B204927F -:100B8800C9BF029ABDF90820D21A1218CCBF12B2F6 -:100B9800434698B213445345C8BFAAEB00024FEA34 -:100BA800C404C8BF12B2B445C3BFA4EB0C04641894 -:100BB80024B224B2D8BFB4461FFA8CF1A444F44539 -:100BC800C4BFAEEB010424B24B1E00F1FF3A23442C -:100BD80052449BB292B2FFF7FFFC09EB89030593DD -:100BE800082302930123384AB2F90020B2427FF762 -:100BF800C3AE049A324412B2039206E0344AB2F900 -:100C08000020B24212DD013636B2039AB24204D055 -:100C18002D4AB2F90020B242F0DC029A013A5B0098 -:100C280012F0FF02DBB20292DDD1A5E6059A29494E -:100C380044461144052211F8010B05EB040A184239 -:100C480014BF384658461FFA8AFA06900FFA8AF9EE -:100C5800A1451DD1013A12F0FF024C46EBD1AA443E -:100C6800174C0FFA8AFACA45CDD0184AB2F90020B3 -:100C78004A4508DCB4F900204A4504DD5846069385 -:100C8800FFF7D3FC069B09F101090FFA89F9EAE796 -:100C98000E48B0F90000A0420DDC0948B0F9000088 -:100CA800A04208DD06980791CDE90823FFF7BDFCAF -:100CB800DDE908230799013424B2C9E71C000020A4 -:100CC80030000020280000202E00002022000020F4 -:100CD8002A0000207F1900082DE9F04F87B08146CF -:100CE80016460393DDE91078049179B9002867D096 -:100CF800354BBDF80C001B88109392B21FFA88F38D -:100D0800B9B207B0BDE8F04FFFF72CBD0024DDF8FD -:100D18000CB0924625460AF1FF3A0123049A03FAD9 -:100D28000AF31340059339D0002C0FDDB9F1000FF9 -:100D380032D0254BA2B21B880093ABEB02001FFAFE -:100D480088F3B9B280B2FFF70DFD002401352DB24A -:100D58000BF1010BBAF1000FDDD1039B002D3344D9 -:100D68001E460ADD194BAAB21B880093B01A1FFA57 -:100D780088F3B9B280B2FFF7F5FC002C20DDB9F199 -:100D8800000F1DD0104BA2B21B881093B61A1FFA81 -:100D980088F3B9B2B0B2B4E74C46D7E7002D0CDD02 -:100DA8000A4BAAB21B880093ABEB02001FFA88F328 -:100DB800B9B280B2FFF7D6FC059D013424B2C7E76B -:100DC80007B0BDE8F08F00BF660000206800002073 -:100DD8002DE9F04FC14B997B81428FB0984600F2C4 -:100DE800AE80DB7B8342C0F0AA80401A98F81210CC -:100DF800414398F81220D8F80000D8F80850FFF7B7 -:100E080019FD0544032200212846FFF713FD002899 -:100E180040F0928098F81340032122462846FFF7B5 -:100E280009FD98F814600390033432462146284699 -:100E3800FFF700FD344498F8156021463246814694 -:100E48002846FFF7F7FC0123721E03FA02F202425A -:100E580018BFB340344498F816608246324618BF2B -:100E6800A0EB030A21462846FFF7E4FC0123721E83 -:100E780003FA02F2024218BFB340344498F81760EC -:100E88008346324618BFA0EB030B21462846FFF7DE -:100E9800D1FC934B1A881F881AEB070705D51A88C7 -:100EA800A2EB0A0292B21A8000278E4A039912888E -:100EB8003944914217DD8C4A1278002A3CD0BAF1A5 -:100EC800000FB4BFCAF1000A00228849AEBF1A80D9 -:100ED8001FFA8AFAA3F800A00F8898F818203A4455 -:100EE80092B20A8000278149DFF820C20A88BCF83C -:100EF80000C0944520D90A88CDF80890344498F861 -:100F0800196016447A4AB2F800C07A4A128892B236 -:100F1800A6EB090680B26245A6EB0B060A9020D123 -:100F28004FF0800B029B002B00F39D806C4B0A9ABC -:100F38001888024490B218800FB0BDE8F08F98F876 -:100F480010308342F8D898F811208242F4D3C01A9E -:100F580098F80F301844401A98F8121000FB011145 -:100F680047E71A88644B6548B3F90030B0F90000C8 -:100F780009881A443B4406930A9B1FFA82FA0144E3 -:100F88000AEB030C0644039B06981FFA8CFC0344E7 -:100F9800634589B200F39E80594B5A48B3F90070F3 -:100FA80098F81830B0F90000BC45A8BF1FFA87FCB4 -:100FB8000CF1FF3C0B449BB2B1441FFA8CFBDFF8E9 -:100FC80050C19945C8BF1FFA89F3BCF900E08342B4 -:100FD800A8BF83B2DE45A9DC069A5245A8BF52468F -:100FE8001FFA82FC6745A1DD013B9BB20993464B82 -:100FF800B3F90070099B9F4298DCB142A8BF314603 -:101008008BB2984292DDE64592B20C927246B8BF16 -:1010180062469F420B92B8BF1F465A46099B0C98DE -:10102800BDF82C80DFF8C8A089B2FFF7D5FABFB2A7 -:10103800B7427CDBB3B20493029B002B79DC099E98 -:10104800049B2B4C0136F61A0B9B0BF1010CACEBF5 -:10105800030C16FB0CF6B6B2012E208800F21181A3 -:10106800FFF7E3FA62E7E308611CEA5C04F00703B0 -:101078004BFA03F31A422AD003222846FFF7DAFB79 -:10108800211D00F1020A4FF000090C46039BA3EB57 -:101098000908B8F1200FA8BF4FF0200821464246A2 -:1010A8002846FFF7C7FB07EB09030146CDE9006AAD -:1010B80042460020FFF710FE039BC1444B454444C1 -:1010C800E4D8029BA3EB0A03564402932AE74FF0A5 -:1010D800010AD8E71FFA83FC5EE700BF340000204E -:1010E800600000200E0000201800002050000020A2 -:1010F80066000020680000201C0000202800002056 -:10110800300000202E0000202A0000200C000020C3 -:1011180022000020BAF80000FFF787FA09F1010958 -:101128001FFA89F9D945F5D90137BFB280E7C14619 -:10113800F8E7631C0793E30804F00701EA5C8023DF -:101148000B411A4219D00322611C2846FFF772FB93 -:10115800831C0593231D0793059B049F079C0893F5 -:10116800089B013B089301330AD1029B059A9B1AFD -:101178000293049B13441E465CE701230593EBE7A7 -:10118800424BB3F90030BB4234DDBDF81860079C10 -:101198004FF0000A039BA3EB0A083C4BB3F900305D -:1011A800B8F1200F28BF4FF02008BB4216DC384B9F -:1011B800B3F90030BB4211DD424621462846FFF70D -:1011C80039FB4FF0010908F1FF3309FA03F9314AF5 -:1011D800314B0D90B9F1000F29D14444039BC2440F -:1011E8005345D7D8294BB3F90030BB4239DD013715 -:1011F800BFB2B5E7264BB3F90030BB42C5DD0C9C46 -:10120800254EDFF890800EE0244BB3F90030A3425E -:1012180007DCB6F90030A34203DDB8F80000FFF799 -:1012280004FA0134A4B2069B9C42EDDBADE71B49EE -:10123800B1F900108E420FDBB3F900108E420BDAC1 -:101248000D9919EA010F16BF15491088088880B250 -:10125800FFF7EBF90F4A104B01364FEA5909B6B2BE -:10126800B8E70B4BB3F90030BB42C0DDDFF8248090 -:10127800B345BCD3B8F800000136FFF7D6F9B6B2CB -:10128800F6E7013EFFF7D1F9B6B2E5E62A000020FD -:101298002E000020660000203000002022000020E0 -:1012A80068000020F0B50A2885B002460CD1214A12 -:1012B800214B1978138803EBC1039BB213801F4B92 -:1012C80000221A8005B0F0BD0D28FBD01B4C1C4D28 -:1012D800184E1C4B208831881B882F88164D95F88E -:1012E80000C095F800E00097CDE901CE09B200B240 -:1012F800FFF7E2FA2A78238802EB420203EB420363 -:101308009BB22380104B1B78002BDBD00F4B22881D -:1013180019882B786FF0050000FB03139342D1DA8C -:101328002A78338803EBC2039BB2338000232380DF -:10133800C8E700BF500000206200002060000020C5 -:101348006600002068000020180000200E00002021 -:1013580038B5074D044614F9010B00B938BD2B68A0 -:101368001BB1C0B2FFF734FDF5E7FFF79BFFF2E7CB -:1013780034000020444B1A68002142F0010210B5E5 -:101388001A6099601A6822F0847222F480321A6016 -:101398003E4A5A601A6822F480221A60D9601A6C90 -:1013A8003B4942F080521A640A6842F400420A60DB -:1013B80001F5E6310A6842F4E06242F004020A608C -:1013C8009A689A609A6842F4A0529A609A6842F4BD -:1013D80000429A601A6842F4A0221A601A689103BF -:1013E800FCD52C4A5A601A6842F080721A60264B63 -:1013F8001C461A689201FCD59A6822F003029A608A -:101408009A6842F002029A60A36803F00C03082B62 -:10141800FAD1FEF7A9FF236B43F001032363236B83 -:1014280043F002032363236B43F004032363236B1A -:1014380043F008032363236B43F010032363236BF8 -:1014480043F020032363236B43F040032363236BA0 -:1014580043F400132363236C43F002032364236CD7 -:1014680043F004032364636C43F001036364636C17 -:1014780043F480136364236C43F400132364236CE4 -:1014880043F00053236410BD00380240103000249C -:10149800007000400A5A40291FB5FFF76BFFFEF79E -:1014A800A7FF554B554C1A6842F010021A609A680B -:1014B80042F030029A60D3F8002442F08062C3F808 -:1014C8000024D3F8082442F04062C3F80824D3F873 -:1014D800002C42F40822C3F8002CD3F8082C42F45C -:1014E8004C22C3F8082CD3F8202C42F0A042C3F8B1 -:1014F800202CD3F8242C42F05002C3F8242C236863 -:1015080043F080632360A36843F04063A3603C4BCF -:101518001A6842F443721A601A6842F040021A606C -:10152800384A936843F4001393604FF4FA70FEF757 -:101538007DFF0020FFF784F80320FFF74BF9002117 -:101548006920FFF7A5F9304B03F1100207CA8DE8AF -:1015580007000FCBFFF788F900214FF62050FFF75F -:10156800A1F92A48FFF7F4FE4FF6FF734FF4B4725F -:101578000A210020FFF7CEF8E12210464FF6FF734C -:101588000A21FFF79FF84FF6FF737A224121E620E0 -:10159800FFF7C0F84FF6FF737A22C821E620FFF75D -:1015A800B9F84FF6FF734FF4B472DE210020FFF74D -:1015B800B1F84CF21865AE231A463C21E22000959A -:1015C800FFF7D0F800951B234FF4A072DF2100200D -:1015D800FFF7C8F8A36943F40053A3614FF4FA7006 -:1015E800FEF724FFA36943F00053A3614FF4FA7098 -:1015F800FEF71CFFEEE700BF00080240001802409B -:101608000050014000E100E05C1600087B1E000865 -:10161800094B9A6892070DD508490A78D2B2DA6060 -:101628005A6822F080025A60DB68DBB20B70044B08 -:1016380004229A61704700BF005001406A000020F0 -:10164800000802400000000000000000010203043E -:1016580006070809081900080000000078160008A5 -:101668000100207E00000A04040204040B080000A4 -:10167800000018030016440662A4D00B003415F8C5 -:1016880053F1400B27B1CAA874155384130051892C -:101698001283401681488C0D0038C8486144688E12 -:1016A80080026294C007472096421007472216120C -:1016B8004006822139280AA0B411F820026F1CC004 -:1016C8000621238002281A07001C1A51000B00313A -:1016D800D913800700309AD90B0031C8C04210874F -:1016E800C00B0031C882340513800B00304342928E -:1016F8007E040B0031E420F40513800B0031C8A0F0 -:10170800F4C4E00B0033F02824A00B0031D113A659 -:1017180027000B0031D313C144E002C01B44030768 -:101728001B49800AA0B0272070200A6133E03E0AD6 -:10173800A0B2070272000B0031C882141001001514 -:1017480047587C3044D526C512A69361011FC00FA7 -:1017580000404494223E88200D003BE885FCC2F8F6 -:101768000D0038E2350111C00D003BC4550A278031 -:101778000B0033F107E60F800B0033F107AA000FC7 -:101788000040E1120A023A0910E00D003CC2FEA135 -:10179800030016D009002D8C49800D003A14491613 -:1017A800348890800B0036C1F00F00420C639AB168 -:1017B800240D003A16314C4A8D080F0040E11541BE -:1017C800221C0B0033D317A6000F0040E114C14DB3 -:1017D800221F0D003BE885F24889080D0039E428EE -:1017E8000C060284F00B0033FA400D003EC2780F5D -:1017F800004441845052040017185210A28C252826 -:10180800515041000D003A184A0C8490800F004254 -:101818000C2214A1000D0039F050241041F805479E -:101828001BD93007001C4A504005471BD4B00A8218 -:101838002890A4400C2733F0044322200AC031C862 -:101848009E8A6E800B00344166622CAC0AC031C897 -:10185800C411380B003404D4E2299A0AC031C8BE36 -:1018680082270007002093DA0B0731A9C4533417E5 -:10187800800B003441666A2003001264055F111A68 -:10188800A009002C4254C72920030016D00EC042DC -:10189800F34D490AC033D7100AC031D513800B075E -:1018A80032CCC4595A200B0731A9C453360206C09A -:1018B80022B5400AC031C89812270007181C27A46F -:1018C800600AC0354533400AC03446150412C05278 -:1018D8002294C2AA08800AC03225410A440B073460 -:1018E800461524200AC033E141087C074720CA4A2C -:1018F80042034716E6074F224A1A480A4233AB000A -:101908000000301C0B04C1C09C310D43B1044613C8 -:1019180005015057174631A0711E88222C93268A3C -:1019280022A8AE2CCBA2FCC633CDF3A0F03E100407 -:10193800210F469204912A4D1395054A549595898D -:101948006B5D57A5FD886519D695AE6CDB96F9C415 -:10195800721CC751DC78DEB7CDF8806088321186FA -:1019680061D88E288BA368FA4392E5195E5D99A623 -:10197800D9D27BA0685A2C00000000003E5B4F5B68 -:101988003E3E6B4F6B3E1C3E7C3E1C183C7E3C181A -:101998001C577D571C1C5E7F5E1C00183C1800FFFE -:1019A800E7C3E7FF0018241800FFE7DBE7FF30482C -:1019B8003A060E2629792926407F050507407F0526 -:1019C800253F5A3CE73C5A7F3E1C1C08081C1C3E1D -:1019D8007F14227F22145F5F005F5F06097F017F0B -:1019E800006689956A606060606094A2FFA29408AE -:1019F800047E040810207E201008082A1C08081CF1 -:101A08002A08081E101010100C1E0C1E0C30383E30 -:101A18003830060E3E0E06000000000000005F0091 -:101A2800000007000700147F147F14242A7F2A125D -:101A38002313086462364956205000080703000043 -:101A48001C2241000041221C002A1C7F1C2A080875 -:101A58003E08080080703000080808080800006088 -:101A6800600020100804023E5149453E00427F4074 -:101A78000072494949462141494D331814127F10D3 -:101A880027454545393C4A4949314121110907361D -:101A980049494936464949291E00001400000040BA -:101AA80034000000081422411414141414004122B4 -:101AB800140802015909063E415D594E7C12111263 -:101AC8007C7F494949363E414141227F4141413E5F -:101AD8007F494949417F090909013E414151737FC5 -:101AE8000808087F00417F41002040413F017F08EE -:101AF8001422417F404040407F021C027F7F04083F -:101B0800107F3E4141413E7F090909063E4151216E -:101B18005E7F09192946264949493203017F010395 -:101B28003F4040403F1F2040201F3F4038403F6318 -:101B38001408146303047804036159494D43007F72 -:101B48004141410204081020004141417F04020143 -:101B580002044040404040000307080020545478E5 -:101B6800407F284444383844444428384444287F33 -:101B7800385454541800087E090218A4A49C787F8D -:101B88000804047800447D40002040403D007F1058 -:101B980028440000417F40007C047804787C0804D5 -:101BA80004783844444438FC182424181824241889 -:101BB800FC7C08040408485454542404043F442476 -:101BC8003C4040207C1C2040201C3C4030403C4491 -:101BD800281028444C9090907C4464544C4400084D -:101BE800364100000077000000413608000201027B -:101BF80004023C2623263C1EA1A161123A40402043 -:101C08007A385454555921555579412154547841BD -:101C1800215554784020545579400C1E527212397F -:101C28005555555939545454593955545458000038 -:101C3800457C410002457D420001457C40F0292455 -:101C480029F0F0282528F07C545545002054547C70 -:101C5800547C0A097F493249494932324848483256 -:101C6800324A4848303A4141217A3A424020780085 -:101C78009DA0A07D39444444393D4040403D3C242A -:101C8800FF2424487E4943662B2FFC2F2BFF09296C -:101C9800F620C0887E090320545479410000447D11 -:101CA800413048484A32384040227A007A0A0A725B -:101CB8007D0D19317D2629292F2826292929263005 -:101CC800484D4020380808080808080808382F1028 -:101CD800C8ACBA2F102834FA00007B000008142A78 -:101CE800142222142A1408AA005500AAAA55AA5593 -:101CF800AA000000FF00101010FF00141414FF00C9 -:101D08001010FF00FF1010F010F0141414FC001451 -:101D180014F700FF0000FF00FF1414F404FC14146F -:101D280017101F10101F101F1414141F001010106C -:101D3800F0000000001F101010101F10101010F0FD -:101D480010000000FF101010101010101010FF10DD -:101D5800000000FF140000FF00FF00001F10170024 -:101D680000FC04F414141710171414F404F40000FD -:101D7800FF00F714141414141414F700F7141414AF -:101D8800171410101F101F141414F4141010F0104E -:101D9800F000001F101F0000001F14000000FC14BA -:101DA8000000F010F01010FF10FF141414FF1410AE -:101DB80010101F00000000F010FFFFFFFFFFF0F001 -:101DC800F0F0F0FFFFFF0000000000FFFF0F0F0F13 -:101DD8000F0F38444438447C2A2A3E147E020206F7 -:101DE80006027E027E0263554941633844443C043E -:101DF800407E201E2006027E020299A5E7A5991CB6 -:101E08002A492A1C4C7201724C304A4D4D303048D8 -:101E1800784830BC625A463D3E494949007E010136 -:101E2800017E2A2A2A2A2A44445F444440514A44CB -:101E38004040444A51400000FF0103E080FF000099 -:101E480008086B6B083612362436060F090F060091 -:101E58000018180000001010003040FF0101001F9A -:101E680001011E00191D1712003C3C3C3C000000FB -:101E7800000000456C656374726F6E6963204C6F77 -:0D1E880061642062792048423945564900C6 -:101E980010000020000000000024F400F0004001C1 +:100588000C00002024000020044B4FF400529A6114 +:10059800A3F580634FF480229A617047000C0240F3 +:1005A80008B5C820FFF742FFC820FFF73FFFC82063 +:1005B800BDE80840FFF73ABF054B4FF480229A6127 +:1005C800044B054A1970536843F080035360704721 +:1005D800000802406A00002000500140034B4FF021 +:1005E800005201469A610248FFF7E6BF000C02403C +:1005F80000500140034B4FF4005201469A610248F3 +:10060800FFF7DABF000C024000500140F8B507467A +:100618002A200D4616461C46FFF7E0FF380AFFF76A +:10062800E9FFF8B2FFF7E6FF300AFFF7E3FFF0B2A1 +:10063800FFF7E0FF2B20FFF7D1FF280AFFF7DAFFCB +:10064800E4B2E8B2FFF7D6FF2046FFF7D3FF204613 +:10065800FFF7D0FF2C20BDE8F840FFF7BFBF000030 +:1006680008B5FFF791FF804B04229A61FFF798FFC6 +:100678000120FFF7B3FFCB20FFF7B0FF3920FFF7CA +:10068800B9FF2C20FFF7B6FF0020FFF7B3FF342097 +:10069800FFF7B0FF0220FFF7ADFFCF20FFF79EFF67 +:1006A8000020FFF7A7FFC120FFF7A4FF3020FFF7C6 +:1006B800A1FFE820FFF792FF8520FFF79BFF0020AE +:1006C800FFF798FF7820FFF795FFEA20FFF786FFEE +:1006D8000020FFF78FFF0020FFF78CFFED20FFF7CA +:1006E8007DFF6420FFF786FF0320FFF783FF1220BA +:1006F800FFF780FF8120FFF77DFFF720FFF76EFFF0 +:100708002020FFF777FFC020FFF768FF2320FFF7BF +:1007180071FFC120FFF762FF1020FFF76BFFC520B4 +:10072800FFF75CFF3E20FFF765FF2820FFF762FF19 +:10073800C720FFF753FF8620FFF75CFF3620FFF73F +:100748004DFF4820FFF756FF3A20FFF747FF552097 +:10075800FFF750FFB120FFF741FF0020FFF74AFFE6 +:100768001820FFF747FFB620FFF738FF0820FFF7EC +:1007780041FF8220FFF73EFF2720FFF73BFFF220D3 +:10078800FFF72CFF0020FFF735FF2620FFF726FF95 +:100798000120FFF72FFFE020FFF720FF0F20FFF7D2 +:1007A80029FF3120FFF726FF2B20FFF723FF0C201E +:1007B800FFF720FF0E20FFF71DFF0820FFF71AFFA5 +:1007C8004E20FFF717FFF120FFF714FF3720FFF740 +:1007D80011FF0720FFF70EFF1020FFF70BFF032084 +:1007E800FFF708FF0E20FFF705FF0920FFF702FFBC +:1007F8000020FFF7FFFEE120FFF7F0FE0020FFF7E3 +:10080800F9FE0E20FFF7F6FE1420FFF7F3FE032093 +:10081800FFF7F0FE1120FFF7EDFE0720FFF7EAFED5 +:100828003120FFF7E7FEC120FFF7E4FE4820FFF77D +:10083800E1FE0820FFF7DEFE0F20FFF7DBFE0C20AD +:10084800FFF7D8FE3120FFF7D5FE3620FFF7D2FE9E +:100858000F20FFF7CFFE1120FFF7C0FE2920BDE8CB +:100868000840FFF7BBBE00BF0008024010B50446B1 +:10087800000AFFF7BFFEE0B2BDE81040FFF7BABEBE +:100888002DE9F0410F4C104D22882B880021013BA7 +:10089800013A80469BB292B20846FFF7B7FE00269F +:1008A8002388B2B29A420BD3BDE8F0814046FFF7E5 +:1008B800DDFF01372B88BAB29A42F7D30136EFE74A +:1008C8000027F7E70E0000200C00002038B5154679 +:1008D8000A4A128890420B460ED2094A128891425F +:1008E8000AD2421C01339BB292B2FFF78FFE284610 +:1008F800BDE83840FFF7BABF38BD00BF0E00002082 +:100908000C00002070B51D46104B1B8898421446F9 +:1009180016D20F4B1A88914212D21A880E19964293 +:10092800C2BF1C88641AA4B24B1E23449BB2024661 +:10093800FFF76CFE4FF6FF76013CA4B2B44200D13B +:1009480070BD2846FFF792FFF6E700BF0E000020B3 +:100958000C00002070B51D46104B14461A889042B2 +:1009680016D20F4A1288914212D21A880619964254 +:10097800C2BF1C88241AA4B2421E22440B4692B25B +:10098800FFF744FE4FF6FF76013CA4B2B44200D113 +:1009980070BD2846FFF76AFFF6E700BF0E0000208B +:1009A8000C000020F8B51546184ABDF818701C460A +:1009B800138898421DD2164B1E88B14219D2168848 +:1009C80000EB050CB445C8BF15881A8801EB04066E +:1009D800C4BF2D1AADB29642C2BF1C88641AA4B215 +:1009E8004B1E421E23442A449BB292B2FFF70EFECE +:1009F80054B9F8BD3846FFF739FF013EB6B2002EAC +:100A0800F8D1013CA4B2F3E72E46F8E70E00002027 +:100A18000C00002038B504463620FFF7DFFD04F04F +:100A280003000228114D124C1BD003281BD00128AB +:100A38000FD04820FFF7DEFDF0232B804FF4A07382 +:100A48002380FFF7FBFCFFF777FDBDE83840FFF791 +:100A58007FBD2820FFF7CEFD4FF4A0732B80F02335 +:100A6800EEE78820E6E7E820F4E700BF0E00002064 +:100A78000C00002010B500EBD10001F0070103685D +:100A8800C1F12004944238BF00791BBA03FA01F37C +:100A98003EBFC1F1080140FA01F10B43C2F1200247 +:100AA80023FA02F010BD000084B030B503AC84E82E +:100AB8000F0003AD0FCD054C0FC495E8070084E87F +:100AC8000700BDE8304004B0704700BF3400002084 +:100AD800024B1880024B1980704700BF600000204D +:100AE80050000020024B1880024B1980704700BF4D +:100AF80068000020660000202DE9F04F1F46964B45 +:100B08001B888BB0984206469146BDF850B09DF8B8 +:100B180054509DF858404FDA904B1B8899424BDA55 +:100B280005EB450C4FEA4C0C00EB0C03002B43DDA6 +:100B3800E2008B18002B3FDD5F4540F0138109EB85 +:100B48008903012D03931FFA81F940F0F280012CEB +:100B580040F0EF80DFF808B24FF0000A039B05254C +:100B68005B444FF0000813F8012B224218BF48F0ED +:100B78000108013D4FEA4808ADB25FFA88F8002D38 +:100B8800F1D14FEA5808B8F1000F0AD0B8F11F0F99 +:100B9800ADB214D1A8193B460522494680B2FFF7E9 +:100BA800D9FE0AF1010A640009F10109BAF1080F36 +:100BB800E4B21FFA89F9D1D10BB0BDE8F08FB8F1D2 +:100BC8001E0F03D1A8193B460422E6E708F01C03D0 +:100BD8001C2B0DD1A8193B460322494680B2FFF7CA +:100BE800B9FE4FEA08185FFA88F804352DB2CAE74B +:100BF80008F01803182B0CD1A8193B4602224946C5 +:100C080080B24FEAC808FFF7A5FE5FFA88F80335F7 +:100C1800ECE718F0100F0BD0A8193A46494680B2F5 +:100C28004FEA8808FFF752FE5FFA88F80235DDE7D9 +:100C38004FEA48085FFA88F80135D7E713F8012B1F +:100C480012EA0B0F18BF44F0010408F1FF386400E2 +:100C58001FFA88F8E4B2B8F1000FEFD164086CB15C +:100C68001F2C1FFA88F81DD115FB08F0049A00976D +:100C780030445346494680B2FFF794FE029B013B3D +:100C88004FEA4B0B9BB2D1445FFA8BFB02931FFADE +:100C980089F9002B90D0039B314A4FF00508134483 +:100CA8000024CBE71E2C06D115FB08F03044009732 +:100CB8005346059ADEE704F01C031C2B10D115FBE4 +:100CC80008F0304400975346069A494680B2FFF729 +:100CD80069FE2401E4B208F104080FFA88F8BEE7B7 +:100CE80004F01803182B0ED115FB08F030440097B8 +:100CF8005346079A494680B2E400FFF753FEE4B230 +:100D080008F10308E9E7E3060ED515FB08F03044BF +:100D1800009753462A46494680B2A400FFF742FE90 +:100D2800E4B208F10208D8E76400E4B208F1010867 +:100D3800D3E7ADB26B009AB2EB180693AB000792FB +:100D48009AB2EB180493082305921FFA84FA0293C7 +:100D58004FF0010B9FE700BF0E0000200C000020A1 +:100D68001B290008654B1888654B304480B2B3F9DD +:100D780000A00FFA80F8C2457FF71EAF614B1B88B1 +:100D88001944614B89B2B3F900E00EB2B6457FF75A +:100D980013AF5E4BB3F90030C4449C457FF70CAFEA +:100DA800DFF86CC1BCF900C0324462457FF704AF7C +:100DB800ADB205EB4502520043450292A2B204923D +:100DC800C9BF029ABDF90820D21A1218CCBF12B2B4 +:100DD800434698B213445345C8BFAAEB00024FEAF2 +:100DE800C404C8BF12B2B445C3BFA4EB0C04641852 +:100DF80024B224B2D8BFB4461FFA8CF1A444F445F7 +:100E0800C4BFAEEB010424B24B1E00F1FF3A2344E9 +:100E180052449BB292B2FFF7F9FB09EB89030593A1 +:100E2800082302930123384AB2F90020B2427FF71F +:100E3800C3AE049A324412B2039206E0344AB2F9BD +:100E48000020B24212DD013636B2039AB24204D013 +:100E58002D4AB2F90020B242F0DC029A013A5B0056 +:100E680012F0FF02DBB20292DDD1A5E6059A29490C +:100E780044461144052211F8010B05EB040A1842F7 +:100E880014BF384658461FFA8AFA06900FFA8AF9AC +:100E9800A1451DD1013A12F0FF024C46EBD1AA44FC +:100EA800174C0FFA8AFACA45CDD0184AB2F9002071 +:100EB8004A4508DCB4F900204A4504DD5846069343 +:100EC800FFF7D4FC069B09F101090FFA89F9EAE753 +:100ED8000E48B0F90000A0420DDC0948B0F9000046 +:100EE800A04208DD06980791CDE90823FFF7BEFC6C +:100EF800DDE908230799013424B2C9E71C00002062 +:100F080030000020280000202E00002022000020B1 +:100F18002A0000201B2900082DE9F04F87B08146E0 +:100F280016460393DDE91078049179B9002867D053 +:100F3800354BBDF80C001B88109392B21FFA88F34A +:100F4800B9B207B0BDE8F04FFFF72CBD0024DDF8BB +:100F58000CB0924625460AF1FF3A0123049A03FA97 +:100F68000AF31340059339D0002C0FDDB9F1000FB7 +:100F780032D0254BA2B21B880093ABEB02001FFABC +:100F880088F3B9B280B2FFF70DFD002401352DB208 +:100F98000BF1010BBAF1000FDDD1039B002D334497 +:100FA8001E460ADD194BAAB21B880093B01A1FFA15 +:100FB80088F3B9B280B2FFF7F5FC002C20DDB9F157 +:100FC800000F1DD0104BA2B21B881093B61A1FFA3F +:100FD80088F3B9B2B0B2B4E74C46D7E7002D0CDDC0 +:100FE8000A4BAAB21B880093ABEB02001FFA88F3E6 +:100FF800B9B280B2FFF7D6FC059D013424B2C7E729 +:1010080007B0BDE8F08F00BF660000206800002030 +:101018002DE9F04FC14B997B81428FB0984600F281 +:10102800AE80DB7B8342C0F0AA80401A98F8121089 +:10103800414398F81220D8F80000D8F80850FFF774 +:1010480019FD0544032200212846FFF713FD002857 +:1010580040F0928098F81340032122462846FFF773 +:1010680009FD98F814600390033432462146284657 +:10107800FFF700FD344498F8156021463246814652 +:101088002846FFF7F7FC0123721E03FA02F2024218 +:1010980018BFB340344498F816608246324618BFE9 +:1010A800A0EB030A21462846FFF7E4FC0123721E41 +:1010B80003FA02F2024218BFB340344498F81760AA +:1010C8008346324618BFA0EB030B21462846FFF79C +:1010D800D1FC934B1A881F881AEB070705D51A8885 +:1010E800A2EB0A0292B21A8000278E4A039912884C +:1010F8003944914217DD8C4A1278002A3CD0BAF163 +:10110800000FB4BFCAF1000A00228849AEBF1A8096 +:101118001FFA8AFAA3F800A00F8898F818203A4412 +:1011280092B20A8000278149DFF820C20A88BCF8F9 +:1011380000C0944520D90A88CDF80890344498F81E +:10114800196016447A4AB2F800C07A4A128892B2F4 +:10115800A6EB090680B26245A6EB0B060A9020D1E1 +:101168004FF0800B029B002B00F39D806C4B0A9A7A +:101178001888024490B218800FB0BDE8F08F98F834 +:1011880010308342F8D898F811208242F4D3C01A5C +:1011980098F80F301844401A98F8121000FB011103 +:1011A80047E71A88644B6548B3F90030B0F9000086 +:1011B80009881A443B4406930A9B1FFA82FA0144A1 +:1011C8000AEB030C0644039B06981FFA8CFC0344A5 +:1011D800634589B200F39E80594B5A48B3F90070B1 +:1011E80098F81830B0F90000BC45A8BF1FFA87FC72 +:1011F8000CF1FF3C0B449BB2B1441FFA8CFBDFF8A7 +:1012080050C19945C8BF1FFA89F3BCF900E0834271 +:10121800A8BF83B2DE45A9DC069A5245A8BF52464C +:101228001FFA82FC6745A1DD013B9BB20993464B3F +:10123800B3F90070099B9F4298DCB142A8BF3146C0 +:101248008BB2984292DDE64592B20C927246B8BFD4 +:1012580062469F420B92B8BF1F465A46099B0C989C +:10126800BDF82C80DFF8C8A089B2FFF7CFF9BFB26C +:10127800B7427CDBB3B20493029B002B79DC099E56 +:10128800049B2B4C0136F61A0B9B0BF1010CACEBB3 +:10129800030C16FB0CF6B6B2012E208800F2118161 +:1012A800FFF7E4FA62E7E308611CEA5C04F007036D +:1012B8004BFA03F31A422AD003222846FFF7DAFB37 +:1012C800211D00F1020A4FF000090C46039BA3EB15 +:1012D8000908B8F1200FA8BF4FF020082146424660 +:1012E8002846FFF7C7FB07EB09030146CDE9006A6B +:1012F80042460020FFF710FE039BC1444B4544447F +:10130800E4D8029BA3EB0A03564402932AE74FF062 +:10131800010AD8E71FFA83FC5EE700BF340000200B +:10132800600000200E00002018000020500000205F +:1013380066000020680000201C0000202800002013 +:10134800300000202E0000202A0000200C00002081 +:1013580022000020BAF80000FFF788FA09F1010915 +:101368001FFA89F9D945F5D90137BFB280E7C146D7 +:10137800F8E7631C0793E30804F00701EA5C80239D +:101388000B411A4219D00322611C2846FFF772FB51 +:10139800831C0593231D0793059B049F079C0893B3 +:1013A800089B013B089301330AD1029B059A9B1ABB +:1013B8000293049B13441E465CE701230593EBE765 +:1013C800424BB3F90030BB4234DDBDF81860079CCE +:1013D8004FF0000A039BA3EB0A083C4BB3F900301B +:1013E800B8F1200F28BF4FF02008BB4216DC384B5D +:1013F800B3F90030BB4211DD424621462846FFF7CB +:1014080039FB4FF0010908F1FF3309FA03F9314AB2 +:10141800314B0D90B9F1000F29D14444039BC244CC +:101428005345D7D8294BB3F90030BB4239DD0137D2 +:10143800BFB2B5E7264BB3F90030BB42C5DD0C9C03 +:10144800254EDFF890800EE0244BB3F90030A3421C +:1014580007DCB6F90030A34203DDB8F80000FFF757 +:1014680005FA0134A4B2069B9C42EDDBADE71B49AB +:10147800B1F900108E420FDBB3F900108E420BDA7F +:101488000D9919EA010F16BF15491088088880B20E +:10149800FFF7ECF90F4A104B01364FEA5909B6B27B +:1014A800B8E70B4BB3F90030BB42C0DDDFF824804E +:1014B800B345BCD3B8F800000136FFF7D7F9B6B288 +:1014C800F6E7013EFFF7D2F9B6B2E5E62A000020BA +:1014D8002E0000206600002030000020220000209E +:1014E80068000020F0B50A2885B002460CD1214AD0 +:1014F800214B1978138803EBC1039BB213801F4B50 +:1015080000221A8005B0F0BD0D28FBD01B4C1C4DE5 +:10151800184E1C4B208831881B882F88164D95F84B +:1015280000C095F800E00097CDE901CE09B200B2FD +:10153800FFF7E2FA2A78238802EB420203EB420320 +:101548009BB22380104B1B78002BDBD00F4B2288DB +:1015580019882B786FF0050000FB03139342D1DA4A +:101568002A78338803EBC2039BB23380002323809D +:10157800C8E700BF50000020620000206000002083 +:101588006600002068000020180000200E000020DF +:1015980038B5074D044614F9010B00B938BD2B685E +:1015A8001BB1C0B2FFF734FDF5E7FFF79BFFF2E789 +:1015B80034000020444B1A68002142F0010210B5A3 +:1015C8001A6099601A6822F0847222F480321A60D4 +:1015D8003E4A5A601A6822F480221A60D9601A6C4E +:1015E8003B4942F080521A640A6842F400420A6099 +:1015F80001F5E6310A6842F4E06242F004020A604A +:101608009A689A609A6842F4A0529A609A6842F47A +:1016180000429A601A6842F4A0221A601A6891037C +:10162800FCD52C4A5A601A6842F080721A60264B20 +:101638001C461A689201FCD59A6822F003029A6047 +:101648009A6842F002029A60A36803F00C03082B20 +:10165800FAD1FEF789FE236B43F001032363236B62 +:1016680043F002032363236B43F004032363236BD8 +:1016780043F008032363236B43F010032363236BB6 +:1016880043F020032363236B43F040032363236B5E +:1016980043F400132363236C43F002032364236C95 +:1016A80043F004032364636C43F001036364636CD5 +:1016B80043F480136364236C43F400132364236CA2 +:1016C80043F00053236410BD00380240103000245A +:1016D800007000400A5A4029F0B587B0FFF76AFF4A +:1016E800FEF786FE654B1A6842F010021A609A6887 +:1016F80042F030029A6003F580631A6842F0806213 +:101708001A609A6842F040629A60D3F8002822F47E +:101718004C22C3F80028D3F8002842F40822C3F862 +:101728000028D3F8082842F44C22C3F80828D3F834 +:10173800202842F0A042C3F82028D3F8242842F0F9 +:101748005002C3F82428D3F8002C42F08062C3F872 +:10175800002CD3F8082C42F04062C3F8082CA3F5FB +:101768003C4300241A6842F441721A605C601A68AB +:1017780042F040021A60424A936843F400139360AF +:101788004FF4FA70FEF752FEFEF76AFF2046FFF7A5 +:1017980077F80320FFF73EF921466920FFF798F90B +:1017A800384B03F1100207CA8DE807000FCBFFF78B +:1017B8007BF921464FF62050FFF794F93248FFF79E +:1017C800E7FE4FF6FF734FF4B4720A212046FFF785 +:1017D800C1F8E12210464FF6FF730A21FFF792F88D +:1017E8004FF6FF737A224121E620FFF7B3F84FF650 +:1017F800FF737A22C821E620FFF7ACF84FF6FF7393 +:101808004FF4B472DE212046FFF7A4F84CF21865B5 +:10181800AE231A4600953C21E220FFF7C3F8009555 +:101828001B234FF4A072DF212046184DFFF7BAF8AA +:1018380005F11006E7B20A2204A9384600F064F858 +:1018480096E807008DE8070095E80F00FFF72CF9E8 +:1018580064210A20FFF73CF9092F0AD80C48FFF742 +:1018680097FE04A8FFF794FE6420FEF7DFFD01341D +:10187800E0E7632FF5D80748F1E700BF000802400A +:1018880000E100E0F8250008172E0008B419000848 +:10189800312E0008322E00080B4B9A68910707D5A5 +:1018A8000A4A1278D2B2DA605A6822F080025A6084 +:1018B8009A68D20707D5DA680449D2B20A705A681A +:1018C80022F040025A607047005001406A00002030 +:1018D800931E222B15D80A2A10B50B4605D00C46A4 +:1018E800194600F013F8204610BD0028F7DA2D2419 +:1018F80003F8014B40420C46194600F007F8204611 +:1019080010BD002008707047FFF7E2BFF0B4DFF8A1 +:1019180084C0164604460D46BCE80F008AB06F46E0 +:101928000FC7BCE80F000FC79CE80300B31E47F8B9 +:10193800040B222B397028D86B1E9C46002701E027 +:101948000F4604460AA9B4FBF6F006FB10420A4407 +:10195800A64212F8282C0CF8012F07F10101EFD943 +:1019680000226A54294467B111F8012D5C785A7035 +:10197800981C0133DA432A44401B3A4490420C70C5 +:10198800F2DB28460AB0F0BC7047002028700AB085 +:10199800F0BC7047342E0008FFF7B8BF0000000005 +:1019A8000000000001020304060708096625000874 +:1019B80000000000D01900080100207E00000C067D +:1019C80005040606231800000000002401E1002F8A +:1019D8007DF3C5027804A0503378E41008E0004A8B +:1019E80000E1C078E4838727FFFF21C3881C384FB4 +:1019F800FFFE8E1C038F0438700008707D480300BA +:101A080007E00FFC0FFF073390E31D0E3007980126 +:101A1800FC007F801FF001FC00DF0063E0061E3839 +:101A280061DE31E799E1FFE07FE00FE12030000C53 +:101A3800E080743E00E01FC0700E381C08E0E1C072 +:101A48003838F011C1C7008E0E7001C738003F8EBC +:101A58007C07C73F8001DC74001DC1E001CE0F0088 +:101A68001C70700E1C1C03838E01C07F00700F80D9 +:101A78000A60405803E0007F8007FE0078782470F1 +:101A88003801C3800F3C003FC000F8001F8003EE00 +:101A9800003C3841C1C79C0738E01FC7007C3803A9 +:101AA800C1E01F0783FC1FFEF07FE3C0FC0801A014 +:101AB800501B7900047CB92C06060703031070300C +:101AC800870306F04704B80C20E031018060180451 +:101AD8007C792D8060380C0310380C90ED078079E4 +:101AE8000E0640E0E0607030300005284E364307AF +:101AF8006EFFC7E0781F8738420007BC844F00E0BC +:101B08004FFFFC038001A0FB267CB260048C472EAB +:101B18007FE0018CC0267804E00026007206A064ED +:101B2800862460384982580E0300086040480FC078 +:101B38001FF81FFE1F0F0E03C700E78076F003CFC4 +:101B480000398038E01C701E3E1E0FFF03FF007E28 +:101B5800000460C04806070787C7E7F7BB1D0FA04A +:101B6800FA0E07086040480FC01FF81FFE1E078EB8 +:101B780001F1C00F0000F0001C001C001C001C003C +:101B88001C001C001C003C003C00380038001FFFF3 +:101B9800E3FFFC086040480FC01FF81FFE1E0F1E21 +:101BA80003CE00E0007000780079007F003FC0009D +:101BB800F0003E4001DC00EE00F38071E0F87FF8B1 +:101BC8001FF803F00008E040480018000E000780E6 +:101BD80003E2003F001DC00E70071C4070E038385B +:101BE8001C0E0E038700E27FFFF800380860404AA9 +:101BF8004FFFADC000EFC0EFF87FFE3C078001D477 +:101C0800000EE00770079C038F03C3FFC0FFC01FCF +:101C1800800860404807E00FFC0FFF0F078F01E7BF +:101C2800007380038001C7C0E7F87FFE3F079E016D +:101C3800CF007AE00738039C038783C3FFC07FC0C7 +:101C48000F800860404A7FFFC000C000C000E0006D +:101C5800E000600070800E0801C090380A0700A0FC +:101C6800E000086040480FC01FF81FFE1E0729C08B +:101C78003870381FF807F80FFF0F03C700EBE007AD +:101C880038071E0787FF81FF803F00086040480F24 +:101C9800801FF01FFC1F070E01CF006AE0077007C6 +:101CA8009C03CF07E3FFF0FFB81F1C000E000E7067 +:101CB800073C078F0787FF81FF803F0001C8C026C8 +:101CC8007E8B13C001DCFB267E8B13E5930007BCDB +:101CD800844C0004003C00FC07F81FC0FE01F8011A +:101CE800C001F800FE001FC007F800FC003C00041B +:101CF80007A8874E7FFFD00009FFFE07BC844D0070 +:101D080001E001F800FF001FC003F800FC001C0000 +:101D1800FC03F81FC0FF01F801E001000008604063 +:101D2800480FC01FF81FFE1F0F8E01EF0077003805 +:101D3800001C001E000E000F000F000F000F000710 +:101D48000500E040000480E0000F7CB988003FE017 +:101D58000003FFF0000FFFF8007F01F801F000F822 +:101D680003C000780F0F0E703C7F9CF071FFF0E10C +:101D7800E7C7E1E38E07C1C73C07839C700F0739AB +:101D8800E01C0E7380381CE7007079CE01E0E39CFC +:101D98000381C7380F070E783E1E1E78FC781CFF9B +:101DA800FFE038FF7F8038787C00780000387800C2 +:101DB80001E07C0007807F007E007FFFF8003FFF86 +:101DC800C0000FFC000AE0005A403E01203B808022 +:101DD80038E001E38100E0E090E03848FFFE24E0CD +:101DE8000390E000E780039C000708E0C059FFE08B +:101DF8007FFE1FFFC700F1C01E9E00738038E01EE3 +:101E080047FFE1FFFC70079C00FAE003B801EE0011 +:101E1800F3FFFCFFFE3FFE000A60806003F0007FD6 +:101E2800E007FFC0781E0780787801E380071C0070 +:101E380023780001C000870007380079E003878015 +:101E48003C1F07C0FFFC01FFC003F80009E0C061A8 +:101E5800FFF01FFFC1FFFE1C01F1C00F1C007A3804 +:101E68000076F0007700078E001CE003CE0078E0D3 +:101E78000F8FFFF0FFFE0FFF0008E0C05A7FFFDB67 +:101E8800C0009FFFE6F0001C0009FFFF8007E0C0CC +:101E9800527FFFEF0009FFF9BC002B80000B608028 +:101EA8006801FC001FFF007FFF01F81F07800F0E6D +:101EB800000E38001C700019E00004F000013C011D +:101EC800FFB80007870001C700038F000F0FC0FE8F +:101ED8000FFFF807FFC003FC000960C063780079B2 +:101EE800E001E7FFFFDE001EB8007001E0C0277EBA +:101EF800FDF3C006E04047400FA0079003C701DE8E +:101F08000F7878FFE1FF03F00A60C059C003CE00E4 +:101F18003C7003C3803C1C03C0E03C0703C0383C52 +:101F280001C3C00E3C0073C003BF001FFC00FCE0EF +:101F380007C7803C1E01C0780E01E0700783801C33 +:101F48001C0070E003C7000F38003C0760C04B78E6 +:101F580000DE00378009FFFC0BE0806DF0007DF8A3 +:101F6800007E3F001FBF801FCF700779E701CF3C7D +:101F78007071E7871C3CF077079E07C0EE0380E08E +:101F88000960C0623C0078F801DF803C7700F1CE40 +:101F980003B8E078E1C1E383877038F1C073C70004 +:101FA800EEE00FE3801F8E003C0B60806801F800B4 +:101FB8001FFE007FFE01F03E07801E1E001C8700EA +:101FC800039C0007EF0000F0E00070E001E1E0078B +:101FD80081F03E01FFF801FFE0007E0008E0C059F3 +:101FE800FFF07FFF1FFFE70079C00FAE003B801EA8 +:101FF800E00F3FFFCFFFE3FFE1BC0009E000000B6B +:1020080064BF6803F8001FFC007FFC01F07C0780B8 +:102018003C1E003C870007378000E70001C7000727 +:102028000E030E1E07B81E07F01F07C01FFFC01FB4 +:10203800FFC00FE3E000038009E0C061FFF81FFF65 +:10204800E1FFFF1C00F1C007A780073800F3801EDE +:102058003FFFE3FFFC3FFF0381C0380E0380F038E9 +:10206800078380383803C3801E3800E3800F3800A8 +:10207800738007800960805807E007FF01FFF03C84 +:102088000F0F00E43801C70000F0000F8000FF00C8 +:102098000FFC003FE0007E0003C0003E3800778060 +:1020A8000E7803CFC1F0FFFC0FFF003F8009E0402E +:1020B800567FFFFE80700D00E01A01C0000960C065 +:1020C8006378007DE001EB80073801C70078F81FCE +:1020D8000FFFC0FFF007F8000AE04059C000778002 +:1020E80003E1C001C7800F41C00703803C81C01CC9 +:1020F80048701C201C1C0078F0401C70007BC080BD +:102108001DC0007F01001F0010E0008A3800F800A1 +:10211800E7003E0074B803B8038701C601C8380E4B +:10212800380E07038E071238383838071E061C2465 +:1021380038E038E140EE00EE0903E003E0000AE091 +:102148000054F001E1E00F0380380F01E01E0F009A +:1021580038380071C001EF0003B80800F80001C06A +:10216800000F80400EE0007BC003C7800E0E007099 +:102178001C03C0781E00F07001C3C0079E000F0A40 +:10218800E00055C000F3800787001C1E00F03807E8 +:1021980080701C01E0F003838200E38001DC00070B +:1021A800F0000F806803802801C00009E000525F3A +:1021B800FFF0000F0001E0003C0003800070000FFA +:1021C8000001E0003C0003800070000F0001E00007 +:1021D8003C0003800070000F0001E0003C0004FF99 +:1021E800FFF0037CB9267FDE378DE2B89FC004E09C +:1021F80040263012C0A3048C24300E483240C03828 +:1022080006037C79267FD1F47D1E879FC006344B58 +:10221800380C121E01F80CC0E6073830C870E3030A +:10222800381C098FF94A7FFFF80314532DE1E1C1E7 +:10223800818007C840441FC07FF0FFF1E079C038B3 +:10224800003800F81FF87FF8FFB9E03A3807380F70 +:102258003C3F1FFF1FF707E38007E0804B3800383B +:10226800F03BFC3FFE3F1F3C073C07E7007780F749 +:1022780080E7C3E7FFC77F871E0007C840440FC039 +:102288003FE07FF0F878E039E01EF8003803BC033F +:102298009C071F0F0FFE07FC01F80007E0404B00EA +:1022A8000381E387FB8FFF9E1F9C07BC07E700772E +:1022B80080F380F3E1F1FFF0FF703C7007C8404401 +:1022C8000F803FE07FF0F078E03A3803CFFFF8E086 +:1022D80000F000700E7C3C3FFC1FF807E0056040F2 +:1022E800281F87E1FD2704FF9A7069C0380007E4BA +:1022F80079480F9C3FDC7FFCF8FCE03DE03F380369 +:10230800BC079C079E1F8FFF87FB81F38003B803E0 +:10231800B8073E0F1FFE0FFC03F0000760804B3824 +:102328000071F0EFF1FFF3E1F781FBC03E700E01A1 +:10233800E0801E7C8DFBEB80037FF91E4790347D87 +:102348001F471EFDF3C0076080433800701EE07908 +:10235800C1E387871E0E781DE03FC07FC0F781C7A5 +:102368008387070F0E0E1C0E381E701CE03C01E020 +:10237800801F7EFDF3C00BC8806DC781E1DFC7F900 +:10238800FFEFF9F0FC3DE0781F780E03E701C0701D +:1023980007488049C7C3BFC7FFCF87DE07EF00F9EB +:1023A800C03807C840440F803FE07FF0F8F8E039B4 +:1023B800E03F3803BC079C071F1F0FFE07FC01F016 +:1023C8000007E4B949C781DFE1FFF1F8F9E039E036 +:1023D8003F3803C780E7C3E7FFC77F873E0DE000AC +:1023E80007E479480F1C3FDC7FDCF0FCE03DE03F70 +:1023F8003803C380F3E1F1FFF0FF703E7D000E0467 +:10240800C8802DCF77DFE7C1E0DE06700007C8403F +:10241800441F807FE0FFF1E079C039C001F000FF80 +:10242800807FE03FF803FC003DC01DE01CF03CFF4E +:10243800F87FF01FC004600024116713FFA716710E +:1024480007E0F00748804B7807CE01DE07BE1F3F44 +:10245800EE3FDC3E3807C8003DC01CE01E1C070CE0 +:102468000641C1C0C1881C700C6101DC00D8201F66 +:102478000401C00BC8005E380E03B81F039C1F0779 +:10248800438360E18770C838C63838C6301DC771C5 +:1024980003B06E01B06C203E0F840380E007C800D3 +:1024A8003DC01CE038F078707038E03DE01DC01F7A +:1024B800C201F003F803B807BC071C0E0E1E0F1C60 +:1024C8000738038007E4393DC01CE03E1C070E0FA7 +:1024D80041C1C0E3C81C700EF101DC00FC201F00E4 +:1024E8000F0481C08070107C00780007C800425F2C +:1024F800FF8007800F001E003C007800F001E00319 +:10250800C007800F001E003C004FFFF004FC792C30 +:102518000F07C3F0F34701C0F0383C0C03C1070DA7 +:102528001C0701E07E0F81E0017CF9237DF7DE7056 +:1025380004FC792DE07C1F81E34701C0780E01E09F +:10254800181E0E079A380E0787E1F0780008184819 +:102558004C7C007F017FE1B0FFD01FC007C00000A6 +:102568000400D0140320670A80E60EC10712213246 +:1025780013D14414A14F16218919B1CB1FD2242499 +:10258800927A29A2C32F42FC30632833335538137B +:10259800FD4224504844B14C54D551152352B540FE +:1025A8005835905B85E16146376706AC6E56F57124 +:1025B80007407767B77E381A82683984585A861870 +:1025C8006A8918B28D38F491592695396797097E2A +:1025D8009A69AE9C89DA9F9A18A37A45A6DA7BA8ED +:1025E800DAABAD5AFCB23B44B60B68B850000000F9 +:1025F800A428000800000000142600080100207E1E +:1026080000000A04040204040B0800000000180378 +:102618000016440662A4D00B003415F853F1400BA1 +:1026280027B1CAA874155384130051891283401620 +:1026380081488C0D0038C8486144688E80026294D5 +:10264800C0074720964210074722161240068221EB +:1026580039280AA0B411F820026F1CC00621238073 +:1026680002281A07001C1A51000B0031D9138007E1 +:1026780000309AD90B0031C8C0421087C00B003116 +:10268800C882340513800B00304342927E040B004D +:1026980031E420F40513800B0031C8A0F4C4E00B2A +:1026A8000033F02824A00B0031D113A627000B001B +:1026B80031D313C144E002C01B4403071B49800AFD +:1026C800A0B0272070200A6133E03E0AA0B20702BA +:1026D80072000B0031C882141001001547587C3075 +:1026E80044D526C512A69361011FC00F004044942B +:1026F800223E88200D003BE885FCC2F80D0038E238 +:10270800350111C00D003BC4550A27800B0033F179 +:1027180007E60F800B0033F107AA000F0040E11213 +:102728000A023A0910E00D003CC2FEA1030016D0CF +:1027380009002D8C49800D003A1449163488908080 +:102748000B0036C1F00F00420C639AB1240D003A19 +:1027580016314C4A8D080F0040E11541221C0B0030 +:1027680033D317A6000F0040E114C14D221F0D00FE +:102778003BE885F24889080D0039E4280C060284F4 +:10278800F00B0033FA400D003EC2780F004441843C +:102798005052040017185210A28C2528515041009D +:1027A8000D003A184A0C8490800F00420C2214A1A4 +:1027B800000D0039F050241041F805471BD93007A7 +:1027C800001C4A504005471BD4B00A822890A440F8 +:1027D8000C2733F0044322200AC031C89E8A6E8039 +:1027E8000B00344166622CAC0AC031C8C411380BE6 +:1027F800003404D4E2299A0AC031C8BE82270007EF +:10280800002093DA0B0731A9C4533417800B003426 +:1028180041666A2003001264055F111AA009002CA2 +:102828004254C72920030016D00EC042F34D490A6E +:10283800C033D7100AC031D513800B0732CCC45926 +:102848005A200B0731A9C453360206C022B5400AE4 +:10285800C031C89812270007181C27A4600AC03581 +:102868004533400AC03446150412C0522294C2AA05 +:1028780008800AC03225410A440B07344615242033 +:102888000AC033E141087C074720CA4A4203471679 +:10289800E6074F224A1A480A4233AB000000301CB0 +:1028A8000B04C1C09C310D43B104461305015057B8 +:1028B800174631A0711E88222C93268A22A8AE2C96 +:1028C800CBA2FCC633CDF3A0F03E1004210F4692F4 +:1028D80004912A4D1395054A549595896B5D57A522 +:1028E800FD886519D695AE6CDB96F9C4721CC75184 +:1028F800DC78DEB7CDF880608832118661D88E2802 +:102908008BA368FA4392E5195E5D99A6D9D27BA09C +:10291800685A2C00000000003E5B4F5B3E3E6B4F48 +:102928006B3E1C3E7C3E1C183C7E3C181C577D5759 +:102938001C1C5E7F5E1C00183C1800FFE7C3E7FF05 +:102948000018241800FFE7DBE7FF30483A060E2698 +:1029580029792926407F050507407F05253F5A3CF0 +:10296800E73C5A7F3E1C1C08081C1C3E7F14227F33 +:1029780022145F5F005F5F06097F017F006689950B +:102988006A606060606094A2FFA29408047E0408F4 +:1029980010207E201008082A1C08081C2A08081E77 +:1029A800101010100C1E0C1E0C30383E3830060E5D +:1029B8003E0E06000000000000005F000000070057 +:1029C8000700147F147F14242A7F2A122313086413 +:1029D8006236495620500008070300001C224100B7 +:1029E8000041221C002A1C7F1C2A08083E080800F7 +:1029F8008070300008080808080000606000201097 +:102A08000804023E5149453E00427F400072494950 +:102A180049462141494D331814127F102745454531 +:102A2800393C4A4949314121110907364949493652 +:102A3800464949291E0000140000004034000000E7 +:102A48000814224114141414140041221408020119 +:102A58005909063E415D594E7C1211127C7F494945 +:102A680049363E414141227F4141413E7F494949E2 +:102A7800417F090909013E414151737F0808087FD8 +:102A880000417F41002040413F017F081422417FDF +:102A9800404040407F021C027F7F0408107F3E4177 +:102AA80041413E7F090909063E4151215E7F0919CE +:102AB8002946264949493203017F01033F404040E6 +:102AC8003F1F2040201F3F4038403F6314081463D5 +:102AD80003047804036159494D43007F4141410291 +:102AE80004081020004141417F04020102044040D3 +:102AF800404040000307080020545478407F284491 +:102B080044383844444428384444287F385454547A +:102B18001800087E090218A4A49C787F0804047889 +:102B280000447D40002040403D007F1028440000C4 +:102B3800417F40007C047804787C08040478384499 +:102B4800444438FC1824241818242418FC7C08044D +:102B58000408485454542404043F44243C4040206E +:102B68007C1C2040201C3C4030403C442810284419 +:102B78004C9090907C4464544C44000836410000CA +:102B880000770000004136080002010204023C26DA +:102B980023263C1EA1A161123A4040207A385454A1 +:102BA8005559215555794121545478412155547826 +:102BB8004020545579400C1E5272123955555559BA +:102BC800395454545939555454580000457C4100DF +:102BD80002457D420001457C40F0292429F0F02877 +:102BE8002528F07C545545002054547C547C0A090F +:102BF8007F4932494949323248484832324A48487E +:102C0800303A4141217A3A42402078009DA0A07D87 +:102C180039444444393D4040403D3C24FF24244845 +:102C28007E4943662B2FFC2F2BFF0929F620C088ED +:102C38007E090320545479410000447D41304848BE +:102C48004A32384040227A007A0A0A727D0D1931D8 +:102C58007D2629292F28262929292630484D402034 +:102C6800380808080808080808382F10C8ACBA2F10 +:102C7800102834FA00007B000008142A14222214B9 +:102C88002A1408AA005500AAAA55AA55AA000000A5 +:102C9800FF00101010FF00141414FF001010FF00A4 +:102CA800FF1010F010F0141414FC001414F700FFB7 +:102CB8000000FF00FF1414F404FC141417101F1074 +:102CC800101F101F1414141F00101010F000000023 +:102CD800001F101010101F10101010F0100000002E +:102CE800FF101010101010101010FF10000000FF3F +:102CF800140000FF00FF00001F10170000FC04F480 +:102D080014141710171414F404F40000FF00F71437 +:102D1800141414141414F700F714141417141010BE +:102D28001F101F141414F4141010F010F000001FDA +:102D3800101F0000001F14000000FC140000F01019 +:102D4800F01010FF10FF141414FF141010101F00BF +:102D5800000000F010FFFFFFFFFFF0F0F0F0F0FFC1 +:102D6800FFFF0000000000FFFF0F0F0F0F0F384498 +:102D78004438447C2A2A3E147E02020606027E0259 +:102D88007E0263554941633844443C04407E201E1A +:102D98002006027E020299A5E7A5991C2A492A1C49 +:102DA8004C7201724C304A4D4D303048784830BC36 +:102DB800625A463D3E494949007E0101017E2A2A60 +:102DC8002A2A2A44445F444440514A444040444AE1 +:102DD80051400000FF0103E080FF000008086B6B12 +:102DE800083612362436060F090F06000018180098 +:102DF80000001010003040FF0101001F01011E00FB +:102E0800191D1712003C3C3C3C0000000000004526 +:102E18006C656374726F6E6963204C6F61642062C5 +:102E28007920484239455649003030003031323334 +:102E38003435363738396162636465666768696A4C +:102E48006B6C6D6E6F707172737475767778797A52 +:012E58000079 +:102E5C0010000020000000000024F400F0004001ED :04000005080001AD41 :00000001FF diff --git a/Release/arm-f429-disco.map b/Release/arm-f429-disco.map index 29ba353..5e6d6d2 100644 --- a/Release/arm-f429-disco.map +++ b/Release/arm-f429-disco.map @@ -6,6 +6,10 @@ Archive member included to satisfy reference by file (symbol) ./system/src/newlib/sbrk.o (__errno) /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-impure.o) /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-errno.o) (_impure_ptr) +/usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-itoa.o) + ./src/main.o (itoa) +/usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-utoa.o) + /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-itoa.o) (__utoa) Allocating common symbols Common symbol size file @@ -33,6 +37,7 @@ cursor_x 0x2 ./src/ili9341gfx.o _displayclipy1 0x2 ./src/ili9341.o textsize 0x1 ./src/ili9341gfx.o _clipx1 0x2 ./src/ili9341.o +spi 0x201 ./src/spi.o _displayclipy2 0x2 ./src/ili9341.o isety 0x2 ./src/ili9341gfx.o _displayclipx2 0x2 ./src/ili9341.o @@ -204,12 +209,6 @@ Discarded input sections 0x0000000000000000 0x8e6 ./src/font_Arial.o .rodata.Arial_20_index 0x0000000000000000 0x8f ./src/font_Arial.o - .rodata.Arial_24 - 0x0000000000000000 0x1c ./src/font_Arial.o - .rodata.Arial_24_data - 0x0000000000000000 0xb96 ./src/font_Arial.o - .rodata.Arial_24_index - 0x0000000000000000 0x8f ./src/font_Arial.o .rodata.Arial_28 0x0000000000000000 0x1c ./src/font_Arial.o .rodata.Arial_28_data @@ -286,10 +285,6 @@ Discarded input sections .bss 0x0000000000000000 0x0 ./src/ili9341.o .text.width 0x0000000000000000 0xc ./src/ili9341.o .text.height 0x0000000000000000 0xc ./src/ili9341.o - .text.ili9341_hard_init - 0x0000000000000000 0x18 ./src/ili9341.o - .text.ili9341_hard_reset - 0x0000000000000000 0x2 ./src/ili9341.o .text.ili9341_spi_init 0x0000000000000000 0xc ./src/ili9341.o .text.ili9341_writedata16 @@ -298,8 +293,6 @@ Discarded input sections 0x0000000000000000 0x1c ./src/ili9341.o .text.RGB14tocolor565 0x0000000000000000 0x18 ./src/ili9341.o - .text.ili9341_init - 0x0000000000000000 0x208 ./src/ili9341.o .text.ili9341_drawline 0x0000000000000000 0x1b4 ./src/ili9341.o .text.ili9341_drawcirclehelper @@ -340,6 +333,24 @@ Discarded input sections .text 0x0000000000000000 0x0 ./src/main.o .data 0x0000000000000000 0x0 ./src/main.o .bss 0x0000000000000000 0x0 ./src/main.o + .text 0x0000000000000000 0x0 ./src/spi.o + .data 0x0000000000000000 0x0 ./src/spi.o + .bss 0x0000000000000000 0x0 ./src/spi.o + .text.spi_send + 0x0000000000000000 0x24 ./src/spi.o + .debug_info 0x0000000000000000 0x1c5 ./src/spi.o + .debug_abbrev 0x0000000000000000 0x127 ./src/spi.o + .debug_loc 0x0000000000000000 0x24 ./src/spi.o + .debug_aranges + 0x0000000000000000 0x20 ./src/spi.o + .debug_ranges 0x0000000000000000 0x28 ./src/spi.o + .debug_line 0x0000000000000000 0x10b ./src/spi.o + .debug_str 0x0000000000000000 0x250 ./src/spi.o + .comment 0x0000000000000000 0x52 ./src/spi.o + .debug_frame 0x0000000000000000 0x28 ./src/spi.o + .ARM.attributes + 0x0000000000000000 0x2e ./src/spi.o + COMMON 0x0000000000000000 0x201 ./src/spi.o .text 0x0000000000000000 0x0 ./src/write.o .data 0x0000000000000000 0x0 ./src/write.o .bss 0x0000000000000000 0x0 ./src/write.o @@ -388,6 +399,10 @@ Discarded input sections .comment 0x0000000000000000 0x4f /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-impure.o) .ARM.attributes 0x0000000000000000 0x2e /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-impure.o) + .data 0x0000000000000000 0x0 /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-itoa.o) + .bss 0x0000000000000000 0x0 /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-itoa.o) + .data 0x0000000000000000 0x0 /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-utoa.o) + .bss 0x0000000000000000 0x0 /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-utoa.o) Memory Configuration @@ -424,6 +439,7 @@ LOAD ./src/glcdfont.o LOAD ./src/ili9341.o LOAD ./src/ili9341gfx.o LOAD ./src/main.o +LOAD ./src/spi.o LOAD ./src/write.o LOAD /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libstdc++_nano.a LOAD /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libm.a @@ -567,10 +583,10 @@ END GROUP .inits 0x00000000080002e0 0x28 0x00000000080002e0 __data_regions_array_start = . - 0x00000000080002e0 0x4 LONG 0x8001e98 LOADADDR (.data) + 0x00000000080002e0 0x4 LONG 0x8002e5c LOADADDR (.data) 0x00000000080002e4 0x4 LONG 0x20000000 ADDR (.data) 0x00000000080002e8 0x4 LONG 0x20000010 (ADDR (.data) + SIZEOF (.data)) - 0x00000000080002ec 0x4 LONG 0x8001e98 LOADADDR (.data_CCMRAM) + 0x00000000080002ec 0x4 LONG 0x8002e5c LOADADDR (.data_CCMRAM) 0x00000000080002f0 0x4 LONG 0x10000000 ADDR (.data_CCMRAM) 0x00000000080002f4 0x4 LONG 0x10000000 (ADDR (.data_CCMRAM) + SIZEOF (.data_CCMRAM)) 0x00000000080002f8 __data_regions_array_end = . @@ -602,7 +618,7 @@ END GROUP .flashtext *(.flashtext .flashtext.*) -.text 0x0000000008000308 0x1b8d +.text 0x0000000008000308 0x2b51 *(.text .text.*) .text._exit 0x0000000008000308 0x6 ./system/src/newlib/exit.o 0x0000000008000308 _exit @@ -643,130 +659,156 @@ END GROUP .text.ili9341_setcliprect 0x0000000008000558 0x38 ./src/ili9341.o 0x0000000008000558 ili9341_setcliprect + .text.ili9341_hard_init + 0x0000000008000590 0x18 ./src/ili9341.o + 0x0000000008000590 ili9341_hard_init + .text.ili9341_hard_reset + 0x00000000080005a8 0x18 ./src/ili9341.o + 0x00000000080005a8 ili9341_hard_reset .text.ili9341_spi_send - 0x0000000008000590 0x20 ./src/ili9341.o - 0x0000000008000590 ili9341_spi_send + 0x00000000080005c0 0x24 ./src/ili9341.o + 0x00000000080005c0 ili9341_spi_send .text.ili9341_writecommand8 - 0x00000000080005b0 0x18 ./src/ili9341.o - 0x00000000080005b0 ili9341_writecommand8 + 0x00000000080005e4 0x18 ./src/ili9341.o + 0x00000000080005e4 ili9341_writecommand8 .text.ili9341_writedata8 - 0x00000000080005c8 0x18 ./src/ili9341.o - 0x00000000080005c8 ili9341_writedata8 + 0x00000000080005fc 0x18 ./src/ili9341.o + 0x00000000080005fc ili9341_writedata8 .text.ili9341_setaddress - 0x00000000080005e0 0x52 ./src/ili9341.o - 0x00000000080005e0 ili9341_setaddress + 0x0000000008000614 0x52 ./src/ili9341.o + 0x0000000008000614 ili9341_setaddress + *fill* 0x0000000008000666 0x2 + .text.ili9341_init + 0x0000000008000668 0x20c ./src/ili9341.o + 0x0000000008000668 ili9341_init .text.ili9341_pushcolor - 0x0000000008000632 0x14 ./src/ili9341.o - 0x0000000008000632 ili9341_pushcolor - *fill* 0x0000000008000646 0x2 + 0x0000000008000874 0x14 ./src/ili9341.o + 0x0000000008000874 ili9341_pushcolor .text.ili9341_clear - 0x0000000008000648 0x4c ./src/ili9341.o - 0x0000000008000648 ili9341_clear + 0x0000000008000888 0x4c ./src/ili9341.o + 0x0000000008000888 ili9341_clear .text.ili9341_drawpixel - 0x0000000008000694 0x38 ./src/ili9341.o - 0x0000000008000694 ili9341_drawpixel + 0x00000000080008d4 0x38 ./src/ili9341.o + 0x00000000080008d4 ili9341_drawpixel .text.ili9341_drawvline - 0x00000000080006cc 0x50 ./src/ili9341.o - 0x00000000080006cc ili9341_drawvline + 0x000000000800090c 0x50 ./src/ili9341.o + 0x000000000800090c ili9341_drawvline .text.ili9341_drawhline - 0x000000000800071c 0x50 ./src/ili9341.o - 0x000000000800071c ili9341_drawhline + 0x000000000800095c 0x50 ./src/ili9341.o + 0x000000000800095c ili9341_drawhline .text.ili9341_fillrect - 0x000000000800076c 0x70 ./src/ili9341.o - 0x000000000800076c ili9341_fillrect + 0x00000000080009ac 0x70 ./src/ili9341.o + 0x00000000080009ac ili9341_fillrect .text.ili9341_setrotation - 0x00000000080007dc 0x60 ./src/ili9341.o - 0x00000000080007dc ili9341_setrotation + 0x0000000008000a1c 0x60 ./src/ili9341.o + 0x0000000008000a1c ili9341_setrotation .text.fetchbits_unsigned - 0x000000000800083c 0x32 ./src/ili9341gfx.o - *fill* 0x000000000800086e 0x2 + 0x0000000008000a7c 0x32 ./src/ili9341gfx.o + *fill* 0x0000000008000aae 0x2 .text.ili9341_setfont - 0x0000000008000870 0x28 ./src/ili9341gfx.o - 0x0000000008000870 ili9341_setfont + 0x0000000008000ab0 0x28 ./src/ili9341gfx.o + 0x0000000008000ab0 ili9341_setfont .text.ili9341_setcursor - 0x0000000008000898 0x14 ./src/ili9341gfx.o - 0x0000000008000898 ili9341_setcursor + 0x0000000008000ad8 0x14 ./src/ili9341gfx.o + 0x0000000008000ad8 ili9341_setcursor .text.ili9341_settextcolor - 0x00000000080008ac 0x14 ./src/ili9341gfx.o - 0x00000000080008ac ili9341_settextcolor + 0x0000000008000aec 0x14 ./src/ili9341gfx.o + 0x0000000008000aec ili9341_settextcolor .text.ili9341_drawcharbits - 0x00000000080008c0 0x420 ./src/ili9341gfx.o - 0x00000000080008c0 ili9341_drawcharbits + 0x0000000008000b00 0x420 ./src/ili9341gfx.o + 0x0000000008000b00 ili9341_drawcharbits .text.ili9341_drawfontbits - 0x0000000008000ce0 0xf8 ./src/ili9341gfx.o - 0x0000000008000ce0 ili9341_drawfontbits + 0x0000000008000f20 0xf8 ./src/ili9341gfx.o + 0x0000000008000f20 ili9341_drawfontbits .text.ili9341_drawfontchar - 0x0000000008000dd8 0x4d4 ./src/ili9341gfx.o - 0x0000000008000dd8 ili9341_drawfontchar + 0x0000000008001018 0x4d4 ./src/ili9341gfx.o + 0x0000000008001018 ili9341_drawfontchar .text.ili9341_drawchar - 0x00000000080012ac 0xac ./src/ili9341gfx.o - 0x00000000080012ac ili9341_drawchar + 0x00000000080014ec 0xac ./src/ili9341gfx.o + 0x00000000080014ec ili9341_drawchar .text.ili9341_out - 0x0000000008001358 0x24 ./src/ili9341gfx.o - 0x0000000008001358 ili9341_out + 0x0000000008001598 0x24 ./src/ili9341gfx.o + 0x0000000008001598 ili9341_out .text.RCC_config - 0x000000000800137c 0x124 ./src/main.o - 0x000000000800137c RCC_config + 0x00000000080015bc 0x124 ./src/main.o + 0x00000000080015bc RCC_config .text.startup.main - 0x00000000080014a0 0x178 ./src/main.o - 0x00000000080014a0 main + 0x00000000080016e0 0x1c0 ./src/main.o + 0x00000000080016e0 main .text.SPI5_IRQHandler - 0x0000000008001618 0x34 ./src/main.o - 0x0000000008001618 SPI5_IRQHandler + 0x00000000080018a0 0x38 ./src/main.o + 0x00000000080018a0 SPI5_IRQHandler + .text 0x00000000080018d8 0x3c /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-itoa.o) + 0x00000000080018d8 __itoa + 0x0000000008001910 itoa + .text 0x0000000008001914 0x90 /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-utoa.o) + 0x0000000008001914 __utoa + 0x00000000080019a0 utoa *(.rodata .rodata.* .constdata .constdata.*) .rodata.AHBPrescTable - 0x000000000800164c 0x10 ./system/src/cmsis/system_stm32f4xx.o - 0x000000000800164c AHBPrescTable + 0x00000000080019a4 0x10 ./system/src/cmsis/system_stm32f4xx.o + 0x00000000080019a4 AHBPrescTable + .rodata.Arial_24 + 0x00000000080019b4 0x1c ./src/font_Arial.o + 0x00000000080019b4 Arial_24 + .rodata.Arial_24_data + 0x00000000080019d0 0xb96 ./src/font_Arial.o + .rodata.Arial_24_index + 0x0000000008002566 0x8f ./src/font_Arial.o + *fill* 0x00000000080025f5 0x3 .rodata.Arial_8 - 0x000000000800165c 0x1c ./src/font_Arial.o - 0x000000000800165c Arial_8 + 0x00000000080025f8 0x1c ./src/font_Arial.o + 0x00000000080025f8 Arial_8 .rodata.Arial_8_data - 0x0000000008001678 0x290 ./src/font_Arial.o + 0x0000000008002614 0x290 ./src/font_Arial.o .rodata.Arial_8_index - 0x0000000008001908 0x77 ./src/font_Arial.o + 0x00000000080028a4 0x77 ./src/font_Arial.o .rodata.glcdfont - 0x000000000800197f 0x4fc ./src/glcdfont.o - 0x000000000800197f glcdfont + 0x000000000800291b 0x4fc ./src/glcdfont.o + 0x000000000800291b glcdfont .rodata.main.str1.1 - 0x0000000008001e7b 0x1a ./src/main.o + 0x0000000008002e17 0x1d ./src/main.o + 0x1f (size before relaxing) + .rodata.str1.4 + 0x0000000008002e34 0x25 /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-utoa.o) *(vtable) *(.eh_frame*) *(.glue_7) - .glue_7 0x0000000008001e95 0x0 linker stubs + .glue_7 0x0000000008002e59 0x0 linker stubs *(.glue_7t) - .glue_7t 0x0000000008001e95 0x0 linker stubs + .glue_7t 0x0000000008002e59 0x0 linker stubs -.vfp11_veneer 0x0000000008001e98 0x0 - .vfp11_veneer 0x0000000008001e98 0x0 linker stubs +.vfp11_veneer 0x0000000008002e5c 0x0 + .vfp11_veneer 0x0000000008002e5c 0x0 linker stubs -.v4_bx 0x0000000008001e98 0x0 - .v4_bx 0x0000000008001e98 0x0 linker stubs +.v4_bx 0x0000000008002e5c 0x0 + .v4_bx 0x0000000008002e5c 0x0 linker stubs -.iplt 0x0000000008001e98 0x0 - .iplt 0x0000000008001e98 0x0 ./system/src/newlib/exit.o +.iplt 0x0000000008002e5c 0x0 + .iplt 0x0000000008002e5c 0x0 ./system/src/newlib/exit.o -.rel.dyn 0x0000000008001e98 0x0 - .rel.iplt 0x0000000008001e98 0x0 ./system/src/newlib/exit.o +.rel.dyn 0x0000000008002e5c 0x0 + .rel.iplt 0x0000000008002e5c 0x0 ./system/src/newlib/exit.o .ARM.extab *(.ARM.extab* .gnu.linkonce.armextab.*) - 0x0000000008001e98 . = ALIGN (0x4) - 0x0000000008001e98 __exidx_start = . + 0x0000000008002e5c . = ALIGN (0x4) + 0x0000000008002e5c __exidx_start = . .ARM.exidx *(.ARM.exidx* .gnu.linkonce.armexidx.*) - 0x0000000008001e98 __exidx_end = . - 0x0000000008001e98 . = ALIGN (0x4) - 0x0000000008001e98 _etext = . - 0x0000000008001e98 __etext = . + 0x0000000008002e5c __exidx_end = . + 0x0000000008002e5c . = ALIGN (0x4) + 0x0000000008002e5c _etext = . + 0x0000000008002e5c __etext = . -.data_CCMRAM 0x0000000010000000 0x0 load address 0x0000000008001e98 +.data_CCMRAM 0x0000000010000000 0x0 load address 0x0000000008002e5c FILL mask 0xff *(.data.CCMRAM .data.CCMRAM.*) 0x0000000010000000 . = ALIGN (0x4) - 0x0000000008001e98 _sidata = LOADADDR (.data) + 0x0000000008002e5c _sidata = LOADADDR (.data) -.data 0x0000000020000000 0x10 load address 0x0000000008001e98 +.data 0x0000000020000000 0x10 load address 0x0000000008002e5c FILL mask 0xff 0x0000000020000000 _sdata = . 0x0000000020000000 __data_start__ = . @@ -788,7 +830,7 @@ END GROUP 0x0000000020000010 _edata = . 0x0000000020000010 __data_end__ = . -.igot.plt 0x0000000020000010 0x0 load address 0x0000000008001ea8 +.igot.plt 0x0000000020000010 0x0 load address 0x0000000008002e6c .igot.plt 0x0000000020000010 0x0 ./system/src/newlib/exit.o .bss_CCMRAM 0x0000000010000000 0x0 @@ -904,7 +946,7 @@ END GROUP .stab.indexstr *(.stab.indexstr) -.comment 0x0000000000000000 0x51 +.comment 0x0000000000000000 0x9f *(.comment) .comment 0x0000000000000000 0x51 ./system/src/newlib/exit.o 0x52 (size before relaxing) @@ -921,6 +963,9 @@ END GROUP .comment 0x0000000000000051 0x52 ./src/ili9341.o .comment 0x0000000000000051 0x52 ./src/ili9341gfx.o .comment 0x0000000000000051 0x52 ./src/main.o + .comment 0x0000000000000051 0x4e /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-itoa.o) + 0x4f (size before relaxing) + .comment 0x000000000000009f 0x4f /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-utoa.o) .ARM.attributes 0x0000000000000000 0x2e @@ -952,6 +997,10 @@ END GROUP 0x0000000000000232 0x2e ./src/ili9341gfx.o .ARM.attributes 0x0000000000000260 0x2e ./src/main.o + .ARM.attributes + 0x000000000000028e 0x2e /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-itoa.o) + .ARM.attributes + 0x00000000000002bc 0x2e /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-utoa.o) .debug *(.debug) @@ -965,7 +1014,7 @@ END GROUP .debug_sfnames *(.debug_sfnames) -.debug_aranges 0x0000000000000000 0x3f0 +.debug_aranges 0x0000000000000000 0x430 *(.debug_aranges) .debug_aranges 0x0000000000000000 0x28 ./system/src/newlib/exit.o @@ -995,11 +1044,15 @@ END GROUP 0x0000000000000338 0x88 ./src/ili9341gfx.o .debug_aranges 0x00000000000003c0 0x30 ./src/main.o + .debug_aranges + 0x00000000000003f0 0x20 /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-itoa.o) + .debug_aranges + 0x0000000000000410 0x20 /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-utoa.o) .debug_pubnames *(.debug_pubnames) -.debug_info 0x0000000000000000 0xaa7a +.debug_info 0x0000000000000000 0xc082 *(.debug_info .gnu.linkonce.wi.*) .debug_info 0x0000000000000000 0x9e6 ./system/src/newlib/exit.o .debug_info 0x00000000000009e6 0x518 ./system/src/newlib/startup.o @@ -1012,11 +1065,13 @@ END GROUP .debug_info 0x00000000000031f9 0x7af ./src/delay.o .debug_info 0x00000000000039a8 0x91d ./src/font_Arial.o .debug_info 0x00000000000042c5 0x169 ./src/glcdfont.o - .debug_info 0x000000000000442e 0x3326 ./src/ili9341.o - .debug_info 0x0000000000007754 0x1b7a ./src/ili9341gfx.o - .debug_info 0x00000000000092ce 0x17ac ./src/main.o + .debug_info 0x000000000000442e 0x337e ./src/ili9341.o + .debug_info 0x00000000000077ac 0x1b7a ./src/ili9341gfx.o + .debug_info 0x0000000000009326 0x18c3 ./src/main.o + .debug_info 0x000000000000abe9 0xa48 /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-itoa.o) + .debug_info 0x000000000000b631 0xa51 /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-utoa.o) -.debug_abbrev 0x0000000000000000 0x1c58 +.debug_abbrev 0x0000000000000000 0x20dd *(.debug_abbrev) .debug_abbrev 0x0000000000000000 0x243 ./system/src/newlib/exit.o .debug_abbrev 0x0000000000000243 0x1e4 ./system/src/newlib/startup.o @@ -1029,11 +1084,13 @@ END GROUP .debug_abbrev 0x0000000000000cc9 0x203 ./src/delay.o .debug_abbrev 0x0000000000000ecc 0xc8 ./src/font_Arial.o .debug_abbrev 0x0000000000000f94 0x7f ./src/glcdfont.o - .debug_abbrev 0x0000000000001013 0x4af ./src/ili9341.o - .debug_abbrev 0x00000000000014c2 0x49e ./src/ili9341gfx.o - .debug_abbrev 0x0000000000001960 0x2f8 ./src/main.o + .debug_abbrev 0x0000000000001013 0x4c2 ./src/ili9341.o + .debug_abbrev 0x00000000000014d5 0x49e ./src/ili9341gfx.o + .debug_abbrev 0x0000000000001973 0x330 ./src/main.o + .debug_abbrev 0x0000000000001ca3 0x22a /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-itoa.o) + .debug_abbrev 0x0000000000001ecd 0x210 /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-utoa.o) -.debug_line 0x0000000000000000 0x3516 +.debug_line 0x0000000000000000 0x393c *(.debug_line) .debug_line 0x0000000000000000 0x13a ./system/src/newlib/exit.o .debug_line 0x000000000000013a 0x2d0 ./system/src/newlib/startup.o @@ -1046,11 +1103,13 @@ END GROUP .debug_line 0x0000000000000bfe 0x18b ./src/delay.o .debug_line 0x0000000000000d89 0x61 ./src/font_Arial.o .debug_line 0x0000000000000dea 0x48 ./src/glcdfont.o - .debug_line 0x0000000000000e32 0x135b ./src/ili9341.o - .debug_line 0x000000000000218d 0xf49 ./src/ili9341gfx.o - .debug_line 0x00000000000030d6 0x440 ./src/main.o + .debug_line 0x0000000000000e32 0x1371 ./src/ili9341.o + .debug_line 0x00000000000021a3 0xf49 ./src/ili9341gfx.o + .debug_line 0x00000000000030ec 0x46b ./src/main.o + .debug_line 0x0000000000003557 0x1ab /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-itoa.o) + .debug_line 0x0000000000003702 0x23a /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-utoa.o) -.debug_frame 0x0000000000000000 0x99c +.debug_frame 0x0000000000000000 0xa44 *(.debug_frame) .debug_frame 0x0000000000000000 0x40 ./system/src/newlib/exit.o .debug_frame 0x0000000000000040 0x80 ./system/src/newlib/startup.o @@ -1061,42 +1120,48 @@ END GROUP .debug_frame 0x0000000000000248 0x38 ./system/src/cmsis/system_stm32f4xx.o .debug_frame 0x0000000000000280 0x20 ./system/src/cmsis/vectors_stm32f429xx.o .debug_frame 0x00000000000002a0 0x48 ./src/delay.o - .debug_frame 0x00000000000002e8 0x4c0 ./src/ili9341.o - .debug_frame 0x00000000000007a8 0x1a4 ./src/ili9341gfx.o - .debug_frame 0x000000000000094c 0x50 ./src/main.o + .debug_frame 0x00000000000002e8 0x4cc ./src/ili9341.o + .debug_frame 0x00000000000007b4 0x1a4 ./src/ili9341gfx.o + .debug_frame 0x0000000000000958 0x58 ./src/main.o + .debug_frame 0x00000000000009b0 0x3c /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-itoa.o) + .debug_frame 0x00000000000009ec 0x58 /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-utoa.o) -.debug_str 0x0000000000000000 0x1d35 +.debug_str 0x0000000000000000 0x1f3f *(.debug_str) - .debug_str 0x0000000000000000 0x5b0 ./system/src/newlib/exit.o + .debug_str 0x0000000000000000 0x58a ./system/src/newlib/exit.o 0x620 (size before relaxing) - .debug_str 0x00000000000005b0 0x1a2 ./system/src/newlib/startup.o + .debug_str 0x000000000000058a 0x1a2 ./system/src/newlib/startup.o 0x385 (size before relaxing) - .debug_str 0x0000000000000752 0x89 ./system/src/newlib/syscalls.o + .debug_str 0x000000000000072c 0x89 ./system/src/newlib/syscalls.o 0x651 (size before relaxing) - .debug_str 0x00000000000007db 0x158 ./system/src/cortexm/exception-handlers.o + .debug_str 0x00000000000007b5 0x158 ./system/src/cortexm/exception-handlers.o 0x73e (size before relaxing) - .debug_str 0x0000000000000933 0xbb ./system/src/cortexm/initialize-hardware.o + .debug_str 0x000000000000090d 0xbb ./system/src/cortexm/initialize-hardware.o 0x2ef (size before relaxing) - .debug_str 0x00000000000009ee 0x40 ./system/src/cortexm/reset-hardware.o + .debug_str 0x00000000000009c8 0x40 ./system/src/cortexm/reset-hardware.o 0x2b1 (size before relaxing) - .debug_str 0x0000000000000a2e 0x142 ./system/src/cmsis/system_stm32f4xx.o + .debug_str 0x0000000000000a08 0x142 ./system/src/cmsis/system_stm32f4xx.o 0x3c8 (size before relaxing) - .debug_str 0x0000000000000b70 0x59 ./system/src/cmsis/vectors_stm32f429xx.o + .debug_str 0x0000000000000b4a 0x59 ./system/src/cmsis/vectors_stm32f429xx.o 0x209 (size before relaxing) - .debug_str 0x0000000000000bc9 0x606 ./src/delay.o + .debug_str 0x0000000000000ba3 0x606 ./src/delay.o 0x8b9 (size before relaxing) - .debug_str 0x00000000000011cf 0x3e6 ./src/font_Arial.o + .debug_str 0x00000000000011a9 0x3e6 ./src/font_Arial.o 0x538 (size before relaxing) - .debug_str 0x00000000000015b5 0x23 ./src/glcdfont.o + .debug_str 0x000000000000158f 0x23 ./src/glcdfont.o 0x22f (size before relaxing) - .debug_str 0x00000000000015d8 0x453 ./src/ili9341.o - 0xa94 (size before relaxing) - .debug_str 0x0000000000001a2b 0x2ad ./src/ili9341gfx.o + .debug_str 0x00000000000015b2 0x453 ./src/ili9341.o + 0xa9d (size before relaxing) + .debug_str 0x0000000000001a05 0x2ad ./src/ili9341gfx.o 0xb16 (size before relaxing) - .debug_str 0x0000000000001cd8 0x5d ./src/main.o - 0x109d (size before relaxing) + .debug_str 0x0000000000001cb2 0x9d ./src/main.o + 0x10ef (size before relaxing) + .debug_str 0x0000000000001d4f 0x1ad /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-itoa.o) + 0x5ff (size before relaxing) + .debug_str 0x0000000000001efc 0x43 /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-utoa.o) + 0x602 (size before relaxing) -.debug_loc 0x0000000000000000 0x456b +.debug_loc 0x0000000000000000 0x49f2 *(.debug_loc) .debug_loc 0x0000000000000000 0x25 ./system/src/newlib/exit.o .debug_loc 0x0000000000000025 0x414 ./system/src/newlib/startup.o @@ -1104,9 +1169,11 @@ END GROUP .debug_loc 0x00000000000004a8 0x7e ./system/src/cortexm/exception-handlers.o .debug_loc 0x0000000000000526 0x12f ./system/src/cmsis/system_stm32f4xx.o .debug_loc 0x0000000000000655 0x96 ./src/delay.o - .debug_loc 0x00000000000006eb 0x26db ./src/ili9341.o - .debug_loc 0x0000000000002dc6 0x175b ./src/ili9341gfx.o - .debug_loc 0x0000000000004521 0x4a ./src/main.o + .debug_loc 0x00000000000006eb 0x26b6 ./src/ili9341.o + .debug_loc 0x0000000000002da1 0x175b ./src/ili9341gfx.o + .debug_loc 0x00000000000044fc 0x98 ./src/main.o + .debug_loc 0x0000000000004594 0x215 /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-itoa.o) + .debug_loc 0x00000000000047a9 0x249 /usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/lib/thumb/v7e-m/nofp/libg_nano.a(lib_a-utoa.o) .debug_macinfo *(.debug_macinfo) diff --git a/Release/src/ili9341.o b/Release/src/ili9341.o index 45fb4d5..8a18795 100644 Binary files a/Release/src/ili9341.o and b/Release/src/ili9341.o differ diff --git a/Release/src/main.d b/Release/src/main.d index dc07528..6892eb8 100644 --- a/Release/src/main.d +++ b/Release/src/main.d @@ -6,7 +6,7 @@ src/main.o: ../src/main.c ../system/include/diag/trace.h \ ../system/include/cmsis/cmsis_gcc.h ../system/include/cmsis/mpu_armv7.h \ ../system/include/cmsis/system_stm32f4xx.h ../include/ili9341.h \ ../include/ili9341gfx.h ../include/font_typedef.h \ - ../include/font_Arial.h ../include/glcdfont.h + ../include/font_Arial.h ../include/glcdfont.h ../include/spi.h ../system/include/diag/trace.h: @@ -37,3 +37,5 @@ src/main.o: ../src/main.c ../system/include/diag/trace.h \ ../include/font_Arial.h: ../include/glcdfont.h: + +../include/spi.h: diff --git a/Release/src/main.o b/Release/src/main.o index a54351e..ff50d16 100644 Binary files a/Release/src/main.o and b/Release/src/main.o differ diff --git a/Release/src/spi.d b/Release/src/spi.d new file mode 100644 index 0000000..5955ab2 --- /dev/null +++ b/Release/src/spi.d @@ -0,0 +1,24 @@ +src/spi.o: ../src/spi.c ../system/include/cmsis/stm32f4xx.h \ + ../system/include/cmsis/stm32f429xx.h ../system/include/cmsis/core_cm4.h \ + ../system/include/cmsis/cmsis_version.h \ + ../system/include/cmsis/cmsis_compiler.h \ + ../system/include/cmsis/cmsis_gcc.h ../system/include/cmsis/mpu_armv7.h \ + ../system/include/cmsis/system_stm32f4xx.h ../include/spi.h + +../system/include/cmsis/stm32f4xx.h: + +../system/include/cmsis/stm32f429xx.h: + +../system/include/cmsis/core_cm4.h: + +../system/include/cmsis/cmsis_version.h: + +../system/include/cmsis/cmsis_compiler.h: + +../system/include/cmsis/cmsis_gcc.h: + +../system/include/cmsis/mpu_armv7.h: + +../system/include/cmsis/system_stm32f4xx.h: + +../include/spi.h: diff --git a/Release/src/spi.o b/Release/src/spi.o new file mode 100644 index 0000000..651fe0d Binary files /dev/null and b/Release/src/spi.o differ diff --git a/Release/src/subdir.mk b/Release/src/subdir.mk index bbce02b..cd66f1c 100644 --- a/Release/src/subdir.mk +++ b/Release/src/subdir.mk @@ -10,6 +10,7 @@ C_SRCS += \ ../src/ili9341.c \ ../src/ili9341gfx.c \ ../src/main.c \ +../src/spi.c \ ../src/write.c OBJS += \ @@ -19,6 +20,7 @@ OBJS += \ ./src/ili9341.o \ ./src/ili9341gfx.o \ ./src/main.o \ +./src/spi.o \ ./src/write.o C_DEPS += \ @@ -28,6 +30,7 @@ C_DEPS += \ ./src/ili9341.d \ ./src/ili9341gfx.d \ ./src/main.d \ +./src/spi.d \ ./src/write.d diff --git a/include/ili9341.h b/include/ili9341.h index 079e639..10b657e 100644 --- a/include/ili9341.h +++ b/include/ili9341.h @@ -84,7 +84,7 @@ void ili9341_setcliprect(); void ili9341_hard_init(void); void ili9341_hard_reset(void); void ili9341_spi_init(void); -void ili9341_spi_send(SPI_TypeDef * SPIx, uint16_t spi_data); +void ili9341_spi_send(SPI_TypeDef * SPIx, uint8_t spi_data); void ili9341_writecommand8(uint8_t com); void ili9341_writedata8(uint8_t data); void ili9341_writedata16(uint16_t data); diff --git a/include/spi.h b/include/spi.h new file mode 100644 index 0000000..f54da2c --- /dev/null +++ b/include/spi.h @@ -0,0 +1,12 @@ + +#include + + +struct spi_struct_def +{ + volatile uint8_t tx_buf[255]; + volatile uint8_t rx_buf[255]; + volatile uint8_t tx_idx; + volatile uint8_t rx_idx; + volatile uint8_t buf_cnt; +}; diff --git a/src/ili9341.c b/src/ili9341.c index 37b7104..cecea1e 100644 --- a/src/ili9341.c +++ b/src/ili9341.c @@ -50,7 +50,8 @@ void ili9341_hard_init(void)//init hardware { //GPIOA->BSRR = RST; //GPIOA->BSRR = DC; - GPIOD->BSRR = GPIO_BSRR_BS13; + + GPIOD->BSRR = GPIO_BSRR_BS13; GPIOC->BSRR = GPIO_BSRR_BR2; @@ -58,14 +59,13 @@ void ili9341_hard_init(void)//init hardware void ili9341_hard_reset(void)//hard reset display { - /* - GPIOA->BSRR = RST; + + //GPIOA->BSRR = RST; delay_ms(200); - GPIOA->BRR = RST; + //GPIOA->BRR = RST; delay_ms(200); - GPIOA->BSRR = RST; + //GPIOA->BSRR = RST; delay_ms(200); - */ } void ili9341_spi_init(void)//set spi speed and settings @@ -75,36 +75,24 @@ void ili9341_spi_init(void)//set spi speed and settings GPIOC->BSRR=GPIO_BSRR_BS2; } -void ili9341_spi_send(SPI_TypeDef * SPIx, uint16_t spi_data)//send spi data to display +void ili9341_spi_send(SPI_TypeDef * SPIx, uint8_t spi_data)//send spi data to display { - //GPIOA->BRR = CS; GPIOC->BSRR = GPIO_BSRR_BR2; spi_buf=spi_data; - SPIx->CR2 |= SPI_CR2_TXEIE; + SPI5->CR2 |= SPI_CR2_TXEIE; } void ili9341_writecommand8(uint8_t com)//command write { - //SPI1->CR2 &= ~SPI_CR2_DS_3; - //SPI1->CR1 &= ~SPI_CR1_SPE; - //SPI1->CR1 = (SPI1->CR1 & 0xf7bf); - //GPIOA->BRR = DC; GPIOD->BSRR = GPIO_BSRR_BR13; - //SPI1->CR1 &= ~(SPI_CR1_DFF); - //SPI1->CR1 |= SPI_CR1_SPE; ili9341_spi_send(SPI5, com); } void ili9341_writedata8(uint8_t data)//data write { - //SPI1->CR1 &= ~SPI_CR1_SPE; - //SPI1->CR1 = (SPI1->CR1 & 0xf7bf); - //GPIOA->BSRR = DC; GPIOD->BSRR = GPIO_BSRR_BS13; - //SPI1->CR1 &= ~(SPI_CR1_DFF); - //SPI1->CR1 |= SPI_CR1_SPE; ili9341_spi_send(SPI5, data); } diff --git a/src/main.c b/src/main.c index eb6f297..7db1f25 100644 --- a/src/main.c +++ b/src/main.c @@ -36,6 +36,7 @@ #include "ili9341gfx.h" #include "font_Arial.h" #include "glcdfont.h" +#include "spi.h" volatile uint8_t spi_buf; @@ -67,7 +68,7 @@ volatile uint8_t spi_buf; #pragma GCC diagnostic ignored "-Wmissing-declarations" #pragma GCC diagnostic ignored "-Wreturn-type" - +extern struct spi_struct_def spi; void RCC_config(void); @@ -76,31 +77,37 @@ int main(int argc, char* argv[]) { // At this stage the system clock should have already been configured // at high speed. - RCC_config(); + uint8_t counter=0; + char text[6]; + + RCC_config(); delay_init(); GPIOC->MODER |= GPIO_MODER_MODE2_0; GPIOC->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR2; + GPIOD->MODER |= GPIO_MODER_MODER13_0; GPIOD->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR13; + + GPIOF->MODER &= ~(GPIO_MODER_MODER7 | GPIO_MODER_MODER9); GPIOF->MODER |= GPIO_MODER_MODER7_1 | GPIO_MODER_MODER9_1; GPIOF->OSPEEDR |= GPIO_OSPEEDR_OSPEED7 | GPIO_OSPEEDR_OSPEED9; GPIOF->AFR[0] |= (5<<28); GPIOF->AFR[1] |= (5<<4); + GPIOG->MODER |= GPIO_MODER_MODE13_0; GPIOG->OSPEEDR |= GPIO_OSPEEDER_OSPEEDR13; - SPI5->CR1 |= SPI_CR1_MSTR | SPI_CR1_SSI | SPI_CR1_SSM | SPI_CR1_BR_0; - //SPI5->CR2 |= SPI_CR2_SSOE | SPI_CR2_FRXTH | SPI_CR2_DS_0 | SPI_CR2_DS_1 | SPI_CR2_DS_2; - //SPI1->CR2 = 0x1700; + SPI5->CR1 |= SPI_CR1_MSTR | SPI_CR1_SSI | SPI_CR1_SSM; // | SPI_CR1_CPHA | SPI_CR1_CPOL; + SPI5->CR2 = 0x0; SPI5->CR1 |= SPI_CR1_SPE; NVIC->ISER[2] |= (1<<(SPI5_IRQn & 0x1f)); - delay_ms(500); + ili9341_init(); ili9341_clear(BLACK); ili9341_setrotation(3); ili9341_setcursor(105,0); @@ -119,11 +126,24 @@ int main(int argc, char* argv[]) // Infinite loop while (1) { - - GPIOG->BSRR |= GPIO_BSRR_BS13; - delay_ms(500); - GPIOG->BSRR |= GPIO_BSRR_BR13; - delay_ms(500); + itoa(counter,text,10); + ili9341_setfont(Arial_24); + ili9341_setcursor(10,100); + if(counter<10) + { + ili9341_out("00"); + } + else if(counter<100) + { + ili9341_out("0"); + } + ili9341_out(text); + + //GPIOG->BSRR |= GPIO_BSRR_BS13; + delay_ms(100); + //GPIOG->BSRR |= GPIO_BSRR_BR13; + + counter++; // Add your code here. } } @@ -209,12 +229,16 @@ RCC->PLLCFGR |= (uint32_t)RCC_PLLCFGR_PLLSRC_HSE; extern void SPI5_IRQHandler(void) { + if(SPI5->SR & SPI_SR_TXE) { SPI5->DR=spi_buf; SPI5->CR2 &= ~SPI_CR2_TXEIE; - spi_buf=SPI5->DR; - GPIOC->BSRR = GPIO_BSRR_BS_2; } + if(SPI5->SR & SPI_SR_RXNE) + { + spi_buf=SPI5->DR; + SPI5->CR2 &= ~SPI_CR2_RXNEIE; + } } diff --git a/src/spi.c b/src/spi.c new file mode 100644 index 0000000..b182002 --- /dev/null +++ b/src/spi.c @@ -0,0 +1,22 @@ +/* + * spi.c + * + * Created on: Jun 12, 2022 + * Author: pascal.spring + */ +#include +#include "spi.h" + +struct spi_struct_def spi; + +void spi_send(uint8_t * data, uint8_t cnt) +{ + spi.buf_cnt=0; + spi.tx_idx=cnt; + + for(uint8_t i=0;i