diff --git a/trunk/bsr.hex b/trunk/bsr.hex index 39af280..a488c2a 100644 --- a/trunk/bsr.hex +++ b/trunk/bsr.hex @@ -1,12 +1,12 @@ -:02000000720D7F -:04001000DA48DC48A6 -:02001C009B4AFD -:02002400E84AA8 -:02002A00334B56 -:08003400604C034C5C4C714D63 -:02004A00DE488E -:02005A00194942 -:02006200F54C5B +:020000006D0D84 +:04001000D148D348B8 +:02001C00924A06 +:02002400DF4AB1 +:02002A002A4B5F +:08003400574CFA4B534C684D88 +:02004A00D54897 +:02005A0010494B +:02006200EC4C64 :0400C0007EFBFF04C0 :0A00C4001B339499E033F240BFAA09 :1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A @@ -34,10 +34,10 @@ :10022E00050A308700BF1801BF1A01BF1C01BF1E8F :10023E0001D7C7C1C1FBF8FFCEABAC8C02D1DD122A :10024E00616902305C03BBF6614900DDEE61890035 -:10025E00EFF51004C6D7FD3D0AFD6F09FD432FFDD6 +:10025E00EFF51004C6D7FD380AFD6F09FD432FFDDB :10026E002338FDC804717AFAFDA223F514F98F160E :10027E00F93105135003FD522B625C01D161E8CFB9 -:10028E0014F902CFC7FB64FD2330FD874471025F72 +:10028E0014F902CFC7FB64FD2330FD7E4471025F7B :10029E00712BE7FD2638FDC53861EDEFF6D7D7C7D0 :1002AE00F616FDC804717BFA31225D0871225D716C :1002BE007AFAEF0B717AFAA7F647DFE9E2EF01F26D @@ -86,7 +86,7 @@ :10056E005020FD3104D936FBFD3104A036FBFDA52C :10057E000471235DF2C6D7C72008FBF8FFFDD5082E :10058E005014C15008FD0708C0CC07048C074C144A -:10059E00DE0C8C07318EFD540A615907EFEECC0745 +:10059E00DE0C8C07318EFD4F0A615907EFEECC074A :1005AE00048C074C1461C8ED7306CC06008C064C07 :1005BE000461C8ED5206301AF9BC02F6BBCEABACE4 :1005CE0031B2D109C73641057184C6DEF3F1C736A3 @@ -95,17 +95,17 @@ :1005FE004900DD09C73641057184C6DEC3F1C73631 :10060E0041057184C661DC0E059C055040C18C0706 :10061E00318E31AD128C06318E318D03BDD831FF46 -:10062E00BDDADADAADD8FD200DC0D2DD0C5008C12E -:10063E005014FD0708C0FDDD0B8C05D1DF06615996 -:10064E0006EDBB058C07318EFD580AD2DD0C500825 -:10065E00C15014FD0708C0FDDD0B8C05D1DF06610E +:10062E00BDDADADAADD8FD1B0DC0D2DD0C5008C133 +:10063E005014FD0708C0FDD80B8C05D1DF0661599B +:10064E0006EDBB058C07318EFD530AD2DD0C50082A +:10065E00C15014FD0708C0FDD80B8C05D1DF066113 :10066E005907EDAF0571605005CC0400CC05008C28 :10067E00054C09DE2B8C05318E04F61FC1317B9E95 :10068E00FDC41189728C05318E04F64F14896142B6 :10069E00DF03F6EF01E6600E049C04615905EFCF0F :1006AE0041001140F81F3A61E86159048C04D1DF12 -:1006BE0008FDDE0BFDF00CEF0C5008C15014FD07C9 -:1006CE0008C0FDDD0B1008C6D7C72004FBF8FF716C +:1006BE0008FDD90BFDEB0CEF0C5008C15014FD07D3 +:1006CE0008C0FDD80B1008C6D7C72004FBF8FF7171 :1006DE005B21CC0100F6BC02AC02440900DE3EAC4C :1006EE000204F60F144100118972AC020C501489E9 :1006FE006142DF03F6EF01E6600E019C01AC0212CF @@ -122,24 +122,24 @@ :1007AE004902DDB400000000617902EFF1CE370896 :1007BE00CBE4FFFFCBE6FFF7CED4FFCF370008F533 :1007CE00120561FDF5ABFFFDD508D25008C15014DE -:1007DE00FD0708C0D2FDDD0B1004C6D73184BD0263 +:1007DE00FD0708C0D2FDD80B1004C6D73184BD0268 :1007EE00EFFA717BBDCBE4FFFFCBE6FFFFCBD4FF6F :1007FE00FF717ABED7717BBED7C7C1200CFBF8FF45 :10080E008C0C318E31ADC1317B9DD4C0BC068DD4E4 :10081E009C088C149C0B8C14318E040C00128C0BC7 -:10082E00318EBDD813FDAF0F61C8EDD008CEABAC85 -:10083E00CC05068C0B318EFD500AD2DD158C0B319A -:10084E008EFD540A6169058C05D1DFE7FD0308E2D0 +:10082E00318EBDD813FDAA0F61C8EDD008CEABAC8A +:10083E00CC05068C0B318EFD4B0AD2DD158C0B319F +:10084E008EFD4F0A6169058C05D1DFE7FD0308E2D5 :10085E00EF71CC0A008C0A4C04DE54F6BC02301A3E :10086E00F9BBAC06148C089EFD118972AB1462990B :10087E00AC06A1BC06617900617902F0E161490222 :10088E00DFE05040C18C0B318E31AD128C0A318EAF -:10089E00318D03BDD831FFBDDADADAADD8FD200DCA +:10089E00318D03BDD831FFBDDADADAADD8FD1B0DCF :1008AE00C0D2DD06FD0308E2EF1961590AEFA68CEE -:1008BE000B318EFD580AD2DD03E2EF0761590BEDC5 +:1008BE000B318EFD530AD2DD03E2EF0761590BEDCA :1008CE002408F2100EC6D7C7717B9D717BFAFDEA24 -:1008DE0007301AF9FD030BFD8E0AC6D7FDD508FDAC -:1008EE00DD0BFD0308F5ABFFF2D7C731746006715F +:1008DE0007301AF9FDFE0AFD890AC6D7FDD508FDB7 +:1008EE00D80BFD0308F5ABFFF2D7C7317460067164 :1008FE0010CBFBEF047118CBFB8FCBFB7FF4FC7698 :10090E00D1DD5C8FCBFB9FF4FC4014F903DF226634 :10091E005C10D1DD1C8FCBFB5C10D1DD0B5080C188 @@ -147,114 +147,114 @@ :10093E00C04014F903DD064014F904DF22665C02A0 :10094E00D1DD1C8FCBFB5C02D1DD0B5040C15010B2 :10095E00FD7634C0EF095020C15010FD7634C0C66C -:10096E00D7C78F0EFC768F0FFC77665C80D1DD10BB -:10097E00675C80D1DF05712360EF0B712260EF069B -:10098E00710407712160665C40D1DD10675C40D157 -:10099E00DF05713360EF0B713260EF067114057174 -:1009AE003160665C01D1DD10675C01D1DF057143FA -:1009BE0060EF0B714260EF06713407714160665C47 -:1009CE0002D1DD10675C02D1DF05715360EF1D713E -:1009DE005260EF184017F901DF087104027151607F -:1009EE00EF0AC736100571C4C6715160665C04D13A -:1009FE00DD10675C04D1DF05716360EF0B7162601F -:100A0E00EF06714407716160665C08D1DD10675CAA -:100A1E0008D1DF05717360EF0B717260EF06711410 -:100A2E0007717160665C10D161E8715AD1C6D7F555 -:100A3E000EFCF510FCCF16FCFFCF12FCFFCF13FC03 -:020A4E00FFD7D0 -:100A50005208EF065203EF025206FEE600FE1B00AC -:100A6000DC16089F03088F0408089F040862FE2410 -:100A700000089F0408EEBF00EEBA00C1C514410E85 -:100A800011D9D0FF118FD1FF312E45C4C0D7F2311B -:100A9000A2C401E2D79DE261DD4C09DF12717BFA4D -:100AA000C18F06089F5FFDC0CF060800EE2700310A -:100AB000F2FA04CF0608004C00DF05D50008DD1669 -:100AC00061DD717BFAD50608DD0ACDE31F61CD61DA -:100AD000CDEE160061CDFED40061FFFE9A00FCF859 -:100AE000FF0EFEB20061CDFED5004C09DF0EC18FB6 -:100AF00006086F5FFD9F0608C0EE0400CF060800E1 -:100B0000F8E3D75200EF025202FE3700CF5EFD003D -:100B1000CF060800BF0408C716629F0008410011F5 -:100B20008F1A209B4100118F1B209F0108C6510086 -:100B3000FE62FFEF025205CF060800C1510CFE0A0B -:100B400000C0D7C1511DFE0200C0D761DD717BFA24 -:100B500070CEC0A59EC47CFF9EC4609EC461CDD7EC -:100B600061DD717BFAC18EC45C1BFED6FFCF060827 -:100B700001FED7FFC061CDD731F2FA1AC1AEE4BF92 -:100B800050FDAEE6BF52FDAED4BF54FD30FFFFBEF8 -:100B9000E4BEE6BED4C0D731F2FA11C1AF50FDBEFB -:100BA000E4AF52FDBEE6AF54FDBED4C0D7C1BF56C0 -:100BB000FD13BF58FD15BF5AFD17BF5CFDC0D7AF71 -:100BC00056FDDB58FDEB5AFDFB5CFDD7534B305215 -:100BD0005430324E323030475631323000FFC1503F -:100BE000FEFEAB0061DD717BFACF060800FE0A0055 -:100BF000FEA4FF61CDF8E3EECF00C7FB0408BF50B1 -:100C0000FD8FC0009C05C5C337040600BF52FD35EB -:100C100036420C300000522BFE6600C2C4C630F0D3 -:100C20000BB800300000B8022004AF52FDB800300D -:100C30000F00B802AF50FD61FF520AFE3AFFECF818 -:100C4000FF0E717BFAC1C7FB04088C05C65C80FEF1 -:100C50000200C0D761DD717BFA70CFC0FFA59FC0D5 -:100C6000007CFF9FC000609FC00061CDD7618BFEFC -:100C7000E2FF717BBE410011FB000017CEFC00615A -:100C8000CB089EFDF31161C999A58392DFF7D7FECA -:100C9000B1FED55EFDDF23C1CF0308035109FEF489 -:100CA000FDC0D2DF37FE3800A20408CF0308075189 -:100CB00009FEE1FDD2B20408DF22C7FB040831833C -:100CC00002C6D7C6510AFECCFD624C1FDF06CF5EBE -:100CD000FD01EF04CF5EFD00C0EE5BFEC0EE55FEF1 -:100CE000C7C1FB04088B31196C0161589BC0C6D782 -:100CF000717BFAFE4DFEAF0408040600C1143654A1 -:100D00000C300000522DF3FE77FF8FC000FE2BFE4B -:100D100061CF5C807C8073C0041900CEFC0F61CB76 -:100D2000C55404EF03C55417FE18FEC7360008BBB0 -:100D3000629C0288089C03D1DD334C41DE2F70F1A8 -:100D4000312DB161090033081C000851FF612A41AF -:100D50000E118FD0FF613B118FD1FF6138DC0E8BFC -:100D60005C03DF0964C6C4FE2BFDEECAFDC6C4EEFB -:020D7000C3FDC1 -:100D720061CF5100718C7109FECBF800FEFCC101FC -:100D820000F6BF00F953C0F693935820FEDFF941F5 -:100D92000036824D34FEFCEF05118B99A7A517444E -:100DA200D44DDFF53602F930FEFCEF04CC0000A78B -:100DB20047DFF9410036D44D3420FEEF05118B99FF -:100DC200A7A51744DC4DDFF53628FE305CFEEF04A4 -:100DD200CC0000A747DFF9FCCE0000EFFE61DD7119 -:100DE2007BFABEF0ADD8BEF200AEF661CDD7C361DC -:100DF200DD717BFABEF0ADD8BEF200DBF6FFADDCF2 -:100E0200BEF000AEF6BDD8AEF40312ADDABEF2000B -:100E1200AEF661CD03BDDAC2D7C3F33174D908830C -:100E2200C1F626D8BDD8C031750683C312F623C2D7 -:100E3200FD3D0E93DF0312F623C2D7440000DD26E8 -:100E420061DD717BFACFE80080BEF6F6BEF4BEF239 -:100E5200ADD8BEF0CFE800818FE8003103FAAEF0E2 -:100E6200F5E80061CDD7B1D7C3F33174D90883C196 -:100E7200F626D8BDD8C0317505C312F623C2FD8B44 -:100E82000E93DF0312F623C2D7440000DD2761DD93 -:100E9200717BFACFE80080BEF6F6BEF4BEF2ADD8A2 -:100EA200BEF0CFE800818FE8003103FAAFE000F531 -:100EB200E80061CDD7ADD8D7C3F33174DB0F83C15E -:100EC200F626D8BDD861317026DABDDAC031750D8B -:100ED20083C312F626DCBDDC61317023C2FDF30E42 -:100EE20093DF0CF626D8BDD861317026DABDDAC29E -:100EF200D7C161686BDC6BDDC0DD2F61DD717BFA10 -:100F0200CFE80080BEF4ADDCBEF6ADD8BEF0ADDAFF -:100F1200BEF2CFE800818FE8003103FAAEF0BDD80F -:100F2200AEF2BDDAF5E80061CDD7F6BDD8BDDAD7AD -:100F32008292DD2B61DD717BFACFE80080BEF0F694 -:100F4200BEF2BEF46208BEF6CFE800818FE800313F -:100F520003FAAFE0006072AEF0F5E80061CDD76051 -:100F620072F6B1D706DABDDAADDC06D8BDD861D8E3 -:100F7200A6DAD7D1DD17C1C3DAD89DD8ADDA311CD4 -:100F820061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD67 -:100F92001BC1C3DADA9DDAADD8311E33311E33718B -:100FA200F9B4DADFF4BDD813BDDAC2C0D746D8DD52 -:100FB2000771FF7177D971C0D75BDB9DDB605BDAAC -:100FC2009DDAADDC5BD9085BD808BDD8D7C3C7F3BF -:100FD200728EFDC162314C410036784D1161A072B2 -:070FE200C09EFD62C6C2D7EC -:0A0FF60030393A31343A3135000049 -:0A20000030393A31343A313500002E +:10096E00D7C7360000665C80D1DD10675C80D1DFB2 +:10097E0005712360EF0B712260EF06710407712180 +:10098E0060665C40D1DD10675C40D1DF057133607D +:10099E00EF0B713260EF06711405713160665C0108 +:1009AE00D1DD10675C01D1DF05714360EF0B714241 +:1009BE0060EF06713407714160665C02D1DD10672D +:1009CE005C02D1DF05715360EF1D715260EF18406C +:1009DE0017F901DF08710402715160EF0AC7361072 +:1009EE000571C4C6715160665C04D1DD10675C048C +:1009FE00D1DF05716360EF0B716260EF0671440722 +:100A0E00716160665C08D1DD10675C08D1DF05712D +:100A1E007360EF0B717260EF06711407717160668F +:100A2E005C10D161E8715AD1C6D7F50EFCF510FCF9 +:0D0A3E00CF16FCFFCF12FCFFCF13FCFFD73B +:100A4B005208EF065203EF025206FEE600FE1B00B1 +:100A5B00DC16089F03088F0408089F040862FE2415 +:100A6B0000089F0408EEBF00EEBA00C1C514410E8A +:100A7B0011D9D0FF118FD1FF312E45C4C0D7F23120 +:100A8B00A2C401E2D79DE261DD4C09DF12717BFA52 +:100A9B00C18F06089F5FFDC0CF060800EE2700310F +:100AAB00F2FA04CF0608004C00DF05D50008DD166E +:100ABB0061DD717BFAD50608DD0ACDE31F61CD61DF +:100ACB00CDEE160061CDFED40061FFFE9A00FCF85E +:100ADB00FF0EFEB20061CDFED5004C09DF0EC18FBB +:100AEB0006086F5FFD9F0608C0EE0400CF060800E6 +:100AFB00F8E3D75200EF025202FE3700CF5EFD0043 +:100B0B00CF060800BF0408C716629F0008410011FA +:100B1B008F1A209B4100118F1B209F0108C651008B +:100B2B00FE62FFEF025205CF060800C1510CFE0A10 +:100B3B0000C0D7C1511DFE0200C0D761DD717BFA29 +:100B4B0070CEC0A59EC47CFF9EC4609EC461CDD7F1 +:100B5B0061DD717BFAC18EC45C1BFED6FFCF06082C +:100B6B0001FED7FFC061CDD731F2FA1AC1AEE4BF97 +:100B7B0050FDAEE6BF52FDAED4BF54FD30FFFFBEFD +:100B8B00E4BEE6BED4C0D731F2FA11C1AF50FDBE00 +:100B9B00E4AF52FDBEE6AF54FDBED4C0D7C1BF56C5 +:100BAB00FD13BF58FD15BF5AFD17BF5CFDC0D7AF76 +:100BBB0056FDDB58FDEB5AFDFB5CFDD7534B30521A +:100BCB005430324E323030475631323000FFC15044 +:100BDB00FEFEAB0061DD717BFACF060800FE0A005A +:100BEB00FEA4FF61CDF8E3EECF00C7FB0408BF50B6 +:100BFB00FD8FC0009C05C5C337040600BF52FD35F1 +:100C0B00363D0C300000522BFE6600C2C4C630EBE2 +:100C1B000BB800300000B8022004AF52FDB8003012 +:100C2B000F00B802AF50FD61FF520AFE3AFFECF81D +:100C3B00FF0E717BFAC1C7FB04088C05C65C80FEF6 +:100C4B000200C0D761DD717BFA70CFC0FFA59FC0DA +:100C5B00007CFF9FC000609FC00061CDD7618BFE01 +:100C6B00E2FF717BBE410011FB000017CEFC00615F +:100C7B00CB089EFDF31161C999A58392DFF7D7FECF +:100C8B00B1FED55EFDDF23C1CF0308035109FEF48E +:100C9B00FDC0D2DF37FE3800A20408CF030807518E +:100CAB0009FEE1FDD2B20408DF22C7FB0408318341 +:100CBB0002C6D7C6510AFECCFD624C1FDF06CF5EC3 +:100CCB00FD01EF04CF5EFD00C0EE5BFEC0EE55FEF6 +:100CDB00C7C1FB04088B31196C0161589BC0C6D787 +:100CEB00717BFAFE4DFEAF0408040600C114364FAB +:100CFB000C300000522DF3FE77FF8FC000FE2BFE51 +:100D0B0061CF5C807C8073C0041900CEFC0F61CB7B +:100D1B00C55404EF03C55417FE18FEC7360008BBB5 +:100D2B00629C0288089C03D1DD334C41DE2F70F1AD +:100D3B00312DB161090033081C000851FF612A41B4 +:100D4B000E118FD0FF613B118FD1FF6138DC0E8B01 +:100D5B005C03DF0964C6C4FE2BFDEECAFDC6C4EE00 +:020D6B00C3FDC6 +:100D6D0061CF5100718C7109FECBF800FEFCC10101 +:100D7D0000F6BF00F953C0F693935820FEDFF941FA +:100D8D000036784D34FEFCEF05118B99A7A517445D +:100D9D00CA4DDFF53602F930FEFCEF04CC0000A79A +:100DAD0047DFF9410036CA4D3420FEEF05118B990E +:100DBD00A7A51744D24DDFF53628FE305CFEEF04B3 +:100DCD00CC0000A747DFF9FCCE0000EFFE61DD711E +:100DDD007BFABEF0ADD8BEF200AEF661CDD7C361E1 +:100DED00DD717BFABEF0ADD8BEF200DBF6FFADDCF7 +:100DFD00BEF000AEF6BDD8AEF40312ADDABEF20011 +:100E0D00AEF661CD03BDDAC2D7C3F33174D9088311 +:100E1D00C1F626D8BDD8C031750683C312F623C2DC +:100E2D00FD380E93DF0312F623C2D7440000DD26F2 +:100E3D0061DD717BFACFE80080BEF6F6BEF4BEF23E +:100E4D00ADD8BEF0CFE800818FE8003103FAAEF0E7 +:100E5D00F5E80061CDD7B1D7C3F33174D90883C19B +:100E6D00F626D8BDD8C0317505C312F623C2FD864E +:100E7D000E93DF0312F623C2D7440000DD2761DD98 +:100E8D00717BFACFE80080BEF6F6BEF4BEF2ADD8A7 +:100E9D00BEF0CFE800818FE8003103FAAFE000F536 +:100EAD00E80061CDD7ADD8D7C3F33174DB0F83C163 +:100EBD00F626D8BDD861317026DABDDAC031750D90 +:100ECD0083C312F626DCBDDC61317023C2FDEE0E4C +:100EDD0093DF0CF626D8BDD861317026DABDDAC2A3 +:100EED00D7C161686BDC6BDDC0DD2F61DD717BFA15 +:100EFD00CFE80080BEF4ADDCBEF6ADD8BEF0ADDA05 +:100F0D00BEF2CFE800818FE8003103FAAEF0BDD814 +:100F1D00AEF2BDDAF5E80061CDD7F6BDD8BDDAD7B2 +:100F2D008292DD2B61DD717BFACFE80080BEF0F699 +:100F3D00BEF2BEF46208BEF6CFE800818FE8003144 +:100F4D0003FAAFE0006072AEF0F5E80061CDD76056 +:100F5D0072F6B1D706DABDDAADDC06D8BDD861D8E8 +:100F6D00A6DAD7D1DD17C1C3DAD89DD8ADDA311CD9 +:100F7D0061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD6C +:100F8D001BC1C3DADA9DDAADD8311E33311E337190 +:100F9D00F9B4DADFF4BDD813BDDAC2C0D746D8DD57 +:100FAD000771FF7177D971C0D75BDB9DDB605BDAB1 +:100FBD009DDAADDC5BD9085BD808BDD8D7C3C7F3C4 +:100FCD00728EFDC162314C4100366E4D1161A072C1 +:070FDD00C09EFD62C6C2D7F1 +:060FE400C73060FDC6D716 +:0A0FF60031353A34373A3334000045 +:0A20000031353A34373A333400002A :10200A0005214F7B9EC5E9000104080D12171C1F0C :10201A00080100001F003B005A0078009700B50035 :10202A00D400F300110130014E01192634445362E1 @@ -346,9 +346,9 @@ :10257C000AF98D289F08F98D285070D612307351A6 :10258C00230480001231FF318E039F09F99FC6FB93 :10259C00F68F09F97C804C95DC1C8F09F9318F245E -:1025AC001400EA30BDD8AA44FDDF0D1231FF318E84 +:1025AC001400EA30BDD8AA44FDDA0D1231FF318E89 :1025BC0003318F16EF1A8F09F9318F241400EA308A -:1025CC00BDD8AA46FDDF0D1231FF318E03318F16B7 +:1025CC00BDD8AA46FDDA0D1231FF318E03318F16BC :1025DC00EA308A427217F3031644000171FE61C897 :1025EC0036FF001701DE02F61617BD4EC7500CFD64 :1025FC000C2BC0D2DF078D289F08F9EF047100CA9D @@ -357,7 +357,7 @@ :10262C008C069C058C079C04EF4ACC0563CC0400FB :10263C00EF4217040600FD042CD2DD0F7100CAFB1B :10264C0071035CCC050071025DEF298C06318E3173 -:10265C008D080E07081C00BBEA308A4072ABFD32B5 +:10265C008D080E07081C00BBEA308A4072ABFD2DBA :10266C000FBB8C019C05D1DF08CC0501CC0400EF1D :10267C00038B9C0417040600FD0F2CD2DD06CC0640 :10268C00C8CC07008C069FC9FB8C06318E318D0897 @@ -463,8 +463,8 @@ :102CCC00FC9F110571603002D7717830027148F0A9 :102CDC0000D7C788061666614FDD0967614EDE03B3 :102CEC0096EF01866672C6D7C7161714AA0412A9E6 -:102CFC0043DD29AA0412A923FDDC4DC3AC02FDDC83 -:102D0C004D13C2BDD813FDAF0FDE0C1714AA02125F +:102CFC0043DD29AA0412A923FDD24DC3AC02FDD297 +:102D0C004D13C2BDD813FDAA0FDE0C1714AA021264 :102D1C00AA0403BA04EF051714A9BA04AC041231BF :102D2C00FF319E03317F087208C6D77100F2003064 :102D3C004400BFB601300188BF9001300984BF9EAA @@ -485,7 +485,7 @@ :102E2C00FFCF9CFB03D7C7161714F6B9AA0412F6EA :102E3C00231231FF31AE03316FBA02C6D7C7C1FBC3 :102E4C00F8FF8C085080D612AB1413B9AB14AA043B -:102E5C0012A92312D939FBF133BDD813FD1B0EBABD +:102E5C0012A92312D939FBF133BDD813FD160EBAC2 :102E6C0002C0C6D731645D01D74014F902DF10F6F9 :102E7C00BE64BE6EBE6ABFA6FBBFACFBBFB2FB316D :102E8C00545D1530A2FBFD322E30A8FBFD322E30E6 @@ -515,7 +515,7 @@ :10300C005E1371235E717B9E8FF4FB9E9A8FF5FB92 :10301C009E9B717A9EC6D7CFBFFB5CCFC0FB5FCFA8 :10302C00E0FB5DCF14FC36CF15FCC9E5EBFBD7C735 -:10303C00CFBCFB12CFBDFB04CFE4FBFFF5E5FBF5EA +:10303C00CFBCFB12CFBDFB05CFE4FBFFF5E5FBF5E9 :10304C00E6FBF5E7FBF5E8FB5600664C64DE087220 :10305C003838FB0086EFF3C6D7C788061617F1E79A :10306C003403002361E3EDAB332361F8ED5631B14A @@ -535,7 +535,7 @@ :10314C00332361F8ED5B33EDAD3334BEFB89615F46 :10315C0099EDB733304129FD7B3866736718BCFB9A :10316C00EDB73340C1FB6ADF1440C2FB68DF0E676A -:10317C004C6CDF0930AD41FD7B38713AD5679FC38C +:10317C004C6CDF0930A441FD7B38713AD5679FC395 :10318C00FBEDB73367D1DD0D30D13CFD7B3834DC42 :10319C00FB89616F99EDB733675C02D1DD0830CAEA :1031AC002AFD7B38EF0C675C01D1DD0630CF2AFDA0 @@ -564,7 +564,7 @@ :10331C009FF6FBEDB733675C1F9FF7FBEDB73330C0 :10332C00883AFD7B38679FFCFBEDB73330433AFDA1 :10333C007B38679FFDFBEF7330653AFD7B38679FE9 -:10334C0000FCEF67675C01D161E8FD8744EF5C4AE4 +:10334C0000FCEF67675C01D161E8FD7E44EF5C4AED :10335C0038C8DE57E83867186AFAA438EF4D679D0D :10336C0038EF4867318E247000DD0D240200DF3BFE :10337C0030EA08FD7B38EF3371625FEF2E675C013A @@ -576,7 +576,7 @@ :1033DC006D08616A08128F1DFC5C80312A6162EFF6 :1033EC0059664C3DDF0AAE90BF18FCF918FCEF4A49 :1033FC00664C3EDF05F919FCEF40664C4FDF05FDCE -:10340C00AF44EF36664C61DF08E838096AFA72EFB0 +:10340C00A644EF36664C61DF08E838096AFA72EFB9 :10341C0029664C7FDF05FD473DEF1F664C4EDF0BE9 :10342C0031745F045210EF12F2EF0F664C5BDC0448 :10343C0052FFEF06667309BCFB72C6D7C788061627 @@ -591,7 +591,7 @@ :1034CC001617F1E734020025DD3D23DD1725DD1C41 :1034DC0023DD0523DD2BEF3B71625E679F20FCCD66 :1034EC003D03EF2F675C839F1DFCEF27675C039FF9 -:1034FC001FFC675C034C0261F8711260FDA246EF81 +:1034FC001FFC675C034C0261F8711260FD9946EF8A :10350C0012679F21FCEF0C6791DF08E0C15012FDA0 :10351C007634C0C6D7C71617F1E7240000DD2A237E :10352C00DD1E240300DD0724FB00DD24EF25312202 @@ -629,9 +629,9 @@ :10372C00FBF8FF8F14FC4E02DC03F2EF318C024FDE :10373C0015FCDC0452FFEF268C022F14FC70613157 :10374C00318D128F15FC2F14FC70613133BDD813E1 -:10375C00FD3D0EBB440001DC03F690BB8B721004E4 +:10375C00FD380EBB440001DC03F690BB8B721004E9 :10376C00C6D7C7C1FBF8FFAC0814A91489708B61CC -:10377C0028706131FDDC4D1344030071FEDC23AC79 +:10377C0028706131FDD24D1344030071FEDC23AC83 :10378C0008148A04819A04AC08148A044C11DC10C5 :10379C00A9148B99AC0814CA0200AC0814CA031003 :1037AC00EF72AC0814CA0400AC0814A914894DDEDD @@ -670,12 +670,12 @@ :1039BC00A8C15030FDF8021006D2DD1DA042FC401B :1039CC0042FC08DE03E2EF6B34FCFB895CFC99FDE6 :1039DC00883A7110CAFBF2EF5A300600C117040680 -:1039EC0000C13001FCFDE44D1004F542FC8FFCFBE2 +:1039EC0000C13001FCFDDA4D1004F542FC8FFCFBEC :1039FC005C01D1DD264014F903DF205010C180FD9D :103A0C007634C0C736100571D4C6DE0F17C1500608 :103A1C00C150A8C15030FDF80210064014F901DD68 :103A2C00114014F905DD0B8FFCFB5C02D161E8FD44 -:103A3C00B241F2100CC6D7D9FDFBC15030FDD002FB +:103A3C00A941F2100CC6D7D9FDFBC15030FDD00204 :103A4C00C0629F00FC7130CDFB8FD5FB5C08D1DFD1 :103A5C0006716307716B27F2D7D900FCC1D9FFFB44 :103A6C00C15030FD6A0310047130CDFB8FD5FB5C67 @@ -710,7 +710,7 @@ :103C3C00D4DE0730AD39FD7B38D24014F903DF1DDB :103C4C003122070630FC29FD7B3831445F0C71436F :103C5C005F5080C15012FD7634C0FD783CFDA33C12 -:103C6C0031645F0671635FFD8143C6D78F1DFC5CB9 +:103C6C0031645F0671635FFD7843C6D78F1DFC5CC2 :103C7C0001D1DD22D549FCDD04B049FCD7CF49FC8C :103C8C00098D3E4F48FCDD0E8D3E9F48FC5040C1D7 :103C9C005012FD7634C0D74014F903DD04F6BD1A7A @@ -743,15 +743,15 @@ :103E4C002361F8EDA140EDFE3F4015F901DF303163 :103E5C0024601FF64644DD05F544FDEF03A044FD48 :103E6C004044FD65DC0FF6BD44F514F971025FEDBD -:103E7C002641FDA223AD44440A0061D8ED264171D0 +:103E7C001D41FDA223AD44440A0061D8ED1D4171E2 :103E8C00325FFDC80471535CFDA2234017F903DFB8 -:103E9C000971025FF514F9ED2641FD102640C9FBAE -:103EAC009BDE0D3124600971025FF514F9ED26419A +:103E9C000971025FF514F9ED1D41FD102640C9FBB7 +:103EAC009BDE0D3124600971025FF514F9ED1D41A3 :103EBC00714A277140110571301105713A22715AFE :103ECC002271501105FD4629D2DD0971025FF514EE -:103EDC00F9ED264171103500CF37001D71401205E8 +:103EDC00F9ED1D4171103500CF37001D71401205F1 :103EEC004015F901DD064015F903DF05F5E5FBEF9B -:103EFC0004CFE5FB03CF14F902FD2C29ED2641FD7F +:103EFC0004CFE5FB03CF14F902FD2C29ED1D41FD88 :103F0C00242CFD802C714A9DFDBB34FD3B30F537D4 :103F1C00FF712BE0F515F971025FCBE43FEFCBE6B7 :103F2C00F6F0FDC804713BD47112027123028F1696 @@ -759,16 +759,16 @@ :103F4C0034CBFB896168995002FD522BD2DD06718E :103F5C0070CBFBEF047178CBFBFDA223FD372D71E9 :103F6C000816F9CF14F9038FBEFB5C02D1DD0950A2 -:103F7C0080C15010FD7634C0ED2641FD28413154EE +:103F7C0080C15010FD7634C0ED1D41FD1F41315400 :103F8C005F2FA450D450DD0831A4E00A31020C0696 -:103F9C00712BE0FD9E4131A4E01731040C13712B01 +:103F9C00712BE0FD954131A4E01731040C13712B0A :103FAC00E05027C15005FD412BC0CF14F90471021C -:103FBC005FFD93418F16F931250731246003F51409 -:103FCC00F9ED2641FD284131020C14F0C15005FDDC -:103FDC00412BC05005FD4002FD9E41CF14F903FD5D -:103FEC0093418F16F931250731246003F514F9ED4F -:103FFC002641F514F9CFE5FB03F5E6FBF5E8FB717B -:10400C00525DF6426CFF61E8ED2641F6BD4A710344 +:103FBC005FFD8A418F16F931250731246003F51412 +:103FCC00F9ED1D41FD1F4131020C14F0C15005FDEE +:103FDC00412BC05005FD4002FD9541CF14F903FD66 +:103FEC008A418F16F931250731246003F514F9ED58 +:103FFC001D41F514F9CFE5FB03F5E6FBF5E8FB7184 +:10400C00525DF6426CFF61E8ED1D41F6BD4A71034D :10401C005DF5FCFBFD883AFD9D2DFD772CFDD52C27 :10402C00714B9D711302712302F5CCFBF5CDFBF5A1 :10403C00CEFBF5CFFB31245D02EFFACE3708CBE493 @@ -777,224 +777,224 @@ :10406C0007714B27714810057148110571381005FF :10407C0071381105713302713B22715302715B224D :10408C007158100571581105CF14F90571325FF68E -:10409C00BD44FD3D0AF515F9F544FD31246004D409 -:1040AC002ADD2371335FE515F9E514F98F16F93123 -:1040BC002568F510FCF50EFC502EFD4002CF15F9CD -:1040CC0003E514F9EF54FD2405FD3B2371730171D5 -:1040DC00320471430271035C71525C31949E02EFA5 -:1040EC00FA712AE7CEA409F5F3003124600261FDD0 -:1040FC00F442FD6F09E5F300CEA40831226006CF2F -:10410C0014F905EF0971335FE515F9E514F9712B15 -:10411C00E78F16F9312503F514F9C6D7D552FCDF14 -:10412C001A310200155003FD522B625C01D1DF07DE -:10413C00F514F971025FD7E552FCD74052FCF0DF61 -:10414C000831040041F552FCD74052FCC8DF0BF596 -:10415C0014F971025FCF52FCF0D73102000A4052C1 -:10416C00FCFFDD22A052FCD7F0C15004FD412BC056 -:10417C008FCBFB5C9F9FCBFB7110DCFB30D13CFDEC -:10418C007B38CF52FCF0D731045D06F514F971027F -:10419C005FD771535FF450717207FDAC02717307F6 -:1041AC00D7FD8505F2D7717BFAC7200CFBF8FF8F82 -:1041BC0002FCF0F901FCF303FDDC4D13BC048F048D -:1041CC00FCF0F903FCF303FDDC4D13BC028F06FC81 -:1041DC00F0F905FCF303FDDC4D13BB717AFAAC046A -:1041EC00BDD8F6BDDAAC04311EBDDCF6BDDEFDF08B -:1041FC000DADD8BDDCADDABDDEAC02BDD8F6BDDA96 -:10420C00AC02311EDADCC3DADEC3BDDCF6BDDEFD8A -:10421C00F00DC0BDDEC0BDDCADDEFD660FADD8BDA2 -:10422C00DCADDABDDEABBDD8F6BDDAAB311EDADC07 -:10423C00C3DADEC3BDDCF6BDDEFDF00DC0BDDEC0F5 -:10424C00BDDCADDEFD660FDADAADD8FD9D45C3C52C -:10425C008FECFC5C3FF0317E046CFC14C2C0B9A046 -:10426C00ECFCF6BC08BC0A9C078C074C2EDD3E8F80 -:10427C00ECFC0E0770F161DC605C3FF0317E127972 -:10428C006CFCBDD8F6BDDA8C0773095C22318FBD8E -:10429C00DC70BDDEFDF00DAC08BDDCAC0AFD660FBC -:1042AC00ADDABC0AADD8BC08615907EFBCAC08BD8F -:1042BC00D8AC0ABDDAC9DC0004F6FDBA0EC9DCFFC5 -:1042CC00FFF6FDBB0FADD8BF66FCAF60FC4266FCD1 -:1042DC00DD12AF62FCBF64FCAF60FCBF62FCAF667A -:1042EC00FCBF60FCAF62FC4264FCDC50AF60FC4283 -:1042FC0062FCDE48AF46FD4260FCDE40404AFD16E3 -:10430C00DC1F404AFDA0DE168F68FC4F4AFDDE0E16 -:10431C00AF60FC226AFC44691061C8FD8143F54A18 -:10432C00FDAF60FC445146DC0BAF60FC241027BF92 -:10433C0048FDEF1130F82ABF48FDEF09404AFDFF58 -:10434C0061E8A04AFDAF64FC4262FCDC1BAF62FC7E -:10435C004260FCDE13AF60FC4248FDDE0BF568FCEE -:10436C00AF60FCBF6AFCEF094068FCFF61E8A06825 -:10437C00FC100CC6D7717BFAC7710A9E31929E0253 -:10438C00EFFA8E949F5AFC8E969F5BFC8E979F5CE7 -:10439C00FC8E989F5DFC8E939F5EFC8E929F5FFCC3 -:1043AC00710B9E717AFA8F5DFCFDCF0F76FD1B456C -:1043BC0013BD56D507FCDF0AD508FCDF05D509FC73 -:1043CC00DD25F6B14656DF11C9563722665C0391DE -:1043DC00DF060A56181A57009617FD3E4613FD596C -:1043EC004431745F02EF6152069292695AFC685430 -:1043FC00FCDFF6AD56BD54F852F3311C791AF94472 -:10440C00FEFFDD44D852F101041AF914A944FFFF50 -:10441C00DF04E6B9EF0BD852F101041AF914A9A183 -:10442C00B9717BFAA007FCD507FCDF1CA008FCD5F2 -:10443C0008FCDF14A009FCD509FCDF0CCF07FCFF3E -:10444C00CF08FCFFCF09FCFFC6717AFAD7C716D884 -:10445C0052F10744A800DC0571725FEF1CF647DDD2 -:10446C0018A4524A52A8DC0571725FEF0CF852F393 -:10447C00311CF6781AF9B7EFE4C6D7C756A896667A -:10448C00F0317E12F6B1781AF966D1DFF1717BFA50 -:10449C00F507FCF508FCF509FCF45271735FC67165 -:1044AC007AFAD7C72004FBF8FFD432DF178D529F5E -:1044BC00EDFC717BFA520692926954FC68EEFCDFBB -:1044CC00F6717AFA4A3206DE0EE83209EEFC9C03EB -:1044DC00A4328C0372EF34F9EDFCF3311C791AF928 -:1044EC00BB310260058B9C03EF128C019C03D5ED54 -:1044FC00FCDF06CFEDFCA7EF03B0EDFC718071077C -:10450C006061DC61FB7101608C03721004C6D7C75B -:10451C002008FBF8FF8F5DFCFDCF0F9C078F5CFC28 -:10452C00FDCF0F9C068F5BFCFDCF0F9C058F5AFCBB -:10453C00FDCF0F9C048F5EFC9C038F5FFC9C028C58 -:10454C0006318E0112791A20BB8C075C03D1DF096E -:10455C008C064C0361C86179008C05318EB1610900 -:10456C0000BB313D120103BB8B0E04708C011C008F -:10457C00BB8F0CFC4E03DC0E8C034F0CFCDC0B8C49 -:10458C00024F0DFCDC04AB12EF03ABB1121008C6EA -:10459C00D7C7C3C12008FBF8FFF661490A61F8616F -:1045AC004908DF07F7340000ED3A46E6BC04F6BCD8 -:1045BC0006AC0ABC02AC08BBAC06614902AC046197 -:1045CC00F8614900DE28AC04BDD8AC06BDDAE1FDCB -:1045DC00750FADDABC06ADD8BC04ABBDD8AC02BD12 -:1045EC00DAE1FD900FADDABC02ADD8BBEFCAAC0678 -:1045FC00BC02AC04BBAC08BDD8AC0ABDDAAC04BD83 -:10460C00DCAC06FDF30EAC04BDDCAC06FD660FE1C4 -:10461C00FD900FADDABC06ADD8BC04AC0661490206 -:10462C00AC0461F8614900DCC5AC0214AB12100C8F -:10463C00C6D7C7C12004FBF8FF8F57FCFDCF0F9CDA -:10464C00034E04DF1CAD544656DE07AD56265412FD -:10465C00EF40F64656DF074654DD03E7EF34F7EF3D -:10466C00318C04318EB1128C03318E43DF1830380B -:10467C002226540656BB8C045C0391DF05AB041850 -:10468C0000BBAB12EF0C8C034E04DE0532A900EF1D -:10469C0001F71006C6D7717BFA31126009F646583D -:1046AC00DD04B658EF7C711360717AFA4014F9048A -:1046BC00DF07715307F424EF69D9E7FBF1E7240016 -:1046CC0000DD0F23DD1A23DD1023DD5323DD27232B -:1046DC00DD38715307F424EF49715207F424EF428B -:1046EC00D424DF07715207E424EF05715307F42437 -:1046FC00C958FA00EF2CD424DF0B715207E424C9FB -:10470C0058FA00EF1DF5E7FBEF18D424DF0B7153BB -:10471C0007E424C958FA00EF09CFE7FB02EF03FDC9 -:10472C002F47D7D91FFCF1E7240000DD0923DD2139 -:10473C0023DD0923EF1B715307F424D7D424DF079F -:10474C00715207E424EF05715307F424C9582D0165 -:10475C00D7715207E424D731425D01D771635DD91B -:10476C00E5FBF1E7240000DD1223DD1923DD112325 -:10477C00DD2623DD3423DD3923DD3FFDEF47EF3D1F -:10478C00FD1048EF38D9E4FBC1AE6CFDDE2CC0F354 -:10479C0013BE6C712304EF25F0C1AE6CFDDE2CC092 -:1047AC00F313BE6C712304EF14F6BE6C712204EF8C -:1047BC000CCB6CFF00712304EF03FD84484014F90B -:1047CC0005DD064014F901DF0671230471635D31C8 -:1047DC00645D0FF6BE64BE6A31220402EF02F690ED -:1047EC00BE6ED7CD2647F45AAE6C317DBFFAFCFDB8 -:1047FC005948D2DF0ED9E4FBC1AE6CFDDE2CC0F300 -:10480C0013BE6CD7FD5948D2DD0DCD2647F45AAEF8 -:10481C006C317DBFFAFCD7E85A0934205080D6BFE2 -:10482C00F6FC22FAFCBDD8304700FD1B0EBFF8FC8D -:10483C0030F6FCFDF42CF313BE6CB426D426DF0C3E -:10484C00CD2647A45A4A5A1F61C8F45AD740C7FB11 -:10485C000BDC05712304F2D740C7FB0661D831226B -:10486C005C11F0C1AE6CFDDE2CC0F313BE6C71227A -:10487C0004EF03FD8448E2D771625DF0C1AE6CFDBC -:10488C00DE2CC0F313BE6CA0FCFC40FCFC40DC3DF9 -:10489C00F5FCFCD9FDFCF1313F044CFD14D9FDFCB9 -:1048AC00F1BDD85008FD6A0E087208E6D2DD04018D -:1048BC0092DFFC896158D1DD05712204EF0371236D -:0E48CC0004A0FDFC40FDFC2061C8F5FDFCD7FA -:1048DA0061FC61FCC1C3C5C7520C929269D4FEC186 -:1048EA00DFF88EFD708EFCC1717AFA4014F903DF8D -:1048FA000630FC29FD7B38C09EFC609EFD34D4FE48 -:10490A005206C0B9A5A592DFF9C6C4C2C061FC614E -:10491A00DF520C929269D4FEC1DFF88EFD708EFCD4 -:10492A00C18F4105775C04D1DD06675C01D1DD509A -:10493A0031345E3671620771335E8FCCFB5FD4FB14 -:10494A00D1DF1B8FCDFB5FD5FBD1DF128FCEFB5F93 -:10495A00D6FBD1DF098FCFFB5FD7FBD1DD0C3162EC -:10496A000702EFFA716307716B27710360FDE42F89 -:10497A00F4227148500571605005717AFAED874A40 -:10498A00675C02D1DD16D422DD124A2202DD0DF463 -:10499A00227148500571605005717AFA717AFA8D60 -:1049AA0022318FE7240000DD0823DD1423DD31EFF7 -:1049BA0050F4327140500571505005E422ED874A97 -:1049CA008F40059F10F9715050058F10F99F12F909 -:1049DA00D910F9FDB933629F11F9CD2202ED874A48 -:1049EA00675C02D1DD18675C10D1DD05CD2203EFCB -:1049FA00107148500571605005F422ED874ACD22A6 -:104A0A00044A2203DF138F11F99F4005D911F9C116 -:104A1A00D910F9FD4834C0EF228F4005768F10F97E -:104A2A0001DC064010F902DE0671605005EF4EC740 -:104A3A00D910F9FD6530C071505005D912F9F12429 -:104A4A002900DD2A240400DD25242200DD2024118A -:104A5A0000DD0C240100DD16241E00DD11EF0C40E0 -:104A6A0010F960DF09CF10F961EF03A010F94A22AB -:104A7A0003DF0AD910F9FDB933629F11F9C09EFC10 -:104A8A00609EFD34D4FE5206C0B9A5A592DFF96135 -:104A9A00FCC1C7717AFA714AE5717BBD51405F0466 -:104AAA0001D1DD06F616A747DFF2300400BF240164 -:104ABA00F6BF2A01300B0BBF2801000000000000DE -:104ACA000000510FBF280100000000000000005044 -:104ADA000FBF2801710AE671235DC6C061FCC1C51A -:104AEA00717AFAD436DD0BEA34899E44A634B43698 -:104AFA00EF33710AE6300400BF2401F6BF2A013001 -:104B0A000B0BBF28010000000000000000510FBF7E -:104B1A0028010000000000000000500FBF280171AA -:104B2A00135D71235DC4C061FC61EF520C929269FE -:104B3A00D4FEC1DFF88EFD708EFCC12006FBF8FFA3 -:104B4A0071503002CEABACCC0400F6BB31B2E210ED -:104B5A00617900F6614900DFF371603002EDED4BD7 -:104B6A008E519C03713BE28C035C02D1DD1E8C03E7 -:104B7A005C08D1DF0971503002CC0400EFCC8C05FF -:104B8A0070FD2135629E50CC0402EFBE8C035C039B -:104B9A00D1DF408E509C02715030028C04D1DF0E5E -:104BAA008C0270FD6735629C05CC0401EF328C04DF -:104BBA004C02DF0671603002EF29CF34025A71606D -:104BCA0030028C0270C18C0570FDC934C0CF34022A -:104BDA004AEF108C035C01D1DD0671603002EF03ED -:104BEA00ED544B1006C09EFC609EFD34D4FE520666 -:104BFA00C0B9A5A592DFF961FCC1C3C5C7520C9221 -:104C0A009269D4FEC1DFF88EFD708EFCC1710A9ED6 -:104C1A0031929E02EFFA8FF6FB4F96FFDF198FF75C -:104C2A00FB4F97FFDF118FF8FB4F98FFDF09500406 -:104C3A00C15011FD7634C0710B9EC09EFC609EFD72 -:104C4A0034D4FE5206C0B9A5A592DFF9C6C4C2C0C3 -:104C5A0061FCA44261FCC1C3C5C7520C929269D4DB -:104C6A00FEC1DFF88EFD708EFCC1C1FBF8FF8D1FFF -:104C7A009C018E31318EE7240600DD0823DD0E23E8 -:104C8A00DD22EF39717AFA8C019D3CEF30717AFAA4 -:104C9A004017F901DF068C019D3BEF2151FF2E01E0 -:104CAA009D3BEF19717AFA8C019D284014F903DDB6 -:104CBA00064014F904DF06306425FD7B384031FFD5 -:104CCA0009DE05A031FFEF077158F00071425E71ED -:104CDA000BE3C0C09EFC609EFD34D4FE5206C0B9F0 -:104CEA00A5A592DFF9C6C4C2C061FC61FF520C924D -:104CFA009269D4FEC1DFF88EFD708EFCC1717AFA1A -:104D0A008FFCFB5C03D1DD194014F903DD06401466 -:104D1A00F904DF0D36100571D4DE0630AD39FD7B9E -:104D2A0038C09EFC609EFD34D4FE5206C0B9A5A5CB -:104D3A0092DFF961FC61FC61FC61FC61FC61FC6170 -:104D4A00FC61FC61FC61FC61FC61FC61FC61FC6171 -:104D5A00FC61FC61FC61FC61FC61FC61FC61FC6161 -:0D4D6A00FC61FC61FC61FC61FC61FC61FC12 -:0A4D780000060C12181E242A303623 -:104D8200C4FB0000000040FE000000000E3BB435F2 -:104D92008C226347B52D702EA246373CF808253E7B -:104DA2004CFC2EFE20FE02F903F94DFC28FE4EFCBF -:104DB2004FFC18F94AFC6CFF1AFF6EFF6AFF64FF92 -:104DC2004BFC66FF50FC0000983AF82AFF0055554C -:024DD200555535 -:084DD400FF0000000000470091 -:104DDC00317503F7332312D714AEF8C716AC06128D -:104DEC00C5AC0416F643DD078B99A7A5B3EFF5C246 -:024DFC00C6D718 -:024FF4000204B5 -:0A4FF60030393A31343A3135000009 +:10409C00BD44FD380AF515F9F544FD31246004D40E +:1040AC002ADD20E515F9E514F98F16F9312562F5AD +:1040BC0010FCF50EFC502EFD4002CF15F903E51453 +:1040CC00F9EF4EFD2405FD3B237173017132047130 +:1040DC00430271035C71525C31949E02EFFA712AB7 +:1040EC00E7CEA4093124600261FDCEA408F442FDA0 +:1040FC006F0931226006CF14F905EF0971335FE5C2 +:10410C0015F9E514F9712BE78F16F9312503F51420 +:10411C00F9C6D7D552FCDF1A310200155003FD52F7 +:10412C002B625C01D1DF07F514F971025FD7E55200 +:10413C00FCD74052FCF0DF0831040041F552FCD7AB +:10414C004052FCC8DF0BF514F971025FCF52FCF042 +:10415C00D73102000A4052FCFFDD22A052FCD7F0FE +:10416C00C15004FD412BC08FCBFB5C9F9FCBFB71DF +:10417C0010DCFB30D13CFD7B38CF52FCF0D7310446 +:10418C005D06F514F971025FD771535FF4507172CB +:10419C0007FDAC02717307D7FD8505F2D7717BFA69 +:1041AC00C7200CFBF8FF8F02FCF0F901FCF303FDB8 +:1041BC00D24D13BC048F04FCF0F903FCF303FDD2C5 +:1041CC004D13BC028F06FCF0F905FCF303FDD24D38 +:1041DC0013BB717AFAAC04BDD8F6BDDAAC04311E4F +:1041EC00BDDCF6BDDEFDEB0DADD8BDDCADDABDDE64 +:1041FC00AC02BDD8F6BDDAAC02311EDADCC3DADEB5 +:10420C00C3BDDCF6BDDEFDEB0DC0BDDEC0BDDCAD5F +:10421C00DEFD610FADD8BDDCADDABDDEABBDD8F6D1 +:10422C00BDDAAB311EDADCC3DADEC3BDDCF6BDDED3 +:10423C00FDEB0DC0BDDEC0BDDCADDEFD610FDADA1D +:10424C00ADD8FD9445C3C58FECFC5C3FF0317E04CA +:10425C006CFC14C2C0B9A0ECFCF6BC08BC0A9C07F0 +:10426C008C074C2EDD3E8FECFC0E0770F161DC6090 +:10427C005C3FF0317E12796CFCBDD8F6BDDA8C0750 +:10428C0073095C22318FBDDC70BDDEFDEB0DAC081B +:10429C00BDDCAC0AFD610FADDABC0AADD8BC08615F +:1042AC005907EFBCAC08BDD8AC0ABDDAC9DC0004B8 +:1042BC00F6FDB50EC9DCFFFFF6FDB60FADD8BF6637 +:1042CC00FCAF60FC4266FCDD12AF62FCBF64FCAF6D +:1042DC0060FCBF62FCAF66FCBF60FCAF62FC42647A +:1042EC00FCDC50AF60FC4262FCDE48AF46FD426035 +:1042FC00FCDE40404AFD16DC1F404AFDA0DE168F56 +:10430C0068FC4F4AFDDE0EAF60FC226AFC4469106B +:10431C0061C8FD7843F54AFDAF60FC445146DC0BA7 +:10432C00AF60FC241027BF48FDEF1130F82ABF48BE +:10433C00FDEF09404AFDFF61E8A04AFDAF64FC4275 +:10434C0062FCDC1BAF62FC4260FCDE13AF60FC4223 +:10435C0048FDDE0BF568FCAF60FCBF6AFCEF094062 +:10436C0068FCFF61E8A068FC100CC6D7717BFAC72B +:10437C00710A9E31929E02EFFA8E949F5AFC8E9691 +:10438C009F5BFC8E979F5CFC8E989F5DFC8E939F31 +:10439C005EFC8E929F5FFC710B9E717AFA8F5DFCB6 +:1043AC00FDCA0F76FD124513BD56D507FCDF0AD5A5 +:1043BC0008FCDF05D509FCDD25F6B14656DF11C931 +:1043CC00563722665C0391DF060A56181A57009678 +:1043DC0017FD354613FD504431745F02EF615206F0 +:1043EC009292695AFC6854FCDFF6AD56BD54F852F3 +:1043FC00F3311C791AF944FEFFDD44D852F1010463 +:10440C001AF914A944FFFFDF04E6B9EF0BD852F1F7 +:10441C0001041AF914A9A1B9717BFAA007FCD507FC +:10442C00FCDF1CA008FCD508FCDF14A009FCD50996 +:10443C00FCDF0CCF07FCFFCF08FCFFCF09FCFFC64D +:10444C00717AFAD7C716D852F10744A800DC057167 +:10445C00725FEF1CF647DD18A4524A52A8DC0571B6 +:10446C00725FEF0CF852F3311CF6781AF9B7EFE4DF +:10447C00C6D7C756A89666F0317E12F6B1781AF9EF +:10448C0066D1DFF1717BFAF507FCF508FCF509FC48 +:10449C00F45271735FC6717AFAD7C72004FBF8FF28 +:1044AC00D432DF178D529FEDFC717BFA520692923B +:1044BC006954FC68EEFCDFF6717AFA4A3206DE0EBD +:1044CC00E83209EEFC9C03A4328C0372EF34F9ED54 +:1044DC00FCF3311C791AF9BB310260058B9C03EF9C +:1044EC00128C019C03D5EDFCDF06CFEDFCA7EF038E +:1044FC00B0EDFC718071076061DC61FB7101608C57 +:10450C0003721004C6D7C72008FBF8FF8F5DFCFDB3 +:10451C00CA0F9C078F5CFCFDCA0F9C068F5BFCFDD1 +:10452C00CA0F9C058F5AFCFDCA0F9C048F5EFC9C25 +:10453C00038F5FFC9C028C06318E0112791A20BB12 +:10454C008C075C03D1DF098C064C0361C8617900D0 +:10455C008C05318EB1610900BB313D120103BB8B5F +:10456C000E04708C011C00BB8F0CFC4E03DC0E8CFB +:10457C00034F0CFCDC0B8C024F0DFCDC04AB12EF7C +:10458C0003ABB1121008C6D7C7C3C12008FBF8FF94 +:10459C00F661490A61F8614908DF07F7340000ED5C +:1045AC003146E6BC04F6BC06AC0ABC02AC08BBAC9B +:1045BC0006614902AC0461F8614900DE28AC04BD17 +:1045CC00D8AC06BDDAE1FD700FADDABC06ADD8BCD7 +:1045DC0004ABBDD8AC02BDDAE1FD8B0FADDABC0289 +:1045EC00ADD8BBEFCAAC06BC02AC04BBAC08BDD8A2 +:1045FC00AC0ABDDAAC04BDDCAC06FDEE0EAC04BD01 +:10460C00DCAC06FD610FE1FD8B0FADDABC06ADD85D +:10461C00BC04AC06614902AC0461F8614900DCC51C +:10462C00AC0214AB12100CC6D7C7C12004FBF8FFA8 +:10463C008F57FCFDCA0F9C034E04DF1CAD5446562D +:10464C00DE07AD56265412EF40F64656DF074654A9 +:10465C00DD03E7EF34F7EF318C04318EB1128C03AC +:10466C00318E43DF1830382226540656BB8C045C3E +:10467C000391DF05AB041800BBAB12EF0C8C034E9F +:10468C0004DE0532A900EF01F71006C6D7717BFADC +:10469C0031126009F64658DD04B658EF7C71136090 +:1046AC00717AFA4014F904DF07715307F424EF69A7 +:1046BC00D9E7FBF1E7240000DD0F23DD1A23DD1021 +:1046CC0023DD5323DD2723DD38715307F424EF4911 +:1046DC00715207F424EF42D424DF07715207E4240B +:1046EC00EF05715307F424C958FA00EF2CD424DFDA +:1046FC000B715207E424C958FA00EF1DF5E7FBEFE4 +:10470C0018D424DF0B715307E424C958FA00EF09BD +:10471C00CFE7FB02EF03FD2647D7D91FFCF1E724B7 +:10472C000000DD0923DD2123DD0923EF1B71530775 +:10473C00F424D7D424DF07715207E424EF05715316 +:10474C0007F424C9582D01D7715207E424D73142FC +:10475C005D01D771635DD9E5FBF1E7240000DD1243 +:10476C0023DD1923DD1123DD2623DD3423DD39235D +:10477C00DD3FFDE647EF3DFD0748EF38D9E4FBC1CF +:10478C00AE6CFDDE2CC0F313BE6C712304EF25F070 +:10479C00C1AE6CFDDE2CC0F313BE6C712304EF14A0 +:1047AC00F6BE6C712204EF0CCB6CFF00712304EF8E +:1047BC0003FD7B484014F905DD064014F901DF06C2 +:1047CC0071230471635D31645D0FF6BE64BE6A31A2 +:1047DC00220402EF02F690BE6ED7CD2647F45AAEF5 +:1047EC006C317DBFFAFCFD5048D2DF0ED9E4FBC121 +:1047FC00AE6CFDDE2CC0F313BE6CD7FD5048D2DD81 +:10480C000DCD2647F45AAE6C317DBFFAFCD7E85A71 +:10481C000934205080D6BFF6FC22FAFCBDD83047B4 +:10482C0000FD160EBFF8FC30F6FCFDF42CF313BEA5 +:10483C006CB426D426DF0CCD2647A45A4A5A1F61E5 +:10484C00C8F45AD740C7FB0BDC05712304F2D740E0 +:10485C00C7FB0661D831225C11F0C1AE6CFDDE2CB9 +:10486C00C0F313BE6C712204EF03FD7B48E2D771D9 +:10487C00625DF0C1AE6CFDDE2CC0F313BE6CA0FC0F +:10488C00FC40FCFC40DC3DF5FCFCD9FDFCF1313F6F +:10489C00044CFD14D9FDFCF1BDD85008FD650E0883 +:1048AC007208E6D2DD040192DFFC896158D1DD0586 +:1048BC00712204EF03712304A0FDFC40FDFC206178 +:0548CC00C8F5FDFCD75A +:1048D10061FC61FCC1C3C5C7520C929269D4FEC18F +:1048E100DFF88EFD708EFCC1717AFA4014F903DF96 +:1048F1000630FC29FD7B38C09EFC609EFD34D4FE51 +:104901005206C0B9A5A592DFF9C6C4C2C061FC6157 +:10491100DF520C929269D4FEC1DFF88EFD708EFCDD +:10492100C18F4105775C04D1DD06675C01D1DD50A3 +:1049310031345E3671620771335E8FCCFB5FD4FB1D +:10494100D1DF1B8FCDFB5FD5FBD1DF128FCEFB5F9C +:10495100D6FBD1DF098FCFFB5FD7FBD1DD0C3162F5 +:104961000702EFFA716307716B27710360FDE42F92 +:10497100F4227148500571605005717AFAED7E4A52 +:10498100675C02D1DD16D422DD124A2202DD0DF46C +:10499100227148500571605005717AFA717AFA8D69 +:1049A10022318FE7240000DD0823DD1423DD31EF00 +:1049B10050F4327140500571505005E422ED7E4AA9 +:1049C1008F40059F10F9715050058F10F99F12F912 +:1049D100D910F9FDB933629F11F9CD2202ED7E4A5A +:1049E100675C02D1DD18675C10D1DD05CD2203EFD4 +:1049F100107148500571605005F422ED7E4ACD22B8 +:104A0100044A2203DF138F11F99F4005D911F9C11F +:104A1100D910F9FD4834C0EF228F4005768F10F987 +:104A210001DC064010F902DE0671605005EF4EC749 +:104A3100D910F9FD6530C071505005D912F9F12432 +:104A41002900DD2A240400DD25242200DD20241193 +:104A510000DD0C240100DD16241E00DD11EF0C40E9 +:104A610010F960DF09CF10F961EF03A010F94A22B4 +:104A710003DF0AD910F9FDB933629F11F9C09EFC19 +:104A8100609EFD34D4FE5206C0B9A5A592DFF9613E +:104A9100FCC1C7717AFA714AE5717BBD51405F046F +:104AA10001D1DD06F616A747DFF2300400BF24016D +:104AB100F6BF2A01300B0BBF2801000000000000E7 +:104AC1000000510FBF28010000000000000000504D +:104AD1000FBF2801710AE671235DC6C061FCC1C523 +:104AE100717AFAD436DD0BEA34899E44A634B436A1 +:104AF100EF33710AE6300400BF2401F6BF2A01300A +:104B01000B0BBF28010000000000000000510FBF87 +:104B110028010000000000000000500FBF280171B3 +:104B2100135D71235DC4C061FC61EF520C92926907 +:104B3100D4FEC1DFF88EFD708EFCC12006FBF8FFAC +:104B410071503002CEABACCC0400F6BB31B2E210F6 +:104B5100617900F6614900DFF371603002EDE44BE9 +:104B61008E519C03713BE28C035C02D1DD1E8C03F0 +:104B71005C08D1DF0971503002CC0400EFCC8C0508 +:104B810070FD2135629E50CC0402EFBE8C035C03A4 +:104B9100D1DF408E509C02715030028C04D1DF0E67 +:104BA1008C0270FD6735629C05CC0401EF328C04E8 +:104BB1004C02DF0671603002EF29CF34025A716076 +:104BC10030028C0270C18C0570FDC934C0CF340233 +:104BD1004AEF108C035C01D1DD0671603002EF03F6 +:104BE100ED4B4B1006C09EFC609EFD34D4FE520678 +:104BF100C0B9A5A592DFF961FCC1C3C5C7520C922A +:104C01009269D4FEC1DFF88EFD708EFCC1710A9EDF +:104C110031929E02EFFA8FF6FB4F96FFDF198FF765 +:104C2100FB4F97FFDF118FF8FB4F98FFDF0950040F +:104C3100C15011FD7634C0710B9EC09EFC609EFD7B +:104C410034D4FE5206C0B9A5A592DFF9C6C4C2C0CC +:104C510061FCA44261FCC1C3C5C7520C929269D4E4 +:104C6100FEC1DFF88EFD708EFCC1C1FBF8FF8D1F08 +:104C71009C018E31318EE7240600DD0823DD0E23F1 +:104C8100DD22EF39717AFA8C019D3CEF30717AFAAD +:104C91004017F901DF068C019D3BEF2151FF2E01E9 +:104CA1009D3BEF19717AFA8C019D284014F903DDBF +:104CB100064014F904DF06306425FD7B384031FFDE +:104CC10009DE05A031FFEF077158F00071425E71F6 +:104CD1000BE3C0C09EFC609EFD34D4FE5206C0B9F9 +:104CE100A5A592DFF9C6C4C2C061FC61FF520C9256 +:104CF1009269D4FEC1DFF88EFD708EFCC1717AFA23 +:104D01008FFCFB5C03D1DD194014F903DD0640146F +:104D1100F904DF0D36100571D4DE0630AD39FD7BA7 +:104D210038C09EFC609EFD34D4FE5206C0B9A5A5D4 +:104D310092DFF961FC61FC61FC61FC61FC61FC6179 +:104D4100FC61FC61FC61FC61FC61FC61FC61FC617A +:104D5100FC61FC61FC61FC61FC61FC61FC61FC616A +:0D4D6100FC61FC61FC61FC61FC61FC61FC1B +:0A4D6E0000060C12181E242A30362D +:104D7800C4FB0000000040FE000000000E3BB435FC +:104D88008C225A47B52D702E9946373CF808253E97 +:104D98004CFC2EFE20FE02F903F94DFC28FE4EFCC9 +:104DA8004FFC18F94AFC6CFF1AFF6EFF6AFF64FF9C +:104DB8004BFC66FF50FC0000983AF82AFF00555556 +:024DC80055553F +:084DCA00FF000000000047009B +:104DD200317503F7332312D714AEF8C716AC061297 +:104DE200C5AC0416F643DD078B99A7A5B3EFF5C250 +:024DF200C6D722 +:024FF4000205B4 +:0A4FF60031353A34373A3334000005 :00000001FF  \ No newline at end of file diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index 155865f..370276f 100644 Binary files a/trunk/bsr.lmf and b/trunk/bsr.lmf differ diff --git a/trunk/bsr_k0r.map b/trunk/bsr_k0r.map index 2d0aa06..ab1eb87 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.33 Date:19 Aug 2011 Page: 1 +78K0R Linker W1.33 Date:22 Aug 2011 Page: 1 Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C @@ -15,7 +15,7 @@ Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - e.rel accero.rel self_flash.rel sw.rel task_debug.rel task_mi sc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_ status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel vo - ltable.rel pedo_lpf_coeff.rel + ltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map @@ -24,9 +24,9 @@ Direc-file:bsr_mcu.dr *** Link information *** - 70 output segment(s) - 3D56H byte(s) real data - 6216 symbol(s) defined + 71 output segment(s) + 3D4EH byte(s) real data + 6254 symbol(s) defined *** Memory map *** @@ -86,11 +86,6 @@ Direc-file:bsr_mcu.dr @@VECT62 accero 00062H 00002H * gap * 00064H 0005CH ?CSEGOB0 000C0H 00004H CSEG OPT_BYTE - @@CODE 000C4H 00000H CSEG BASE - @@CODE magic 000C4H 00000H - @@CODE ini_VECT 000C4H 00000H - @@CODE batt_params - 000C4H 00000H LDR_CODL 000C4H 00000H CSEG LDR_CODL loader 000C4H 00000H LDR_CODL main 000C4H 00000H @@ -104,7 +99,7 @@ Direc-file:bsr_mcu.dr 000C4H 00000H LDR_CODL hal 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - LDR_CODE 000CEH 00982H CSEG + LDR_CODE 000CEH 0097DH CSEG LDR_CODE loader 000CEH 00196H LDR_CODE main 00264H 00048H LDR_CODE WDT 002ACH 00000H @@ -115,43 +110,50 @@ Direc-file:bsr_mcu.dr 008F8H 00000H LDR_CODE task_status 008F8H 00077H - LDR_CODE hal 0096FH 000E1H - FSL_CODE 00A50H 00322H CSEG + LDR_CODE hal 0096FH 000DCH + FSL_CODE 00A4BH 00322H CSEG FSL_CODE fsl_block_cmd - 00A50H 0002BH + 00A4BH 0002BH FSL_CODE fsl_block_check - 00A7BH 00013H + 00A76H 00013H FSL_CODE fsl_common - 00A8EH 0014FH + 00A89H 0014FH FSL_CODE fsl_reset - 00BDDH 00001H + 00BD8H 00001H FSL_CODE fsl_si_ibf - 00BDEH 00064H + 00BD9H 00064H FSL_CODE fsl_phySwap - 00C42H 0004DH + 00C3DH 0004DH FSL_CODE fsl_si_common - 00C8FH 00061H - FSL_CODE fsl_swap 00CF0H 00030H + 00C8AH 00061H + FSL_CODE fsl_swap 00CEBH 00030H FSL_CODE fsl_write - 00D20H 00052H - @@LCODE 00D72H 00277H CSEG - @@LCODE @cstart 00D72H 0006DH - @@LCODE @imul 00DDFH 00011H - @@LCODE @lumul 00DF0H 0002BH - @@LCODE @isdiv 00E1BH 00022H - @@LCODE @iudiv 00E3DH 0002DH - @@LCODE @isrem 00E6AH 00021H - @@LCODE @iurem 00E8BH 0002FH - @@LCODE @lsdiv 00EBAH 00039H - @@LCODE @ludiv 00EF3H 0003FH - @@LCODE @divuw 00F32H 00034H - @@LCODE @ladd 00F66H 0000FH - @@LCODE @llsh 00F75H 0001BH - @@LCODE @lursh 00F90H 0001FH - @@LCODE @iscmp 00FAFH 0000CH - @@LCODE @lband 00FBBH 00014H - @@LCODE @bcdtob 00FCFH 0001AH -* gap * 00FE9H 0000DH + 00D1BH 00052H + @@LCODE 00D6DH 00277H CSEG + @@LCODE @cstart 00D6DH 0006DH + @@LCODE @imul 00DDAH 00011H + @@LCODE @lumul 00DEBH 0002BH + @@LCODE @isdiv 00E16H 00022H + @@LCODE @iudiv 00E38H 0002DH + @@LCODE @isrem 00E65H 00021H + @@LCODE @iurem 00E86H 0002FH + @@LCODE @lsdiv 00EB5H 00039H + @@LCODE @ludiv 00EEEH 0003FH + @@LCODE @divuw 00F2DH 00034H + @@LCODE @ladd 00F61H 0000FH + @@LCODE @llsh 00F70H 0001BH + @@LCODE @lursh 00F8BH 0001FH + @@LCODE @iscmp 00FAAH 0000CH + @@LCODE @lband 00FB6H 00014H + @@LCODE @bcdtob 00FCAH 0001AH + @@CODE 00FE4H 00006H CSEG BASE + @@CODE magic 00FE4H 00000H + @@CODE ini_VECT 00FE4H 00000H + @@CODE batt_params + 00FE4H 00000H + @@CODE kanaria_c + 00FE4H 00006H +* gap * 00FEAH 0000CH MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -199,7 +201,9 @@ Direc-file:bsr_mcu.dr @@CNST voltable 0221CH 00040H @@CNST pedo_lpf_coeff 0225CH 00030H - ROM_CODE 0228CH 0264EH CSEG + @@CNST kanaria_c + 0228CH 00000H + ROM_CODE 0228CH 02645H CSEG ROM_CODE pm 0228CH 00998H ROM_CODE i2c_ctr 02C24H 0005CH ROM_CODE i2c_twl 02C80H 0005EH @@ -213,284 +217,298 @@ Direc-file:bsr_mcu.dr ROM_CODE sw 03B0EH 00129H ROM_CODE task_misc 03C37H 001EEH - ROM_CODE task_sys 03E25H 0038DH + ROM_CODE task_sys 03E25H 00384H ROM_CODE pedo_alg_thre_det2 - 041B2H 004F0H - ROM_CODE led_cam 046A2H 000C1H - ROM_CODE led_pow 04763H 00177H - ROM_CODE voltable 048DAH 00000H + 041A9H 004F0H + ROM_CODE led_cam 04699H 000C1H + ROM_CODE led_pow 0475AH 00177H + ROM_CODE voltable 048D1H 00000H ROM_CODE pedo_lpf_coeff - 048DAH 00000H - @@BASE 048DAH 0049DH CSEG BASE - @@BASE loader 048DAH 00000H - @@BASE pm 048DAH 0003FH - @@BASE i2c_ctr 04919H 00182H - @@BASE main 04A9BH 00000H - @@BASE magic 04A9BH 00000H - @@BASE WDT 04A9BH 00000H - @@BASE i2c_mcu 04A9BH 00098H - @@BASE i2c_twl 04B33H 000D0H - @@BASE led 04C03H 00000H - @@BASE rtc 04C03H 0005DH - @@BASE vreg_ctr 04C60H 00000H - @@BASE vreg_twl 04C60H 00000H - @@BASE adc 04C60H 00095H - @@BASE renge 04CF5H 00000H - @@BASE accero 04CF5H 0004AH + 048D1H 00000H + @@BASE 048D1H 0049DH CSEG BASE + @@BASE loader 048D1H 00000H + @@BASE pm 048D1H 0003FH + @@BASE i2c_ctr 04910H 00182H + @@BASE main 04A92H 00000H + @@BASE magic 04A92H 00000H + @@BASE WDT 04A92H 00000H + @@BASE i2c_mcu 04A92H 00098H + @@BASE i2c_twl 04B2AH 000D0H + @@BASE led 04BFAH 00000H + @@BASE rtc 04BFAH 0005DH + @@BASE vreg_ctr 04C57H 00000H + @@BASE vreg_twl 04C57H 00000H + @@BASE adc 04C57H 00095H + @@BASE renge 04CECH 00000H + @@BASE accero 04CECH 0004AH @@BASE self_flash - 04D3FH 00000H - @@BASE sw 04D3FH 00000H + 04D36H 00000H + @@BASE sw 04D36H 00000H @@BASE task_debug - 04D3FH 00000H + 04D36H 00000H @@BASE task_misc - 04D3FH 00000H - @@BASE task_sys 04D3FH 00000H + 04D36H 00000H + @@BASE task_sys 04D36H 00000H @@BASE pedo_alg_thre_det2 - 04D3FH 00000H - @@BASE ini_VECT 04D3FH 00038H + 04D36H 00000H + @@BASE ini_VECT 04D36H 00038H @@BASE task_status - 04D77H 00000H - @@BASE led_cam 04D77H 00000H - @@BASE led_pow 04D77H 00000H - @@BASE hal 04D77H 00000H + 04D6EH 00000H + @@BASE led_cam 04D6EH 00000H + @@BASE led_pow 04D6EH 00000H + @@BASE hal 04D6EH 00000H @@BASE batt_params - 04D77H 00000H - @@BASE voltable 04D77H 00000H + 04D6EH 00000H + @@BASE voltable 04D6EH 00000H @@BASE pedo_lpf_coeff - 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL @cstart 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL pm 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL led 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL rtc 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL adc 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL renge 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL accero 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL sw 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP + 04D6EH 00000H + @@BASE kanaria_c + 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL @cstart 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL pm 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL led 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL rtc 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL adc 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL renge 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL accero 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL sw 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP @@CNSTL task_misc - 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL task_sys 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP + 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL task_sys 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL led_cam 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL led_pow 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP + 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL led_cam 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL led_pow 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP @@CNSTL batt_params - 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP - @@CNSTL voltable 04D77H 00000H - @@CNSTL 04D77H 00000H CSEG PAGE64KP + 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL voltable 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP @@CNSTL pedo_lpf_coeff - 04D77H 00000H - @@CALT 04D77H 00000H CSEG - @@CALT @cstart 04D77H 00000H - @@CALT loader 04D77H 00000H - @@CALT pm 04D77H 00000H - @@CALT i2c_ctr 04D77H 00000H - @@CALT main 04D77H 00000H - @@CALT magic 04D77H 00000H - @@CALT WDT 04D77H 00000H - @@CALT i2c_mcu 04D77H 00000H - @@CALT i2c_twl 04D77H 00000H - @@CALT led 04D77H 00000H - @@CALT rtc 04D77H 00000H - @@CALT vreg_ctr 04D77H 00000H - @@CALT vreg_twl 04D77H 00000H - @@CALT adc 04D77H 00000H - @@CALT renge 04D77H 00000H - @@CALT accero 04D77H 00000H - @@CALT self_flash - 04D77H 00000H - @@CALT sw 04D77H 00000H - @@CALT task_debug - 04D77H 00000H - @@CALT task_misc - 04D77H 00000H - @@CALT task_sys 04D77H 00000H - @@CALT pedo_alg_thre_det2 - 04D77H 00000H - @@CALT ini_VECT 04D77H 00000H - @@CALT task_status - 04D77H 00000H - @@CALT led_cam 04D77H 00000H - @@CALT led_pow 04D77H 00000H - @@CALT hal 04D77H 00000H - @@CALT batt_params - 04D77H 00000H - @@CALT voltable 04D77H 00000H - @@CALT pedo_lpf_coeff - 04D77H 00000H - @@RLINIT 04D77H 00000H CSEG UNIT64KP - @@RLINIT loader 04D77H 00000H - @@RLINIT pm 04D77H 00000H - @@RLINIT i2c_ctr 04D77H 00000H - @@RLINIT main 04D77H 00000H - @@RLINIT magic 04D77H 00000H - @@RLINIT WDT 04D77H 00000H - @@RLINIT i2c_mcu 04D77H 00000H - @@RLINIT i2c_twl 04D77H 00000H - @@RLINIT led 04D77H 00000H - @@RLINIT rtc 04D77H 00000H - @@RLINIT vreg_ctr 04D77H 00000H - @@RLINIT vreg_twl 04D77H 00000H - @@RLINIT adc 04D77H 00000H - @@RLINIT renge 04D77H 00000H - @@RLINIT accero 04D77H 00000H - @@RLINIT self_flash - 04D77H 00000H - @@RLINIT sw 04D77H 00000H - @@RLINIT task_debug - 04D77H 00000H - @@RLINIT task_misc - 04D77H 00000H - @@RLINIT task_sys 04D77H 00000H - @@RLINIT pedo_alg_thre_det2 - 04D77H 00000H - @@RLINIT ini_VECT 04D77H 00000H - @@RLINIT task_status - 04D77H 00000H - @@RLINIT led_cam 04D77H 00000H - @@RLINIT led_pow 04D77H 00000H - @@RLINIT hal 04D77H 00000H - @@RLINIT batt_params - 04D77H 00000H - @@RLINIT voltable 04D77H 00000H - @@RLINIT pedo_lpf_coeff - 04D77H 00000H - @@RLINIT @rom 04D77H 00000H - @@CODEL 04D77H 00000H CSEG - @@CODEL pm 04D77H 00000H - @@CODEL i2c_ctr 04D77H 00000H - @@CODEL magic 04D77H 00000H - @@CODEL i2c_twl 04D77H 00000H - @@CODEL led 04D77H 00000H - @@CODEL rtc 04D77H 00000H - @@CODEL vreg_ctr 04D77H 00000H - @@CODEL vreg_twl 04D77H 00000H - @@CODEL adc 04D77H 00000H - @@CODEL renge 04D77H 00000H - @@CODEL accero 04D77H 00000H - @@CODEL sw 04D77H 00000H - @@CODEL task_misc - 04D77H 00000H - @@CODEL task_sys 04D77H 00000H - @@CODEL pedo_alg_thre_det2 - 04D77H 00000H - @@CODEL ini_VECT 04D77H 00000H - @@CODEL led_cam 04D77H 00000H - @@CODEL led_pow 04D77H 00000H - @@CODEL batt_params - 04D77H 00000H - @@CODEL voltable 04D77H 00000H - @@CODEL pedo_lpf_coeff - 04D77H 00000H -* gap * 04D77H 00001H - @@CNSTL 04D78H 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04D78H 0000AH - @@R_INIT 04D82H 00052H CSEG UNIT64KP - @@R_INIT @cstart 04D82H 00000H - @@R_INIT loader 04D82H 00000H - @@R_INIT pm 04D82H 00000H - @@R_INIT i2c_ctr 04D82H 00000H - @@R_INIT main 04D82H 00000H - @@R_INIT magic 04D82H 00000H - @@R_INIT WDT 04D82H 00000H - @@R_INIT i2c_mcu 04D82H 00000H - @@R_INIT i2c_twl 04D82H 00000H - @@R_INIT led 04D82H 00000H - @@R_INIT rtc 04D82H 00000H - @@R_INIT vreg_ctr 04D82H 00000H - @@R_INIT vreg_twl 04D82H 00000H - @@R_INIT adc 04D82H 0000CH - @@R_INIT renge 04D8EH 00014H - @@R_INIT accero 04DA2H 00000H + 04D6EH 00000H + @@CNSTL 04D6EH 00000H CSEG PAGE64KP + @@CNSTL kanaria_c + 04D6EH 00000H + @@CNSTL 04D6EH 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04D6EH 0000AH + @@R_INIT 04D78H 00052H CSEG UNIT64KP + @@R_INIT @cstart 04D78H 00000H + @@R_INIT loader 04D78H 00000H + @@R_INIT pm 04D78H 00000H + @@R_INIT i2c_ctr 04D78H 00000H + @@R_INIT main 04D78H 00000H + @@R_INIT magic 04D78H 00000H + @@R_INIT WDT 04D78H 00000H + @@R_INIT i2c_mcu 04D78H 00000H + @@R_INIT i2c_twl 04D78H 00000H + @@R_INIT led 04D78H 00000H + @@R_INIT rtc 04D78H 00000H + @@R_INIT vreg_ctr 04D78H 00000H + @@R_INIT vreg_twl 04D78H 00000H + @@R_INIT adc 04D78H 0000CH + @@R_INIT renge 04D84H 00014H + @@R_INIT accero 04D98H 00000H @@R_INIT self_flash - 04DA2H 00000H - @@R_INIT sw 04DA2H 00000H + 04D98H 00000H + @@R_INIT sw 04D98H 00000H @@R_INIT task_debug - 04DA2H 00000H + 04D98H 00000H @@R_INIT task_misc - 04DA2H 00026H - @@R_INIT task_sys 04DC8H 00002H + 04D98H 00026H + @@R_INIT task_sys 04DBEH 00002H @@R_INIT pedo_alg_thre_det2 - 04DCAH 00006H - @@R_INIT ini_VECT 04DD0H 00000H + 04DC0H 00006H + @@R_INIT ini_VECT 04DC6H 00000H @@R_INIT task_status - 04DD0H 00000H - @@R_INIT led_cam 04DD0H 00000H - @@R_INIT led_pow 04DD0H 00004H - @@R_INIT hal 04DD4H 00000H + 04DC6H 00000H + @@R_INIT led_cam 04DC6H 00000H + @@R_INIT led_pow 04DC6H 00004H + @@R_INIT hal 04DCAH 00000H @@R_INIT batt_params - 04DD4H 00000H - @@R_INIT voltable 04DD4H 00000H + 04DCAH 00000H + @@R_INIT voltable 04DCAH 00000H @@R_INIT pedo_lpf_coeff - 04DD4H 00000H - @@R_INIT @rom 04DD4H 00000H - @@R_INIS 04DD4H 00008H CSEG UNIT64KP - @@R_INIS @cstart 04DD4H 00000H - @@R_INIS loader 04DD4H 00000H - @@R_INIS pm 04DD4H 00002H - @@R_INIS i2c_ctr 04DD6H 00002H - @@R_INIS main 04DD8H 00000H - @@R_INIS magic 04DD8H 00000H - @@R_INIS WDT 04DD8H 00000H - @@R_INIS i2c_mcu 04DD8H 00000H - @@R_INIS i2c_twl 04DD8H 00000H - @@R_INIS led 04DD8H 00000H - @@R_INIS rtc 04DD8H 00000H - @@R_INIS vreg_ctr 04DD8H 00000H - @@R_INIS vreg_twl 04DD8H 00000H - @@R_INIS adc 04DD8H 00000H - @@R_INIS renge 04DD8H 00000H - @@R_INIS accero 04DD8H 00000H + 04DCAH 00000H + @@R_INIT kanaria_c + 04DCAH 00000H + @@R_INIT @rom 04DCAH 00000H + @@R_INIS 04DCAH 00008H CSEG UNIT64KP + @@R_INIS @cstart 04DCAH 00000H + @@R_INIS loader 04DCAH 00000H + @@R_INIS pm 04DCAH 00002H + @@R_INIS i2c_ctr 04DCCH 00002H + @@R_INIS main 04DCEH 00000H + @@R_INIS magic 04DCEH 00000H + @@R_INIS WDT 04DCEH 00000H + @@R_INIS i2c_mcu 04DCEH 00000H + @@R_INIS i2c_twl 04DCEH 00000H + @@R_INIS led 04DCEH 00000H + @@R_INIS rtc 04DCEH 00000H + @@R_INIS vreg_ctr 04DCEH 00000H + @@R_INIS vreg_twl 04DCEH 00000H + @@R_INIS adc 04DCEH 00000H + @@R_INIS renge 04DCEH 00000H + @@R_INIS accero 04DCEH 00000H @@R_INIS self_flash - 04DD8H 00000H - @@R_INIS sw 04DD8H 00000H + 04DCEH 00000H + @@R_INIS sw 04DCEH 00000H @@R_INIS task_debug - 04DD8H 00000H + 04DCEH 00000H @@R_INIS task_misc - 04DD8H 00000H - @@R_INIS task_sys 04DD8H 00000H + 04DCEH 00000H + @@R_INIS task_sys 04DCEH 00000H @@R_INIS pedo_alg_thre_det2 - 04DD8H 00000H - @@R_INIS ini_VECT 04DD8H 00000H + 04DCEH 00000H + @@R_INIS ini_VECT 04DCEH 00000H @@R_INIS task_status - 04DD8H 00000H - @@R_INIS led_cam 04DD8H 00002H - @@R_INIS led_pow 04DDAH 00002H - @@R_INIS hal 04DDCH 00000H + 04DCEH 00000H + @@R_INIS led_cam 04DCEH 00002H + @@R_INIS led_pow 04DD0H 00002H + @@R_INIS hal 04DD2H 00000H @@R_INIS batt_params - 04DDCH 00000H - @@R_INIS voltable 04DDCH 00000H + 04DD2H 00000H + @@R_INIS voltable 04DD2H 00000H @@R_INIS pedo_lpf_coeff - 04DDCH 00000H - @@R_INIS @rom 04DDCH 00000H - @@LCODEL 04DDCH 00022H CSEG - @@LCODEL abs 04DDCH 00008H - @@LCODEL memcpy_n 04DE4H 0001AH -* gap * 04DFEH 001F6H + 04DD2H 00000H + @@R_INIS kanaria_c + 04DD2H 00000H + @@R_INIS @rom 04DD2H 00000H + @@CALT 04DD2H 00000H CSEG + @@CALT @cstart 04DD2H 00000H + @@CALT loader 04DD2H 00000H + @@CALT pm 04DD2H 00000H + @@CALT i2c_ctr 04DD2H 00000H + @@CALT main 04DD2H 00000H + @@CALT magic 04DD2H 00000H + @@CALT WDT 04DD2H 00000H + @@CALT i2c_mcu 04DD2H 00000H + @@CALT i2c_twl 04DD2H 00000H + @@CALT led 04DD2H 00000H + @@CALT rtc 04DD2H 00000H + @@CALT vreg_ctr 04DD2H 00000H + @@CALT vreg_twl 04DD2H 00000H + @@CALT adc 04DD2H 00000H + @@CALT renge 04DD2H 00000H + @@CALT accero 04DD2H 00000H + @@CALT self_flash + 04DD2H 00000H + @@CALT sw 04DD2H 00000H + @@CALT task_debug + 04DD2H 00000H + @@CALT task_misc + 04DD2H 00000H + @@CALT task_sys 04DD2H 00000H + @@CALT pedo_alg_thre_det2 + 04DD2H 00000H + @@CALT ini_VECT 04DD2H 00000H + @@CALT task_status + 04DD2H 00000H + @@CALT led_cam 04DD2H 00000H + @@CALT led_pow 04DD2H 00000H + @@CALT hal 04DD2H 00000H + @@CALT batt_params + 04DD2H 00000H + @@CALT voltable 04DD2H 00000H + @@CALT pedo_lpf_coeff + 04DD2H 00000H + @@CALT kanaria_c + 04DD2H 00000H + @@RLINIT 04DD2H 00000H CSEG UNIT64KP + @@RLINIT loader 04DD2H 00000H + @@RLINIT pm 04DD2H 00000H + @@RLINIT i2c_ctr 04DD2H 00000H + @@RLINIT main 04DD2H 00000H + @@RLINIT magic 04DD2H 00000H + @@RLINIT WDT 04DD2H 00000H + @@RLINIT i2c_mcu 04DD2H 00000H + @@RLINIT i2c_twl 04DD2H 00000H + @@RLINIT led 04DD2H 00000H + @@RLINIT rtc 04DD2H 00000H + @@RLINIT vreg_ctr 04DD2H 00000H + @@RLINIT vreg_twl 04DD2H 00000H + @@RLINIT adc 04DD2H 00000H + @@RLINIT renge 04DD2H 00000H + @@RLINIT accero 04DD2H 00000H + @@RLINIT self_flash + 04DD2H 00000H + @@RLINIT sw 04DD2H 00000H + @@RLINIT task_debug + 04DD2H 00000H + @@RLINIT task_misc + 04DD2H 00000H + @@RLINIT task_sys 04DD2H 00000H + @@RLINIT pedo_alg_thre_det2 + 04DD2H 00000H + @@RLINIT ini_VECT 04DD2H 00000H + @@RLINIT task_status + 04DD2H 00000H + @@RLINIT led_cam 04DD2H 00000H + @@RLINIT led_pow 04DD2H 00000H + @@RLINIT hal 04DD2H 00000H + @@RLINIT batt_params + 04DD2H 00000H + @@RLINIT voltable 04DD2H 00000H + @@RLINIT pedo_lpf_coeff + 04DD2H 00000H + @@RLINIT kanaria_c + 04DD2H 00000H + @@RLINIT @rom 04DD2H 00000H + @@CODEL 04DD2H 00000H CSEG + @@CODEL pm 04DD2H 00000H + @@CODEL i2c_ctr 04DD2H 00000H + @@CODEL magic 04DD2H 00000H + @@CODEL i2c_twl 04DD2H 00000H + @@CODEL led 04DD2H 00000H + @@CODEL rtc 04DD2H 00000H + @@CODEL vreg_ctr 04DD2H 00000H + @@CODEL vreg_twl 04DD2H 00000H + @@CODEL adc 04DD2H 00000H + @@CODEL renge 04DD2H 00000H + @@CODEL accero 04DD2H 00000H + @@CODEL sw 04DD2H 00000H + @@CODEL task_misc + 04DD2H 00000H + @@CODEL task_sys 04DD2H 00000H + @@CODEL pedo_alg_thre_det2 + 04DD2H 00000H + @@CODEL ini_VECT 04DD2H 00000H + @@CODEL led_cam 04DD2H 00000H + @@CODEL led_pow 04DD2H 00000H + @@CODEL batt_params + 04DD2H 00000H + @@CODEL voltable 04DD2H 00000H + @@CODEL pedo_lpf_coeff + 04DD2H 00000H + @@CODEL kanaria_c + 04DD2H 00000H + @@LCODEL 04DD2H 00022H CSEG + @@LCODEL abs 04DD2H 00008H + @@LCODEL memcpy_n 04DDAH 0001AH +* gap * 04DF4H 00200H MGC_VER 04FF4H 00002H CSEG AT MGC_VER magic 04FF4H 00002H MGC_TAIL 04FF6H 0000AH CSEG AT @@ -538,6 +556,9 @@ Direc-file:bsr_mcu.dr @@DATA voltable FFCFEH 00000H @@DATA pedo_lpf_coeff FFCFEH 00000H + @@DATA kanaria FFCFEH 00000H + @@DATA kanaria_c + FFCFEH 00000H @@DATA @rom FFCFEH 00000H @@INIT FFCFEH 00052H DSEG BASEP @@INIT @cstart FFCFEH 00000H @@ -577,6 +598,9 @@ Direc-file:bsr_mcu.dr @@INIT voltable FFD50H 00000H @@INIT pedo_lpf_coeff FFD50H 00000H + @@INIT kanaria FFD50H 00000H + @@INIT kanaria_c + FFD50H 00000H @@INIT @rom FFD50H 00000H FSL_DATA FFD50H 00010H DSEG UNITP FSL_DATA fsl_common @@ -618,6 +642,9 @@ Direc-file:bsr_mcu.dr @@INITL voltable FFD60H 00000H @@INITL pedo_lpf_coeff FFD60H 00000H + @@INITL kanaria FFD60H 00000H + @@INITL kanaria_c + FFD60H 00000H @@INITL @rom FFD60H 00000H @@DATAL FFD60H 00000H DSEG UNIT64KP @@DATAL loader FFD60H 00000H @@ -656,6 +683,9 @@ Direc-file:bsr_mcu.dr @@DATAL voltable FFD60H 00000H @@DATAL pedo_lpf_coeff FFD60H 00000H + @@DATAL kanaria FFD60H 00000H + @@DATAL kanaria_c + FFD60H 00000H @@DATAL @rom FFD60H 00000H * gap * FFD60H 000A0H @@ -701,6 +731,8 @@ Direc-file:bsr_mcu.dr @@INIS voltable FFE28H 00000H @@INIS pedo_lpf_coeff FFE28H 00000H + @@INIS kanaria_c + FFE28H 00000H @@INIS @rom FFE28H 00000H @@DATS FFE28H 00034H DSEG SADDRP @@DATS @cstart FFE28H 00000H @@ -740,6 +772,8 @@ Direc-file:bsr_mcu.dr @@DATS voltable FFE5CH 00000H @@DATS pedo_lpf_coeff FFE5CH 00000H + @@DATS kanaria_c + FFE5CH 00000H @@DATS @rom FFE5CH 00000H @@BITS FFE5CH 00005H BSEG @@BITS @cstart FFE5CH.0 00000H.0 @@ -779,6 +813,8 @@ Direc-file:bsr_mcu.dr @@BITS voltable FFE61H.0 00000H.0 @@BITS pedo_lpf_coeff FFE61H.0 00000H.0 + @@BITS kanaria_c + FFE61H.0 00000H.0 * gap * FFE61H 00073H @@SEGREG FFED4H 00004H DSEG AT @@SEGREG @SEGREG FFED4H 00004H diff --git a/trunk/config.h b/trunk/config.h index d478bed..f056b3c 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -3,7 +3,7 @@ #define MCU_VER_MAJOR 0x02 -#define MCU_VER_MINOR 0x04 +#define MCU_VER_MINOR 0x05 // デバッグ向けスイッチ diff --git a/trunk/hal.c b/trunk/hal.c index 75e1385..f1620ae 100644 --- a/trunk/hal.c +++ b/trunk/hal.c @@ -38,8 +38,13 @@ bit SHELL_OPEN; // チャタリング除去ならここでやったり(押し時間カウントは別) void hal_update() { +#ifdef _ENABLE_HAL_ u8 temp_conf = vreg_ctr[ VREG_C_HAL_OVW_CONT0 ]; u8 temp_dat = vreg_ctr[ VREG_C_HAL_OVW_DAT0 ]; +#else + u8 temp_conf = 0x00; + u8 temp_dat = 0; // 何でも良い +#endif // アダプタ有無 if( temp_conf & REG_BIT_HAL0_PM_EXTDC_n ) diff --git a/trunk/hoge.bin b/trunk/hoge.bin index b18f698..e4a1917 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/main.c b/trunk/main.c index b4c9b67..725ddb4 100644 --- a/trunk/main.c +++ b/trunk/main.c @@ -28,6 +28,8 @@ bit i2c_mcu_time_out_error; // I2C extern void i2c_mcu_error_monitor(); #endif +extern void f(); + /* ======================================================== 本当のエントリ関数は loader.c にあります @@ -83,6 +85,7 @@ void main_loop( void ) } #endif HALT( ); +// f(); } } diff --git a/trunk/pm.c b/trunk/pm.c index e3a7893..93fc0c4 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -549,7 +549,7 @@ task_status_immed tski_BT_temp_update( ) // temperature = 81.45 - 111.9 * raw_adc_temperature/256.0; // それぞれ256倍してある temperature = (u8)(( 20851 - 112 * raw_adc_temperature + (256/2) ) /256); - vreg_ctr[VREG_C_BT_TEMP] = (u8)temperature; + vreg_ctr[VREG_C_BT_TEMP] = temperature; newrcomp = 0; if( temperature > 20 ) diff --git a/trunk/task_sys.c b/trunk/task_sys.c index e9e9edd..f4c4e07 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -399,7 +399,6 @@ void tsk_sys( ) // アダプタ有り /////////////////////////////// または、アダプタさして３秒は充電LEDを点けている期間 // 電源ボタン押しチェックへ - SW_pow_mask = false; system_status.poweron_reason = RSN_PWSW; system_status.pwr_state = ON_CHECK; @@ -429,8 +428,6 @@ void tsk_sys( ) // 割り込み待ちで寝る // RTCIMK = 1; // systick用インターバルタイマー割り込みマスク - CKC = bits8(0,0,0,0, 1,0,0,1); - OSMC = 0x00; #ifdef _DBG_CHK_OFF_LEAK_ { // off中のpin設定ミスチェック @@ -466,6 +463,8 @@ void tsk_sys( ) } #endif + CKC = bits8(0,0,0,0, 1,0,0,1); // 4MHzに落としてからSTOPしなくてはならない + if( PM_EXTDC_n ) // きわどいタイミングで挿抜が起きることがある { STOP(); @@ -476,12 +475,12 @@ void tsk_sys( ) // ・KeyReturn割り込み（電源ボタン） // ・RTCアラーム（現在封印） + // クロック復帰 + CKC = bits8(0,0,0,0, 1,0,0,0); + renge_flg_interval = 0; hal_update(); - OSMC = 0x01; - CKC = bits8(0,0,0,0, 1,0,0,0); - // 起きた理由は？ if( !PM_EXTDC_n ){ system_status.pwr_state = OFF; // 一回回ってきて、ON_CHECKに行く diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index ce2b59c..b742281 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -541,20 +541,12 @@ void vreg_ctr_after_read( u8 adrs, u8 data ) /****************************************************************************** 割り込みを入れる - 割り込みマスクが必要と言うことでこんな事をする羽目になりました - *****************************************************************************/ -#if 0 -// マスクされてたら、フラグは立てるが、割り込みは入れない。 -#define set_irq( irqreg, bitpos ) \ -{ \ - vreg_ctr[ irqreg ] |= bitpos; \ - if( ( vreg_ctr[ irqreg+8 ] & bitpos ) == 0 ){ \ - IRQ0_ast; \ - } \ -} -#endif -// マスクされてたら、フラグ「立てない」、割り込み入れない。 + 　マスクされてたら、フラグ「立てない」、割り込み入れない。 + 　割り込みを入れ、読み出される前にマスクがかかったときは、SoC上の処理キュー上には + IRQを読むタスクが積んであるので、読みには来る。 + 　それと、念のため、マスクをいじるときは空読みしてもらう。 + *****************************************************************************/ void set_irq( u8 irqreg, u8 irq_flg ) { u8 tot; diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index c9ae21d..eefa1ac 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,28 +1,4 @@ C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no loader.c -loader.c(139) : CC78K0R warning W0401: Conversion may lose significant digits -loader.c(140) : CC78K0R warning W0401: Conversion may lose significant digits -loader.c(172) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 3 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\loader.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no pm.c -pm.c(484) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(777) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(781) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(811) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(832) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(898) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(907) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1110) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(1112) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 9 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\pm.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no i2c_ctr.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\i2c_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no main.c Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\main.asm @@ -31,144 +7,7 @@ Assembly complete, 0 error(s) and 0 warning(s) found. Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no WDT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\WDT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no i2c_mcu.c -i2c_mcu.c(210) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\i2c_mcu.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no i2c_twl.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\i2c_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no led.c -led.c(82) : CC78K0R warning W0745: Expected function prototype -led.c(331) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\led.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no rtc.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\rtc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no vreg_ctr.c -vreg_ctr.c(165) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(166) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(168) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(170) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(171) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(219) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(219) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(224) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(224) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(228) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(228) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(232) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(232) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(236) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 14 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\vreg_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no vreg_twl.c -vreg_twl.c(55) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_twl.c(59) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\vreg_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no adc.c -adc.c(102) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(183) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(229) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(288) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(409) : CC78K0R warning W0745: Expected function prototype -adc.c(438) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(443) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 7 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\adc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no renge\renge.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\renge.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no accero.c -accero.c(105) : CC78K0R warning W0745: Expected function prototype -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\accero.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no self_flash.c -self_flash.c(280) : CC78K0R warning W0401: Conversion may lose significant digits -self_flash.c(281) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\self_flash.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no sw.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\sw.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no task_debug.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\task_debug.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no task_misc.c -task_misc.c(335) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(337) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(349) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 3 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\task_misc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no task_sys.c -task_sys.c(219) : CC78K0R warning W0401: Conversion may lose significant digits -task_sys.c(585) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\task_sys.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c -pedo_alg_thre_det2.c(102) : CC78K0R warning W0745: Expected function prototype -pedo_alg_thre_det2.c(118) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\pedo_alg_thre_det2.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no ini_VECT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\ini_VECT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no task_status.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\task_status.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no led_cam.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\led_cam.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no led_pow.c -led_pow.c(99) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(104) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(155) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(215) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(244) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 5 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\led_pow.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no hal.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\hal.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no batt_params.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\batt_params.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no voltable.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\voltable.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no pedo_lpf_coeff.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\pedo_lpf_coeff.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -obsr.lmf "..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel +"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -obsr.lmf "..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K' Read Device File Directory : C:\PROGRAM FILES (X86)\NEC ELECTRONICS TOOLS\DEV\ RA78K0R warning W3420: File 'pm.rel' already has had error(s)/warning(s) by 'CC78K' @@ -193,4 +32,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 66 +Build Total error(s) : 0 Total warning(s) : 13 diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index f88c3e3..dd2ac87 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -231,74 +231,6 @@ LT=8 Z=0 CommandFile=0 RA_OPT= -[SrcFile] -Source1=loader.c -Source2=pm.c -Source3=i2c_ctr.c -Source4=main.c -Source5=magic.c -Source6=WDT.c -Source7=i2c_mcu.c -Source8=i2c_twl.c -Source9=led.c -Source10=rtc.c -Source11=vreg_ctr.c -Source12=vreg_twl.c -Source13=adc.c -Source14=renge\renge.c -Source15=accero.c -Source16=self_flash.c -Source17=sw.c -Source18=task_debug.c -Source19=task_misc.c -Source20=task_sys.c -Source21=pedo_alg_thre_det2.c -Source22=ini_VECT.c -Source23=task_status.c -Source24=led_cam.c -Source25=led_pow.c -Source26=hal.c -Source27=batt_params.c -Source28=voltable.c -Source29=pedo_lpf_coeff.c -[IncFile] -Include1=incs_loader.h -Include2=sim\simOnWin.h -Include3=sim\sfrAlias.h -Include4=config.h -Include5=jhl_defs.h -Include6=user_define.h -Include7=hal.h -Include8=bsr_system.h -Include9=renge\renge.h -Include10=renge\renge_defs.h -Include11=renge\renge_task_immediate.h -Include12=vreg_ctr.h -Include13=vreg_twl.h -Include14=loader.h -Include15=i2c_mcu.h -Include16=WDT.h -Include17=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h -Include18=fsl_user.h -Include19=i2c_ctr.h -Include20=pm.h -Include21=rtc.h -Include22=reboot.h -Include23=magic.h -Include24=incs.h -Include25=i2c_twl.h -Include26=accero.h -Include27=pedometer.h -Include28=sw.h -Include29=adc.h -Include30=led.h -Include31=batt_params.h -Include32=pool.h -Include33=i2c_twl_defs.h -Include34=renge\renge_task_intval.h -Include35=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h -Include36=self_flash.h -Include37=sim\sim_interrupt_decrare.c [Options.CC78K0R 0] Version=210 Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r @@ -768,6 +700,76 @@ VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 VF78K0Rvs= +[SrcFile] +Source1=loader.c +Source2=pm.c +Source3=i2c_ctr.c +Source4=main.c +Source5=magic.c +Source6=WDT.c +Source7=i2c_mcu.c +Source8=i2c_twl.c +Source9=led.c +Source10=rtc.c +Source11=vreg_ctr.c +Source12=vreg_twl.c +Source13=adc.c +Source14=renge\renge.c +Source15=accero.c +Source16=self_flash.c +Source17=sw.c +Source18=task_debug.c +Source19=task_misc.c +Source20=task_sys.c +Source21=pedo_alg_thre_det2.c +Source22=ini_VECT.c +Source23=task_status.c +Source24=led_cam.c +Source25=led_pow.c +Source26=hal.c +Source27=batt_params.c +Source28=voltable.c +Source29=pedo_lpf_coeff.c +Source30=kanaria.asm +Source31=kanaria_c.c +[IncFile] +Include1=incs_loader.h +Include2=sim\simOnWin.h +Include3=sim\sfrAlias.h +Include4=config.h +Include5=jhl_defs.h +Include6=user_define.h +Include7=hal.h +Include8=bsr_system.h +Include9=renge\renge.h +Include10=renge\renge_defs.h +Include11=renge\renge_task_immediate.h +Include12=vreg_ctr.h +Include13=vreg_twl.h +Include14=loader.h +Include15=i2c_mcu.h +Include16=WDT.h +Include17=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +Include18=fsl_user.h +Include19=i2c_ctr.h +Include20=pm.h +Include21=rtc.h +Include22=reboot.h +Include23=magic.h +Include24=incs.h +Include25=i2c_twl.h +Include26=accero.h +Include27=pedometer.h +Include28=sw.h +Include29=adc.h +Include30=led.h +Include31=batt_params.h +Include32=pool.h +Include33=i2c_twl_defs.h +Include34=renge\renge_task_intval.h +Include35=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h +Include36=self_flash.h +Include37=sim\sim_interrupt_decrare.c [Options.LK78K0R 0] Version=100 O0=bsr_k0r.lmf diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 7f8119d..debf5e7 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,42 +1,17 @@ [ProjectManager] FrameMax=0 -FrameX=383 -FrameY=50 -FrameCX=1293 +FrameX=37 +FrameY=30 +FrameCX=1590 FrameCY=1075 -OpenFile1=loader.c,0,248,38,1221,669,0,1,0,0 -OpenFile2=pm.c,0,373,197,1346,828,0,1,0,0 -OpenFile3=i2c_ctr.c,0,655,120,1628,751,0,1,0,0 -OpenFile4=main.c,0,250,250,1841,957,0,1,0,0 -OpenFile5=magic.c,0,300,300,1891,1007,0,1,0,0 -OpenFile6=WDT.c,0,275,275,1866,982,0,2,24,0 -OpenFile7=i2c_mcu.c,0,325,325,1916,1032,0,1,0,0 -OpenFile8=i2c_twl.c,0,364,126,1955,833,0,1,0,0 -OpenFile9=led.c,0,228,97,1819,804,0,1,0,0 -OpenFile10=rtc.c,0,364,142,1955,849,0,1,0,0 -OpenFile11=vreg_ctr.c,0,313,167,1904,874,0,1,0,0 -OpenFile12=vreg_twl.c,0,353,225,1944,932,0,1,0,0 -OpenFile13=adc.c,0,300,241,1891,948,0,1,0,0 -OpenFile14=renge\renge.c,0,342,270,1933,977,0,1,0,0 -OpenFile15=accero.c,0,355,308,1328,939,0,1,0,0 -OpenFile16=self_flash.c,0,346,268,1937,975,0,1,0,0 -OpenFile17=sw.c,0,358,322,1949,1029,0,1,0,0 -OpenFile18=task_debug.c,0,332,258,1923,965,0,1,0,0 -OpenFile19=task_misc.c,0,364,322,1955,1029,0,1,0,0 -OpenFile20=task_sys.c,0,351,450,1521,951,0,1,0,0 -OpenFile21=pedo_alg_thre_det2.c,0,414,74,1387,705,0,1,0,0 -OpenFile22=ini_VECT.c,0,275,275,1866,982,0,1,0,0 -OpenFile23=task_status.c,0,300,300,1891,1007,0,1,0,0 -OpenFile24=led_cam.c,0,325,325,1916,1032,0,1,0,0 -OpenFile25=led_pow.c,0,354,184,1945,891,0,1,0,0 -OpenFile26=hal.c,0,262,160,1853,867,0,1,0,0 -OpenFile27=batt_params.c,0,376,168,1967,875,0,1,0,0 -OpenFile28=voltable.c,0,300,300,1273,931,0,1,0,0 -OpenFile29=ProjectWindow +OpenFile1=pm.c,0,373,197,1346,828,0,1,0,0 +OpenFile2=i2c_ctr.c,0,655,120,1628,751,0,1,0,0 +OpenFile3=kanaria_c.c,0,68,138,763,769,8,5,8,0 +OpenFile4=main.c,0,402,105,1713,812,11,53,11,0 +OpenFile5=OutputWindow +OutputPos=0,210,901,168,1473 +OpenFile6=ProjectWindow PrjPos=0,0,706,0,291 -OpenFile30=pedo_lpf_coeff.c,0,478,297,1451,928,0,1,19,0 -OpenFile31=OutputWindow -OutputPos=0,349,1040,690,1928 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 5c855af..27e6b29 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -12,7 +12,7 @@ T=4e4248ee 8=reboot.h 9=magic.h [pm.c] -T=4e4111a9 +T=4e4e011b 1=incs.h 2=adc.h 3=led.h @@ -26,7 +26,7 @@ T=4e409e63 1=config.h 2=incs.h [main.c] -T=4e40c90e +T=4e4e254b 1=incs_loader.h 2=WDT.h 3=rtc.h @@ -36,18 +36,18 @@ T=4e40c90e 7=adc.h 8=pool.h [magic.c] -T=4e4248f2 +T=4e4e2af0 1=config.h 2=magic.h [WDT.c] T=4e424710 1=incs_loader.h [i2c_mcu.c] -T=4e4234b9 +T=4e4e1d71 1=incs_loader.h 2=i2c_mcu.h [i2c_twl.c] -T=4e409e61 +T=4e4e1d71 1=config.h 2=incs.h 3=i2c_twl_defs.h @@ -60,7 +60,7 @@ T=4e423830 T=4e423614 1=incs.h [vreg_ctr.c] -T=4e409e63 +T=4e4e208a 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -78,7 +78,7 @@ T=4d5e3e6f 4=vreg_twl.h 5=vreg_ctr.h [adc.c] -T=4e42374e +T=4e4cadc7 1=incs.h 2=adc.h 3=pm.h @@ -134,7 +134,7 @@ T=4e409e61 7=led.h 8=vreg_twl.h [task_sys.c] -T=4e4251f0 +T=4e4e0120 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -175,7 +175,7 @@ T=4e423450 1=incs.h 2=led.h [hal.c] -T=4e40c910 +T=4e4db237 1=incs_loader.h [batt_params.c] T=4e409e1b @@ -187,6 +187,10 @@ T=4e422f23 [pedo_lpf_coeff.c] T=4e422f1d 1=incs.h +[kanaria.asm] +T=4e4226a2 +[kanaria_c.c] +T=4e4e2c3d [incs_loader.h] T=4e409e1d 1=sim\simOnWin.h @@ -201,13 +205,13 @@ T=4e409e1d 10=i2c_mcu.h 11=WDT.h [sim\simOnWin.h] -T=4e4243ba +T=4e4cce4f 1=sim\sfrAlias.h [sim\sfrAlias.h] T=4e409e19 1=config.h [config.h] -T=4e409e18 +T=4e4daac7 [jhl_defs.h] T=4df82cd1 1=config.h