diff --git a/trunk/accero.c b/trunk/accero.c index 1efe4ce..4b5a176 100644 --- a/trunk/accero.c +++ b/trunk/accero.c @@ -224,7 +224,7 @@ task_status_immed tski_acc_setup( ) } // 実書き込み兼、通信できたかフラグ更新 - if( iic_mcu_write( IIC_SLA_ACCEL, ( ACC_REG_CTRL1 | ACC_REG_FLG_BURST_ACCESS ), 4, str_send_buf ) == ERR_NOSLAVE ) + if( iic_mcu_write( IIC_SLA_ACCEL, ( ACC_REG_CTRL1 | ACC_REG_FLG_BURST_ACCESS ), 4, str_send_buf ) == I2C_ERR_NOSLAVE ) { vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_ACCERO_ERR; }else{ diff --git a/trunk/bsr.hex b/trunk/bsr.hex index 3634199..f19539d 100644 --- a/trunk/bsr.hex +++ b/trunk/bsr.hex @@ -1,261 +1,262 @@ -:02000000720D7F -:04001000D746D946B0 -:02001C00854815 -:02002400D248C0 -:02002A001D496E -:080034004A4AED49464AC54C59 -:02004A00DB4693 -:02005A00154748 -:020062004A4C06 -:06008000DE4A174B614B44 -:0400C0007EFBFF04C0 +:02000000780D79 +:02000200FFFFFE +:040010001B481D4824 +:02001C00C949D0 +:02002400704A20 +:02002A00BB4ACF +:08003400E84B8B4BE44B634EDB +:02004A001F484D +:02005A00594803 +:02006200E84D67 +:060080007C4CB54CFF4C66 +:0400C0007EFBFF853F :0A00C4001B339499E033F240BFAA09 -:1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A -:1000DE00D8710006F98EA89C018C015C10D1DD0A46 -:1000EE007110A6FB710006F9EF0B8C015C80D161DB -:1000FE00E8710006F98F06F931030EF6B1BBF66111 -:10010E004900DD05618900EFF5FDD701FD2801FDF0 -:10011E008001FD6702EFAEC0C6D7C7360000674C40 -:10012E0009DE3F318E04F60FC1317B9EFDC411896D -:10013E007267318E04F64F14896142DF03F6EF01C8 -:10014E00E660610667318E124900207267318E04B7 -:10015E00F64F14896142DF03F6EF01E66061068710 -:10016E00EFBC40F84F3A61E88666D161E8FDDE06E5 -:10017E00C6D751105B0C319E609F08F94008F901FB -:10018E00DF05CD3705EF03CD37078F06F95CE39F0B -:10019E0006F951035B04318EE7240000DD1023DDE8 -:1001AE000823DF0E712006F9D7713006F9D771409A -:1001BE0006F9D7717BFACEA010CEA180E5F3000030 -:1001CE000000CEA408F5AAFFD78F06F9310508CD99 -:1001DE000003CD0307EF03CD030ECE23F88F06F9F0 -:1001EE0031030BCD0408CD0508F690BFB401CF1135 -:1001FE0005F8F521FFCE22E9CE24F3CE25FACE2640 -:10020E00FCCE275FCE2EFCCF120511CF350002CFCC -:10021E00370019CF530006CBEEFEFFCE3831CE3964 -:10022E0070CF38050A308700BF1801BF1A01BF1CF6 -:10023E0001BF1E01D7C7C1C1FBF8FFCEABAC8C020C -:10024E00D1DD12616902305C03BBF6614900DDEE5F -:10025E00618900EFF51004C6D7FD3D0AFD7409FD56 -:10026E000C2FFDC337FDD104717AFAFDA223F504DC -:10027E00F98F06F93105135003FD372B625C01D15E -:10028E0061E8CF04F902CFAFFB64FDEC2FFD87428E -:10029E00710293712BE7618461A461EDEFF8D7FDD4 -:1002AE00CA46D2717BFAD7D7C7F616FDD104FDAD7B -:1002BE000231229108712291717AFAEF0B717AFA5A -:1002CE00A7F647DFE9E2EF01F2C6D7C7C1C1FBF8D7 -:1002DE00FF17A1C1E0C18C0A70C18C0270FD010331 -:1002EE001006D2DF04F44DEF03CD4D028C017210D7 -:1002FE0004C6D7C7C1FBF8FFFDB602D2DD03E2EF9D -:10030E00618B70FD1F04D2DD077123915202EF52F3 -:10031E008C0870FD3A04FD85048B6C0170FD3A0467 -:10032E00300400BF2401301740BF1C01300400BF51 -:10033E0022018C0A91DF04F6BF2A01710BE2CE4432 -:10034E00FF3182E202EFFAAC0C148E449961790C03 -:10035E0061690A8C0AD1DFDAFDAE04710BE27123FA -:10036E0091F2C0C6D7C7C1FBF8FFFDB602D2DD03BE -:10037E00E2EF25710AE68B70FD1F04D2DD077123B3 -:10038E00915202EF138C0870FD3A048C0A70FD3AFC -:10039E0004FDAE04712391F2C0C6D7C7C1FBF8FFAE -:1003AE00FDB602D2DD03E2EF65710AE6710BE28B58 -:1003BE0070FD1F04D2DD077123915202EF50710BB5 -:1003CE00E231129139C73422FBAC0C1652048B99D0 -:1003DE00A5A792DFF9C63184BD02EFFA717ABDCEC0 -:1003EE00B144CBB422FB8C0A318EBEB8CEBB487161 -:1003FE004BE1714BE5710ABD8C089E44EF0F710BFA -:10040E00E68C089E448C0A9D4CAC0CBD4AF2C0C6CC -:10041E00D7C716FD5D04AF0401BF0C0117FD3A04EA -:10042E00D2DD06FDAE04E2EF01F2C6D7C716710AA1 -:10043E00E6710BE2669E443182E202EFFAF6420466 -:10044E0001DD09AF0401BF0C01E2EF01F2C6D7AF27 -:10045E002801085CFB08BF2801FDB502AF28015C2E -:10046E00FBBF2801300400BF2A01301780BF1C01DA -:10047E00300400BF2201D7AF2401086C0408BF244A -:10048E0001AF28016C0F086C0B08BF2801FDB502E7 -:10049E00AF2A01085CFB08BF2A01FDB502ED5D0421 -:1004AE00300400BF2401F6BF2A01300B0BBF280118 -:1004BE00FDB502300B0FBF2801FDB502300F0FBF87 -:1004CE002801D731349101D7712291710BBD0000F3 -:1004DE00717BBD6A0E03713B25713B23E0FD430228 -:1004EE007120F000FDB502F6BF26015024BF1401A5 -:1004FE00CB440014300F0FBF2801711391710BE222 -:10050E00710AE6FD5D04CE44FF3182E202EFFAFD90 -:10051E00AE04AF0401BF0C01712391713291D7313A -:10052E00249102EFFAFD8504713A25713A235A0E91 -:10053E00FC7128F000713391D7C7880616FDB602FC -:10054E00D2DD03E2EF36710AE650A4FD1F04D2DDC0 -:10055E00077123915202EF2417FD3A046770FD3A9A -:10056E0004FD850450A4FD3A045020FD3A04D84EF3 -:10057E00FD3A04A44EFDAE04712391F2C6D7C720F6 -:10058E0008FBF8FFFDDC085014C15008FD0E08C032 -:10059E00CC07048C074C14DE0C8C07318EFD540AEC -:1005AE00615907EFEECC07048C074C1461C8ED7A45 -:1005BE0006CC06008C064C0461C8ED5906300AF9CB -:1005CE00BC02F6BBCEABAC31B2D109C73641057118 -:1005DE0084C6DEF3F1C73641057184C661DC9C0525 -:1005EE00713BD1AC02148F40059971505005617961 -:1005FE0002617900F0E1614900DD09C736410571FC -:10060E0084C6DEC3F1C73641057184C661DC0E05B2 -:10061E009C055040C18C07318E31AD128C06318E47 -:10062E00318D03BDD831FFBDDADADAADD8FD200D3C -:10063E00C0D2DD0C5008C15014FD0E08C0FDDD0BFC -:10064E008C05D1DF06615906EDC2058C07318EFD92 -:10065E00580AD2DD0C5008C15014FD0E08C0FDDD45 -:10066E000B8C05D1DF06615907EDB605716050059B -:10067E00CC0400CC05008C054C09DE2B8C05318E8C -:10068E0004F61FC1317B9EFDC41189728C05318E1B -:10069E0004F64F14896142DF03F6EF01E6600E04A3 -:1006AE009C04615905EFCF41001140F81F3A61E8F3 -:1006BE006159048C04D1DF08FDDE0BFDF00CEF0C4C -:1006CE005008C15014FD0E08C0FDDD0B1008C6D732 -:1006DE00C72004FBF8FF715B21CC0100F6BC02AC15 -:1006EE0002440900DE3EAC0204F60F1441001189EB -:1006FE0072AC020C5014896142DF03F6EF01E66022 -:10070E000E019C01AC021249005072AC0204F67F3D -:10071E0014896142DF03F6EF01E6600E019C016170 -:10072E007902EFBB40F67FFF61F86159018C01D170 -:10073E0061F8EDDC07CC0100717AFAFDD10471137A -:10074E0000711B20710303710205E0C15003FD26E9 -:10075E002BC05013FD4302500FC1E0FD262BC0CE1F -:10076E00ABAC6159018C0191DD068C014C03DF03AA -:10077E00E6EF01F66061FB7151018C014C0861F8E6 -:10078E00CC010031320705A024FCEF03F524FC4018 -:10079E0024FC11DC0DF524FCF0C15003FD262BC00A -:1007AE00EF12E6BC02F6614902DDB4000000006102 -:1007BE007902EFF1CE3708CBE4FFFFCBE6FFF7CEA1 -:1007CE00D4FFCF370008F5120561FDF5ABFFFDDC58 -:1007DE0008D25008C15014FD0E08C0D2FDDD0B101A -:1007EE0004C6D73184BD02EFFA717BBDCBE4FFFFA7 -:1007FE00CBE6FFFFCBD4FFFF717ABED7717BBED79E -:10080E00C7C1200CFBF8FF8C0C318E31ADC1317B92 -:10081E009DD4C0BC068DD49C088C149C0B8C1431BA -:10082E008E040C00128C0B318EBDD813FDAF0F61F0 -:10083E00C8EDD708CEABACCC05068C0B318EFD5077 -:10084E000AD2DD158C0B318EFD540A6169058C05BB -:10085E00D1DFE7FD0A08E2EF71CC0A008C0A4C04E6 -:10086E00DE54F6BC02300AF9BBAC06148C089EFDB1 -:10087E00118972AB146299AC06A1BC066179006154 -:10088E007902F0E1614902DFE05040C18C0B318EFC -:10089E0031AD128C0A318E318D03BDD831FFBDDAE8 -:1008AE00DADAADD8FD200DC0D2DD06FD0A08E2EF82 -:1008BE001961590AEFA68C0B318EFD580AD2DD0351 -:1008CE00E2EF0761590BED2B08F2100EC6D7C77178 -:1008DE007B9D717BFAFDF107300AF9FD030BFD8E4E -:1008EE000AC6D7FDDC08FDDD0BFD0A08F5ABFFF2ED -:1008FE00D7C7316494067110B3FBEF047118B3FBC4 -:10090E008FB3FB7B8876D1DD5B8FB3FB9D88400474 -:10091E00F903DF22665C10D1DD1C8FB3FB5C10D1B6 -:10092E00DD0B5080C15011FD1B34C0EF095040C18A -:10093E005011FD1B34C04004F903DD064004F904D8 -:10094E00DF22665C02D1DD1C8FB3FB5C02D1DD0BB6 -:10095E005040C15010FD1B34C0EF095020C1501043 -:10096E00FD1B34C0C6D7C7360000665C80D1DD10D3 -:10097E00675C80D1DF05711394EF0B711294EF0653 -:10098E00710407711194665C40D1DD10675C40D133 -:10099E00DF05712394EF0B712294EF06711405712C -:1009AE002194665C01D1DD10675C01D1DF057133E6 -:1009BE0094EF0B713294EF06713407713194665CCB -:1009CE0002D1DD10675C02D1DF05714394EF1D711A -:1009DE004294EF184007F901DF0871040271419447 -:1009EE00EF0AC736100571C4C6714194665C04D116 -:1009FE00DD10675C04D1DF05715394EF0B715294D7 -:100A0E00EF06714407715194665C08D1DD10675C86 -:100A1E0008D1DF05716394EF0B716294EF067114C8 -:100A2E0007716194665C10D161E8715AD1C6D7F531 -:100A3E00F6FBF5F8FBCFFEFBFFCFFAFBFFCFFBFB80 -:020A4E00FFD7D0 -:100A50005208EF065203EF025206FEE600FE1B00AC -:100A6000DC16089F03088F0408089F040862FE2410 -:100A700000089F0408EEBF00EEBA00C1C514410E85 -:100A800011D9D0FF118FD1FF312E45C4C0D7F2311B -:100A9000A2C401E2D79DE261DD4C09DF12717BFA4D -:100AA000C18F06089F25FDC0CF060800EE27003144 -:100AB000F2FA04CF0608004C00DF05D50008DD1669 -:100AC00061DD717BFAD50608DD0ACDE31F61CD61DA -:100AD000CDEE160061CDFED40061FFFE9A00FCF859 -:100AE000FF0EFEB20061CDFED5004C09DF0EC18FB6 -:100AF00006086F25FD9F0608C0EE0400CF0608001B -:100B0000F8E3D75200EF025202FE3700CF24FD0077 -:100B1000CF060800BF0408C716629F0008410011F5 -:100B20008F1A209B4100118F1B209F0108C6510086 -:100B3000FE62FFEF025205CF060800C1510CFE0A0B -:100B400000C0D7C1511DFE0200C0D761DD717BFA24 -:100B500070CEC0A59EC47CFF9EC4609EC461CDD7EC -:100B600061DD717BFAC18EC45C1BFED6FFCF060827 -:100B700001FED7FFC061CDD731F2FA1AC1AEE4BF92 -:100B800016FDAEE6BF18FDAED4BF1AFD30FFFFBEA6 -:100B9000E4BEE6BED4C0D731F2FA11C1AF16FDBE35 -:100BA000E4AF18FDBEE6AF1AFDBED4C0D7C1BF1C6E -:100BB000FD13BF1EFD15BF20FD17BF22FDC0D7AF1F -:100BC0001CFDDB1EFDEB20FDFB22FDD7534B3052FD -:100BD0005430324E323030475631323000FFC1503F -:100BE000FEFEAB0061DD717BFACF060800FE0A0055 -:100BF000FEA4FF61CDF8E3EECF00C7FB0408BF16EB -:100C0000FD8FC0009C05C5C337040600BF18FD3525 -:100C100036420C300000522BFE6600C2C4C630F0D3 -:100C20000BB800300000B8022004AF18FDB8003047 -:100C30000F00B802AF16FD61FF520AFE3AFFECF852 -:100C4000FF0E717BFAC1C7FB04088C05C65C80FEF1 -:100C50000200C0D761DD717BFA70CFC0FFA59FC0D5 -:100C6000007CFF9FC000609FC00061CDD7618BFEFC -:100C7000E2FF717BBE410011FB000017CEFC00615A -:100C8000CB089EFDF31161C999A58392DFF7D7FECA -:100C9000B1FED524FDDF23C1CF0308035109FEF4C3 -:100CA000FDC0D2DF37FE3800A20408CF0308075189 -:100CB00009FEE1FDD2B20408DF22C7FB040831833C -:100CC00002C6D7C6510AFECCFD624C1FDF06CF24F8 -:100CD000FD01EF04CF24FD00C0EE5BFEC0EE55FE2B -:100CE000C7C1FB04088B31196C0161589BC0C6D782 -:100CF000717BFAFE4DFEAF0408040600C1143654A1 -:100D00000C300000522DF3FE77FF8FC000FE2BFE4B -:100D100061CF5C807C8073C0041900CEFC0F61CB76 -:100D2000C55404EF03C55417FE18FEC7360008BBB0 -:100D3000629C0288089C03D1DD334C41DE2F70F1A8 -:100D4000312DB161090033081C000851FF612A41AF -:100D50000E118FD0FF613B118FD1FF6138DC0E8BFC -:100D60005C03DF0964C6C4FE2BFDEECAFDC6C4EEFB -:020D7000C3FDC1 -:100D720061CF5100718C7109FECBF800FEFCC101FC -:100D820000F6BF00F953C0F693935820FEDFF941F5 -:100D92000036D64C34CCFCEF05118B99A7A517442D -:100DA200204DDFF53602F930CCFCEF04CC0000A771 -:100DB20047DFF9410036204D3420FEEF05118B99B3 -:100DC200A7A51744304DDFF53630FE3090FEEF0414 -: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 -:100FD200728EFDC162314C410036CC4C1161A0725F -:070FE200C09EFD62C6C2D7EC -:0A0FF60032313A33303A353500004D -:0A20000032313A33303A3535000032 +:0A00CE00FFFFFFFFFFFFFFFFFFFF32 +:1000D800C7C1FBF8FFCEABACC736F00071F4C66100 +:1000E800D8710006F98EA89C018C015C10D1DD0A3C +:1000F8007110A6FB710006F9EF0B8C015C80D161D1 +:10010800E8710006F98F06F931030EF6B1BBF66106 +:100118004900DD05618900EFF5FDE101FD3201FDD2 +:100128008A01FD7102EFAEC0C6D7C7360000674C22 +:1001380009DE3F318E04F60FC1317B9EFDC4118963 +:100148007267318E04F64F14896142DF03F6EF01BE +:10015800E660610667318E124900207267318E04AD +:10016800F64F14896142DF03F6EF01E66061068706 +:10017800EFBC40F84F3A61E88666D161E8FDE406D5 +:10018800C6D751105B0C319E609F08F94008F901F1 +:10019800DF05CD3705EF03CD37078F06F95CE39F01 +:1001A80006F951035B04318EE7240000DD1023DDDE +:1001B8000823DF0E712006F9D7713006F9D7714090 +:1001C80006F9D7717BFACEA010CEA180E5F3000026 +:1001D8000000CEA408F5AAFFD78F06F9310508CD8F +:1001E8000003CD0307EF03CD030ECE23F88F06F9E6 +:1001F80031030BCD0408CD0508F690BFB401CF112B +:1002080005F8F521FFCE22E9CE24F3CE25FACE2635 +:10021800FCCE275FCE2EFCCF120511CF350002CFC2 +:10022800370019CF530006CBEEFEFFCE3831CE395A +:1002380070CF38050A308700BF1801BF1A01BF1CEC +:1002480001BF1E01D7C7C1C1FBF8FFCEABAC8C0202 +:10025800D1DD12616902305C03BBF6614900DDEE55 +:10026800618900EFF51004C6D7FD430AFD7A09FD40 +:100278000C2FFDC337FDDE04717AFAFDA223F504C5 +:10028800F98F06F93105135003FD372B625C01D154 +:1002980061E8CF04F902CFAFFB64FDEC2FFDCB433F +:1002A800711295712BE7618461A461EDEFF8D7FDB8 +:1002B8000E48D2717BFAD7D7C7F616FDDE04FDB714 +:1002C8000231229308712293717AFAEF0C717AFA4B +:1002D800A7F647DFE95203EF01F2C6D7C7C1C1FB52 +:1002E800F8FF17A1C1E0C18C0A70C18C0270FD052E +:1002F800031006629D508C01721004C6D7C7C1FB5B +:10030800F8FFFDC002D2DD045203EF618B70FD31AE +:1003180004D2DD077123935202EF528C0870FD4717 +:1003280004FD92048B6C0170FD4704300400BF2467 +:1003380001301740BF1C01300400BF22018C0A9114 +:10034800DF04F6BF2A01710BE2CE44FF3182E202DC +:10035800EFFAAC0C148E449961790C61690A8C0A25 +:10036800D1DFDAFDBB04710BE2712393F2C0C6D76B +:10037800C7C1FBF8FFFDC002D2DD045203EF2571AF +:100388000AE68B70FD3104D2DD077123935202EF28 +:10039800138C0870FD47048C0A70FD4704FDBB04EC +:1003A800712393F2C0C6D7C7C1FBF8FFFDC002D2C4 +:1003B800DD045203EF70710AE6710BE28B70FD31B8 +:1003C80004D2DD077123935202EF5B710BE2311205 +:1003D8009344C73422FBAC0C1652048B99A5A79200 +:1003E800DFF9C68B9D4D8C089D4E8C0A9D4F31843C +:1003F800BD02EFFA717ABDCEB144CBB422FB8C0AB0 +:10040800318EBEB8CEBB48714BE1714BE5710ABD68 +:100418008C089E44EF0F710BE68C089E448C0A9D55 +:100428004CAC0CBD4AF2C0C6D7C716FD6A0417FD0E +:100438004704D2DD07FDBB045202EF01F2C6D7C75D +:1004480016710AE6710BE2669E443182E202EFFA07 +:10045800F6420401DD09AF0401BF0C01E2EF01F22D +:10046800C6D7AF2801085CFB08BF2801FDBF02AF53 +:1004780028015CFBBF2801300400BF2A0130178027 +:10048800BF1C01300400BF2201D7AF2401086C044F +:1004980008BF2401AF28016C0F086C0B08BF2801A6 +:1004A800FDBF02AF2A01085CFB08BF2A01FDBF029D +:1004B800ED6A04300400BF2401F6BF2A01300B0B9B +:1004C800BF2801FDBF02300B0FBF2801FDBF02305E +:1004D8000F0FBF2801D731349301D77122936A0EC9 +:1004E80003713B25713B23E0FD4D027120F000FDB7 +:1004F800BF02F6BF26015024BF1401CB44001430BC +:100508000F0FBF2801711393710BE2710AE6FD6AA0 +:1005180004CE44FF3182E202EFFAFDBB04AF0401CE +:10052800BF0C01712393713293D731249302EFFAF0 +:10053800FD9204713A25713A235A0EFC7128F00095 +:10054800713393D7C7880616FDC002D2DD04520363 +:10055800EF36710AE650A4FD3104D2DD077123930A +:100568005202EF2417FD47046770FD4704FD92040B +:1005780050A4FD47045020FD4704D851FD4704A46A +:1005880051FDBB04712393F2C6D7C72008FBF8FFBF +:10059800FDE2085014C15008FD1408C0CC07048CB3 +:1005A800074C14DE0C8C07318EFD5A0A615907EF8F +:1005B800EECC07048C074C1461C8ED8006CC06000D +:1005C8008C064C0461C8ED5F06300AF9BC02F6BB24 +:1005D800CEABAC31B2D109C73641057184C6DEF362 +:1005E800F1C73641057184C661DC9C05713BD1AC0D +:1005F80002148F40059971505005617902617900A4 +:10060800F0E1614900DD09C73641057184C6DEC3E2 +:10061800F1C73641057184C661DC0E059C05504062 +:10062800C18C07318E31AD128C06318E318D03BDF0 +:10063800D831FFBDDADADAADD8FD260DC0D2DD0C2F +:100648005008C15014FD1408C0FDE30B8C05D1DF20 +:1006580006615906EDC8058C07318EFD5E0AD2DDAC +:100668000C5008C15014FD1408C0FDE30B8C05D1D3 +:10067800DF06615907EDBC0571605005CC0400CC5C +:1006880005008C054C09DE2B8C05318E04F61FC144 +:10069800317B9EFDC41189728C05318E04F64F148E +:1006A800896142DF03F6EF01E6600E049C0461599C +:1006B80005EFCF41001140F81F3A61E86159048CF9 +:1006C80004D1DF08FDE40BFDF60CEF0C5008C15017 +:1006D80014FD1408C0FDE30B1008C6D7C72004FB9F +:1006E800F8FF715B21CC0100F6BC02AC02440900A2 +:1006F800DE3EAC0204F60F144100118972AC020C04 +:100708005014896142DF03F6EF01E6600E019C0197 +:10071800AC021249005072AC0204F67F148961429F +:10072800DF03F6EF01E6600E019C01617902EFBB81 +:1007380040F67FFF61F86159018C01D161F8EDE263 +:1007480007CC0100717AFAFDDE04711300711B20D9 +:10075800710303710205E0C15003FD262BC050133D +:10076800FD4D02500FC1E0FD262BC0CEABAC615948 +:10077800018C0191DD068C014C03DF03E6EF01F6E5 +:100788006061FB7151018C014C0861F8CC010031AA +:10079800320705A024FCEF03F524FC4024FC11DCFF +:1007A8000DF524FCF0C15003FD262BC0EF12E6BC6A +:1007B80002F6614902DDB400000000617902EFF140 +:1007C800CE3708CBE4FFFFCBE6FFF7CED4FFCF3719 +:1007D8000008F5120561FDF5ABFFFDE208D25008EF +:1007E800C15014FD1408C0D2FDE30B1004C6D73164 +:1007F80084BD02EFFA717BBDCBE4FFFFCBE6FFFFC0 +:10080800CBD4FFFF717ABED7717BBED7C7C1200C8E +:10081800FBF8FF8C0C318E31ADC1317B9DD4C0BC4F +:10082800068DD49C088C149C0B8C14318E040C00FF +:10083800128C0B318EBDD813FDB50F61C8EDDD08E4 +:10084800CEABACCC05068C0B318EFD560AD2DD152D +:100858008C0B318EFD5A0A6169058C05D1DFE7FDE5 +:100868001008E2EF71CC0A008C0A4C04DE54F6BC86 +:1008780002300AF9BBAC06148C089EFD118972ABD4 +:10088800146299AC06A1BC06617900617902F0E1B5 +:10089800614902DFE05040C18C0B318E31AD128CC2 +:1008A8000A318E318D03BDD831FFBDDADADAADD821 +:1008B800FD260DC0D2DD06FD1008E2EF1961590AC8 +:1008C800EFA68C0B318EFD5E0AD2DD03E2EF0761E5 +:1008D800590BED3108F2100EC6D7C7717B9D717B9D +:1008E800FAFDF707300AF9FD090BFD940AC6D7FD92 +:1008F800E208FDE30BFD1008F5ABFFF2D7C7317432 +:1009080096067110B3FBEF047118B3FB8FB3FB7B32 +:100918008A76D1DD5B8FB3FB9D8A4004F903DF2221 +:10092800665C10D1DD1C8FB3FB5C10D1DD0B5080F1 +:10093800C15011FD1B34C0EF095040C15011FD1BBF +:1009480034C04004F903DD064004F904DF22665C84 +:1009580002D1DD1C8FB3FB5C02D1DD0B5040C150CE +:1009680010FD1B34C0EF095020C15010FD1B34C0CE +:10097800C6D7C7360000665C80D1DD10675C80D1C1 +:10098800DF05712396EF0B712296EF06710407714C +:100998002196665C40D1DD10675C40D1DF0571337C +:1009A80096EF0B713296EF06711405713196665CFD +:1009B80001D1DD10675C01D1DF05714396EF0B7142 +:1009C8004296EF06713407714196665C02D1DD10DC +:1009D800675C02D1DF05715396EF1D715296EF18CF +:1009E8004007F901DF08710402715196EF0AC73612 +:1009F800100571C4C6715196665C04D1DD10675C40 +:100A080004D1DF05716396EF0B716296EF067144AE +:100A180007716196665C08D1DD10675C08D1DF0557 +:100A2800717396EF0B717296EF06711407717196D8 +:100A3800665C10D161E8715AD1C6D7F5F6FBF5F8B6 +:0E0A4800FBCFFEFBFFCFFAFBFFCFFBFBFFD780 +:100A56005208EF065203EF025206FEE600FE1B00A6 +:100A6600DC16089F03088F0408089F040862FE240A +:100A760000089F0408EEBF00EEBA00C1C514410E7F +:100A860011D9D0FF118FD1FF312E45C4C0D7F23115 +:100A9600A2C401E2D79DE261DD4C09DF12717BFA47 +:100AA600C18F06089F25FDC0CF060800EE2700313E +:100AB600F2FA04CF0608004C00DF05D50008DD1663 +:100AC60061DD717BFAD50608DD0ACDE31F61CD61D4 +:100AD600CDEE160061CDFED40061FFFE9A00FCF853 +:100AE600FF0EFEB20061CDFED5004C09DF0EC18FB0 +:100AF60006086F25FD9F0608C0EE0400CF06080015 +:100B0600F8E3D75200EF025202FE3700CF24FD0071 +:100B1600CF060800BF0408C716629F0008410011EF +:100B26008F1A209B4100118F1B209F0108C6510080 +:100B3600FE62FFEF025205CF060800C1510CFE0A05 +:100B460000C0D7C1511DFE0200C0D761DD717BFA1E +:100B560070CEC0A59EC47CFF9EC4609EC461CDD7E6 +:100B660061DD717BFAC18EC45C1BFED6FFCF060821 +:100B760001FED7FFC061CDD731F2FA1AC1AEE4BF8C +:100B860016FDAEE6BF18FDAED4BF1AFD30FFFFBEA0 +:100B9600E4BEE6BED4C0D731F2FA11C1AF16FDBE2F +:100BA600E4AF18FDBEE6AF1AFDBED4C0D7C1BF1C68 +:100BB600FD13BF1EFD15BF20FD17BF22FDC0D7AF19 +:100BC6001CFDDB1EFDEB20FDFB22FDD7534B3052F7 +:100BD6005430324E323030475631323000FFC15039 +:100BE600FEFEAB0061DD717BFACF060800FE0A004F +:100BF600FEA4FF61CDF8E3EECF00C7FB0408BF16E5 +:100C0600FD8FC0009C05C5C337040600BF18FD351F +:100C160036480C300000522BFE6600C2C4C630F6C1 +:100C26000BB800300000B8022004AF18FDB8003041 +:100C36000F00B802AF16FD61FF520AFE3AFFECF84C +:100C4600FF0E717BFAC1C7FB04088C05C65C80FEEB +:100C56000200C0D761DD717BFA70CFC0FFA59FC0CF +:100C6600007CFF9FC000609FC00061CDD7618BFEF6 +:100C7600E2FF717BBE410011FB000017CEFC006154 +:100C8600CB089EFDF31161C999A58392DFF7D7FEC4 +:100C9600B1FED524FDDF23C1CF0308035109FEF4BD +:100CA600FDC0D2DF37FE3800A20408CF0308075183 +:100CB60009FEE1FDD2B20408DF22C7FB0408318336 +:100CC60002C6D7C6510AFECCFD624C1FDF06CF24F2 +:100CD600FD01EF04CF24FD00C0EE5BFEC0EE55FE25 +:100CE600C7C1FB04088B31196C0161589BC0C6D77C +:100CF600717BFAFE4DFEAF0408040600C114365A95 +:100D06000C300000522DF3FE77FF8FC000FE2BFE45 +:100D160061CF5C807C8073C0041900CEFC0F61CB70 +:100D2600C55404EF03C55417FE18FEC7360008BBAA +:100D3600629C0288089C03D1DD334C41DE2F70F1A2 +:100D4600312DB161090033081C000851FF612A41A9 +:100D56000E118FD0FF613B118FD1FF6138DC0E8BF6 +:100D66005C03DF0964C6C4FE2BFDEECAFDC6C4EEF5 +:020D7600C3FDBB +:100D780061CF5100718C7109FECBF800FEFCCB01EC +:100D880000F6BF00F953C0F693935820FEDFF941EF +:100D98000036744E34CCFCEF05118B99A7A5174487 +:100DA800BE4EDFF53602F930CCFCEF04CC0000A7CC +:100DB80047DFF9410036BE4E3420FEEF05118B990E +:100DC800A7A51744CE4EDFF53630FE3092FEEF046D +:100DD800CC0000A747DFF9FCD80000EFFE61DD7109 +:100DE8007BFABEF0ADD8BEF200AEF661CDD7C361D6 +:100DF800DD717BFABEF0ADD8BEF200DBF6FFADDCEC +:100E0800BEF000AEF6BDD8AEF40312ADDABEF20005 +:100E1800AEF661CD03BDDAC2D7C3F33174D9088306 +:100E2800C1F626D8BDD8C031750683C312F623C2D1 +:100E3800FD430E93DF0312F623C2D7440000DD26DC +:100E480061DD717BFACFE80080BEF6F6BEF4BEF233 +:100E5800ADD8BEF0CFE800818FE8003103FAAEF0DC +:100E6800F5E80061CDD7B1D7C3F33174D90883C190 +:100E7800F626D8BDD8C0317505C312F623C2FD9138 +:100E88000E93DF0312F623C2D7440000DD2761DD8D +:100E9800717BFACFE80080BEF6F6BEF4BEF2ADD89C +:100EA800BEF0CFE800818FE8003103FAAFE000F52B +:100EB800E80061CDD7ADD8D7C3F33174DB0F83C158 +:100EC800F626D8BDD861317026DABDDAC031750D85 +:100ED80083C312F626DCBDDC61317023C2FDF90E36 +:100EE80093DF0CF626D8BDD861317026DABDDAC298 +:100EF800D7C161686BDC6BDDC0DD2F61DD717BFA0A +:100F0800CFE80080BEF4ADDCBEF6ADD8BEF0ADDAF9 +:100F1800BEF2CFE800818FE8003103FAAEF0BDD809 +:100F2800AEF2BDDAF5E80061CDD7F6BDD8BDDAD7A7 +:100F38008292DD2B61DD717BFACFE80080BEF0F68E +:100F4800BEF2BEF46208BEF6CFE800818FE8003139 +:100F580003FAAFE0006072AEF0F5E80061CDD7604B +:100F680072F6B1D706DABDDAADDC06D8BDD861D8DD +:100F7800A6DAD7D1DD17C1C3DAD89DD8ADDA311CCE +:100F880061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD61 +:100F98001BC1C3DADA9DDAADD8311E33311E337185 +:100FA800F9B4DADFF4BDD813BDDAC2C0D746D8DD4C +:100FB8000771FF7177D971C0D75BDB9DDB605BDAA6 +:100FC8009DDAADDC5BD9085BD808BDD8D7C3C7F3B9 +:100FD800728EFDC162314C4100366A4E1161A072B9 +:070FE800C09EFD62C6C2D7E6 +:0A0FF60031323A35343A3031000050 +:0A20000031323A35343A3031000035 :10200A0005214F7B9EC5E9000104080D12171C1F0C :10201A00080100001F003B005A0078009700B50035 :10202A00D400F300110130014E01192634445362E1 @@ -298,67 +299,67 @@ :10227A001204FAF3F0F0F3F7FBFE00020303020282 :02228A00010051 :10228C008D3AB43AD1DF52CD3A1EFD3B23FDE62206 -:10229C003132900D3104900931129405713304EFF1 -:1022AC0003713204FD172331229005714202EF03B2 +:10229C003132920D3104920931229605713304EFDB +:1022AC0003713204FD172331229205714202EF03B0 :1022BC00714302D432DD11B4328FB2FB5C01D1DD3B :1022CC0004F432EF03714202314402067140B3FB55 :1022DC00EF047148B3FBFD0526D74A304BDC114A9D -:1022EC0030B9DE0C4A3B28DE03A43BD7713390D7C0 +:1022EC0030B9DE0C4A3B28DE03A43BD7713392D7BE :1022FC004A303EDC054A30BDDC0C4A3C28DE03A4E7 -:10230C003CD7713290D7F43BF43CD73122940C4A31 -:10231C003D02DE03A43DD7712390D73132040A402D -:10232C00AFFB3CDE04712390D7712290F43DD7C7EC -:10233C00C1FBF8FF714490711794DE5771149471BE -:10234C004190311294127130B3FB5002C15011FD07 +:10230C003CD7713292D7F43BF43CD73132960C4A1D +:10231C003D02DE03A43DD7712392D73132040A402B +:10232C00AFFB3CDE04712392D7712292F43DD7C7E8 +:10233C00C1FBF8FF714492712796DE577124967198 +:10234C004192312296127130B3FB5002C15011FDF3 :10235C001B34C0CD3232EF3B7138B3FBE0C15011AE :10236C00FD1B34C0F43217C15002FD0E2BC0D2DF5E :10237C000D8B318E318D080E01081C00BD34AD342F :10238C0044009BDC05D5AFFBDF095020C15011FD8B :10239C001B34C0C0C6D7C78D2076FDE323FD422B6E -:1023AC00D507F9DD05710390EF2B664B2061F831F1 -:1023BC0054901A715390FDD104664C07DD0381DFF4 -:1023CC00098F06F9310303FD6C24FD802471029002 +:1023AC00D507F9DD05710392EF2B664B2061F831EF +:1023BC0054921A715392FDDE04664C07DD0381DFE3 +:1023CC00098F06F9310303FD6C24FD802471029200 :1023DC003063256194C6D7C77162017172015005D3 -:1023EC00FD43025008FD9836629D305009FD983629 +:1023EC00FD4D025008FD9836629D305009FD98361F :1023FC006276716301711806F94A30F1DC05E50764 :10240C00F9EF224A3004DE1ACF07F9025008C15006 -:10241C006CFDD902C092DF0DD44DDF09711006F9A5 +:10241C006CFDE402C092DF0DD450DF09711006F997 :10242C00EF03F507F94007F901DF05710A22EF0602 :10243C00710B22710302CD20075700674C08DE1088 :10244C0073090A20614EDC05679D20EF0387EFEBD3 :10245C004A2007DF09D507F961F8CF07F903C6D77A -:10246C00500AFD4302304000C15006FDF12AC05015 -:10247C0096ED4302C72006FBF8FFD507F961E8ED9E +:10246C00500AFD4D02304000C15006FDF12AC0500B +:10247C0096ED4D02C72006FBF8FFD507F961E8ED94 :10248C005F25304A57C1503EFDF12AC0D2DD07719D :10249C0000B2FBED5F257108B2FB17040200C150BE -:1024AC0004C1500CC1506CFD01031006EA38AA4857 +:1024AC0004C1500CC1506CFD05031006EA38AA4853 :1024BC00318D12AA48318E616B08616A08C1500EC9 :1024CC00FDF12AC0F690C1500CFDF12AC0CC0100E0 -:1024DC008C014C04DE2831249102EFFA711291EA3E +:1024DC008C014C04DE2831249302EFFA711293EA3A :1024EC00388C015010D605C15010C18C01D6044057 -:1024FC0000C1506CFDA9031006615901EFD250A523 -:10250C00FD4302EA38AA48318D12AA48318E616B1C -:10251C0008616A08C1500EFDF12AC050A5FD4302A6 -:10252C005004C1506CFDD902C0629C01EA388A4B40 +:1024FC0000C1506CFDAF031006615901EFD250A51D +:10250C00FD4D02EA38AA48318D12AA48318E616B12 +:10251C0008616A08C1500EFDF12AC050A5FD4D029C +:10252C005004C1506CFDE402C0629C01EA388A4B35 :10253C004E0161C3048A4A4E0117040200C15004C3 -:10254C00C1500CC1506CFDA9031006F6C1503EFDE4 +:10254C00C1500CC1506CFDAF031006F6C1503EFDDE :10255C00F12AC01006C6D7C78D3E4B3061F8ED028C :10256C00264A4028DE05A440ED0226F4408D309D1D :10257C003E8D305070D612307351230480001231CE :10258C00FF318E039D3F9FAEFBF68D3F7C804C95BB :10259C00DC1B8D3F318F241400EA38BDD8AA44FDD2 -:1025AC00DF0D1231FF318E03318F16EF198D3F3154 -:1025BC008F241400EA38BDD8AA46FDDF0D1231FF76 +:1025AC00E50D1231FF318E03318F16EF198D3F314E +:1025BC008F241400EA38BDD8AA46FDE50D1231FF70 :1025CC00318E03318F16EA388A427217F3031644A0 :1025DC00000171FE61C836FF001701DE02F6161706 -:1025EC00BD76C7500CFDF12AC0D2DF068D309D3E62 +:1025EC00BD78C7500CFDF12AC0D2DF068D309D3E60 :1025FC00EF047100B2FBF2C6D7C72008FBF8FF400E :10260C0007F901DD064007F902DF1C17040600FD7F :10261C00E92BD2DF0A8C069C058C079C04EF4ACC74 :10262C000563CC0400EF4217040600FDE92BD2DD54 -:10263C000F7100B2FB710390CC0500710291EF2970 +:10263C000F7100B2FB710392CC0500710293EF296C :10264C008C06318E318D080E07081C00BBEA388AC7 -:10265C004072ABFD320FBB8C019C05D1DF08CC0561 +:10265C004072ABFD380FBB8C019C05D1DF08CC055B :10266C0001CC0400EF038B9C0417040600FDF42B33 :10267C00D2DD06CC06C8CC07008C069FB1FB8C06BD :10268C00318E318D080E07081C00BD34AD34440169 @@ -366,18 +367,18 @@ :1026AC0001A0DC08CC031EF6BD42EF37AD344481EB :1026BC009DDC09CC030AC942F401EF27AD34440177 :1026CC009BDC09CC0305C942F401EF17AD3444017E -:1026DC0091DC09CC0300C942F401EF07710291C9E6 -:1026EC0042F4013132040C31249008CC0564CC0442 +:1026DC0091DC09CC0300C942F401EF07710293C9E4 +:1026EC0042F4013132040C31249208CC0564CC0440 :1026FC0000EF0D8C034E05DE078C039C05CC04000B :10270C008C059FAFFB8C049FB0FBFD762B8D444E4C :10271C0005DD2840AFFB0BDE054A440BDE1440AF51 :10272C00FB06DE054A4406DE09D5AFFBDF0DD444BB :10273C00DD095020C15011FD1B34C08FAFFB9D44EF :10274C00FDB32B1008C6D7C7D837C15002FD262BB6 -:10275C00C04008F90161F8712010055012FD4302C8 -:10276C008D376C0870C15002FD262BC05003FD4301 +:10275C00C04008F90161F8712010055012FD4D02BE +:10276C008D376C0870C15002FD262BC05003FD4DF7 :10277C00028D376C1870C15002FD262BC05016FD0F -:10278C0043025003FD372B625C01D1DD107170B335 +:10278C004D025003FD372B625C01D1DD107170B32B :10279C00FB5002C15013FD1B34C0F2EF01E2C6D74F :1027AC00C75004FD372B625C03D1DD405014FD4350 :1027BC002834B3FB895C9F998A0C7CFF50FF5C1416 @@ -385,8 +386,8 @@ :1027DC00997162075600316207058666D1DFF77181 :1027EC006307716B2734C6FB895CEB997128100564 :1027FC005002FD372BD2DD354008F901DF05500AB8 -:10280C00FD43028D376C1070C15002FD262BC0E0C9 -:10281C00FD4302D837C15002FD262BC05033FD4377 +:10280C00FD4D028D376C1070C15002FD262BC0E0BF +:10281C00FD4D02D837C15002FD262BC05033FD4D63 :10282C0002F0C15002FD262BC07178B3FBE0C15001 :10283C0013FD1B34C0C6D7C7C12004FBF8FFCC0264 :10284C00005004FD372B629C038C045C20D1DD0E00 @@ -395,7 +396,7 @@ :10287C00028C045C08D1DD0E8C036C029C038C0270 :10288C006C089C02EF138C045C04D1DD0C8C035C93 :10289C00FD9C038C026C049C028C03D1DD05501A48 -:1028AC00FD43028C0370C15004FD262BC08FB3FB7B +:1028AC00FD4D028C0370C15004FD262BC08FB3FB71 :1028BC005C9F728C03318E316D148C03318E314DD3 :1028CC00616D08616C5C606162629FB3FB8FBFFBE2 :1028DC007CFF50FF5E02D1DD278FBFFB7CFF5E02C9 @@ -404,18 +405,18 @@ :10290C00F21006C6D7D9A7FBC15006FD262BC0D99D :10291C00A8FBC15007FD262BC0D7FD1129F2D7C744 :10292C00711300711B20710303710205E0C1500388 -:10293C00FD262BC05013FD4302F0C15005FD262B84 -:10294C00C0500FC1E0FD262BC0500AFD430271039D -:10295C00055008FD4302501FC1E0FD262BC050124C -:10296C00FD43025003FD372B625C01D1DF03E2EF24 +:10293C00FD262BC05013FD4D02F0C15005FD262B7A +:10294C00C0500FC1E0FD262BC0500AFD4D02710393 +:10295C00055008FD4D02501FC1E0FD262BC0501242 +:10296C00FD4D025003FD372B625C01D1DF03E2EF1A :10297C0024F0FD372B629D363602F9C75008FD0E48 :10298C002BC05003C1FD262BC0710203711A20FD10 :10299C00CE2AF431F2C6D75003FD372B625C01D13D -:1029AC00DD155014FD4328FDAC275014FD4302E007 +:1029AC00DD155014FD4328FDAC275014FD4D02E0FD :1029BC00C15003FD262BC0711300711B2071030342 -:1029CC005014FD4302F0C1E0FD262BC0F0C15003B2 +:1029CC005014FD4D02F0C1E0FD262BC0F0C15003A8 :1029DC00FD262BC0D7C72004FBF8FFCC02008D319D -:1029EC009C035010C150A4FDD902C0629D31D44D3E +:1029EC009C035010C150A4FDE402C0629D31D45030 :1029FC00DD04F2EDAB2A8C037B315C08D1DD0F8D4D :102A0C00315C08D1DF05CC0210EF03CC02208C0323 :102A1C007B315C04D1DD158D315C04D1DF088C0277 @@ -426,27 +427,27 @@ :102A6C00D1DFF4716307716B278D315C40D1DD09C7 :102A7C005002C15012FD1B34C08D315C01D1DD08F8 :102A8C00E0C15012FD1B34C0717AFA8D315C41D11A -:102A9C00DD0C5A31BED831C15010FD4705C0F210C3 +:102A9C00DD0C5A31BED831C15010FD4C05C0F210BE :102AAC0004C6D7FD5327F2D7FDAC27F2D7C78FC684 :102ABC00FB7617FD4328664FC6FBDFF2F5C6FBF22B -:102ACC00C6D75064FD4302FDFF2B6261FB71119070 -:102ADC00F171149061DC70C15012FD4705C0FDC945 -:102AEC0035CD5D03D7C7C1C1FBF8FFAC0ABB17C11D -:102AFC005002C18C0270C1506CFDA9031006100469 +:102ACC00C6D75064FD4D02FDFF2B6261FB71119264 +:102ADC00F171149261DC70C15012FD4C05C0FDC93E +:102AEC0035CD5F03D7C7C1C1FBF8FFAC0ABB17C11B +:102AFC005002C18C0270C1506CFDAF031006100463 :102B0C00C6D7C7C1FBF8FFAC08C15002C18B70C15E -:102B1C00506CFD01031006C0C6D7C7880616677037 -:102B2C00C1C75084FD73031004C6D7C716C75084A1 -:102B3C00FDD902C0C6D7C74A2004DE045600EF02F6 +:102B1C00506CFD05031006C0C6D7C7880616677033 +:102B2C00C1C75084FD78031004C6D7C716C750849C +:102B3C00FDE402C0C6D7C74A2004DE045600EF02EB :102B4C0056014008F901DF048686EF0A4008F902B5 :102B5C00DF045104610666318F12504CD633514C50 :102B6C00D6610A045420BD38C6D740AFFB51DC05F2 :102B7C00CF04FC0FD740AFFB33DC05CF04FC0BD7E5 :102B8C0040AFFB0BDC05CF04FC07D740AFFB066165 :102B9C00D831320405CF04FC03D7D5AFFBDD04E5F7 -:102BAC0004FCD7F504FCD7D504F9DF04716390D786 -:102BBC00FDFF2B6261FB71719071149071779061C4 -:102BCC00C831629017716290717490711190F171AB -:102BDC00749061DC70C15012FD4705C0D7C716C791 +:102BAC0004FCD7F504FCD7D504F9DF04716392D784 +:102BBC00FDFF2B6261FB71719271149271779261BE +:102BCC00C831629217716292717492711192F171A3 +:102BDC00749261DC70C15012FD4C05C0D7C716C78A :102BEC005004FD0E2BC0C6D7C716C75002FD0E2BC6 :102BFC00C0C6D740AFFB0BDE02E2D7F2D7710001A3 :102C0C000571785005713AD5713BD18F10055CFC7C @@ -462,8 +463,8 @@ :102CAC00028F11055CFC9F110571603002D77178A1 :102CBC0030027148F000D7C788061666614FDD09EF :102CCC0067614EDE0396EF01866672C6D7C716178C -:102CDC0014AA0412A943DD29AA0412A923FD304D1C -:102CEC00C3AC02FD304D13C2BDD813FDAF0FDE0CCB +:102CDC0014AA0412A943DD29AA0412A923FDCE4E7D +:102CEC00C3AC02FDCE4E13C2BDD813FDB50FDE0C26 :102CFC001714AA0212AA0403BA04EF051714A9BAEE :102D0C0004AC041231FF319E03317F087208C6D720 :102D1C007100F200304400BFB601300188BF900151 @@ -472,48 +473,48 @@ :102D4C0001F6BFBC01BFB80150EEBFBA01A1BFB2C2 :102D5C0001C918FE00F6BE6EBE64BE6A7123047112 :102D6C0053078F06F9310507F5CDFBCB6CFF0071CE -:102D7C005391714291D730EF00BFB401F6BFBA0145 -:102D8C007108F200712304715307714391D78D5070 -:102D9C00B450D1DF6931D4D105715BD1E452D45236 -:102DAC00DD2E7140B2FBD851F1E734020023DD0671 +:102D7C006393715293D730EF00BFB401F6BFBA0121 +:102D8C007108F200712304715307715393D78D525C +:102D9C00B452D1DF6931D4D105715BD1E454D45430 +:102DAC00DD2E7140B2FBD853F1E734020023DD066F :102DBC0025DD0325DF05F6BE66EF06D9CCFBF1BE9B -:102DCC0066A4514A5120DF04F451B452CD5019D7A6 -:102DDC00CD501E7148B2FBD5CEFBDF04F6BE66D7D4 +:102DCC0066A4534A5320DF04F453B454CD5219D79C +:102DDC00CD521E7148B2FBD5CEFBDF04F6BE66D7D2 :102DEC00D9CCFBF14266FFDD15D9CCFBF112AE66F6 -:102DFC0043DE05A266FFEF03B266FFCD5003D7C7D3 +:102DFC0043DE05A266FFEF03B266FFCD5203D7C7D1 :102E0C00161714F6B9AA0412F6231231FF31AE03C9 :102E1C00316FBA02C6D7C7C1FBF8FF8C085080D6F9 :102E2C0012AB1413B9AB14AA0412A92312D927FBA1 -:102E3C00F133BDD813FD1B0EBA02C0C6D731649155 +:102E3C00F133BDD813FD210EBA02C0C6D73174933D :102E4C0001D74004F902DF10F6BE64BE6EBE6ABF45 -:102E5C008EFBBF94FBBF9AFB31549114308AFBFD5F +:102E5C008EFBBF94FBBF9AFB31649314308AFBFD4D :102E6C000B2E3090FBFD0B2E3096FBFD0B2EEF71D5 -:102E7C003174910D7173917108D2FBF454F453EFCA -:102E8C0060D453DF5A8F26FB9D534A541FDC1771B5 -:102E9C0000D2FB4028FBFFDD1CA4558F28FB4B55B3 -:102EAC00DE13F454EF0FD854F1A1605C1F9D5471E4 -:102EBC0008D2FBF455E854092AFB70C1308AFBFD9B -:102ECC00222EC0E854094AFB70C13090FBFD222E23 -:102EDC00C0E854096AFB70C13096FBFD222EC0B4C9 -:102EEC0053308AFBFDD92CF313BE6E3090FBFDD909 +:102E7C003104940D7103947108D2FBF456F455EFA0 +:102E8C0060D455DF5A8F26FB9D554A561FDC1771AF +:102E9C0000D2FB4028FBFFDD1CA4578F28FB4B57AF +:102EAC00DE13F456EF0FD856F1A1605C1F9D5671DE +:102EBC0008D2FBF457E856092AFB70C1308AFBFD97 +:102ECC00222EC0E856094AFB70C13090FBFD222E21 +:102EDC00C0E856096AFB70C13096FBFD222EC0B4C7 +:102EEC0055308AFBFDD92CF313BE6E3090FBFDD907 :102EFC002CF313BE6A3096FBFDD92CF313BE64D7AA :102F0C00C736F00071F4DC297170F000CE9D08CE4C :102F1C009EC0CE9F80F594FFF593FFF592FFE59749 :102F2C00FFE596FFE595FFE598FFCE9C7F7100A627 :102F3C00FB711BE3712BE3711AE7712BE7717A9D1F -:102F4C00710A9E31929E02EFFA710B9E710392717F -:102F5C001392712392C6D7C73102921E71029271DD +:102F4C00710A9E31929E02EFFA710B9E711394716D +:102F5C002394713394C6D7C73112941E7112947195 :102F6C000A9E31929E02EFFA34D4FB3692FF52073E :102F7C008B99A5A792DFF9710B9EC6D7C788061649 -:102F8C0031129215711292C7349CFB3092FF16527B +:102F8C0031229415712294C7349CFB3092FF165257 :102F9C00078B99A5A792DFF9C6667367189CFBC6C9 -:102FAC00D7C77103923114921E711392710A9E311C +:102FAC00D7C77113943124941E712394710A9E31E6 :102FBC00929E02EFFA3492FF369CFB52078B99A536 -:102FCC00A792DFF9710B9E31249213712392717BBE +:102FCC00A792DFF9710B9E31349413713394717B9A :102FDC009E8FDCFB9E9A8FDDFB9E9B717A9EC6D7E3 :102FEC00CFA7FB5CCFA8FB5FCFC8FB5DCFFCFB364C :102FFC00CFFDFBC9E5D3FBD7C7CFA4FB12CFA5FBF5 -:10300C0006CFCCFBFFF5CDFBF5CEFBF5CFFBF5D01A +:10300C0007CFCCFBFFF5CDFBF5CEFBF5CFFBF5D019 :10301C00FB5600664C64DE08723826FB0086EFF324 :10302C00C6D7C788061617F1E73403002361E3ED12 :10303C0053332361F8ED1F31B12361E3ED293125C1 @@ -532,7 +533,7 @@ :10310C000D3324120061F8ED27332361F8ED1833E9 :10311C00ED553334A6FB89615F99ED5F3330262979 :10312C00619466736718A4FBED5F3340A9FB6ADFFB -:10313C001340AAFB68DF0D674C6CDF0830C43F619D +:10313C001340AAFB68DF0D674C6CDF0830C73F619A :10314C0094713AD5679FABFBED5F3367D1DD0C30E3 :10315C00F73A619434C4FB89616F99ED5F33675C16 :10316C0002D1DD0730AF2A6194EF0B675C01D1DD32 @@ -548,7 +549,7 @@ :10320C0046EF0D4A4605DE08E846671811FDA44650 :10321C00ED5F33675C0F7266736218A4FBED5F336E :10322C004A4664DE1B4A4601DF0667D161F8570146 -:10323C00E846671826FBA4464A460561C871729198 +:10323C00E846671826FBA4464A460561C871029405 :10324C00ED5F33675C7F70C117F1243000FD882F70 :10325C00C0ED5F33675C3F70C117F1243000FD880F :10326C002FC0ED5F33675C0770C117F1243000FD90 @@ -556,13 +557,13 @@ :10328C00FD882FC0ED5F336770C117F1243000FD4E :10329C00882FC0ED5F33CEABAC710A9E31929E028B :1032AC00EFFAD592FFDF05710B9EEFED679E9971DA -:1032BC000B9E9FDBFBED5F33712292675C7F9FDC83 -:1032CC00FBED5F33712292675C3F9FDDFBED5F335B +:1032BC000B9E9FDBFBED5F33713294675C7F9FDC71 +:1032CC00FBED5F33713294675C3F9FDDFBED5F3349 :1032DC00675C3F9FDEFBEF7B675C1F9FDFFBEF7341 :1032EC0030B3386194679FE4FBEF68306E386194BB :1032FC00679FE5FBEF5D3090386194679FE8FBEFCB -:10330C0052675C01D1DD4CFD8742EF474A56C8DE5F -:10331C0042E85667185AFAA456EF38679D56EF33B1 +:10330C0052675C01D1DD4CFDCB43EF474A58C8DE18 +:10331C0042E85867185AFAA458EF38679D58EF33AB :10332C00675C01D1DD05711202EF03711302675C5A :10333C0002D1DD05712202EF03712302679FD3FBDB :10334C00EF1167318EEF0CEF0A664C5BDE0573678D @@ -570,14 +571,14 @@ :10336C00FD632FEF6B664C02DF1F8FA6FB5C0372B5 :10337C008F03FC5C03318E316D08616A08128F0378 :10338C00FC5C80312A6162EF56664C3DDF08AE90E2 -:10339C00BD58F858EF49664C3EDF04F859EF4066CB -:1033AC004C4FDF05FDAF42EF36664C61DF08E85647 +:10339C00BD5AF85AEF49664C3EDF04F85BEF4066C5 +:1033AC004C4FDF05FDF343EF36664C61DF08E85800 :1033BC00095AFA72EF29664C7FDF05FD6D3BEF1F52 -:1033CC00664C4EDF0B316493045210EF12F2EF0F88 +:1033CC00664C4EDF0B317495045210EF12F2EF0F76 :1033DC00664C5BDC0452FFEF06667309A4FB72C6F5 :1033EC00D7C788061617F1241000240500DC072423 -:1033FC004C00DD17EF17FDAD0217F104A4FB148987 -:10340C00617F99717AFA713292EF02A456C6D7C7CE +:1033FC004C00DD17EF17FDB70217F104A4FB14897D +:10340C00617F99717AFA714294EF02A458C6D7C7BA :10341C00C1C1FBF8FF4004F903DD064004F904DFE9 :10342C0038717BFA8C027309ACFB5E0AD1DF278CF6 :10343C0002318E04A4FB14896E0A99716207717AA9 @@ -585,48 +586,48 @@ :10345C00716307716B27717AFA1004C6D7CF03FC1E :10346C0003F501FCF505FCF507FCD7C78806161714 :10347C00F1E734020025DD3D23DD1725DD1C23DDBE -:10348C000523DD2BEF3B716292679F06FCCD5D033C +:10348C000523DD2BEF3B717294679F06FCCD5F0328 :10349C00EF2F675C839F03FCEF27675C039F05FCA2 -:1034AC00675C034C0261F8710294FD9D44EF126756 +:1034AC00675C034C0261F8711296FDE145EF1267FF :1034BC009F07FCEF0C6791DF08E0C15012FD1B3435 :1034CC00C0C6D7C71617F1E7240000DD2A23DD1E7E -:1034DC00240300DD0724FB00DD24EF2531129405C5 +:1034DC00240300DD0724FB00DD24EF2531229605B3 :1034EC00308000EF01F6086F04FC7208EF198F01B1 -:1034FC00FCF501FC72EF107132935235EF09F2EFCB +:1034FC00FCF501FC72EF107142955235EF09F2EFB9 :10350C000666730900FC72C6D7C71617F1E72400CC :10351C0000DD38241000DD1C23DD1C23DD30240EDF :10352C0000DD18241100DD1B240F00DD12243000F7 :10353C00DD15EF1EE2EF1D5202EF195204EF15528A :10354C0006EF115205EF0D5207EF09F2EF06520389 -:10355C00EF0252FFC6D7C7314492377143928D5C4C -:10356C009FACFB8D5B9FCBFB36D2FCC7D85BFDC9F8 -:10357C0036618A70618AFD0E37C0D860F1312F60D8 -:10358C009D5F8D5A4B5FDD0A7152928D5F9D5ACDB6 -:10359C005D034A5D05DE0830D3356194CD5D6BB4B7 -:1035AC005D7150F000CE300BCF170006CE3106FD0A -:1035BC00B502717A30710BE3710BE7C6D78D5F9D45 -:1035CC005A8D5F9FADFBD74004F903DF064004F929 -:1035DC0004DF02F2D73154920C7153927173928DB5 -:1035EC005F9D61EF313164921F716392717292D55C -:1035FC0006FCDF04F462EF0A8F06FC5002D6A160D1 -:10360C009D628D629D61EF0E317492068D629D619B -:10361C00EF048D5F9D618D619FADFBD861FD3B36E5 -:10362C00E861091C2270C15013FD4705C0F2D7C7D1 +:10355C00EF0252FFC6D7C7315494377153948D5E26 +:10356C009FACFB8D5D9FCBFB36D2FCC7D85DFDC9F4 +:10357C0036618A70618AFD0E37C0D862F1312F60D6 +:10358C009D618D5C4B61DD0A7162948D619D5CCD9A +:10359C005F034A5F05DE0830D3356194CD5F6BB4B1 +:1035AC005F7150F000CE300BCF170006CE3106FD08 +:1035BC00BF02717A30710BE3710BE7C6D78D619D39 +:1035CC005C8D619FADFBD74004F903DF064004F925 +:1035DC0004DF02F2D73164940C7163947103958DFE +:1035EC00619D63EF313174941F717394710295D5A1 +:1035FC0006FCDF04F464EF0A8F06FC5002D6A160CF +:10360C009D648D649D63EF0E310495068D649D63FE +:10361C00EF048D619D638D639FADFBD863FD3B36DD +:10362C00E863091C2270C15013FD4C05C0F2D7C7CA :10363C00C1C1FBF8FF8C02D1DF05F506FCEF1A8C3B :10364C00024C05DE06CF06FC02EF0E8C02318E1208 -:10365C0031FE03311F609F06FC8D634F06FCDD2895 -:10366C00CC011F8F06FC9D63CC00008B4C08DE1434 +:10365C0031FE03311F609F06FC8D654F06FCDD2893 +:10366C00CC011F8F06FC9D65CC00008B4C08DE1432 :10367C008B730912204F06FCDC058B9C01EF056156 -:10368C005900EFE78C019D5E1004C6D7C716710A6E +:10368C005900EFE78C019D601004C6D7C716710A6C :10369C00E7710BE37150F000CE300BCF17000666CC -:1036AC009E31FDB502717A30710BE33182E302EF8A +:1036AC009E31FDBF02717A30710BE33182E302EF80 :1036BC00FA8D1F7158F000710BE772C6D7C7C1C1E4 :1036CC00FBF8FF8FFCFB4E02DC03F2EF318C024F58 :1036DC00FDFBDC0452FFEF268C022FFCFB706131EA :1036EC00318D128FFDFB2FFCFB70613133BDD81374 -:1036FC00FD3D0EBB440001DC03F690BB8B72100445 +:1036FC00FD430EBB440001DC03F690BB8B7210043F :10370C00C6D7C7C1FBF8FFAC0814A91489708B612C -:10371C0028706131FD304D1344030071FEDC23AC85 +:10371C0028706131FDCE4E1344030071FEDC23ACE6 :10372C0008148A04819A04AC08148A044C11DC1025 :10373C00A9148B99AC0814CA0200AC0814CA031063 :10374C00EF72AC0814CA0400AC0814A914894DDE3D @@ -639,352 +640,377 @@ :1037BC0014CA0310C0C6D7EDC637C75600664C0AEC :1037CC00DE0BF0317E12F67810FC86EFF0C6D7C710 :1037DC00200CFBF8FF17040600C15006C150A8C10D -:1037EC005030FD01031006D2DD1BA4664A6608DECC +:1037EC005030FD05031006D2DD1BA4684A6808DEC4 :1037FC0003E2EF6A34E4FB895CFC99FDB338711089 :10380C00B2FBF2EF59300600C117040600C130E9D3 -:10381C00FBFD384D1004F4668FE4FB5C01D1DD2612 +:10381C00FBFDD64E1004F4688FE4FB5C01D1DD2671 :10382C004004F903DF205010C180FD1B34C0C736A3 :10383C00100571D4C6DE0F17C15006C150A8C15077 -:10384C0030FD010310064004F901DD114004F905B7 -:10385C00DD0B8FE4FB5C02D161E8FDC93FF2100C7B -:10386C00C6D7D9E5FBC15030FDD902C0629FE8FB39 +:10384C0030FD050310064004F901DD114004F905B3 +:10385C00DD0B8FE4FB5C02D161E8FD0D41F2100C35 +:10386C00C6D7D9E5FBC15030FDE402C0629FE8FB2E :10387C007130B5FB8FBDFB5C08D1DF06716307713E -:10388C006B27F2D7D9E8FBC1D9E7FBC15030FD73E8 +:10388C006B27F2D7D9E8FBC1D9E7FBC15030FD78E3 :10389C000310047130B5FB8FBDFB5C08D1DF0671E2 :1038AC006307716B27F2D7C7200CFBF8FFCC09001C :1038BC004007F901DF05CC0A02EF03CC0A10CC0B50 :1038CC00808FE4FB5C039C07717AFA8C07D1DF08CC :1038DC00717AD5CC0807EF06717BD5CC082F17046D -:1038EC000800C15004C150A0C15030FDA9031006FE +:1038EC000800C15004C150A0C15030FDAF031006F8 :1038FC00624C02DF067110B2FBEF047118B2FBC709 :10390C0036100571D4C6DE164004F903DF1017A17A -:10391C00C15006C150A8C15030FD01031006FDADC9 +:10391C00C15006C150A8C15030FD05031006FDB7BB :10392C00028FE4FB5C034E07DF9EF2100CC6D7D56A -:10393C0004F9DF03F6BD684004F901DD0AD472DD39 -:10394C0003B472D7CD72038F04F9318FE723DD0BEB +:10393C0004F9DF03F6BD6A4004F901DD0AD474DD35 +:10394C0003B474D7CD74038F04F9318FE723DD0BE7 :10395C0024020024030061C8ED603A8F06F931237C -:10396C003E301B004668DF0AE0C15010FD1B34C01E -:10397C00EF1D3077014668DF165002C15010FD1B59 -:10398C0034C0F6466EDF088FC8FB5010D6BD6EF6FD -:10399C00466EDD36B66E466EDF30710291EF2B301F -:1039AC001B004668DF13F64670DF18E0C15010FDAF -:1039BC001B34C0C9705307EF0A307701466861F8B1 -:1039CC00710291F6467061E8B67031349408712337 -:1039DC0093F6BD68EF1431249305F6BD68EF0BA682 -:1039EC0068F6466861F8C968FFFF314294194A6A63 -:1039FC0005DE16A46A4A6A05DF0FA46A5004C1509A -:103A0C0010FD1B34C0EF02F46A314494194A6C0562 -:103A1C00DE16A46C4A6C05DF0FA46C5008C1501064 -:103A2C00FD1B34C0EF02F46CD46DDD03B46DD731E3 -:103A3C005294174A6B05DE14A46B4A6B05DF0DA478 -:103A4C006B5010C1FD1B34C0EF02F46B4A6B066166 -:103A5C00F8CD6D25D7C736100571D4DE0630DB37AF +:10396C003E301B00466ADF0AE0C15010FD1B34C01C +:10397C00EF1D307701466ADF165002C15010FD1B57 +:10398C0034C0F64670DF088FC8FB5010D6BD70F6F9 +:10399C004670DD36B6704670DF30710293EF2B3017 +:1039AC001B00466ADF13F64672DF18E0C15010FDAB +:1039BC001B34C0C9725307EF0A307701466A61F8AD +:1039CC00710293F6467261E8B6723144960871330F +:1039DC0095F6BD6AEF1431349505F6BD6AEF0BA66A +:1039EC006AF6466A61F8C96AFFFF315296194A6C49 +:1039FC0005DE16A46C4A6C05DF0FA46C5004C15094 +:103A0C0010FD1B34C0EF02F46C315496194A6E054C +:103A1C00DE16A46E4A6E05DF0FA46E5008C150105E +:103A2C00FD1B34C0EF02F46ED46FDD03B46FD731DD +:103A3C006296174A6D05DE14A46D4A6D05DF0DA460 +:103A4C006D5010C1FD1B34C0EF02F46D4A6D066160 +:103A5C00F8CD6F25D7C736100571D4DE0630DB37AD :103A6C006194D24004F903DF1C3122070530E129AF -:103A7C0061943134930C7133935080C15012FD1BFF -:103A8C0034C0FDA33AFDC93A31549306715393FDEA -:103A9C008141FDC446C6D78F03FC5C01D1DD1DD42A -:103AAC0075DD03B475D7CD75098D5E4B74DD0D8D49 -:103ABC005E9D745040C15012FD1B34C0D74004F9B8 +:103A7C0061943144950C7143955080C15012FD1BDB +:103A8C0034C0FDA33AFDC93A31649506716395FDC6 +:103A9C00C542FD0848C6D78F03FC5C01D1DD1DD49F +:103AAC0077DD03B477D7CD77098D604B76DD0D8D3F +:103ABC00609D765040C15012FD1B34C0D74004F9B4 :103ACC0003DD04F6BD1AD7D5D0FBDF08F6461ADDA8 :103ADC0019B61AD7D9CCFBF1461ADD0ED9CCFB128C -:103AEC00AD1A43DE03A61AD7B61AD7C7FDAD028F9F -:103AFC00C4FB76F5C4FB717AFA5C10D161E87142B3 -:103B0C0093665C0FD1DD57665C01D1DD05F504F9D8 +:103AEC00AD1A43DE03A61AD7B61AD7C7FDB7028F95 +:103AFC00C4FB76F5C4FB717AFA5C10D161E87152A3 +:103B0C0095665C0FD1DD57665C01D1DD05F504F9D6 :103B1C00EF4C665C02D1DD11E0C15003FD262BC0D9 :103B2C00711300711B20710303665C04D1DD1171EC :103B3C001300711B20D503FC61F8710303FD69347C -:103B4C00665C08D161E87103035005FD4302710204 +:103B4C00665C08D161E87103035005FD4D027102FA :103B5C00035003C1FD262BC0711A20FDCE2AF2C6DC :103B6C00D7C756FF4A461361C8ED473C8F06F9315B :103B7C001505300400EF0F8F06F9314505300500AF -:103B8C00EF04D907F9F1609F28FC8D769F29FC7111 -:103B9C003490E661301271049061DC31196162621B +:103B8C00EF04D907F9F1609F28FC8D789F29FC710F +:103B9C003492E661301271049261DC311961626217 :103BAC009F2AFCE52BFC31140205308000EF01F656 -:103BBC00C131249405304000EF01F6C2616B0861FD +:103BBC00C131349605304000EF01F6C2616B0861EB :103BCC006A08C131340405302000EF01F6C2616B84 :103BDC0008616A08C131240205300800EF01F6C201 -:103BEC00616B08616A08C131549405300400EF011F -:103BFC00F6C2616B08616A08C131449404E6A1EF16 -:103C0C0001F6C2616B08616A08C131349403E6EFB6 +:103BEC00616B08616A08C131649605300400EF010D +:103BFC00F6C2616B08616A08C131549604E6A1EF04 +:103C0C0001F6C2616B08616A08C131449603E6EFA4 :103C1C0001F6C2616B08616A9F2CFCF1712404618E :103C2C00DC9F26FCF171540761DC9F27FCD846F120 :103C3C000104ECFC14A9148976A4466672C6D7C795 -:103C4C00FD74098F04F9318FE724000061F8ED2928 +:103C4C00FD7A098F04F9318FE724000061F8ED2922 :103C5C003E23DD1B2361F8ED333D2361F8EDAF3DD1 :103C6C002361F8EDF83D2361F8EDCC3EED263EF6F0 -:103C7C00BD6E7103914005F901DF2C3114941B4684 -:103C8C0068DD04F424EF02A4244A2465DC0FF6BD9D -:103C9C0068F504F9710293ED473FFDA223AD68442A -:103CAC000A0061D8ED473F712293FDD10471539006 -:103CBC00FDA2234007F903DF09710293F504F9ED26 -:103CCC00473FFD052640B1FB9BDE0D311494097175 -:103CDC000293F504F9ED473F714A277140110571C4 +:103C7C00BD707103934005F901DF2C3124961B466E +:103C8C006ADD04F424EF02A4244A2465DC0FF6BD9B +:103C9C006AF504F9711295ED4A3FFDA223AD6A4411 +:103CAC000A0061D8ED4A3F713295FDDE04715392E2 +:103CBC00FDA2234007F903DF09711295F504F9ED14 +:103CCC004A3FFD052640B1FB9BDE0D312496097160 +:103CDC001295F504F9ED4A3F714A277140110571AF :103CEC00301105713A22715A2271501105FD2B29A0 -:103CFC00D2DD09710293F504F9ED473F71103500DF +:103CFC00D2DD09711295F504F9ED4A3F71103500CA :103D0C00CF37001D714012054005F901DD06400555 :103D1C00F903DF05F5CDFBEF04CFCDFB03CF04F9A1 -:103D2C0002FD1129ED473FFD092CFD652C714A9DC3 +:103D2C0002FD1129ED4A3FFD092CFD652C714A9DC0 :103D3C00FD6934FD0430F537FF712BE0F505F971A1 -:103D4C000293CBE43FEFCBE6F6F0FDD104713BD40C +:103D4C001295CBE43FEFCBE6F6F0FDDE04713BD4ED :103D5C007112027123028F06F93105285004FD37C8 :103D6C002B625C03318E315D34B3FB8961689950F1 :103D7C0002FD372BD2DD067170B3FBEF047178B303 :103D8C00FBFDA223FD1C2D710806F9CF04F9038F4E :103D9C00A6FB5C02D1DD095080C15010FD1B34C064 -:103DAC00ED473FFD493F3144932FA478D478DD088B -:103DBC0031A4E00A31020C06712BE0FDB53F31A4B1 +:103DAC00ED4A3FFD4C3F3154952FA47AD47ADD086F +:103DBC0031A4E00A31020C06712BE0FDB83F31A4AE :103DCC00E01731040C13712BE05027C15005FD2670 -:103DDC002BC0CF04F904710293FDAA3F8F06F93171 -:103DEC00250731149403F504F9ED473FFD493F31A4 -:103DFC00020C14F0C15005FD262BC05005FD4302EA -:103E0C00FDB53FCF04F903FDAA3F8F06F931250715 -:103E1C0031149403F504F9ED473FF504F9CFCDFBCC -:103E2C0003F5CEFBF5D0FB715291F6426CFF61E8C5 -:103E3C00ED473FF6BD6E710391F5E4FBFDB33871B0 +:103DDC002BC0CF04F904711295FDAD3F8F06F9315C +:103DEC00250731249603F504F9ED4A3FFD4C3F318C +:103DFC00020C14F0C15005FD262BC05005FD4D02E0 +:103E0C00FDB83FCF04F903FDAD3F8F06F93125070F +:103E1C0031249603F504F9ED4A3FF504F9CFCDFBB7 +:103E2C0003F5CEFBF5D0FB716293F6426CFF61E8B3 +:103E3C00ED4A3FF6BD70710393F5E4FBFDB33871A9 :103E4C007AFAFD822DFD5C2CFDBA2C714B9D711301 :103E5C0002712302F5B4FBF5B5FBF5B6FBF5B7FB28 -:103E6C0031249102EFFACE3708CBE4BFFFCBE6FF4B +:103E6C0031249302EFFACE3708CBE4BFFFCBE6FF49 :103E7C00F3CED4FFCF37000971481205F6BEE0BE71 :103E8C00E2BED0716A27FDA329714307714B2771DC :103E9C0048100571481105713810057138110571FC :103EAC003302713B22715302715B22715810057100 -:103EBC00581105CF04F905712293F6BD68FD3D0A32 -:103ECC00F505F9F42431149404D432DD20E505F918 -:103EDC00E504F98F06F9312562F5F8FBF5F6FB5090 -:103EEC002EFD4302CF05F903E504F9EF4EFD2D0538 -:103EFC00FD3B2371730171320471430271039071A4 -:103F0C00529031949E02EFFA712AE7CEA409310443 -:103F1C00070261FDCEA408F464FD74093112940605 -:103F2C00CF04F905EF09712393E505F9E504F9715F -:103F3C002BE78F06F9312503F504F9C6D7D479DFC1 -:103F4C0019310200585003FD372B625C01D1DF0799 -:103F5C00F504F9710293D7E479D74A79F0DF073188 -:103F6C0004003AF479D74A79C8DF0AF504F97102EA -:103F7C0093CD79F0D7310200084A79FFDD1FA4797F -:103F8C00D7F0C15004FD262BC08FB3FB5C9F9FB3B1 -:103F9C00FB7110C4FB30F73A6194CD79F0D7310442 -:103FAC009106F504F9710293D7714393F478717209 -:103FBC0007FDB502717307D7FD8C05F2D7C7200C2E -:103FCC00FBF8FFFDAD028FEAFBF0F9E9FBF303FD13 -:103FDC00304D13BC048FECFBF0F9EBFBF303FD301D -:103FEC004D13BC028FEEFBF0F9EDFBF303FD304DEE -:103FFC0013BB717AFAAC04BDD8F6BDDAAC04311E31 -:10400C00BDDCF6BDDEFDF00DADD8BDDCADDABDDE40 -:10401C00AC02BDD8F6BDDAAC02311EDADCC3DADE96 -:10402C00C3BDDCF6BDDEFDF00DC0BDDEC0BDDCAD3C -:10403C00DEFD660FADD8BDDCADDABDDEABBDD8F6AE -:10404C00BDDAAB311EDADCC3DADEC3BDDCF6BDDEB5 -:10405C00FDF00DC0BDDEC0BDDCADDEFD660FDADAF5 -:10406C00ADD8FD9843C3C58D865C3FF0317E0440CE -:10407C00FC14C2C0B9A486F6BC08BC0A9C078C0709 -:10408C004C2EDD3D8D860E0770F161DC605C3FF0DF -:10409C00317E127940FCBDD8F6BDDA8C0773095C11 -:1040AC0022318FBDDC70BDDEFDF00DAC08BDDCAC8B -:1040BC000AFD660FADDABC0AADD8BC08615907EF32 -:1040CC00BDAC08BDD8AC0ABDDAC9DC0004F6FDBA3B -:1040DC000EC9DCFFFFF6FDBB0FADD8BD80AF3AFCBF -:1040EC004680DD11AF3CFCBF3EFCAF3AFCBF3CFC54 -:1040FC00AD80BF3AFCAF3CFC423EFCDC46AF3AFC28 -:10410C00423CFCDE3EAD26423AFCDE374A2A16DC47 -:10411C001A4A2AA0DE138D824B2ADE0DAF3AFC26FA -:10412C008444691061C8FD8141F42AAF3AFC4451C2 -:10413C0046DC0AAF3AFC241027BD28EF0DC928F83D -:10414C002AEF074A2AFF61E8A42AAF3EFC423CFC56 -:10415C00DC18AF3CFC423AFCDE10AF3AFC4628DEE1 -:10416C0009F482AF3AFCBD84EF074A82FF61E8A4F0 -:10417C0082100CC6D7C7FDAD02710A9E31929E0209 -:10418C00EFFA8E949F34FC8E969F35FC8E979F365B -:10419C00FC8E989F37FC8E939F38FC8E929F39FC37 -:1041AC00710B9E717AFA8F37FCFDCF0F76FD16439B -:1041BC0013BD7ED5EFFBDF0AD5F0FBDF05D5F1FB98 -:1041CC00DD25F6B1467EDF11C97E3722665C039190 -:1041DC00DF060A7E181A7F009617FD394413FD5925 -:1041EC004231649302EF61520692926934FC682E5C -:1041FC00FCDFF6AD7EBD7CF87AF3311C790AF9440C -:10420C00FEFFDD44D87AF101040AF914A944FFFF3A -:10421C00DF04E6B9EF0BD87AF101040AF914A9A16D -:10422C00B9FDAD02A0EFFBD5EFFBDF1CA0F0FBD579 -:10423C00F0FBDF14A0F1FBD5F1FBDF0CCFEFFBFFA4 -:10424C00CFF0FBFFCFF1FBFFC6717AFAD7C716D8B8 -:10425C007AF10744A800DC05716293EF1CF647DD88 -:10426C0018A47A4A7AA8DC05716293EF0CF87AF3F9 -:10427C00311CF6780AF9B7EFE4C6D7C756A896668C -:10428C00F0317E12F6B1780AF966D1DFF1FDAD029C -:10429C00F5EFFBF5F0FBF5F1FBF47A716393C67166 -:1042AC007AFAD7C72004FBF8FFD446DF168D7A9D27 -:1042BC0087FDAD0252069292692EFC68C0FCDFF6B7 -:1042CC00717AFA4A4606DE0EE84609C0FC9C03A445 -:1042DC00468C0372EF30F887F3311C790AF9BB3145 -:1042EC007293058B9C03EF0F8C019C03D487DF0525 -:1042FC00CD87A7EF02B487718071779361DC61FB86 -:10430C007171938C03721004C6D7C72008FBF8FF99 -:10431C008F37FCFDCF0F9C078F36FCFDCF0F9C0613 -:10432C008F35FCFDCF0F9C058F34FCFDCF0F9C040B -:10433C008F38FC9C038F39FC9C028C06318E011249 -:10434C00791A20BB8C075C03D1DF098C064C036106 -:10435C00C86179008C05318EB1610900BB313D1209 -:10436C000103BB8B0E04708C011C00BB8FF4FB4E45 -:10437C0003DC0E8C034FF4FBDC0B8C024FF5FBDCE7 -:10438C0004AB12EF03ABB1121008C6D7C7C3C120E0 -:10439C0008FBF8FFF661490A61F8614908DF07F785 -:1043AC00340000ED3544E6BC04F6BC06AC0ABC0295 -:1043BC00AC08BBAC06614902AC0461F8614900DE93 -:1043CC0028AC04BDD8AC06BDDAE1FD750FADDABC86 -:1043DC0006ADD8BC04ABBDD8AC02BDDAE1FD900F84 -:1043EC00ADDABC02ADD8BBEFCAAC06BC02AC04BBA8 -:1043FC00AC08BDD8AC0ABDDAAC04BDDCAC06FDF330 -:10440C000EAC04BDDCAC06FD660FE1FD900FADDA21 -:10441C00BC06ADD8BC04AC06614902AC0461F861C1 -:10442C004900DCC5AC0214AB12100CC6D7C7C120B6 -:10443C0004FBF8FF8F31FCFDCF0F9C034E04DF1CF7 -:10444C00AD7C467EDE07AD7E267C12EF40F6467EC6 -:10445C00DF07467CDD03E7EF34F7EF318C04318E58 -:10446C00B1128C03318E43DF18303822267C067E45 -:10447C00BB8C045C0391DF05AB041800BBAB12EFE3 -:10448C000C8C034E04DE0532A900EF01F71006C6B2 -:10449C00D7FDAD0231029408F6468ADD03B68AD701 -:1044AC00710394717AFA4004F904DF06715307F42E -:1044BC002CD7D9CFFBF1E7240000DD0F23DD182327 -:1044CC00DD0F23DD4C23DD2423DD33715307F42C66 -:1044DC00D7715207F42CD7D42CDF07715207E42C78 -:1044EC00EF05715307F42CC98AFA00D7D42CDF0AD4 -:1044FC00715207E42CC98AFA00D7F5CFFBD7D42C1C -:10450C00DF0A715307E42CC98AFA00D7CFCFFB021C -:10451C00D7FD2145D7D905FCF1E7240000DD09239F -:10452C00DD2123DD0923EF1B715307F42CD7D42C89 -:10453C00DF07715207E42CEF05715307F42CC98A7D -:10454C002D01D7715207E42CD731429101D77163F9 -:10455C0091D9CDFBF1E7240000DD1223DD1923DD19 -:10456C001123DD2623DD3423DD3923DD3FFDE14539 -:10457C00EF3DFD0246EF38D9CCFBC1AE6CFDC32C30 -:10458C00C0F313BE6C712304EF25F0C1AE6CFDC3F8 -:10459C002CC0F313BE6C712304EF14F6BE6C7122A5 -:1045AC0004EF0CCB6CFF00712304EF03FD76464047 -:1045BC0004F905DD064004F901DF0671230471637B -:1045CC00913164910FF6BE64BE6A31220402EF028F -:1045DC00F690BE6ED7CD2E47F48CAE6C317DBFCA33 -:1045EC00FCFD4B46D2DF0ED9CCFBC1AE6CFDC32C0F -:1045FC00C0F313BE6CD7FD4B46D2DD0DCD2E47F468 -:10460C008CAE6C317DBFCAFCD7E88C09342050804D -:10461C00D6BFC6FC22CAFCBDD8304700FD1B0EBF5E -:10462C00C8FC30C6FCFDD92CF313BE6CB42ED42EB2 -:10463C00DF0CCD2E47A48C4A8C1F61C8F48CD7405C -:10464C00AFFB0BDC05712304F2D740AFFB0661D83E -:10465C0031229011F0C1AE6CFDC32CC0F313BE6CB3 -:10466C00712204EF03FD7646E2D7716291F0C1AE80 -:10467C006CFDC32CC0F313BE6CA48D4A8D40DC378B -:10468C00F48DD88EF1313F0412FD14D88EF1BDD8C3 -:10469C005008FD6A0E087208E6D2DD040192DFFCB8 -:1046AC00896158D1DD05712204EF03712304A48EB6 -:1046BC004A8E2061C8F48ED7C73026FDC6D77180CC -:0B46CC00717DFADE035201D75200D7C7 -:1046D70061FC61FCC1C3C5C7520C929269D4FEC18B -:1046E700DFF88EFD708EFCC1717AFA4004F903DFA2 -:1046F7000530E1296194C09EFC609EFD34D4FE52D2 -:1047070006C0B9A5A592DFF9C6C4C2C061FC61DFC6 -:10471700520C929269D4FEC1DFF88EFD708EFCC1F7 -:104727008F4105775C04D1DD06675C01D1DD50312F -:104737003492367162077133928FB4FB5FBCFBD141 -:10474700DF1B8FB5FB5FBDFBD1DF128FB6FB5FBEF3 -:10475700FBD1DF098FB7FB5FBFFBD1DD0C316207F0 -:1047670002EFFA716307716B27717393FDAD2FF435 -:10477700227148500571605005717AFAED714867EA -:104787005C02D1DD16D422DD124A2202DD0DF422AD -:104797007148500571605005717AFA717AFA8D2265 -:1047A700318FE7240000DD0823DD1423DD2CEF4AD9 -:1047B700F4467140500571505005E422ED71488F61 -:1047C70040059D47715050058D479D49D847FD616C -:1047D70033629D48CD2202ED7148675C02D1DD1737 -:1047E700675C10D1DD05CD2203EF0F7148500571CD -:1047F700605005F422EF73CD22044A2203DF108DA7 -:10480700489F4005D848C1D847FDED33C0EF1F8FFB -:10481700400576717447DC054A4702DE0671605031 -:1048270005EF47C7D847FD2E30C071505005D8490E -:10483700F1242900DD27240400DD22242200DD1DC8 -:10484700241100DD0C240100DD13241E00DD0EEF12 -:104857000A4A4760DF07CD4761EF02A4474A2203B0 -:10486700DF08D847FD6133629D48C09EFC609EFD0E -:1048770034D4FE5206C0B9A5A592DFF961FCC1C7C1 -:10488700717AFA714AE5717BBD51405F0401D1DD50 -:1048970006F616A747DFF2300400BF2401F6BF2A49 -:1048A70001300B0BBF280100000000000000005181 -:1048B7000FBF28010000000000000000500FBF28B4 -:1048C70001710AE6712391C6C061FCC1C5717AFA0C -:1048D700D44CDD0BEA4A899E44A64AB44CEF3371A7 -:1048E7000AE6300400BF2401F6BF2A01300B0BBFD4 -:1048F70028010000000000000000510FBF28010040 -:1049070000000000000000500FBF280171139171D3 -:104917002391C4C061FC61EF520C929269D4FEC12D -:10492700DFF88EFD708EFCC12006FBF8FF7150305A -:1049370002CEABACCC0400F6BB31B2E21061790019 -:10494700F6614900DFF371603002EDD7498E519C63 -:1049570003713BE28C035C02D1DD1E8C035C08D142 -:10496700DF0971503002CC0400EFCC8C0570FDCF0D -:1049770034629E50CC0402EFBE8C035C03D1DF404F -:104987008E509C02715030028C04D1DF0E8C027065 -:10499700FD1535629C05CC0401EF328C044C02DF17 -:1049A7000671603002EF29CF34025A716030028CF1 -:1049B7000270C18C0570FD7734C0CF34024AEF1006 -:1049C7008C035C01D1DD0671603002EF03ED3E49D7 -:1049D7001006C09EFC609EFD34D4FE5206C0B9A5E9 -:1049E700A592DFF961FCC1C3C5C7520C929269D485 -:1049F700FEC1DFF88EFD708EFCC1710A9E31929E5A -:104A070002EFFA8FDEFB4F96FFDF198FDFFB4F9721 -:104A1700FFDF118FE0FB4F98FFDF095004C15011F2 -:104A2700FD1B34C0710B9EC09EFC609EFD34D4FEFE -:104A37005206C0B9A5A592DFF9C6C4C2C061FCA4DD -:104A47006461FCC1C3C5C7520C929269D4FEC1DF31 -:104A5700F88EFD708EFCC1C1FBF8FF8D1F9C018E87 -:104A670031318EE7240600DD0823DD0E23DD22EF3A -:104A770038717AFA8C019D5CEF2F717AFA4007F949 -:104A870001DF068C019D5BEF2051FF2E019D5BEF3F -:104A970018717AFA8C019D304004F903DD06400451 -:104AA700F904DF0530632561944031FF09DE05A075 -:104AB70031FFEF077158F000714292710BE3C0C0EC -:104AC7009EFC609EFD34D4FE5206C0B9A5A592DFB8 -:104AD700F9C6C4C2C061FCC7FDAD02D46461F83138 -:104AE700049327710393D464DD05B464CEABAC7132 -:104AF7007AFA5600664C0ADD1172F3311C79D8FC3C -:104B0700CEFC0061CA61A486EFEA717AFAF2C6D7D1 -:104B1700C7C1C1FBF8FFCC01008C014C0ADE36FD92 -:104B2700AD028C01F0317E0410FC14A96168DF0925 -:104B3700AC02B9717AFAF2EF1D8C01F0317E12796D -:104B470010FC614902DF06717AFAE2EF09717AFA1D -:104B5700615901EFC4E21004C6D7C72004FBF8FF70 -:104B6700F64210FC61F8ED444CFDAD02CC03008C1D -:104B7700034C0ADE3C8C03F0317E0410FC14A9615F -:104B870068DF05717AFAEF29717AFA8C0372F331CB -:104B97001C7910FCCEFC0061CA629C02D1DF0A8C32 -:104BA70003F0317E12E67810FCFDAD02615903EF88 -:104BB700BECC0200CC01018C02F0317E0410FC1443 -:104BC700A96168DD788C02F0317E127910FCE74329 -:104BD700DF658C014C0ADE5F8C01F0317E127910A3 -:104BE700FCE743DD4DFDAD028C01F0317E0410FC86 -:104BF70014A96168DF186169018C01F0317E12F632 -:104C07007810FC8C024E01DCED717AFAEF2F8C01E3 -:104C1700F0317E0410FC14A9128C02F0317E337837 -:104C270010FC8C01F0317E12E67810FC615902719C -:104C37007AFA615901EF9B615902EDBE4B00F21000 -:104C470004C6D761FF520C929269D4FEC1DFF88E79 -:104C5700FD708EFCC1717AFA8FE4FB5C03D1DD181D -:104C67004004F903DD064004F904DF0C3610057132 -:104C7700D4DE0530DB376194C09EFC609EFD34D4E2 -:104C8700FE5206C0B9A5A592DFF961FC61FC61FC83 -:104C970061FC61FC61FC61FC61FC61FC61FC61FC25 -:104CA70061FC61FC61FC61FC61FC61FC61FC61FC15 -:104CB70061FC61FC61FC61FC61FC61FC61FC61FC05 -:044CC70061FC61FC2F -:0A4CCC0000060C12181E242A3036D0 -:104CD600ACFB0000000060FE000000003B396235BE -:104CE6008C2255459A2D492E9D44613AFF084B3C2E -:104CF60028FC36FE20FE02F903F929FC30FE2AFCC8 -:104D06002BFC08F926FC6CFF1AFF6EFF6AFF64FF96 -:0A4D160027FC66FF2CFC555555558F -:104D2000FF0000000000983AF82AFF00000047004A -:104D3000317503F7332312D714AEF8C716AC061239 -:104D4000C5AC0416F643DD078B99A7A5B3EFF5C2F2 -:024D5000C6D7C4 -:024FF4000206B3 -:0A4FF60032313A33303A353500000D +:103EBC00581105CF04F905713295F6BD6AFD430A18 +:103ECC00F505F9F42431249604D432DD20E505F906 +:103EDC00E504F98F06F9312565F5F8FBF5F6FB508D +:103EEC002EFD4D02CF05F903E504F9EF51FD320526 +:103EFC00FD3B2371730171320471430271039271A2 +:103F0C00529231949E02EFFA712AE7FDCC3FCEA477 +:103F1C00093104070261FDCEA408F466FD7A09316B +:103F2C00229606CF04F905EF09713395E505F9E5FD +:103F3C0004F9712BE78F06F9312503F504F9C6D77F +:103F4C00D47BDF19310200585003FD372B625C0122 +:103F5C00D1DF07F504F9711295D7E47BD74A7BF0D2 +:103F6C00DF073104003AF47BD74A7BC8DF0AF5043B +:103F7C00F9711295CD7BF0D7310200084A7BFFDD39 +:103F8C001FA47BD7F0C15004FD262BC08FB3FB5C64 +:103F9C009F9FB3FB7110C4FB30F73A6194CD7BF05B +:103FAC00D731049306F504F9711295D7715395F432 +:103FBC007A717207FDBF02717307D7FD9205F2D7B4 +:103FCC00C72018FBF8FF8F30005F20FF708D0008B2 +:103FDC0072087CFF50FF6152629C0C8F31005F2194 +:103FEC00FF708D010872087CFF50FF6152629C0DBE +:103FFC00CC0E008F33005F23FF708D030872087C9A +:10400C00FF50FF6152629C0F8F34005F24FF708D54 +:10401C00040872087CFF50FF6152629C108F3500BF +:10402C005F25FF708D050872087CFF50FF6152629E +:10403C009C11CC12008F37005F27FF708D07087220 +:10404C00087CFF50FF6152629C138F3C005F2CFF79 +:10405C00708D0C0872087CFF50FF6152629C148FAB +:10406C003E005F2EFF708D0E0872087CFF50FF61C2 +:10407C0052629C15CC16008F12055F1105708F10C3 +:10408C00050872087CFF50FF6152629C178E207CE1 +:10409C00FF5B009B8E217CFF5B019C018E227CFFD1 +:1040AC005B029C028E237CFF5B03708F53000872B3 +:1040BC00087CFF50FF6152629C038E247CFF5B04E2 +:1040CC009C048E257CFF5B059C058E267CFF5B0685 +:1040DC009C068E277CFF5B079C078E2C7CFF5B0C61 +:1040EC009C088E2E7CFF5B0E9C098E2F7CFF5B0F39 +:1040FC009C0A8F11057CFF5F10059C0B001018C6E5 +:10410C00D7C7200CFBF8FFFDB7028FEAFBF0F9E9EB +:10411C00FBF303FDCE4E13BC048FECFBF0F9EBFB71 +:10412C00F303FDCE4E13BC028FEEFBF0F9EDFBF367 +:10413C0003FDCE4E13BB717AFAAC04BDD8F6BDDAD2 +:10414C00AC04311EBDDCF6BDDEFDF60DADD8BDDC1C +:10415C00ADDABDDEAC02BDD8F6BDDAAC02311EDA8A +:10416C00DCC3DADEC3BDDCF6BDDEFDF60DC0BDDEA4 +:10417C00C0BDDCADDEFD6C0FADD8BDDCADDABDDE97 +:10418C00ABBDD8F6BDDAAB311EDADCC3DADEC3BDAB +:10419C00DCF6BDDEFDF60DC0BDDEC0BDDCADDEFD6A +:1041AC006C0FDADAADD8FDDC44C3C58D885C3FF00A +:1041BC00317E0440FC14C2C0B9A488F6BC08BC0A09 +:1041CC009C078C074C2EDD3D8D880E0770F161DC51 +:1041DC00605C3FF0317E127940FCBDD8F6BDDA8CC4 +:1041EC000773095C22318FBDDC70BDDEFDF60DACB2 +:1041FC0008BDDCAC0AFD6C0FADDABC0AADD8BC084E +:10420C00615907EFBDAC08BDD8AC0ABDDAC9DC00FA +:10421C0004F6FDC00EC9DCFFFFF6FDC10FADD8BD25 +:10422C0082AF3AFC4682DD11AF3CFCBF3EFCAF3A9C +:10423C00FCBF3CFCAD82BF3AFCAF3CFC423EFCDC1C +:10424C0046AF3AFC423CFCDE3EAD26423AFCDE3741 +:10425C004A2A16DC1A4A2AA0DE138D844B2ADE0D5C +:10426C00AF3AFC268644691061C8FDC542F42AAFFA +:10427C003AFC445146DC0AAF3AFC241027BD28EF27 +:10428C000DC928F82AEF074A2AFF61E8A42AAF3E95 +:10429C00FC423CFCDC18AF3CFC423AFCDE10AF3A72 +:1042AC00FC4628DE09F484AF3AFCBD86EF074A844D +:1042BC00FF61E8A484100CC6D7C7FDB702710A9E33 +:1042CC0031929E02EFFA8E949F34FC8E969F35FCB1 +:1042DC008E979F36FC8E989F37FC8E939F38FC8E62 +:1042EC00929F39FC710B9E717AFA8F37FCFDD50FBA +:1042FC0076FD5A4413BD80D5EFFBDF0AD5F0FBDF0A +:10430C0005D5F1FBDD25F6B14680DF11C9803722DA +:10431C00665C0391DF060A80181A81009617FD7DF2 +:10432C004513FD9D4331749502EF615206929269DB +:10433C0034FC682EFCDFF6AD80BD7EF87CF3311CBE +:10434C00790AF944FEFFDD44D87CF101040AF91422 +:10435C00A944FFFFDF04E6B9EF0BD87CF101040A96 +:10436C00F914A9A1B9FDB702A0EFFBD5EFFBDF1C37 +:10437C00A0F0FBD5F0FBDF14A0F1FBD5F1FBDF0CBB +:10438C00CFEFFBFFCFF0FBFFCFF1FBFFC6717AFA4B +:10439C00D7C716D87CF10744A800DC05717295EFDD +:1043AC001CF647DD18A47C4A7CA8DC05717295EFDD +:1043BC000CF87CF3311CF6780AF9B7EFE4C6D7C7D2 +:1043CC0056A89666F0317E12F6B1780AF966D1DFFE +:1043DC00F1FDB702F5EFFBF5F0FBF5F1FBF47C71A9 +:1043EC007395C6717AFAD7C72004FBF8FFD446DF61 +:1043FC00168D7C9D89FDB70252069292692EFC683F +:10440C00C0FCDFF6717AFA4A4606DE0EE84609C0B1 +:10441C00FC9C03A4468C0372EF30F889F3311C79B1 +:10442C000AF9BB310296058B9C03EF0F8C019C03A0 +:10443C00D489DF05CD89A7EF02B489718071079605 +:10444C0061DC61FB7101968C03721004C6D7C72026 +:10445C0008FBF8FF8F37FCFDD50F9C078F36FCFD52 +:10446C00D50F9C068F35FCFDD50F9C058F34FCFDBC +:10447C00D50F9C048F38FC9C038F39FC9C028C0656 +:10448C00318E0112791A20BB8C075C03D1DF098CA9 +:10449C00064C0361C86179008C05318EB16109004D +:1044AC00BB313D120103BB8B0E04708C011C00BB95 +:1044BC008FF4FB4E03DC0E8C034FF4FBDC0B8C02F5 +:1044CC004FF5FBDC04AB12EF03ABB1121008C6D7EF +:1044DC00C7C3C12008FBF8FFF661490A61F86149BE +:1044EC0008DF07F7340000ED7945E6BC04F6BC069E +:1044FC00AC0ABC02AC08BBAC06614902AC0461F866 +:10450C00614900DE28AC04BDD8AC06BDDAE1FD7B08 +:10451C000FADDABC06ADD8BC04ABBDD8AC02BDDA6D +:10452C00E1FD960FADDABC02ADD8BBEFCAAC06BC50 +:10453C0002AC04BBAC08BDD8AC0ABDDAAC04BDDC23 +:10454C00AC06FDF90EAC04BDDCAC06FD6C0FE1FD58 +:10455C00960FADDABC06ADD8BC04AC06614902AC12 +:10456C000461F8614900DCC5AC0214AB12100CC636 +:10457C00D7C7C12004FBF8FF8F31FCFDD50F9C037E +:10458C004E04DF1CAD7E4680DE07AD80267E12EF2A +:10459C0040F64680DF07467EDD03E7EF34F7EF3168 +:1045AC008C04318EB1128C03318E43DF18303822DB +:1045BC00267E0680BB8C045C0391DF05AB041800DF +:1045CC00BBAB12EF0C8C034E04DE0532A900EF01DD +:1045DC00F71006C6D7FDB70231129608F6468CDDE9 +:1045EC0003B68CD7711396717AFA4004F904DF067E +:1045FC00715307F42CD7D9CFFBF1E7240000DD0F62 +:10460C0023DD1823DD0F23DD4C23DD2423DD337163 +:10461C005307F42CD7715207F42CD7D42CDF077125 +:10462C005207E42CEF05715307F42CC98CFA00D710 +:10463C00D42CDF0A715207E42CC98CFA00D7F5CFC1 +:10464C00FBD7D42CDF0A715307E42CC98CFA00D7A2 +:10465C00CFCFFB02D7FD6546D7D905FCF1E7240087 +:10466C0000DD0923DD2123DD0923EF1B715307F442 +:10467C002CD7D42CDF07715207E42CEF05715307AC +:10468C00F42CC98C2D01D7715207E42CD7315293DD +:10469C0001D7717393D9CDFBF1E7240000DD122310 +:1046AC00DD1923DD1123DD2623DD3423DD3923DD64 +:1046BC003FFD2547EF3DFD4647EF38D9CCFBC1AE5A +:1046CC006CFDC32CC0F313BE6C712304EF25F0C139 +:1046DC00AE6CFDC32CC0F313BE6C712304EF14F647 +:1046EC00BE6C712204EF0CCB6CFF00712304EF0342 +:1046FC00FDBA474004F905DD064004F901DF0671F7 +:10470C0023047173933174930FF6BE64BE6A312225 +:10471C000402EF02F690BE6ED7CD2E47F48EAE6C2F +:10472C00317DBFCAFCFD8F47D2DF0ED9CCFBC1AEA9 +:10473C006CFDC32CC0F313BE6CD7FD8F47D2DD0DBF +:10474C00CD2E47F48EAE6C317DBFCAFCD7E88E09F6 +:10475C0034205080D6BFC6FC22CAFCBDD8304700DE +:10476C00FD210EBFC8FC30C6FCFDD92CF313BE6C6A +:10477C00B42ED42EDF0CCD2E47A48E4A8E1F61C8CA +:10478C00F48ED740AFFB0BDC05712304F2D740AF9E +:10479C00FB0661D831229211F0C1AE6CFDC32CC066 +:1047AC00F313BE6C712204EF03FDBA47E2D77172AA +:1047BC0093F0C1AE6CFDC32CC0F313BE6CA48F4A36 +:1047CC008F40DC37F48FD890F1313F0412FD14D8B0 +:1047DC0090F1BDD85008FD700E087208E6D2DD04C9 +:1047EC000192DFFC896158D1DD05712204EF037160 +:1047FC002304A4904A902061C8F490D7C73026FDBA +:0F480C00C6D77180717DFADE035201D75200D7F3 +:10481B0061FC61FCC1C3C5C7520C929269D4FEC145 +:10482B00DFF88EFD708EFCC1717AFA4004F903DF5C +:10483B000530E1296194C09EFC609EFD34D4FE528C +:10484B0006C0B9A5A592DFF9C6C4C2C061FC61DF81 +:10485B00520C929269D4FEC1DFF88EFD708EFCC1B2 +:10486B008F4105775C04D1DD06675C01D1DD5031EA +:10487B004494367162077143948FB4FB5FBCFBD1D8 +:10488B00DF1B8FB5FB5FBDFBD1DF128FB6FB5FBEAE +:10489B00FBD1DF098FB7FB5FBFFBD1DD0C316207AB +:1048AB0002EFFA716307716B27710396FDAD2FF45D +:1048BB00227148500571605005717AFAEDB5496760 +:1048CB005C02D1DD16D422DD124A2202DD0DF42268 +:1048DB007148500571605005717AFA717AFA8D2220 +:1048EB00318FE7240000DD0823DD1423DD2CEF4A94 +:1048FB00F4467140500571505005E422EDB5498FD7 +:10490B0040059D47715050058D479D49D847FD6126 +:10491B0033629D48CD2202EDB549675C02D1DD17AC +:10492B00675C10D1DD05CD2203EF0F714850057187 +:10493B00605005F422EF73CD22044A2203DF108D61 +:10494B00489F4005D848C1D847FDED33C0EF1F8FB6 +:10495B00400576717447DC054A4702DE06716050EC +:10496B0005EF47C7D847FD2E30C071505005D849C9 +:10497B00F1242900DD27240400DD22242200DD1D83 +:10498B00241100DD0C240100DD13241E00DD0EEFCD +:10499B000A4A4760DF07CD4761EF02A4474A22036B +:1049AB00DF08D847FD6133629D48C09EFC609EFDC9 +:1049BB0034D4FE5206C0B9A5A592DFF961FCC1C380 +:1049CB00C5C7520C929269D4FEC1DFF88EFD708E72 +:1049DB00FCC1717AFA51405F0401D1DD06F616A7CE +:1049EB0047DFF2300400BF2401F6BF2A01300B0B66 +:1049FB00BF2801FDBF02300B0FBF2801FDBF0230E6 +:104A0B000F0FBF2801710AE6F6420C01DD33AF042C +:104A1B0001BF0C0131429329714293710BE2D84DC6 +:104A2B00FD31043184BD02EFFACBB422FBD84FF138 +:104A3B00BEB8714BE1714BE5710ABD8D4E9E44EFD3 +:104A4B000C714393714AE5717BBD712393C09EFC3E +:104A5B00609EFD34D4FE5206C0B9A5A592DFF9C6FF +:104A6B00C4C2C061FCC1C5717AFAD44CDD0BEA4AF1 +:104A7B00899E44A64AB44CEF33710AE6300400BF5A +:104A8B002401F6BF2A01300B0BBF280100000000E8 +:104A9B0000000000510FBF280100000000000000C3 +:104AAB0000500FBF2801711393712393C4C061FC95 +:104ABB0061EF520C929269D4FEC1DFF88EFD708EBD +:104ACB00FCC12006FBF8FF71503002CEABACCC041E +:104ADB0000F6BB31B2E210617900F6614900DFF3F9 +:104AEB0071603002ED754B8E519C03713BE28C0370 +:104AFB005C02D1DD1E8C035C08D1DF0971503002E2 +:104B0B00CC0400EFCC8C0570FDCF34629E50CC04EE +:104B1B0002EFBE8C035C03D1DF408E509C027150C0 +:104B2B0030028C04D1DF0E8C0270FD1535629C05B2 +:104B3B00CC0401EF328C044C02DF0671603002EFC3 +:104B4B0029CF34025A716030028C0270C18C05700F +:104B5B00FD7734C0CF34024AEF108C035C01D1DDFA +:104B6B000671603002EF03EDDC4A1006C09EFC605C +:104B7B009EFD34D4FE5206C0B9A5A592DFF961FCA7 +:104B8B00C1C3C5C7520C929269D4FEC1DFF88EFD2A +:104B9B00708EFCC1710A9E31929E02EFFA8FDEFB82 +:104BAB004F96FFDF198FDFFB4F97FFDF118FE0FB76 +:104BBB004F98FFDF095004C15011FD1B34C0710B1E +:104BCB009EC09EFC609EFD34D4FE5206C0B9A5A5C6 +:104BDB0092DFF9C6C4C2C061FCA46661FCC1C3C547 +:104BEB00C7520C929269D4FEC1DFF88EFD708EFC19 +:104BFB00C1C1FBF8FF8D1F9C018E31318EE724065E +:104C0B0000DD0823DD0E23DD22EF38717AFA8C01EB +:104C1B009D5EEF2F717AFA4007F901DF068C019D3B +:104C2B005DEF2051FF2E019D5DEF18717AFA8C011B +:104C3B009D304004F903DD064004F904DF053063C1 +:104C4B002561944031FF09DE05A031FFEF07715854 +:104C5B00F000715294710BE3C0C09EFC609EFD345A +:104C6B00D4FE5206C0B9A5A592DFF9C6C4C2C06175 +:104C7B00FCC7FDB702D46661F83114952771139503 +:104C8B00D466DD05B466CEABAC717AFA5600664CD1 +:104C9B000ADD1172F3311C79D8FCCEFC0061CA61BC +:104CAB00A486EFEA717AFAF2C6D7C7C1C1FBF8FF47 +:104CBB00CC01008C014C0ADE36FDB7028C01F031C1 +:104CCB007E0410FC14A96168DF09AC02B9717AFA91 +:104CDB00F2EF1D8C01F0317E127910FC614902DF7D +:104CEB0006717AFAE2EF09717AFA615901EFC4E2BF +:104CFB001004C6D7C72004FBF8FFF64210FC61F87E +:104D0B00EDE24DFDB702CC03008C034C0ADE3C8C6C +:104D1B0003F0317E0410FC14A96168DF05717AFA87 +:104D2B00EF29717AFA8C0372F3311C7910FCCEFCEB +:104D3B000061CA629C02D1DF0A8C03F0317E12E65D +:104D4B007810FCFDB702615903EFBECC0200CC0119 +:104D5B00018C02F0317E0410FC14A96168DD788CA3 +:104D6B0002F0317E127910FCE743DF658C014C0AAF +:104D7B00DE5F8C01F0317E127910FCE743DD4DFDD7 +:104D8B00B7028C01F0317E0410FC14A96168DF18A6 +:104D9B006169018C01F0317E12F67810FC8C024EA9 +:104DAB0001DCED717AFAEF2F8C01F0317E0410FCEF +:104DBB0014A9128C02F0317E337810FC8C01F03187 +:104DCB007E12E67810FC615902717AFA615901EF93 +:104DDB009B615902ED5C4D00F21004C6D761FF5286 +:104DEB000C929269D4FEC1DFF88EFD708EFCC171FE +:104DFB007AFA8FE4FB5C03D1DD184004F903DD067E +:104E0B004004F904DF0C36100571D4DE0530DB37B6 +:104E1B006194C09EFC609EFD34D4FE5206C0B9A5C1 +:104E2B00A592DFF961FC61FC61FC61FC61FC61FC3A +:104E3B0061FC61FC61FC61FC61FC61FC61FC61FC7F +:104E4B0061FC61FC61FC61FC61FC61FC61FC61FC6F +:0E4E5B0061FC61FC61FC61FC61FC61FC61FCBE +:0A4E6A0000060C12181E242A303630 +:104E7400ACFB0000000062FE000000003B3962351C +:104E84008C2299469A2D492EE145613A05094B3CFD +:104E940028FC36FE20FE02F903F929FC30FE2AFC28 +:104EA4002BFC08F926FC6CFF1AFF6EFF6AFF64FFF7 +:0A4EB40027FC66FF2CFC55555555F0 +:104EBE00FF0000000000983AF82AFF0000004700AB +:104ECE00317503F7332312D714AEF8C716AC06129A +:104EDE00C5AC0416F643DD078B99A7A5B3EFF5C253 +:024EEE00C6D725 +:024FF400323752 +:0A4FF60031323A35343A3031000010 :00000001FF  \ No newline at end of file diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index 6e9d00b..232324e 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 02560fc..79be30b 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,22 +1,22 @@ -78K0R Linker W1.33 Date:24 Aug 2011 Page: 1 +78K0R Linker W1.33 Date:25 Aug 2011 Page: 1 Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C - C78K0R\W2.13\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -pbsr - _k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Electro - nics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0r - m.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronics T - ools\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_t - wl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel reng - 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 kanaria.rel kanaria_c.rel get_e - i.rel + C78K0R\W2.13\lib78k0r\s0rm.rel -go85h,0FC00h,1024 -gi1B339499 + E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -bC:\Program File + s (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib + -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -iC:\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.re + l i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_t + wl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel tas + k_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 get_ei.rel Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map @@ -25,9 +25,9 @@ Direc-file:bsr_mcu.dr *** Link information *** - 71 output segment(s) - 3CB0H byte(s) real data - 6298 symbol(s) defined + 73 output segment(s) + 3E56H byte(s) real data + 6355 symbol(s) defined *** Memory map *** @@ -61,7 +61,8 @@ Direc-file:bsr_mcu.dr 00002H 00000H LDR_CNSL 00002H 00000H CSEG PAGE64KP LDR_CNSL hal 00002H 00000H -* gap * 00002H 0000EH + ??NMIROM 00002H 00002H CSEG +* gap * 00004H 0000CH @@VECT10 00010H 00004H CSEG AT @@VECT10 ini_VECT 00010H 00004H * gap * 00014H 00008H @@ -146,54 +147,55 @@ Direc-file:bsr_mcu.dr 000C4H 00000H LDR_CODL hal 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - LDR_CODE 000CEH 00982H CSEG - LDR_CODE loader 000CEH 00199H - LDR_CODE main 00267H 0004EH - LDR_CODE WDT 002B5H 00000H - LDR_CODE i2c_mcu 002B5H 002D7H + ?OCDSTAD 000CEH 0000AH CSEG + LDR_CODE 000D8H 0097EH CSEG + LDR_CODE loader 000D8H 00199H + LDR_CODE main 00271H 0004EH + LDR_CODE WDT 002BFH 00000H + LDR_CODE i2c_mcu 002BFH 002D3H LDR_CODE self_flash - 0058CH 00373H + 00592H 00373H LDR_CODE task_debug - 008FFH 00000H + 00905H 00000H LDR_CODE task_status - 008FFH 00075H - LDR_CODE hal 00974H 000DCH - FSL_CODE 00A50H 00322H CSEG + 00905H 00075H + LDR_CODE hal 0097AH 000DCH + FSL_CODE 00A56H 00322H CSEG FSL_CODE fsl_block_cmd - 00A50H 0002BH + 00A56H 0002BH FSL_CODE fsl_block_check - 00A7BH 00013H + 00A81H 00013H FSL_CODE fsl_common - 00A8EH 0014FH + 00A94H 0014FH FSL_CODE fsl_reset - 00BDDH 00001H + 00BE3H 00001H FSL_CODE fsl_si_ibf - 00BDEH 00064H + 00BE4H 00064H FSL_CODE fsl_phySwap - 00C42H 0004DH + 00C48H 0004DH FSL_CODE fsl_si_common - 00C8FH 00061H - FSL_CODE fsl_swap 00CF0H 00030H + 00C95H 00061H + FSL_CODE fsl_swap 00CF6H 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 + 00D26H 00052H + @@LCODE 00D78H 00277H CSEG + @@LCODE @cstart 00D78H 0006DH + @@LCODE @imul 00DE5H 00011H + @@LCODE @lumul 00DF6H 0002BH + @@LCODE @isdiv 00E21H 00022H + @@LCODE @iudiv 00E43H 0002DH + @@LCODE @isrem 00E70H 00021H + @@LCODE @iurem 00E91H 0002FH + @@LCODE @lsdiv 00EC0H 00039H + @@LCODE @ludiv 00EF9H 0003FH + @@LCODE @divuw 00F38H 00034H + @@LCODE @ladd 00F6CH 0000FH + @@LCODE @llsh 00F7BH 0001BH + @@LCODE @lursh 00F96H 0001FH + @@LCODE @iscmp 00FB5H 0000CH + @@LCODE @lband 00FC1H 00014H + @@LCODE @bcdtob 00FD5H 0001AH +* gap * 00FEFH 00007H MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -243,7 +245,7 @@ Direc-file:bsr_mcu.dr 0225CH 00030H @@CNST kanaria_c 0228CH 00000H - ROM_CODE 0228CH 0244BH CSEG + ROM_CODE 0228CH 0258FH CSEG ROM_CODE pm 0228CH 0097DH ROM_CODE i2c_ctr 02C09H 0005CH ROM_CODE i2c_twl 02C65H 0005EH @@ -257,262 +259,262 @@ Direc-file:bsr_mcu.dr ROM_CODE sw 0393BH 00126H ROM_CODE task_misc 03A61H 001EAH - ROM_CODE task_sys 03C4BH 0037EH + ROM_CODE task_sys 03C4BH 004C2H ROM_CODE pedo_alg_thre_det2 - 03FC9H 004D4H - ROM_CODE led_cam 0449DH 000B8H - ROM_CODE led_pow 04555H 0016FH - ROM_CODE voltable 046C4H 00000H + 0410DH 004D4H + ROM_CODE led_cam 045E1H 000B8H + ROM_CODE led_pow 04699H 0016FH + ROM_CODE voltable 04808H 00000H ROM_CODE pedo_lpf_coeff - 046C4H 00000H + 04808H 00000H ROM_CODE kanaria_c - 046C4H 00006H - ROM_CODE get_ei 046CAH 0000DH - @@BASE 046D7H 005F4H CSEG BASE - @@BASE loader 046D7H 00000H - @@BASE pm 046D7H 0003EH - @@BASE i2c_ctr 04715H 00170H - @@BASE main 04885H 00000H - @@BASE magic 04885H 00000H - @@BASE WDT 04885H 00000H - @@BASE i2c_mcu 04885H 00098H - @@BASE i2c_twl 0491DH 000D0H - @@BASE led 049EDH 00000H - @@BASE rtc 049EDH 0005DH - @@BASE vreg_ctr 04A4AH 00000H - @@BASE vreg_twl 04A4AH 00000H - @@BASE adc 04A4AH 00094H - @@BASE renge 04ADEH 0016CH - @@BASE accero 04C4AH 00049H + 04808H 00006H + ROM_CODE get_ei 0480EH 0000DH + @@BASE 0481BH 0064EH CSEG BASE + @@BASE loader 0481BH 00000H + @@BASE pm 0481BH 0003EH + @@BASE i2c_ctr 04859H 00170H + @@BASE main 049C9H 00000H + @@BASE magic 049C9H 00000H + @@BASE WDT 049C9H 00000H + @@BASE i2c_mcu 049C9H 000F2H + @@BASE i2c_twl 04ABBH 000D0H + @@BASE led 04B8BH 00000H + @@BASE rtc 04B8BH 0005DH + @@BASE vreg_ctr 04BE8H 00000H + @@BASE vreg_twl 04BE8H 00000H + @@BASE adc 04BE8H 00094H + @@BASE renge 04C7CH 0016CH + @@BASE accero 04DE8H 00049H @@BASE self_flash - 04C93H 00000H - @@BASE sw 04C93H 00000H + 04E31H 00000H + @@BASE sw 04E31H 00000H @@BASE task_debug - 04C93H 00000H + 04E31H 00000H @@BASE task_misc - 04C93H 00000H - @@BASE task_sys 04C93H 00000H + 04E31H 00000H + @@BASE task_sys 04E31H 00000H @@BASE pedo_alg_thre_det2 - 04C93H 00000H - @@BASE ini_VECT 04C93H 00038H + 04E31H 00000H + @@BASE ini_VECT 04E31H 00038H @@BASE task_status - 04CCBH 00000H - @@BASE led_cam 04CCBH 00000H - @@BASE led_pow 04CCBH 00000H - @@BASE hal 04CCBH 00000H + 04E69H 00000H + @@BASE led_cam 04E69H 00000H + @@BASE led_pow 04E69H 00000H + @@BASE hal 04E69H 00000H @@BASE batt_params - 04CCBH 00000H - @@BASE voltable 04CCBH 00000H + 04E69H 00000H + @@BASE voltable 04E69H 00000H @@BASE pedo_lpf_coeff - 04CCBH 00000H + 04E69H 00000H @@BASE kanaria_c - 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL @cstart 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL pm 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL led 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL rtc 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL adc 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL renge 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL accero 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL sw 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP + 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL @cstart 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL pm 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL led 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL rtc 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL adc 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL renge 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL accero 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL sw 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP @@CNSTL task_misc - 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL task_sys 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP + 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL task_sys 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL led_cam 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL led_pow 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP + 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL led_cam 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL led_pow 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP @@CNSTL batt_params - 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP - @@CNSTL voltable 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP + 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP + @@CNSTL voltable 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP @@CNSTL pedo_lpf_coeff - 04CCBH 00000H - @@CNSTL 04CCBH 00000H CSEG PAGE64KP + 04E69H 00000H + @@CNSTL 04E69H 00000H CSEG PAGE64KP @@CNSTL kanaria_c - 04CCBH 00000H - @@RLINIT 04CCBH 00000H CSEG UNIT64KP - @@RLINIT loader 04CCBH 00000H - @@RLINIT pm 04CCBH 00000H - @@RLINIT i2c_ctr 04CCBH 00000H - @@RLINIT main 04CCBH 00000H - @@RLINIT magic 04CCBH 00000H - @@RLINIT WDT 04CCBH 00000H - @@RLINIT i2c_mcu 04CCBH 00000H - @@RLINIT i2c_twl 04CCBH 00000H - @@RLINIT led 04CCBH 00000H - @@RLINIT rtc 04CCBH 00000H - @@RLINIT vreg_ctr 04CCBH 00000H - @@RLINIT vreg_twl 04CCBH 00000H - @@RLINIT adc 04CCBH 00000H - @@RLINIT renge 04CCBH 00000H - @@RLINIT accero 04CCBH 00000H + 04E69H 00000H + @@RLINIT 04E69H 00000H CSEG UNIT64KP + @@RLINIT loader 04E69H 00000H + @@RLINIT pm 04E69H 00000H + @@RLINIT i2c_ctr 04E69H 00000H + @@RLINIT main 04E69H 00000H + @@RLINIT magic 04E69H 00000H + @@RLINIT WDT 04E69H 00000H + @@RLINIT i2c_mcu 04E69H 00000H + @@RLINIT i2c_twl 04E69H 00000H + @@RLINIT led 04E69H 00000H + @@RLINIT rtc 04E69H 00000H + @@RLINIT vreg_ctr 04E69H 00000H + @@RLINIT vreg_twl 04E69H 00000H + @@RLINIT adc 04E69H 00000H + @@RLINIT renge 04E69H 00000H + @@RLINIT accero 04E69H 00000H @@RLINIT self_flash - 04CCBH 00000H - @@RLINIT sw 04CCBH 00000H + 04E69H 00000H + @@RLINIT sw 04E69H 00000H @@RLINIT task_debug - 04CCBH 00000H + 04E69H 00000H @@RLINIT task_misc - 04CCBH 00000H - @@RLINIT task_sys 04CCBH 00000H + 04E69H 00000H + @@RLINIT task_sys 04E69H 00000H @@RLINIT pedo_alg_thre_det2 - 04CCBH 00000H - @@RLINIT ini_VECT 04CCBH 00000H + 04E69H 00000H + @@RLINIT ini_VECT 04E69H 00000H @@RLINIT task_status - 04CCBH 00000H - @@RLINIT led_cam 04CCBH 00000H - @@RLINIT led_pow 04CCBH 00000H - @@RLINIT hal 04CCBH 00000H + 04E69H 00000H + @@RLINIT led_cam 04E69H 00000H + @@RLINIT led_pow 04E69H 00000H + @@RLINIT hal 04E69H 00000H @@RLINIT batt_params - 04CCBH 00000H - @@RLINIT voltable 04CCBH 00000H + 04E69H 00000H + @@RLINIT voltable 04E69H 00000H @@RLINIT pedo_lpf_coeff - 04CCBH 00000H + 04E69H 00000H @@RLINIT kanaria_c - 04CCBH 00000H - @@RLINIT @rom 04CCBH 00000H - @@CODEL 04CCBH 00000H CSEG - @@CODEL pm 04CCBH 00000H - @@CODEL i2c_ctr 04CCBH 00000H - @@CODEL magic 04CCBH 00000H - @@CODEL i2c_twl 04CCBH 00000H - @@CODEL led 04CCBH 00000H - @@CODEL rtc 04CCBH 00000H - @@CODEL vreg_ctr 04CCBH 00000H - @@CODEL vreg_twl 04CCBH 00000H - @@CODEL adc 04CCBH 00000H - @@CODEL renge 04CCBH 00000H - @@CODEL accero 04CCBH 00000H - @@CODEL sw 04CCBH 00000H + 04E69H 00000H + @@RLINIT @rom 04E69H 00000H + @@CODEL 04E69H 00000H CSEG + @@CODEL pm 04E69H 00000H + @@CODEL i2c_ctr 04E69H 00000H + @@CODEL magic 04E69H 00000H + @@CODEL i2c_twl 04E69H 00000H + @@CODEL led 04E69H 00000H + @@CODEL rtc 04E69H 00000H + @@CODEL vreg_ctr 04E69H 00000H + @@CODEL vreg_twl 04E69H 00000H + @@CODEL adc 04E69H 00000H + @@CODEL renge 04E69H 00000H + @@CODEL accero 04E69H 00000H + @@CODEL sw 04E69H 00000H @@CODEL task_misc - 04CCBH 00000H - @@CODEL task_sys 04CCBH 00000H + 04E69H 00000H + @@CODEL task_sys 04E69H 00000H @@CODEL pedo_alg_thre_det2 - 04CCBH 00000H - @@CODEL ini_VECT 04CCBH 00000H - @@CODEL led_cam 04CCBH 00000H - @@CODEL led_pow 04CCBH 00000H + 04E69H 00000H + @@CODEL ini_VECT 04E69H 00000H + @@CODEL led_cam 04E69H 00000H + @@CODEL led_pow 04E69H 00000H @@CODEL batt_params - 04CCBH 00000H - @@CODEL voltable 04CCBH 00000H + 04E69H 00000H + @@CODEL voltable 04E69H 00000H @@CODEL pedo_lpf_coeff - 04CCBH 00000H + 04E69H 00000H @@CODEL kanaria_c - 04CCBH 00000H -* gap * 04CCBH 00001H - @@CNSTL 04CCCH 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04CCCH 0000AH - @@R_INIT 04CD6H 0004AH CSEG UNIT64KP - @@R_INIT @cstart 04CD6H 00000H - @@R_INIT loader 04CD6H 00000H - @@R_INIT pm 04CD6H 00000H - @@R_INIT i2c_ctr 04CD6H 00000H - @@R_INIT main 04CD6H 00000H - @@R_INIT magic 04CD6H 00000H - @@R_INIT WDT 04CD6H 00000H - @@R_INIT i2c_mcu 04CD6H 00000H - @@R_INIT i2c_twl 04CD6H 00000H - @@R_INIT led 04CD6H 00000H - @@R_INIT rtc 04CD6H 00000H - @@R_INIT vreg_ctr 04CD6H 00000H - @@R_INIT vreg_twl 04CD6H 00000H - @@R_INIT adc 04CD6H 0000CH - @@R_INIT renge 04CE2H 00014H - @@R_INIT accero 04CF6H 00000H + 04E69H 00000H +* gap * 04E69H 00001H + @@CNSTL 04E6AH 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04E6AH 0000AH + @@R_INIT 04E74H 0004AH CSEG UNIT64KP + @@R_INIT @cstart 04E74H 00000H + @@R_INIT loader 04E74H 00000H + @@R_INIT pm 04E74H 00000H + @@R_INIT i2c_ctr 04E74H 00000H + @@R_INIT main 04E74H 00000H + @@R_INIT magic 04E74H 00000H + @@R_INIT WDT 04E74H 00000H + @@R_INIT i2c_mcu 04E74H 00000H + @@R_INIT i2c_twl 04E74H 00000H + @@R_INIT led 04E74H 00000H + @@R_INIT rtc 04E74H 00000H + @@R_INIT vreg_ctr 04E74H 00000H + @@R_INIT vreg_twl 04E74H 00000H + @@R_INIT adc 04E74H 0000CH + @@R_INIT renge 04E80H 00014H + @@R_INIT accero 04E94H 00000H @@R_INIT self_flash - 04CF6H 00000H - @@R_INIT sw 04CF6H 00000H + 04E94H 00000H + @@R_INIT sw 04E94H 00000H @@R_INIT task_debug - 04CF6H 00000H + 04E94H 00000H @@R_INIT task_misc - 04CF6H 00026H - @@R_INIT task_sys 04D1CH 00000H + 04E94H 00026H + @@R_INIT task_sys 04EBAH 00000H @@R_INIT pedo_alg_thre_det2 - 04D1CH 00000H - @@R_INIT ini_VECT 04D1CH 00000H + 04EBAH 00000H + @@R_INIT ini_VECT 04EBAH 00000H @@R_INIT task_status - 04D1CH 00000H - @@R_INIT led_cam 04D1CH 00000H - @@R_INIT led_pow 04D1CH 00004H - @@R_INIT hal 04D20H 00000H + 04EBAH 00000H + @@R_INIT led_cam 04EBAH 00000H + @@R_INIT led_pow 04EBAH 00004H + @@R_INIT hal 04EBEH 00000H @@R_INIT batt_params - 04D20H 00000H - @@R_INIT voltable 04D20H 00000H + 04EBEH 00000H + @@R_INIT voltable 04EBEH 00000H @@R_INIT pedo_lpf_coeff - 04D20H 00000H + 04EBEH 00000H @@R_INIT kanaria_c - 04D20H 00000H - @@R_INIT @rom 04D20H 00000H - @@R_INIS 04D20H 00010H CSEG UNIT64KP - @@R_INIS @cstart 04D20H 00000H - @@R_INIS loader 04D20H 00000H - @@R_INIS pm 04D20H 00002H - @@R_INIS i2c_ctr 04D22H 00002H - @@R_INIS main 04D24H 00000H - @@R_INIS magic 04D24H 00000H - @@R_INIS WDT 04D24H 00000H - @@R_INIS i2c_mcu 04D24H 00000H - @@R_INIS i2c_twl 04D24H 00000H - @@R_INIS led 04D24H 00000H - @@R_INIS rtc 04D24H 00000H - @@R_INIS vreg_ctr 04D24H 00000H - @@R_INIS vreg_twl 04D24H 00000H - @@R_INIS adc 04D24H 00000H - @@R_INIS renge 04D24H 00000H - @@R_INIS accero 04D24H 00000H + 04EBEH 00000H + @@R_INIT @rom 04EBEH 00000H + @@R_INIS 04EBEH 00010H CSEG UNIT64KP + @@R_INIS @cstart 04EBEH 00000H + @@R_INIS loader 04EBEH 00000H + @@R_INIS pm 04EBEH 00002H + @@R_INIS i2c_ctr 04EC0H 00002H + @@R_INIS main 04EC2H 00000H + @@R_INIS magic 04EC2H 00000H + @@R_INIS WDT 04EC2H 00000H + @@R_INIS i2c_mcu 04EC2H 00000H + @@R_INIS i2c_twl 04EC2H 00000H + @@R_INIS led 04EC2H 00000H + @@R_INIS rtc 04EC2H 00000H + @@R_INIS vreg_ctr 04EC2H 00000H + @@R_INIS vreg_twl 04EC2H 00000H + @@R_INIS adc 04EC2H 00000H + @@R_INIS renge 04EC2H 00000H + @@R_INIS accero 04EC2H 00000H @@R_INIS self_flash - 04D24H 00000H - @@R_INIS sw 04D24H 00000H + 04EC2H 00000H + @@R_INIS sw 04EC2H 00000H @@R_INIS task_debug - 04D24H 00000H + 04EC2H 00000H @@R_INIS task_misc - 04D24H 00000H - @@R_INIS task_sys 04D24H 00002H + 04EC2H 00000H + @@R_INIS task_sys 04EC2H 00002H @@R_INIS pedo_alg_thre_det2 - 04D26H 00006H - @@R_INIS ini_VECT 04D2CH 00000H + 04EC4H 00006H + @@R_INIS ini_VECT 04ECAH 00000H @@R_INIS task_status - 04D2CH 00000H - @@R_INIS led_cam 04D2CH 00002H - @@R_INIS led_pow 04D2EH 00002H - @@R_INIS hal 04D30H 00000H + 04ECAH 00000H + @@R_INIS led_cam 04ECAH 00002H + @@R_INIS led_pow 04ECCH 00002H + @@R_INIS hal 04ECEH 00000H @@R_INIS batt_params - 04D30H 00000H - @@R_INIS voltable 04D30H 00000H + 04ECEH 00000H + @@R_INIS voltable 04ECEH 00000H @@R_INIS pedo_lpf_coeff - 04D30H 00000H + 04ECEH 00000H @@R_INIS kanaria_c - 04D30H 00000H - @@R_INIS @rom 04D30H 00000H - @@LCODEL 04D30H 00022H CSEG - @@LCODEL abs 04D30H 00008H - @@LCODEL memcpy_n 04D38H 0001AH -* gap * 04D52H 002A2H + 04ECEH 00000H + @@R_INIS @rom 04ECEH 00000H + @@LCODEL 04ECEH 00022H CSEG + @@LCODEL abs 04ECEH 00008H + @@LCODEL memcpy_n 04ED6H 0001AH +* gap * 04EF0H 00104H MGC_VER 04FF4H 00002H CSEG AT MGC_VER magic 04FF4H 00002H MGC_TAIL 04FF6H 0000AH CSEG AT @@ -738,7 +740,7 @@ Direc-file:bsr_mcu.dr @@INIS kanaria_c FFE30H 00000H @@INIS @rom FFE30H 00000H - @@DATS FFE30H 00060H DSEG SADDRP + @@DATS FFE30H 00062H DSEG SADDRP @@DATS @cstart FFE30H 00000H @@DATS loader FFE30H 00000H @@DATS pm FFE30H 00016H @@ -746,80 +748,80 @@ Direc-file:bsr_mcu.dr @@DATS main FFE4AH 00000H @@DATS magic FFE4AH 00000H @@DATS WDT FFE4AH 00000H - @@DATS i2c_mcu FFE4AH 00006H - @@DATS i2c_twl FFE50H 00000H - @@DATS led FFE50H 00006H - @@DATS rtc FFE56H 00000H - @@DATS vreg_ctr FFE56H 00004H - @@DATS vreg_twl FFE5AH 00000H - @@DATS adc FFE5AH 0000AH - @@DATS renge FFE64H 00002H - @@DATS accero FFE66H 00002H + @@DATS i2c_mcu FFE4AH 00008H + @@DATS i2c_twl FFE52H 00000H + @@DATS led FFE52H 00006H + @@DATS rtc FFE58H 00000H + @@DATS vreg_ctr FFE58H 00004H + @@DATS vreg_twl FFE5CH 00000H + @@DATS adc FFE5CH 0000AH + @@DATS renge FFE66H 00002H + @@DATS accero FFE68H 00002H @@DATS self_flash - FFE68H 00000H - @@DATS sw FFE68H 0000CH + FFE6AH 00000H + @@DATS sw FFE6AH 0000CH @@DATS task_debug - FFE74H 00000H + FFE76H 00000H @@DATS task_misc - FFE74H 00004H - @@DATS task_sys FFE78H 00002H + FFE76H 00004H + @@DATS task_sys FFE7AH 00002H @@DATS pedo_alg_thre_det2 - FFE7AH 0000EH - @@DATS ini_VECT FFE88H 00000H + FFE7CH 0000EH + @@DATS ini_VECT FFE8AH 00000H @@DATS task_status - FFE88H 00002H - @@DATS led_cam FFE8AH 00002H - @@DATS led_pow FFE8CH 00004H - @@DATS hal FFE90H 00000H + FFE8AH 00002H + @@DATS led_cam FFE8CH 00002H + @@DATS led_pow FFE8EH 00004H + @@DATS hal FFE92H 00000H @@DATS batt_params - FFE90H 00000H - @@DATS voltable FFE90H 00000H + FFE92H 00000H + @@DATS voltable FFE92H 00000H @@DATS pedo_lpf_coeff - FFE90H 00000H + FFE92H 00000H @@DATS kanaria_c - FFE90H 00000H - @@DATS @rom FFE90H 00000H - @@BITS FFE90H 00005H BSEG - @@BITS @cstart FFE90H.0 00000H.0 - @@BITS loader FFE90H.0 00000H.0 - @@BITS pm FFE90H.0 00001H.0 - @@BITS i2c_ctr FFE91H.0 00000H.0 - @@BITS main FFE91H.0 00000H.1 - @@BITS magic FFE91H.1 00000H.0 - @@BITS WDT FFE91H.1 00000H.0 - @@BITS i2c_mcu FFE91H.1 00000H.3 - @@BITS i2c_twl FFE91H.4 00000H.0 - @@BITS led FFE91H.4 00000H.4 - @@BITS rtc FFE92H.0 00000H.3 - @@BITS vreg_ctr FFE92H.3 00000H.1 - @@BITS vreg_twl FFE92H.4 00000H.0 - @@BITS adc FFE92H.4 00000H.4 - @@BITS renge FFE93H.0 00000H.2 - @@BITS accero FFE93H.2 00000H.0 + FFE92H 00000H + @@DATS @rom FFE92H 00000H + @@BITS FFE92H 00005H BSEG + @@BITS @cstart FFE92H.0 00000H.0 + @@BITS loader FFE92H.0 00000H.0 + @@BITS pm FFE92H.0 00001H.0 + @@BITS i2c_ctr FFE93H.0 00000H.0 + @@BITS main FFE93H.0 00000H.1 + @@BITS magic FFE93H.1 00000H.0 + @@BITS WDT FFE93H.1 00000H.0 + @@BITS i2c_mcu FFE93H.1 00000H.4 + @@BITS i2c_twl FFE93H.5 00000H.0 + @@BITS led FFE93H.5 00000H.4 + @@BITS rtc FFE94H.1 00000H.3 + @@BITS vreg_ctr FFE94H.4 00000H.1 + @@BITS vreg_twl FFE94H.5 00000H.0 + @@BITS adc FFE94H.5 00000H.4 + @@BITS renge FFE95H.1 00000H.2 + @@BITS accero FFE95H.3 00000H.0 @@BITS self_flash - FFE93H.2 00000H.0 - @@BITS sw FFE93H.2 00000H.1 + FFE95H.3 00000H.0 + @@BITS sw FFE95H.3 00000H.1 @@BITS task_debug - FFE93H.3 00000H.0 + FFE95H.4 00000H.0 @@BITS task_misc - FFE93H.3 00000H.3 - @@BITS task_sys FFE93H.6 00000H.0 + FFE95H.4 00000H.3 + @@BITS task_sys FFE95H.7 00000H.0 @@BITS pedo_alg_thre_det2 - FFE93H.6 00000H.2 - @@BITS ini_VECT FFE94H.0 00000H.0 + FFE95H.7 00000H.2 + @@BITS ini_VECT FFE96H.1 00000H.0 @@BITS task_status - FFE94H.0 00000H.0 - @@BITS led_cam FFE94H.0 00000H.1 - @@BITS led_pow FFE94H.1 00000H.0 - @@BITS hal FFE94H.1 00000H.6 + FFE96H.1 00000H.0 + @@BITS led_cam FFE96H.1 00000H.1 + @@BITS led_pow FFE96H.2 00000H.0 + @@BITS hal FFE96H.2 00000H.6 @@BITS batt_params - FFE94H.7 00000H.0 - @@BITS voltable FFE94H.7 00000H.0 + FFE97H.0 00000H.0 + @@BITS voltable FFE97H.0 00000H.0 @@BITS pedo_lpf_coeff - FFE94H.7 00000H.0 + FFE97H.0 00000H.0 @@BITS kanaria_c - FFE94H.7 00000H.0 -* gap * FFE95H 0003FH + FFE97H.0 00000H.0 +* gap * FFE97H 0003DH @@SEGREG FFED4H 00004H DSEG AT @@SEGREG @SEGREG FFED4H 00004H @@RTARG0 FFED8H 00008H DSEG AT diff --git a/trunk/config.h b/trunk/config.h index 180bdac..bc09d8a 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -3,7 +3,7 @@ #define MCU_VER_MAJOR 0x02 -#define MCU_VER_MINOR 0x06 +#define MCU_VER_MINOR 0x07 // デバッグ向けスイッチ @@ -16,7 +16,7 @@ //#define _FORCE_TAIKENDAI_ //#define _FORCE_TAIKENDAI_NBD_ -//#define _DBG_CHK_OFF_LEAK_ // OFF時リーク電流のチェック(デバッガで確認) +#define _DBG_CHK_OFF_LEAK_ // OFF時リーク電流のチェック(デバッガで確認) //#define _DBG_NOP_ // ブレークを貼るためにNOP()を有効にしたいとき //#define _ENABLE_HAL_ // デバッグ用にHALを有効にする。コメントアウトでスルーになる。 diff --git a/trunk/hoge.bin b/trunk/hoge.bin index 9cd1e76..a252c7f 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/i2c_mcu.c b/trunk/i2c_mcu.c index 7776291..4713123 100644 --- a/trunk/i2c_mcu.c +++ b/trunk/i2c_mcu.c @@ -54,8 +54,8 @@ static void iic_mcu_send_st( ); static void iic_mcu_send_re_st( ); static void iic_mcu_send_sp( ); -static err iic_mcu_send_a_byte( u8 ); -static err iic_mcu_call_slave( u8 slave ); +static i2c_err iic_mcu_send_a_byte( u8 ); +static i2c_err iic_mcu_call_slave( u8 slave ); extern void DI_wt_chk(); @@ -71,8 +71,11 @@ static u8 iic_send_work[4]; static u8 *p_iic_send_wo_dma_dat; static u8 iic_send_wo_dma_len; -u8 iic_mcu_result; // 一文字リードの時はデータを返す。 - // ステータスが必要ならこっちを呼んで +// データエラー（ROHM製加速度センサ）時リトライのため +/// とりあえず、DMA使用マルチバイトライト の時にしか機能しない +static u8 last_slave, last_reg_adrs, last_size; + +i2c_err iic_mcu_result; // 一文字リードの時はデータを返す。 #ifdef i2c_timeout_test extern bit i2c_mcu_time_out_error; @@ -85,7 +88,7 @@ void nop8() } -static err iic_mcu_wait_free() +static i2c_err iic_mcu_wait_free() { u16 tot = 0; @@ -105,10 +108,10 @@ static err iic_mcu_wait_free() #ifdef i2c_timeout_test i2c_mcu_time_out_error = true; #endif - return( ERR_ERR ); + return( I2C_ERR_TIMEOUT ); } } - return( ERR_SUCCESS ); + return( I2C_ERR_OK ); } @@ -120,56 +123,9 @@ u8 iic_mcu_read_a_byte( u8 SLA, u8 adrs ) { u8 dat; -#if 1 - // ラッパー - if( iic_mcu_read( SLA, adrs, 1, &dat ) == ERR_SUCCESS ) - { - iic_mcu_result = ERR_OK; - } - else - { - iic_mcu_result = ERR_NOSLAVE; - } - return ( dat ); + iic_mcu_result = iic_mcu_read( SLA, adrs, 1, &dat ); -#else - iic_mcu_wait_free(); - - // スタートコンディションとスレーブの呼び出し、レジスタアドレスの送信 - if( iic_mcu_call_slave( SLA ) != 0 ) - { - iic_mcu_result = ERR_NOSLAVE; - iic_mcu_busy = false; - return ( 0 ); - } - - // レジスタアドレスの送信 - iic_mcu_send_a_byte( adrs ); // 終わるまで帰ってこない - // if( err != ERR_SUCCESS )〜 - - // データ受信 // - iic_mcu_send_re_st( ); // リスタートコンディション - iic_mcu_send_a_byte( SLA | 0x01 ); // 送信完了まで戻ってきません。 - - ST0 = 0x0004; // 受信モードに設定を変えるのでロジック停止 - SCR02 = RXE0 | 1 << SLC02 | 7 << DLS02; // 受信設定 - SS0 = 0x0004; // 通信待機 - - SOE0 = 0x0000; // 1バイト送信なので、最後のNAKを送る - IICIF10 = 0; - SIO10 = 0xFF; // ダミーデータを書くと受信開始 - - while( IICIF10 == 0 ) - { // 受信完了待ち - ; - } - dat = SIO10; - - iic_mcu_send_sp( ); - IICIF10 = 0; // 後を濁さないこと - iic_mcu_busy = false; - return ( dat ); -#endif + return ( dat ); } @@ -184,13 +140,14 @@ u8 iic_mcu_read_a_byte( u8 SLA, u8 adrs ) スレーブがウェイトコンディションを出すことは禁止です。 その場合でもエラー検出などできません ======================================================== */ -err iic_mcu_read( u8 slave, u8 adrs, u8 len, u8 * dest ) +i2c_err iic_mcu_read( u8 slave, u8 adrs, u8 len, u8 * dest ) { #if 1 - if( iic_mcu_wait_free() != ERR_SUCCESS ) + if( iic_mcu_wait_free() != I2C_ERR_OK ) { - return( ERR_ERR ); + // (タイムアウト) + return( I2C_ERR_TIMEOUT ); } #else // 使用中なら帰る @@ -200,12 +157,13 @@ err iic_mcu_read( u8 slave, u8 adrs, u8 len, u8 * dest ) if( iic_mcu_call_slave( slave ) != 0 ) { iic_mcu_busy = false; - return ( ERR_NOSLAVE ); + return ( I2C_ERR_NOSLAVE ); } // レジスタアドレスの送信 iic_mcu_send_a_byte( adrs ); // 終わるまで帰ってこない - // if( err != ERR_SUCCESS )〜 + + // 絶対にNAKが帰ってこない前提 // データ受信 // iic_mcu_send_re_st( ); // リスタートコンディション @@ -237,7 +195,7 @@ err iic_mcu_read( u8 slave, u8 adrs, u8 len, u8 * dest ) IICIF10 = 0; iic_mcu_busy = false; - return ( ERR_SUCCESS ); + return ( I2C_ERR_OK ); } @@ -248,41 +206,26 @@ err iic_mcu_read( u8 slave, u8 adrs, u8 len, u8 * dest ) 前の転送が終わるのを待って、ライトします。 返値　iic_mcu_write　に同じ ======================================================== */ -err iic_mcu_write_a_byte( u8 SLA, u8 adrs, u8 dat ) +i2c_err iic_mcu_write_a_byte( u8 SLA, u8 adrs, u8 dat ) { - -#if 0 - static u8 temp; // 書きっぱなしで終了を見ずに関数を抜ける（可能性が高い）のでstatic - - // これをしないと、立て続けに書いたときに前のデータを破壊してしまう - while( iic_mcu_busy ) - { - NOP( ); - } - - temp = dat; - iic_mcu_wo_dma = true; - return ( iic_mcu_write( SLA, adrs, 1, &temp ) ); -#else // １文字の時はDMAとか起動しないでさっさと終わらせる - if( iic_mcu_wait_free() != ERR_SUCCESS ) + if( iic_mcu_wait_free() != I2C_ERR_OK ) { - return( ERR_ERR ); + return( I2C_ERR_TIMEOUT ); } // スタートコンディションとスレーブの呼び出し... IICMK10 = 1; - if( iic_mcu_call_slave( SLA ) != ERR_SUCCESS ) + if( iic_mcu_call_slave( SLA ) != I2C_ERR_OK ) { iic_mcu_busy = false; - return ( ERR_NOSLAVE ); + return( I2C_ERR_NOSLAVE ); } iic_mcu_send_a_byte( adrs ); iic_mcu_send_a_byte( dat ); iic_mcu_send_sp( ); iic_mcu_busy = false; - return ( ERR_SUCCESS ); -#endif + return ( I2C_ERR_OK ); } @@ -293,20 +236,20 @@ err iic_mcu_write_a_byte( u8 SLA, u8 adrs, u8 dat ) *strから len文字書きます。 - 0 正常終了 - 1 スレーブが応答しない - 2 バスが誰かに占有されていてタイムアウト - 3 前に指示された通信がまだ終わってない + I2C_ERR_OK 正常終了 + I2C_ERR_NAK スレーブが応答しない + I2C_ERR_TIMEOUT 電気的故障で？タイムアウト + // I2C_ERR_ 前に指示された通信がまだ終わってない 【注】 スレーブがウェイトコンディションを出すことは禁止です。 その場合でもエラー検出などできません DMA1を使用します。 ******************************************************************************/ -err iic_mcu_write( u8 slave, u8 adrs, u8 len, void * src ) +i2c_err iic_mcu_write( u8 slave, u8 adrs, u8 len, void * src ) { - if( iic_mcu_wait_free() != ERR_SUCCESS ) + if( iic_mcu_wait_free() != I2C_ERR_OK ) { - return( ERR_ERR ); + return( I2C_ERR_TIMEOUT ); } #if 0 // 使用中なら帰る @@ -315,19 +258,25 @@ err iic_mcu_write( u8 slave, u8 adrs, u8 len, void * src ) // スタートコンディションとスレーブの呼び出し... IICMK10 = 1; IICIF10 = 0; - if( iic_mcu_call_slave( slave ) != ERR_SUCCESS ) + if( iic_mcu_call_slave( slave ) != I2C_ERR_OK ) { iic_mcu_busy = false; - return ( ERR_NOSLAVE ); + return ( I2C_ERR_NOSLAVE ); } IICIF10 = 0; if( !iic_mcu_wo_dma ) { - // DMAを使用する（通常） + // DMAを使用する（通常）// // レジスタアドレスを送り、データの準備 memcpy( iic_send_work, src, 4 ); //バッファとして4バイトしか用意して無いため。 + + // リトライ時のため + last_slave = slave; + last_reg_adrs = adrs; + last_size = len; + // DMAセット while( DST1 ) {;} @@ -340,7 +289,7 @@ err iic_mcu_write( u8 slave, u8 adrs, u8 len, void * src ) DMAIF1 = 0; DMAMK1 = 0; - DST1 = 1; + DST1 = 1; // DEN1 = 1から2clk以上開け SIO10 = adrs; // 書きっぱなし！ 割り込みが発生してDMAスタート // 残りは割り込みルーチン内で @@ -354,11 +303,11 @@ err iic_mcu_write( u8 slave, u8 adrs, u8 len, void * src ) SIO10 = adrs; iic_send_wo_dma_len = len; - p_iic_send_wo_dma_dat = src; + p_iic_send_wo_dma_dat = (u8*)src; // 残りは割り込みルーチン内で } - return ( ERR_SUCCESS ); + return ( I2C_ERR_OK ); } @@ -376,34 +325,80 @@ err iic_mcu_write( u8 slave, u8 adrs, u8 len, void * src ) ======================================================== */ __interrupt void int_dma1( ) { + static bit in_retry; + EI(); - DMAMK1 = 1; - DEN1 = 0; - while( ( SSR02L & TSF0 ) != 0 ) + // 最後のバイトの送信完了待ち + while( ( SSR02L & TSF0 ) != 0 ) { - u16 i = 0; + u16 i = 0; if( ++i == 0 ) // タイムアウト？ { break; } } + // ストップコンディション発行 // iic_mcu_send_sp(); // ISR中で外の関数を呼ぶのは都合が悪い（汎用レジスタ待避が発生する）ので展開 { ST0 = 0x0004; SOE0 = 0; // 受信の時はもっと前に「も」設定してる。(NACK出力) SO0 = 0x0000 | TAUS_MASK; // SCL -// nop8(); すら呼んじゃだめ + nop8(); //. もう何も怖くない。外の関数呼ぶ +/* NOP(); NOP(); NOP(); NOP(); NOP(); NOP(); NOP(); NOP(); - SO0 = 0x0400 | TAUS_MASK; // SCL +*/ + SO0 = 0x0400 | TAUS_MASK; // SCL + nop8(); +/* NOP(); NOP(); NOP(); NOP(); NOP(); NOP(); NOP(); NOP(); - SO0 = 0x0404 | TAUS_MASK; +*/ + SO0 = 0x0404 | TAUS_MASK; } IICMK10 = 1; + + // データの途中で NAK だったら、一度だけリトライする。 + /// 手抜き実装 + if( SIR02 != 0 ) + { + SIR02 = SSR02; + + if( !in_retry ) + { + in_retry = true; + + IICIF10 = 0; + iic_mcu_call_slave( last_slave ); // ここでNAKは今ノンケア + + while( DST1 ){;} + DRA1 = (u16)( &iic_send_work[0] ); // 自動インクリメントされてしまっているので再セット + DBC1 = last_size; // 自動デクリメントされてしまっているので再セット + // ほかの設定は前回のまま + + DMAIF1 = 0; + DMAMK1 = 0; + DST1 = 1; + + SIO10 = last_reg_adrs; // 書きっぱなし！ 割り込みが発生してDMAスタート + return; + // おしまい　またね！ // + } + else + { + // エラー二度目。もう知らない + dbg_nop(); + // そのまま終了処理へ + } + } + + // 正常終了 + in_retry = false; + DMAMK1 = 1; + DEN1 = 0; iic_mcu_busy = false; } @@ -418,30 +413,31 @@ __interrupt void int_dma1( ) __interrupt void int_iic10( ) { EI(); - if( iic_send_wo_dma_len != 0 ) + if( iic_send_wo_dma_len != 0 ) // まだ送信しきっていない？ { SIO10 = *p_iic_send_wo_dma_dat; p_iic_send_wo_dma_dat ++; iic_send_wo_dma_len --; return; + // おしまい // } - // 最後のバイト送信完了 + // 最後のバイト送信完了、ストップコンディション発行 IICMK10 = 1; // iic_mcu_send_sp(); // ISR中で外の関数を呼ぶのは都合が悪い（汎用レジスタ待避が発生する）ので展開 { ST0 = 0x0004; SOE0 = 0; // 受信の時はもっと前に「も」設定してる。(NACK出力) - SO0 = 0x0000 | TAUS_MASK; // SCL - NOP(); NOP(); NOP(); NOP(); + SO0 = 0x0000 | TAUS_MASK; // clear SCL + NOP(); NOP(); NOP(); NOP(); // NOP8等も呼んではだめ NOP(); NOP(); NOP(); NOP(); - SO0 = 0x0400 | TAUS_MASK; // SCL + SO0 = 0x0400 | TAUS_MASK; // set SCL NOP(); NOP(); NOP(); NOP(); NOP(); NOP(); NOP(); NOP(); - SO0 = 0x0404 | TAUS_MASK; + SO0 = 0x0404 | TAUS_MASK; // set CSL adn SDA } - iic_mcu_wo_dma = false; + iic_mcu_wo_dma = false; iic_mcu_busy = false; } @@ -453,18 +449,19 @@ __interrupt void int_iic10( ) ACK　→　　　　　　　　　　　　　　　　　返：0 　NACK →　ストップコンディションを出す。　返：1 ======================================================== */ -static err iic_mcu_call_slave( u8 slave ) +static i2c_err iic_mcu_call_slave( u8 slave ) { iic_mcu_send_st( ); - SIR02 = SSR02; // NAKエラーのフラグクリア - if( iic_mcu_send_a_byte( slave ) != ERR_SUCCESS ) +// SIR02 = SSR02; // NAKエラーのフラグクリア + // todo 直前のエラーチェック？ + if( iic_mcu_send_a_byte( slave ) != I2C_ERR_OK ) { iic_mcu_send_sp( ); - return ( ERR_NAK ); // 指定のスレーブがいない / busy + return ( I2C_ERR_NOSLAVE ); // 指定のスレーブがいない } - return ( ERR_SUCCESS ); + return ( I2C_ERR_OK ); } @@ -473,7 +470,7 @@ static err iic_mcu_call_slave( u8 slave ) ほんとに１バイト書くのみ 書き終わるまで帰りません ======================================================== */ -static err iic_mcu_send_a_byte( u8 dat ) +static i2c_err iic_mcu_send_a_byte( u8 dat ) { IICMK10 = 1; IICIF10 = 0; @@ -482,12 +479,13 @@ static err iic_mcu_send_a_byte( u8 dat ) { // NOP( ); } // 通信中 - if( SSR02 != 0 ) + + if( SSR02 != 0 ) // 何らかエラー発生? { - SIR02 = SSR02; - return ( ERR_NAK ); + SIR02 = SSR02; // エラークリア + return( I2C_ERR_NAK ); } - return ( ERR_SUCCESS ); + return( I2C_ERR_OK ); } @@ -557,13 +555,12 @@ void iic_mcu_start( ) return; } - iic_mcu_busy = true; - DST1 = 0; - NOP( ); // 2clkもしくは、DSTn==0をポーリング - NOP( ); - DEN1 = 0; + iic_mcu_busy = true; +// DST1 = 0; I2C_PU_on(); +// DEN1 = 0; // DST1 = 0 から 2clkもしくは、DSTn==0をポーリングしてから + wait_ms( 1 ); // 立ち上がるのに50us位かかる SAU0EN = 1; @@ -578,16 +575,18 @@ void iic_mcu_start( ) // バスのリセット - IICIF10 = 0; - IICMK10 = 1; + { + IICIF10 = 0; + IICMK10 = 1; - iic_mcu_send_st(); + iic_mcu_send_st(); - SIO10 = 0xFF; - while( IICIF10 == 0 ){;} // 通信中 - iic_mcu_send_sp(); + SIO10 = 0xFF; + while( IICIF10 == 0 ){;} // 通信中 + iic_mcu_send_sp(); - SIR02 = SSR02; + SIR02 = SSR02; + } iic_mcu_busy = false; iic_mcu_initialized = true; @@ -616,22 +615,22 @@ void iic_mcu_stop( ) コーデックに 『１バイト』 ライト iic_mcu_write_a_byte CODEC不具合ワークアラウンド ======================================================== */ -err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat ) +i2c_err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat ) { static u8 count; // １文字の時はDMAとか起動しないでさっさと終わらせる - if( iic_mcu_wait_free() != ERR_SUCCESS ) + if( iic_mcu_wait_free() !=I2C_ERR_OK ) { - return( ERR_ERR ); + return( I2C_ERR_TIMEOUT ); } // スタートコンディションとスレーブの呼び出し... IICMK10 = 1; - if( iic_mcu_call_slave( IIC_SLA_CODEC ) != ERR_SUCCESS ) + if( iic_mcu_call_slave( IIC_SLA_CODEC ) != I2C_ERR_OK ) { iic_mcu_busy = false; - return ( ERR_NOSLAVE ); + return ( I2C_ERR_NOSLAVE ); } iic_mcu_send_a_byte( adrs ); iic_mcu_send_a_byte( dat ); @@ -647,5 +646,5 @@ err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat ) iic_mcu_send_sp( ); iic_mcu_busy = false; - return ( ERR_SUCCESS ); + return ( I2C_ERR_OK ); } diff --git a/trunk/i2c_mcu.h b/trunk/i2c_mcu.h index af2b1d1..16eeba8 100644 --- a/trunk/i2c_mcu.h +++ b/trunk/i2c_mcu.h @@ -3,9 +3,13 @@ // ======================================================== -#define ERR_OK 0 -#define ERR_NAK 1 -#define ERR_NOSLAVE 2 +typedef enum{ + I2C_ERR_OK = 0, + I2C_ERR_NAK, + I2C_ERR_NOSLAVE, + I2C_ERR_TIMEOUT, + I2C_ERR_UNDEF = 0xFF +}i2c_err; @@ -13,21 +17,21 @@ extern volatile bit iic_mcu_busy; extern bit iic_mcu_wo_dma; -extern u8 iic_mcu_result; +extern i2c_err iic_mcu_result; // ======================================================== -err iic_mcu_read( u8 SLA, u8 adrs, u8 len, u8 * dest ); +i2c_err iic_mcu_read( u8 SLA, u8 adrs, u8 len, u8 * dest ); u8 iic_mcu_read_a_byte( u8 SLA, u8 adrs ); -err iic_mcu_write( u8 SLA, u8 adrs, u8 len, void * src ); -err iic_mcu_write_a_byte( u8 SLA, u8 adrs, u8 dat ); +i2c_err iic_mcu_write( u8 SLA, u8 adrs, u8 len, void * src ); +i2c_err iic_mcu_write_a_byte( u8 SLA, u8 adrs, u8 dat ); -err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat ); +i2c_err iic_mcu_write_a_byte_codec( u8 adrs, u8 dat ); // codecバグ回避機能付き // ↓その通信が完了したら解除されます。 -#define iic_mcu_set_wo_dma() { while( iic_mcu_busy ){;} iic_mcu_wo_dma = 1; } +#define iic_mcu_set_wo_dma() { while( iic_mcu_busy ){;} iic_mcu_wo_dma = true; } void iic_mcu_start( ); void iic_mcu_stop( ); diff --git a/trunk/magic.c b/trunk/magic.c index 607677a..75aa461 100644 --- a/trunk/magic.c +++ b/trunk/magic.c @@ -24,6 +24,6 @@ const unsigned char MGC_HEADd[] = __TIME__; const unsigned char MGC_TAILd[] = __TIME__; #pragma section @@CNST MGC_VER AT 0x4FF4 -const unsigned char MCU_VER[2] = { MCU_VER_MAJOR, MCU_VER_MINOR }; +const unsigned char MCU_VER[2] = { MCU_VER_MAJOR +'0', MCU_VER_MINOR +'0' }; #endif diff --git a/trunk/pm.c b/trunk/pm.c index b5a4e38..767b82c 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -371,7 +371,7 @@ void BT_model_detect() // もしかして：キャプチャボード // if(( iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VERSION ) == 0x01 ) && - ( iic_mcu_result == ERR_OK )) + ( iic_mcu_result == I2C_ERR_OK )) { system_status.captureBox = 1; } diff --git a/trunk/task_sys.c b/trunk/task_sys.c index 479597c..a81884f 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -439,7 +439,7 @@ void tsk_sys( ) RTCIMK = 1; // systick用インターバルタイマー割り込みマスク #ifdef _DBG_CHK_OFF_LEAK_ -// leak_check(); + leak_check(); #endif CKC = bits8(0,0,0,0, 1,0,0,1); // 4MHzに落としてからSTOPしなくてはならない diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index 89bc6ac..dd5d998 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,15 +1,199 @@ 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 -rd2s2 -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 -pinter_asm -ks -kx 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 -rd2s2 -qvjl2w -sainter_asm -zpb -no pm.c +pm.c(492) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(785) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(789) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(819) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(840) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(906) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(915) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1118) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(1120) : 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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx inter_asm\main.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 -rd2s2 -qvjl2w -sainter_asm -zpb -no magic.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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx 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 -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_mcu.c +i2c_mcu.c(170) : 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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx 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 -rd2s2m -qvjl2w -sainter_asm -zpb -no vreg_ctr.c +vreg_ctr.c(167) : 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(172) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(173) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(221) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(221) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(226) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(226) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(230) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(230) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(234) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(234) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(238) : 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 -pinter_asm -ks -kx 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 -rd2s2m -qvjl2w -sainter_asm -zpb -no vreg_twl.c +vreg_twl.c(61) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_twl.c(65) : 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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx 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 -rd2s2m -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 -pinter_asm -ks -kx 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 -rd2s2 -qvjl2w -sainter_asm -zpb -no accero.c +accero.c(113) : 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 -pinter_asm -ks -kx 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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx 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 -rd2s2 -qvjl2w -sainter_asm -zpb -no task_misc.c +task_misc.c(341) : CC78K0R warning W0401: Conversion may lose significant digits +task_misc.c(343) : CC78K0R warning W0401: Conversion may lose significant digits +task_misc.c(355) : 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 -pinter_asm -ks -kx 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 -rd2s2 -qvjl2w -sainter_asm -zpb -no task_sys.c task_sys.c(225) : CC78K0R warning W0401: Conversion may lose significant digits task_sys.c(562) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. +task_sys.c(627) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(628) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(630) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(631) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(632) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(634) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(635) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(636) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(638) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(640) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(641) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(642) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(643) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(644) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(645) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(646) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(647) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(648) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(649) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(650) : CC78K0R warning W0401: Conversion may lose significant digits +task_sys.c(651) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 23 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 -pinter_asm -ks -kx inter_asm\task_sys.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 kanaria.rel kanaria_c.rel get_ei.rel +"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 -rd2s2 -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c +pedo_alg_thre_det2.c(103) : CC78K0R warning W0745: Expected function prototype +pedo_alg_thre_det2.c(119) : 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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx 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 -rd2s2 -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 -pinter_asm -ks -kx inter_asm\pedo_lpf_coeff.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 -rd2s2 -qvjl2w -sainter_asm -zpb -no kanaria_c.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 -pinter_asm -ks -kx inter_asm\kanaria_c.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" -go85h,0FC00h,1024 -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 get_ei.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' @@ -29,9 +213,6 @@ Link complete, 0 error(s) and 13 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\oc78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf Object Conversion Complete, 0 error(s) and 0 warning(s) found. C:\Windows\system32\cmd.exe /c ruby nec_s_2_bsrbin2.rb bsr.hex -4 -intel-HEX to bsr bin converter - file converted! - - -Build Total error(s) : 0 Total warning(s) : 15 +133 +!E debug enable!! +Build Total error(s) : 0 Total warning(s) : 87 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index aaeddd0..41888bf 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -14,7 +14,7 @@ Low-voltage Flash Rewriting=On Fail Safe Break=0x2000 Port=1 NMI=OFF -TRESET=ON +TRESET=OFF IRESET=OFF WAIT=OFF SysClock=None @@ -22,7 +22,7 @@ SubClock=None [Mapping] Count=0 [Main] -Geometry=39, 38, 1452, 1091 +Geometry=264, 264, 1200, 858 Window=Normal MDI_MAX=OFF Button=ON @@ -78,7 +78,7 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=78, 84, 822, 815 +Geometry=0, 0, 600, 400 Window=Normal DispStart=73 CaretPos=74,0 @@ -140,10 +140,10 @@ SaveStart= SaveEnd= Accumulative=ON [Assemble] -Geometry=10, 12, 600, 947 -Window=Normal -DispStart=3446 -CaretPos=3446,27 +Geometry=0, 0, 0, 0 +Window=Hide +DispStart=847627264 +CaretPos=0,0 Address1= Address2= Address3= @@ -160,7 +160,7 @@ Address13= Address14= Address15= Address16= -Data1=hdw +Data1= Data2= Data3= Data4= @@ -179,29 +179,24 @@ Data16= Case=ON Scan=OFF Direction=Down -FindStart=0x0 -FindEnd=0x7FFFF +FindStart= +FindEnd= SaveRange=Screen SaveStart= SaveEnd= -[Assemble1] -Geometry=585, 65, 600, 400 -Window=Normal -DispStart=12181 -CaretPos=12209,27 [Memory] -Geometry=24, 534, 550, 400 -Window=Normal -Boundary=163 +Geometry=0, 0, 0, 0 +Window=Hide +Boundary=0 Format=Hex Mode=Byte -Endian=Little +Endian= Ascii=OFF Idtag=OFF Address= -DispStart=000FFE70 -CaretPosData=50, 65509 -CaretPosAscii=0, 65487 +DispStart=FFFFFFFF +CaretPosData=0, 0 +CaretPosAscii=0, 0 Address1= Address2= Address3= @@ -261,7 +256,7 @@ Window=Hide Boundary=0 Mode=Proper [Sfr] -Geometry=25, 25, 668, 937 +Geometry=704, 55, 400, 400 Window=Normal Address1= Address2= @@ -283,10 +278,10 @@ Boundary=202, 89 Mode=Hex Attribute=Show Sort=Unsort -Pickup=OFF -SelectSort=Address -Last Name=P0 -Line=531 +Pickup=ON +SelectSort=Name +Last Name=P2 +Line=27 L1=P0 L2=P1 L3=P2 @@ -298,526 +293,22 @@ L8=P7 L9=P12 L10=P14 L11=P15 -L12=SDR00 -L13=SIO00 -L14=TXD0 -L15=SDR01 -L16=RXD0 -L17=SIO01 -L18=TDR00 -L19=TDR01 -L20=ADCRH -L21=PM0 -L22=PM1 -L23=PM2 -L24=PM3 -L25=PM4 -L26=PM5 -L27=PM6 -L28=PM7 -L29=PM12 -L30=PM14 -L31=PM15 -L32=ADM -L33=ADCE -L34=ADCS -L35=ADS -L36=KRM -L37=EGP0 -L38=EGN0 -L39=ISC -L40=TIS0 -L41=SDR02 -L42=SIO10 -L43=TXD1 -L44=SDR03 -L45=RXD1 -L46=IICA0 -L47=IICS0 -L48=SPD0 -L49=STD0 -L50=ACKD0 -L51=TRC0 -L52=COI0 -L53=EXC0 -L54=ALD0 -L55=MSTS0 -L56=IICF0 -L57=IICRSV0 -L58=STCEN0 -L59=IICBSY0 -L60=STCF0 -L61=TDR02 -L62=TDR03 -L63=TDR04 -L64=TDR05 -L65=TDR06 -L66=TDR07 -L67=RSUBC -L68=SEC -L69=MIN -L70=HOUR -L71=WEEK -L72=DAY -L73=MONTH -L74=YEAR -L75=SUBCUD -L76=ALARMWM -L77=ALARMWH -L78=ALARMWW -L79=RTCC0 -L80=RCLOE0 -L81=RCLOE1 -L82=RTCE -L83=RTCC1 -L84=RWAIT -L85=RWST -L86=RIFG -L87=WAFG -L88=WALIE -L89=WALE -L90=RTCC2 -L91=RCKDIV -L92=RCLOE2 -L93=RINTE -L94=CMC -L95=CSC -L96=HIOSTOP -L97=XTSTOP -L98=MSTOP -L99=OSTC -L100=OSTS -L101=CKC -L102=MCM0 -L103=MCS -L104=CSS -L105=CLS -L106=CKS0 -L107=PCLOE0 -L108=CKS1 -L109=PCLOE1 -L110=RESF -L111=LVIM -L112=LVIF -L113=LVIMD -L114=LVISEL -L115=LVION -L116=LVIS -L117=WDTE -L118=DSA0 -L119=DSA1 -L120=DRA0 -L121=DRA0L -L122=DRA0H -L123=DRA1 -L124=DRA1L -L125=DRA1H -L126=DBC0 -L127=DBC0L -L128=DBC0H -L129=DBC1 -L130=DBC1L -L131=DBC1H -L132=DMC0 -L133=DWAIT0 -L134=DS0 -L135=DRS0 -L136=STG0 -L137=DMC1 -L138=DWAIT1 -L139=DS1 -L140=DRS1 -L141=STG1 -L142=DRC0 -L143=DST0 -L144=DEN0 -L145=DRC1 -L146=DST1 -L147=DEN1 -L148=BECTL -L149=FLMDPUP -L150=PFCMD -L151=PFS -L152=FPRERR -L153=FLPMC -L154=BFAEN -L155=FWEPR -L156=BRAMEN -L157=IF2 -L158=IF2L -L159=TMIF05 -L160=TMIF06 -L161=TMIF07 -L162=PIF6 -L163=IF2H -L164=IICAIF1 -L165=PIF20 -L166=PIF21 -L167=PIF22 -L168=PIF23 -L169=MK2 -L170=MK2L -L171=TMMK05 -L172=TMMK06 -L173=TMMK07 -L174=PMK6 -L175=MK2H -L176=IICAMK1 -L177=PMK20 -L178=PMK21 -L179=PMK22 -L180=PMK23 -L181=PR02 -L182=PR02L -L183=TMPR005 -L184=TMPR006 -L185=TMPR007 -L186=PPR06 -L187=PR02H -L188=IICAPR01 -L189=PPR020 -L190=PPR021 -L191=PPR022 -L192=PPR023 -L193=PR12 -L194=PR12L -L195=TMPR105 -L196=TMPR106 -L197=TMPR107 -L198=PPR16 -L199=PR12H -L200=IICAPR11 -L201=PPR120 -L202=PPR121 -L203=PPR122 -L204=PPR123 -L205=IF0 -L206=IF0L -L207=WDTIIF -L208=LVIIF -L209=PIF0 -L210=PIF1 -L211=PIF2 -L212=PIF4 -L213=PIF5 -L214=IF0H -L215=DMAIF0 -L216=DMAIF1 -L217=CSIIF00 -L218=STIF0 -L219=CSIIF01 -L220=SRIF0 -L221=SREIF0 -L222=IF1 -L223=IF1L -L224=CSIIF10 -L225=IICIF10 -L226=STIF1 -L227=SRIF1 -L228=SREIF1 -L229=IICAIF0 -L230=TMIF00 -L231=TMIF01 -L232=TMIF02 -L233=TMIF03 -L234=IF1H -L235=ADIF -L236=RTCIF -L237=RTCIIF -L238=KRIF -L239=MDIF -L240=TMIF04 -L241=MK0 -L242=MK0L -L243=WDTIMK -L244=LVIMK -L245=PMK0 -L246=PMK1 -L247=PMK2 -L248=PMK4 -L249=PMK5 -L250=MK0H -L251=DMAMK0 -L252=DMAMK1 -L253=CSIMK00 -L254=STMK0 -L255=CSIMK01 -L256=SRMK0 -L257=SREMK0 -L258=MK1 -L259=MK1L -L260=CSIMK10 -L261=IICMK10 -L262=STMK1 -L263=SRMK1 -L264=SREMK1 -L265=IICAMK0 -L266=TMMK00 -L267=TMMK01 -L268=TMMK02 -L269=TMMK03 -L270=MK1H -L271=ADMK -L272=RTCMK -L273=RTCIMK -L274=KRMK -L275=MDMK -L276=TMMK04 -L277=PR00 -L278=PR00L -L279=WDTIPR0 -L280=LVIPR0 -L281=PPR00 -L282=PPR01 -L283=PPR02 -L284=PPR04 -L285=PPR05 -L286=PR00H -L287=DMAPR00 -L288=DMAPR01 -L289=CSIPR000 -L290=STPR00 -L291=CSIPR001 -L292=SRPR00 -L293=SREPR00 -L294=PR01 -L295=PR01L -L296=CSIPR010 -L297=IICPR010 -L298=STPR01 -L299=SRPR01 -L300=SREPR01 -L301=IICAPR00 -L302=TMPR000 -L303=TMPR001 -L304=TMPR002 -L305=TMPR003 -L306=PR01H -L307=ADPR0 -L308=RTCPR0 -L309=RTCIPR0 -L310=KRPR0 -L311=MDPR0 -L312=TMPR004 -L313=PR10 -L314=PR10L -L315=WDTIPR1 -L316=LVIPR1 -L317=PPR10 -L318=PPR11 -L319=PPR12 -L320=PPR14 -L321=PPR15 -L322=PR10H -L323=DMAPR10 -L324=DMAPR11 -L325=CSIPR100 -L326=STPR10 -L327=CSIPR101 -L328=SRPR10 -L329=SREPR10 -L330=PR11 -L331=PR11L -L332=CSIPR110 -L333=IICPR110 -L334=STPR11 -L335=SRPR11 -L336=SREPR11 -L337=IICAPR10 -L338=TMPR100 -L339=TMPR101 -L340=TMPR102 -L341=TMPR103 -L342=PR11H -L343=ADPR1 -L344=RTCPR1 -L345=RTCIPR1 -L346=KRPR1 -L347=MDPR1 -L348=TMPR104 -L349=MDAL -L350=MULA -L351=MDAH -L352=MULB -L353=MDBH -L354=MULOH -L355=MDBL -L356=MULOL -L357=PMC -L358=MAA -L359=ADPC -L360=PU0 -L361=PU1 -L362=PU3 -L363=PU4 -L364=PU5 -L365=PU7 -L366=PU12 -L367=PU14 -L368=PIM3 -L369=PIM7 -L370=POM3 -L371=POM7 -L372=NFEN0 -L373=NFEN1 -L374=NFEN2 -L375=MDCL -L376=MDCH -L377=MDUC -L378=DIVST -L379=DIVMODE -L380=PER0 -L381=SAU0EN -L382=IICA0EN -L383=ADCEN -L384=RTCEN -L385=PER2 -L386=TAU0EN -L387=OSMC -L388=BCDADJ -L389=SSR00 -L390=SSR00L -L391=SSR01 -L392=SSR01L -L393=SSR02 -L394=SSR02L -L395=SSR03 -L396=SSR03L -L397=SIR00 -L398=SIR00L -L399=SIR01 -L400=SIR01L -L401=SIR02 -L402=SIR02L -L403=SIR03 -L404=SIR03L -L405=SMR00 -L406=SMR01 -L407=SMR02 -L408=SMR03 -L409=SCR00 -L410=SCR01 -L411=SCR02 -L412=SCR03 -L413=SE0 -L414=SE0L -L415=SS0 -L416=SS0L -L417=ST0 -L418=ST0L -L419=SPS0 -L420=SPS0L -L421=SO0 -L422=SOE0 -L423=SOE0L -L424=SOL0 -L425=SOL0L -L426=TCR00 -L427=TCR01 -L428=TCR02 -L429=TCR03 -L430=TCR04 -L431=TCR05 -L432=TCR06 -L433=TCR07 -L434=TMR00 -L435=TMR01 -L436=TMR02 -L437=TMR03 -L438=TMR04 -L439=TMR05 -L440=TMR06 -L441=TMR07 -L442=TSR00 -L443=TSR00L -L444=TSR01 -L445=TSR01L -L446=TSR02 -L447=TSR02L -L448=TSR03 -L449=TSR03L -L450=TSR04 -L451=TSR04L -L452=TSR05 -L453=TSR05L -L454=TSR06 -L455=TSR06L -L456=TSR07 -L457=TSR07L -L458=TE0 -L459=TE0L -L460=TS0 -L461=TS0L -L462=TT0 -L463=TT0L -L464=TPS0 -L465=TPS0L -L466=TO0 -L467=TO0L -L468=TOE0 -L469=TOE0L -L470=TOL0 -L471=TOL0L -L472=TOM0 -L473=TOM0L -L474=IICCTL00 -L475=SPT0 -L476=STT0 -L477=ACKE0 -L478=WTIM0 -L479=SPIE0 -L480=WREL0 -L481=LREL0 -L482=IICE0 -L483=IICCTL10 -L484=DFC0 -L485=SMC0 -L486=DAD0 -L487=CLD0 -L488=WUP0 -L489=IICWL0 -L490=IICWH0 -L491=SVA0 -L492=PER3 -L493=IICA1EN -L494=P20 -L495=PM20 -L496=PU20 -L497=EGP2 -L498=EGN2 -L499=IICA1 -L500=IICS1 -L501=SPD1 -L502=STD1 -L503=ACKD1 -L504=TRC1 -L505=COI1 -L506=EXC1 -L507=ALD1 -L508=MSTS1 -L509=IICF1 -L510=IICRSV1 -L511=STCEN1 -L512=IICBSY1 -L513=STCF1 -L514=IICCTL01 -L515=SPT1 -L516=STT1 -L517=ACKE1 -L518=WTIM1 -L519=SPIE1 -L520=WREL1 -L521=LREL1 -L522=IICE1 -L523=IICCTL11 -L524=DFC1 -L525=SMC1 -L526=DAD1 -L527=CLD1 -L528=WUP1 -L529=IICWL1 -L530=IICWH1 -L531=SVA1 +L12=P20 +L13=PER0 +L14=PER2 +L15=PER3 +L16=PM0 +L17=PM1 +L18=PM12 +L19=PM14 +L20=PM15 +L21=PM2 +L22=PM20 +L23=PM3 +L24=PM4 +L25=PM5 +L26=PM6 +L27=PM7 [Local Variable] Geometry=0, 0, 0, 0 Window=Hide @@ -871,22 +362,22 @@ SaveRange=Screen SaveStart= SaveEnd= [Register] -Geometry=50, 50, 250, 400 -Window=Normal +Geometry=25, 25, 250, 400 +Window=Hide Mode=Hex Boundary=159 Pickup=OFF Name=Functional Register Bank=0 -RP0=1 -RP1=1 -RP2=1 -RP3=1 -PC=1 -SP=1 -PSW=1 -ES=1 -CS=1 +RP0=3 +RP1=3 +RP2=3 +RP3=3 +PC=3 +SP=3 +PSW=3 +ES=3 +CS=3 [Event Manager] Geometry=0, 0, 0, 0 Window=Hide @@ -962,41 +453,32 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=935, 61, 440, 634 -Window=Normal -Boundary=13762700 -0=.SW_pow_count,P,N,A,+,1 -Line=1 +Geometry=0, 0, 0, 0 +Window=Hide +Boundary=0 +Line=0 [Quick Watch] -0=RTCC0,B,A,1 -1=RTCC1,B,A,1 -2=PM12,B,A,1 -3=P12,B,A,1 -4=CMC,B,A,1 -5=CSC,P,A,1 -6=OSMC,P,A,1 -7=KRM,P,A,1 -8=MK0,P,A,1 -9=MK1,P,A,1 -10=PU7,B,A,1 -11=PM7,B,A,1 -12=P7,B,A,1 -13=system_status,P,A,1 -14=PWSW_POWON_TIME,P,A,1 -15=SW_pow_count,P,A,1 +0= +1= +2= +3= +4= +5= +6= +7= +8= +9= +10= +11= +12= +13= +14= +15= [Software Break] -Geometry=914, 762, 500, 200 -Window=Normal +Geometry=0, 0, 0, 0 +Window=Hide Width=150 30 200 100 -Name0=Swb00002 -Address0=task_sys.c#_tsk_sys+0x4d -Window0=ASM -Status0=ON -Name1=Swb00003 -Address1=task_sys.c#_tsk_sys+0x5c -Window1=ASM -Status1=OFF -Count=2 +Count=0 [Reset] Debugger=ON Symbol=OFF @@ -1021,7 +503,7 @@ Window=Hide [Data Flash Option] Data Flash Emulation=OFF [List] -Geometry=75, 75, 856, 846 +Geometry=0, 0, 0, 0 Window=Hide [Console] Geometry=0, 0, 0, 0 diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 8d026dc..0e64b78 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -1196,7 +1196,7 @@ G=1 E=0 E0=flash.elk E1=a.elk -GO=0 +GO=1 GOValue=85 GOStart=FC00 GOSizeValue=1024