diff --git a/trunk/accero.c b/trunk/accero.c index b8108a3..1efe4ce 100644 --- a/trunk/accero.c +++ b/trunk/accero.c @@ -38,6 +38,8 @@ #define ACC_REG_CTRL5 0x24 #define ACC_REG_X 0x28 +#define ACC_REG_FLG_BURST_ACCESS 0x80 + // ビット位置 #define ACC_bP_PM0 5 #define ACC_bP_DR0 3 @@ -64,12 +66,18 @@ +// ======================================================== +#define ACC_RAW_DATA_SIZE 6 + + // ======================================================== task_status tsk_soft_int( ); +extern void DI_wt_chk(); + + -#define ACC_RAW_DATA_SIZE 6 /* ======================================================== 　・割り込みを確認してデータを吸い上げ、レジスタに書き出します ・本当であればコールバック関数を登録しておけばいいじゃんとなるのですが、 @@ -82,7 +90,7 @@ task_status_immed tski_cbk_accero( ) u8 acc_dat_buff[ ACC_RAW_DATA_SIZE ]; // 加速度センサデータレジスタへの反映 - if( iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | 0x80 ), ACC_RAW_DATA_SIZE, acc_dat_buff ) + if( iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | ACC_REG_FLG_BURST_ACCESS ), ACC_RAW_DATA_SIZE, acc_dat_buff ) != ERR_SUCCESS ) { err_count ++; @@ -95,7 +103,7 @@ task_status_immed tski_cbk_accero( ) { // 加速度センサが異常になったので止める vreg_ctr[ VREG_C_ACC_CONFIG ] &= ~( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ ); - tski_acc_hosu_set(); + tski_acc_setup(); vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_ACCERO_ERR; return ( ERR_FINISED ); // タスクの削除は必要 } @@ -116,7 +124,7 @@ task_status_immed tski_cbk_accero( ) if( ACC_VALID ) { u8 temp[ACC_RAW_DATA_SIZE]; - iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | 0x80 ), ACC_RAW_DATA_SIZE, temp ); + iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | ACC_REG_FLG_BURST_ACCESS ), ACC_RAW_DATA_SIZE, temp ); } } if(( system_status.pwr_state != ON_CHECK ) @@ -172,43 +180,19 @@ task_status_immed tski_acc_write( ) /*========================================================= 　加速度センサの設定 ========================================================*/ -task_status_immed tski_acc_hosu_set( ) +task_status_immed tski_acc_setup( ) { -// iic_mcu_read_a_byte( IIC_SLA_ACCEL, ACC_REG_WHOAMI ); // スタックが足りないので展開… -// if( iic_mcu_result == ERR_NOSLAVE ) - { - u8 dummy; - - if( iic_mcu_read( IIC_SLA_ACCEL, ACC_REG_WHOAMI, 1, &dummy ) == ERR_NOSLAVE ) - { - vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_ACCERO_ERR; - return ( ERR_FINISED ); // とりあえず、タスクは削除しなくてはならない - // おしまい - }else{ - vreg_ctr[ VREG_C_STATUS_1 ] &= ~REG_BIT_ACCERO_ERR; - } - } - + // 加速度 on/off設定する { u8 str_send_buf[4]; str_send_buf[1] = 0x00; // ctrl2 HPF:normal, filterd, HPF for IRQ : dis/dis, HPF coeff:norm - /* - if( system_status.model == MODEL_TS_BOARD ) - { - // TS Final SoC - str_send_buf[2] = 0x02; // 3 IRQ pol :Active HI, Drive:Pushpull, - } - else - { - // 実機＆派生種、白箱 - str_send_buf[2] = 0x10; // 3 IRQ pol :Active HI, Drive:Pushpull, - } - */ + + // ピン不足のため、TSとそれ以外（回路違い）を区別して設定 if( system_status.model == MODEL_TS_BOARD ) { - str_send_buf[2] = bits8(0,0,0,0, 0,0,1,0); // ピン不足のため、ちゃんと分ける + str_send_buf[2] = bits8(0,0,0,0, 0,0,1,0); } else { @@ -216,35 +200,56 @@ task_status_immed tski_acc_hosu_set( ) } str_send_buf[3] = 0x80; // ctrl3 block update:enable, MSB first, scale: +-2G(default), selftest: dis - if( ( vreg_ctr[VREG_C_ACC_CONFIG] & - ( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ ) ) == 0 ) { - PMK23 = 1; - // 完全停止 - str_send_buf[0] = - ( ACC_BITS_PM_PDN << ACC_bP_PM0 | 0 << ACC_bP_DR0 | ACC_BITS_ALL_AXIS_ON ); + u8 acc_setting_sent = ( vreg_ctr[VREG_C_ACC_CONFIG] & + ( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ )); + + do{ + EI(); + if( acc_setting_sent == 0 ) + { + PMK23 = 1; + // 完全停止 + str_send_buf[0] = + ( ACC_BITS_PM_PDN << ACC_bP_PM0 | 0 << ACC_bP_DR0 | ACC_BITS_ALL_AXIS_ON ); + } + else + { + PMK23 = 0; + // 100Hz 自動取り込み + str_send_buf[0] = + ( ACC_BITS_PM_NORM << ACC_bP_PM0 + | ACC_BITS_DR_100Hz << ACC_bP_DR0 + | ACC_BITS_ALL_AXIS_ON ); + } + + // 実書き込み兼、通信できたかフラグ更新 + if( iic_mcu_write( IIC_SLA_ACCEL, ( ACC_REG_CTRL1 | ACC_REG_FLG_BURST_ACCESS ), 4, str_send_buf ) == ERR_NOSLAVE ) + { + vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_ACCERO_ERR; + }else{ + vreg_ctr[ VREG_C_STATUS_1 ] &= ~REG_BIT_ACCERO_ERR; + } + + // カラ読み。前回のゴミを読み捨て + if( ACC_VALID ) + { + if( system_status.pwr_state == ON ) + { + u8 temp[ACC_RAW_DATA_SIZE]; + iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | ACC_REG_FLG_BURST_ACCESS ), 6, temp ); + } + } + + // センサに書きにいっている最中にSoCがまた書き換えてしまうかもしれない + DI_wt_chk(); + }while( acc_setting_sent != ( vreg_ctr[VREG_C_ACC_CONFIG] & + ( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ )) ); + } - else - { - PMK23 = 0; - // 100Hz 自動取り込み - str_send_buf[0] = - ( ACC_BITS_PM_NORM << ACC_bP_PM0 - | ACC_BITS_DR_100Hz << ACC_bP_DR0 - | ACC_BITS_ALL_AXIS_ON ); - } - iic_mcu_write( IIC_SLA_ACCEL, ( ACC_REG_CTRL1 | 0x80 ), 4, str_send_buf ); } - // カラ読み - if( ACC_VALID ) - { - if( system_status.pwr_state == ON ) - { - u8 temp[ACC_RAW_DATA_SIZE]; - iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | 0x80 ), 6, temp ); - } - } + // DI状態のまま帰る return ( ERR_FINISED ); } diff --git a/trunk/accero.h b/trunk/accero.h index 20494b9..fbf80d6 100644 --- a/trunk/accero.h +++ b/trunk/accero.h @@ -8,7 +8,7 @@ /////////////////////////////////////////////////////////// task_status_immed tski_cbk_accero( ); -task_status_immed tski_acc_hosu_set( ); +task_status_immed tski_acc_setup( ); #endif diff --git a/trunk/bsr.hex b/trunk/bsr.hex index 9712591..d5e933a 100644 --- a/trunk/bsr.hex +++ b/trunk/bsr.hex @@ -1,5 +1,4 @@ -:02000000790D78 -:02000200FFFFFE +:020000006F0D82 :04001000D746D946B0 :02001C00854815 :02002400D248C0 @@ -9,254 +8,253 @@ :02005A00154748 :020062004A4C06 :06008000DE4A174B614B44 -:0400C0007EFBFF853F +:0400C0007EFBFF04C0 :0A00C4001B339499E033F240BFAA09 -:0A00CE00FFFFFFFFFFFFFFFFFFFF32 -:1000D800C7C1FBF8FFCEABACC736F00071F4C66100 -:1000E800D8710006F98EA89C018C015C10D1DD0A3C -:1000F8007110A6FB710006F9EF0B8C015C80D161D1 -:10010800E8710006F98F06F931030EF6B1BBF66106 -:100118004900DD05618900EFF5FDDE01FD3201FDD5 -:100128008A01FD6E02EFAEC0C6D7C7360000674C25 -:1001380009DE3F318E04F60FC1317B9EFDC4118963 -:100148007267318E04F64F14896142DF03F6EF01BE -:10015800E660610667318E124900207267318E04AD -:10016800F64F14896142DF03F6EF01E66061068706 -:10017800EFBC40F84F3A61E88666D161E8FDE506D4 -:10018800C6D751105B0C319E609F08F94008F901F1 -:10019800DF05CD3705EF03CD37078F06F95CE39F01 -:1001A80006F951035B04318EE7240000DD1023DDDE -:1001B8000823DF0E712006F9D7713006F9D7714090 -:1001C80006F9D7717BFACEA010CEA180E5F300CE58 -:1001D800A408F5AAFFD78F06F9310508CD0003CD8D -:1001E8000307EF03CD030ECE23F88F06F931030B77 -:1001F800CD0408CD0508F690BFB401CF1105F8F578 -:1002080021FFCE22E9CE24F3CE25FACE26FCCE2736 -:100218005FCE2EFCCF120511CF350002CF37001963 -:10022800CF530006CBEEFEFFCE3831CE3970CF3833 -:10023800050A308700BF1801BF1A01BF1C01BF1E85 -:1002480001D7C7C1C1FBF8FFCEABAC8C02D1DD1220 -:10025800616902305C03BBF6614900DDEE6189002B -:10026800EFF51004C6D7FD440AFD7B09FD002FFDFC -:10027800CD37FDD804717AFAFD9623F504F98F0677 -:10028800F93105135003FD2B2B625C01D161E8CFD6 -:1002980004F902CFAFFB64FDE02FFD8742710293A2 -:1002A800712BE7618461A461EDEFF8D7FDCA46D2EE -:1002B800717BFAD7D7C7F616FDD804FDB4023122F0 -:1002C8009108712291717AFAEF0B717AFAA7F647C1 -:1002D800DFE9E2EF01F2C6D7C7C1C1FBF8FF17A1FA -:1002E800C1E0C18C0A70C18C0270FD08031006D2EF -:1002F800DF04F44DEF03CD4D028C01721004C6D714 -:10030800C7C1FBF8FFFDBD02D2DD03E2EF618B70D0 -:10031800FD2604D2DD077123915202EF528C08703A -:10032800FD4104FD8C048B6C0170FD410430040018 -:10033800BF2401301740BF1C01300400BF22018CCC -:100348000A91DF04F6BF2A01710BE2CE44FF318225 -:10035800E202EFFAAC0C148E449961790C61690AD7 -:100368008C0AD1DFDAFDB504710BE2712391F2C07A -:10037800C6D7C7C1FBF8FFFDBD02D2DD03E2EF25FA -:10038800710AE68B70FD2604D2DD077123915202B3 -:10039800EF138C0870FD41048C0A70FD4104FDB513 -:1003A80004712391F2C0C6D7C7C1FBF8FFFDBD0297 -:1003B800D2DD03E2EF65710AE6710BE28B70FD2670 -:1003C80004D2DD077123915202EF50710BE2311212 -:1003D8009139C73422FBAC0C1652048B99A5A7920D -:1003E800DFF9C63184BD02EFFA717ABDCEB144CBD4 -:1003F800B422FB8C0A318EBEB8CEBB48714BE1717A -:100408004BE5710ABD8C089E44EF0F710BE68C0812 -:100418009E448C0A9D4CAC0CBD4AF2C0C6D7C71688 -:10042800FD6404AF0401BF0C0117FD4104D2DD06D1 -:10043800FDB504E2EF01F2C6D7C716710AE6710BE3 -:10044800E2669E443182E202EFFAF6420401DD09D7 -:10045800AF0401BF0C01E2EF01F2C6D7AF280108D3 -:100468005CFB08BF2801FDBC02AF28015CFBBF286C -:1004780001300400BF2A01301780BF1C013004007E -:10048800BF2201D7AF2401086C0408BF2401AF289C -:10049800016C0F086C0B08BF2801FDBC02AF2A01D4 -:1004A800085CFB08BF2A01FDBC02ED6404300400AF -:1004B800BF2401F6BF2A01300B0BBF2801FDBC0287 -:1004C800300B0FBF2801FDBC02300F0FBF2801D72A -:1004D80031349101D7712291710BBD0000717BBD40 -:1004E8006A0E03713B25713B23E0FD4A027120F03F -:1004F80000FDBC02F6BF26015024BF1401CB440006 -:1005080014300F0FBF2801711391710BE2710AE6C5 -:10051800FD6404CE44FF3182E202EFFAFDB504AF78 -:100528000401BF0C01712391713291D731249102DA -:10053800EFFAFD8C04713A25713A235A0EFC7128A2 -:10054800F000713391D7C7880616FDBD02D2DD03CE -:10055800E2EF36710AE650A4FD2604D2DD077123C6 -:10056800915202EF2417FD41046770FD4104FD8C90 -:100578000450A4FD41045020FD4104D84EFD41041F -:10058800A44EFDB504712391F2C6D7C72008FBF825 -:10059800FFFDE3085014C15008FD1508C0CC07043E -:1005A8008C074C14DE0C8C07318EFD5B0A615907F1 -:1005B800EFEECC07048C074C1461C8ED8106CC061D -:1005C800008C064C0461C8ED6006300AF9BC02F6DE -:1005D800BBCEABAC31B2D109C73641057184C6DE9A -:1005E800F3F1C73641057184C661DC9C05713BD1C6 -:1005F800AC02148F400599715050056179026179F8 -:1006080000F0E1614900DD09C73641057184C6DEA5 -:10061800C3F1C73641057184C661DC0E059C0550DF -:1006280040C18C07318E31AD128C06318E318D036D -:10063800BDD831FFBDDADADAADD8FD270DC0D2DD7D -:100648000C5008C15014FD1508C0FDE40B8C05D1F1 -:10065800DF06615906EDC9058C07318EFD5F0AD2A8 -:10066800DD0C5008C15014FD1508C0FDE40B8C05C5 -:10067800D1DF06615907EDBD0571605005CC040056 -:10068800CC05008C054C09DE2B8C05318E04F61F39 -:10069800C1317B9EFDC41189728C05318E04F64FE1 -:1006A80014896142DF03F6EF01E6600E049C0461E1 -:1006B8005905EFCF41001140F81F3A61E86159042C -:1006C8008C04D1DF08FDE50BFDF70CEF0C5008C1D9 -:1006D8005014FD1508C0FDE40B1008C6D7C7200448 -:1006E800FBF8FF715B21CC0100F6BC02AC024409A7 -:1006F80000DE3EAC0204F60F144100118972AC0210 -:100708000C5014896142DF03F6EF01E6600E019C8C -:1007180001AC021249005072AC0204F67F148961E0 -:1007280042DF03F6EF01E6600E019C01617902EFFA -:10073800BB40F67FFF61F86159018C01D161F8ED8A -:10074800E307CC0100717AFAFDD804711300711B1C -:1007580020710303710205E0C15003FD1A2BC0503C -:1007680013FD4A02500FC1E0FD1A2BC0CEABAC619D -:1007780059018C0191DD068C014C03DF03E6EF0182 -:10078800F66061FB7151018C014C0861F8CC0100E5 -:1007980031320705A024FCEF03F524FC4024FC11AA -:1007A800DC0DF524FCF0C15003FD1A2BC0EF12E656 -:1007B800BC02F6614902DDB400000000617902EF75 -:1007C800F1CE3708CBE4FFFFCBE6FFF7CED4FFCF5F -:1007D800370008F5120561FDF5ABFFFDE308D250BF -:1007E80008C15014FD1508C0D2FDE40B1004C6D78B -:1007F8003184BD02EFFA717BBDCBE4FFFFCBE6FF8E -:10080800FFCBD4FFFF717ABED7717BBED7C7C1209B -:100818000CFBF8FF8C0C318E31ADC1317B9DD4C0FF -:10082800BC068DD49C088C149C0B8C14318E040C43 -:1008380000128C0B318EBDD813FDB60F61C8EDDEEA -:1008480008CEABACCC05068C0B318EFD570AD2DD39 -:10085800158C0B318EFD5B0A6169058C05D1DFE7CC -:10086800FD1108E2EF71CC0A008C0A4C04DE54F644 -:10087800BC02300AF9BBAC06148C089EFD118972C3 -:10088800AB146299AC06A1BC06617900617902F0EB -:10089800E1614902DFE05040C18C0B318E31AD126D -:1008A8008C0A318E318D03BDD831FFBDDADADAAD6D -:1008B800D8FD270DC0D2DD06FD1108E2EF196159F8 -:1008C8000AEFA68C0B318EFD5F0AD2DD03E2EF073B -:1008D80061590BED3208F2100EC6D7C7717B9D71B6 -:1008E8007BFAFDF807300AF9FD0A0BFD950AC6D711 -:1008F800FDE308FDE40BFD1108F5ABFFF2D7C731A6 -:100908006494067110B3FBEF047118B3FB8FB3FB4B -:100918007B8876D1DD5B8FB3FB9D884004F903DFCC -:1009280022665C10D1DD1C8FB3FB5C10D1DD0B504F -:1009380080C15011FD2534C0EF095040C15011FD50 -:100948002534C04004F903DD064004F904DF2266BB -:100958005C02D1DD1C8FB3FB5C02D1DD0B5040C1C2 -:100968005010FD2534C0EF095020C15010FD25342A -:10097800C0C6D7C7360000665C80D1DD10675C80D2 -:10098800D1DF05711394EF0B711294EF0671040710 -:10099800711194665C40D1DD10675C40D1DF057150 -:1009A8002394EF0B712294EF06711405712194665C -:1009B8005C01D1DD10675C01D1DF05713394EF0B69 -:1009C800713294EF06713407713194665C02D1DD9F -:1009D80010675C02D1DF05714394EF1D714294EFFB -:1009E800184007F901DF08710402714194EF0AC742 -:1009F80036100571C4C6714194665C04D1DD106778 -:100A08005C04D1DF05715394EF0B715294EF0671BA -:100A18004407715194665C08D1DD10675C08D1DF2A -:100A280005716394EF0B716294EF0671140771619D -:100A380094665C10D161E8715AD1C6D7F5F6FBF51A -:0F0A4800F8FBCFFEFBFFCFFAFBFFCFFBFBFFD787 -:100A57005208EF065203EF025206FEE600FE1B00A5 -:100A6700DC16089F03088F0408089F040862FE2409 -:100A770000089F0408EEBF00EEBA00C1C514410E7E -:100A870011D9D0FF118FD1FF312E45C4C0D7F23114 -:100A9700A2C401E2D79DE261DD4C09DF12717BFA46 -:100AA700C18F06089F25FDC0CF060800EE2700313D -:100AB700F2FA04CF0608004C00DF05D50008DD1662 -:100AC70061DD717BFAD50608DD0ACDE31F61CD61D3 -:100AD700CDEE160061CDFED40061FFFE9A00FCF852 -:100AE700FF0EFEB20061CDFED5004C09DF0EC18FAF -:100AF70006086F25FD9F0608C0EE0400CF06080014 -:100B0700F8E3D75200EF025202FE3700CF24FD0070 -:100B1700CF060800BF0408C716629F0008410011EE -:100B27008F1A209B4100118F1B209F0108C651007F -:100B3700FE62FFEF025205CF060800C1510CFE0A04 -:100B470000C0D7C1511DFE0200C0D761DD717BFA1D -:100B570070CEC0A59EC47CFF9EC4609EC461CDD7E5 -:100B670061DD717BFAC18EC45C1BFED6FFCF060820 -:100B770001FED7FFC061CDD731F2FA1AC1AEE4BF8B -:100B870016FDAEE6BF18FDAED4BF1AFD30FFFFBE9F -:100B9700E4BEE6BED4C0D731F2FA11C1AF16FDBE2E -:100BA700E4AF18FDBEE6AF1AFDBED4C0D7C1BF1C67 -:100BB700FD13BF1EFD15BF20FD17BF22FDC0D7AF18 -:100BC7001CFDDB1EFDEB20FDFB22FDD7534B3052F6 -:100BD7005430324E323030475631323000FFC15038 -:100BE700FEFEAB0061DD717BFACF060800FE0A004E -:100BF700FEA4FF61CDF8E3EECF00C7FB0408BF16E4 -:100C0700FD8FC0009C05C5C337040600BF18FD351E -:100C170036490C300000522BFE6600C2C4C630F7BE -:100C27000BB800300000B8022004AF18FDB8003040 -:100C37000F00B802AF16FD61FF520AFE3AFFECF84B -:100C4700FF0E717BFAC1C7FB04088C05C65C80FEEA -:100C57000200C0D761DD717BFA70CFC0FFA59FC0CE -:100C6700007CFF9FC000609FC00061CDD7618BFEF5 -:100C7700E2FF717BBE410011FB000017CEFC006153 -:100C8700CB089EFDF31161C999A58392DFF7D7FEC3 -:100C9700B1FED524FDDF23C1CF0308035109FEF4BC -:100CA700FDC0D2DF37FE3800A20408CF0308075182 -:100CB70009FEE1FDD2B20408DF22C7FB0408318335 -:100CC70002C6D7C6510AFECCFD624C1FDF06CF24F1 -:100CD700FD01EF04CF24FD00C0EE5BFEC0EE55FE24 -:100CE700C7C1FB04088B31196C0161589BC0C6D77B -:100CF700717BFAFE4DFEAF0408040600C114365B93 -:100D07000C300000522DF3FE77FF8FC000FE2BFE44 -:100D170061CF5C807C8073C0041900CEFC0F61CB6F -:100D2700C55404EF03C55417FE18FEC7360008BBA9 -:100D3700629C0288089C03D1DD334C41DE2F70F1A1 -:100D4700312DB161090033081C000851FF612A41A8 -:100D57000E118FD0FF613B118FD1FF6138DC0E8BF5 -:100D67005C03DF0964C6C4FE2BFDEECAFDC6C4EEF4 -:020D7700C3FDBA -:100D790061CF5100718C7109FECBF800FEFCCB01EB -:100D890000F6BF00F953C0F693935820FEDFF941EE -:100D99000036D64C34CCFCEF05118B99A7A5174426 -:100DA900204DDFF53602F930CCFCEF04CC0000A76A -:100DB90047DFF9410036204D3420FEEF05118B99AC -:100DC900A7A51744304DDFF53630FE3090FEEF040D -:100DD900CC0000A747DFF9FCD80000EFFE61DD7108 -:100DE9007BFABEF0ADD8BEF200AEF661CDD7C361D5 -:100DF900DD717BFABEF0ADD8BEF200DBF6FFADDCEB -:100E0900BEF000AEF6BDD8AEF40312ADDABEF20004 -:100E1900AEF661CD03BDDAC2D7C3F33174D9088305 -:100E2900C1F626D8BDD8C031750683C312F623C2D0 -:100E3900FD440E93DF0312F623C2D7440000DD26DA -:100E490061DD717BFACFE80080BEF6F6BEF4BEF232 -:100E5900ADD8BEF0CFE800818FE8003103FAAEF0DB -:100E6900F5E80061CDD7B1D7C3F33174D90883C18F -:100E7900F626D8BDD8C0317505C312F623C2FD9236 -:100E89000E93DF0312F623C2D7440000DD2761DD8C -:100E9900717BFACFE80080BEF6F6BEF4BEF2ADD89B -:100EA900BEF0CFE800818FE8003103FAAFE000F52A -:100EB900E80061CDD7ADD8D7C3F33174DB0F83C157 -:100EC900F626D8BDD861317026DABDDAC031750D84 -:100ED90083C312F626DCBDDC61317023C2FDFA0E34 -:100EE90093DF0CF626D8BDD861317026DABDDAC297 -:100EF900D7C161686BDC6BDDC0DD2F61DD717BFA09 -:100F0900CFE80080BEF4ADDCBEF6ADD8BEF0ADDAF8 -:100F1900BEF2CFE800818FE8003103FAAEF0BDD808 -:100F2900AEF2BDDAF5E80061CDD7F6BDD8BDDAD7A6 -:100F39008292DD2B61DD717BFACFE80080BEF0F68D -:100F4900BEF2BEF46208BEF6CFE800818FE8003138 -:100F590003FAAFE0006072AEF0F5E80061CDD7604A -:100F690072F6B1D706DABDDAADDC06D8BDD861D8DC -:100F7900A6DAD7D1DD17C1C3DAD89DD8ADDA311CCD -:100F890061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD60 -:100F99001BC1C3DADA9DDAADD8311E33311E337184 -:100FA900F9B4DADFF4BDD813BDDAC2C0D746D8DD4B -:100FB9000771FF7177D971C0D75BDB9DDB605BDAA5 -:100FC9009DDAADDC5BD9085BD808BDD8D7C3C7F3B8 -:100FD900728EFDC162314C410036CC4C1161A07258 -:070FE900C09EFD62C6C2D7E5 -:0A0FF60031333A33393A3239000042 -:0A20000031333A33393A3239000027 +:1000CE00C7C1FBF8FFCEABACC736F00071F4C6610A +:1000DE00D8710006F98EA89C018C015C10D1DD0A46 +:1000EE007110A6FB710006F9EF0B8C015C80D161DB +:1000FE00E8710006F98F06F931030EF6B1BBF66111 +:10010E004900DD05618900EFF5FDD401FD2801FDF3 +:10011E008001FD6402EFAEC0C6D7C7360000674C43 +:10012E0009DE3F318E04F60FC1317B9EFDC411896D +:10013E007267318E04F64F14896142DF03F6EF01C8 +:10014E00E660610667318E124900207267318E04B7 +:10015E00F64F14896142DF03F6EF01E66061068710 +:10016E00EFBC40F84F3A61E88666D161E8FDDB06E8 +:10017E00C6D751105B0C319E609F08F94008F901FB +:10018E00DF05CD3705EF03CD37078F06F95CE39F0B +:10019E0006F951035B04318EE7240000DD1023DDE8 +:1001AE000823DF0E712006F9D7713006F9D771409A +:1001BE0006F9D7717BFACEA010CEA180E5F300CE62 +:1001CE00A408F5AAFFD78F06F9310508CD0003CD97 +:1001DE000307EF03CD030ECE23F88F06F931030B81 +:1001EE00CD0408CD0508F690BFB401CF1105F8F582 +:1001FE0021FFCE22E9CE24F3CE25FACE26FCCE2741 +:10020E005FCE2EFCCF120511CF350002CF3700196D +:10021E00CF530006CBEEFEFFCE3831CE3970CF383D +:10022E00050A308700BF1801BF1A01BF1C01BF1E8F +:10023E0001D7C7C1C1FBF8FFCEABAC8C02D1DD122A +:10024E00616902305C03BBF6614900DDEE61890035 +:10025E00EFF51004C6D7FD3A0AFD7109FD0C2FFD0E +:10026E00C337FDCE04717AFAFDA223F504F98F0689 +:10027E00F93105135003FD372B625C01D161E8CFD4 +:10028E0004F902CFAFFB64FDEC2FFD8742710293A0 +:10029E00712BE7618461A461EDEFF8D7FDCA46D2F8 +:1002AE00717BFAD7D7C7F616FDCE04FDAA0231220E +:1002BE009108712291717AFAEF0B717AFAA7F647CB +:1002CE00DFE9E2EF01F2C6D7C7C1C1FBF8FF17A104 +:1002DE00C1E0C18C0A70C18C0270FDFE021006D204 +:1002EE00DF04F44DEF03CD4D028C01721004C6D71E +:1002FE00C7C1FBF8FFFDB302D2DD03E2EF618B70E5 +:10030E00FD1C04D2DD077123915202EF528C08704E +:10031E00FD3704FD82048B6C0170FD370430040040 +:10032E00BF2401301740BF1C01300400BF22018CD6 +:10033E000A91DF04F6BF2A01710BE2CE44FF31822F +:10034E00E202EFFAAC0C148E449961790C61690AE1 +:10035E008C0AD1DFDAFDAB04710BE2712391F2C08E +:10036E00C6D7C7C1FBF8FFFDB302D2DD03E2EF250E +:10037E00710AE68B70FD1C04D2DD077123915202C7 +:10038E00EF138C0870FD37048C0A70FD3704FDAB3B +:10039E0004712391F2C0C6D7C7C1FBF8FFFDB302AB +:1003AE00D2DD03E2EF65710AE6710BE28B70FD1C84 +:1003BE0004D2DD077123915202EF50710BE231121C +:1003CE009139C73422FBAC0C1652048B99A5A79217 +:1003DE00DFF9C63184BD02EFFA717ABDCEB144CBDE +:1003EE00B422FB8C0A318EBEB8CEBB48714BE17184 +:1003FE004BE5710ABD8C089E44EF0F710BE68C081D +:10040E009E448C0A9D4CAC0CBD4AF2C0C6D7C71692 +:10041E00FD5A04AF0401BF0C0117FD3704D2DD06EF +:10042E00FDAB04E2EF01F2C6D7C716710AE6710BF7 +:10043E00E2669E443182E202EFFAF6420401DD09E1 +:10044E00AF0401BF0C01E2EF01F2C6D7AF280108DD +:10045E005CFB08BF2801FDB202AF28015CFBBF2880 +:10046E0001300400BF2A01301780BF1C0130040088 +:10047E00BF2201D7AF2401086C0408BF2401AF28A6 +:10048E00016C0F086C0B08BF2801FDB202AF2A01E8 +:10049E00085CFB08BF2A01FDB202ED5A04300400CD +:1004AE00BF2401F6BF2A01300B0BBF2801FDB2029B +:1004BE00300B0FBF2801FDB202300F0FBF2801D73E +:1004CE0031349101D7712291710BBD0000717BBD4A +:1004DE006A0E03713B25713B23E0FD40027120F053 +:1004EE0000FDB202F6BF26015024BF1401CB44001A +:1004FE0014300F0FBF2801711391710BE2710AE6D0 +:10050E00FD5A04CE44FF3182E202EFFAFDAB04AF96 +:10051E000401BF0C01712391713291D731249102E4 +:10052E00EFFAFD8204713A25713A235A0EFC7128B6 +:10053E00F000713391D7C7880616FDB302D2DD03E2 +:10054E00E2EF36710AE650A4FD1C04D2DD077123DA +:10055E00915202EF2417FD37046770FD3704FD82B8 +:10056E000450A4FD37045020FD3704D84EFD370447 +:10057E00A44EFDAB04712391F2C6D7C72008FBF839 +:10058E00FFFDD9085014C15008FD0B08C0CC07045C +:10059E008C074C14DE0C8C07318EFD510A61590705 +:1005AE00EFEECC07048C074C1461C8ED7706CC0631 +:1005BE00008C064C0461C8ED5606300AF9BC02F6F2 +:1005CE00BBCEABAC31B2D109C73641057184C6DEA4 +:1005DE00F3F1C73641057184C661DC9C05713BD1D0 +:1005EE00AC02148F40059971505005617902617902 +:1005FE0000F0E1614900DD09C73641057184C6DEB0 +:10060E00C3F1C73641057184C661DC0E059C0550E9 +:10061E0040C18C07318E31AD128C06318E318D0377 +:10062E00BDD831FFBDDADADAADD8FD1D0DC0D2DD91 +:10063E000C5008C15014FD0B08C0FDDA0B8C05D10F +:10064E00DF06615906EDBF058C07318EFD550AD2C6 +:10065E00DD0C5008C15014FD0B08C0FDDA0B8C05E3 +:10066E00D1DF06615907EDB30571605005CC04006A +:10067E00CC05008C054C09DE2B8C05318E04F61F43 +:10068E00C1317B9EFDC41189728C05318E04F64FEB +:10069E0014896142DF03F6EF01E6600E049C0461EB +:1006AE005905EFCF41001140F81F3A61E861590436 +:1006BE008C04D1DF08FDDB0BFDED0CEF0C5008C1F7 +:1006CE005014FD0B08C0FDDA0B1008C6D7C7200466 +:1006DE00FBF8FF715B21CC0100F6BC02AC024409B1 +:1006EE0000DE3EAC0204F60F144100118972AC021A +:1006FE000C5014896142DF03F6EF01E6600E019C97 +:10070E0001AC021249005072AC0204F67F148961EA +:10071E0042DF03F6EF01E6600E019C01617902EF04 +:10072E00BB40F67FFF61F86159018C01D161F8ED94 +:10073E00D907CC0100717AFAFDCE04711300711B3A +:10074E0020710303710205E0C15003FD262BC0503A +:10075E0013FD4002500FC1E0FD262BC0CEABAC61A5 +:10076E0059018C0191DD068C014C03DF03E6EF018C +:10077E00F66061FB7151018C014C0861F8CC0100EF +:10078E0031320705A024FCEF03F524FC4024FC11B4 +:10079E00DC0DF524FCF0C15003FD262BC0EF12E654 +:1007AE00BC02F6614902DDB400000000617902EF7F +:1007BE00F1CE3708CBE4FFFFCBE6FFF7CED4FFCF69 +:1007CE00370008F5120561FDF5ABFFFDD908D250D3 +:1007DE0008C15014FD0B08C0D2FDDA0B1004C6D7A9 +:1007EE003184BD02EFFA717BBDCBE4FFFFCBE6FF98 +:1007FE00FFCBD4FFFF717ABED7717BBED7C7C120A6 +:10080E000CFBF8FF8C0C318E31ADC1317B9DD4C009 +:10081E00BC068DD49C088C149C0B8C14318E040C4D +:10082E0000128C0B318EBDD813FDAC0F61C8EDD408 +:10083E0008CEABACCC05068C0B318EFD4D0AD2DD4D +:10084E00158C0B318EFD510A6169058C05D1DFE7E0 +:10085E00FD0708E2EF71CC0A008C0A4C04DE54F658 +:10086E00BC02300AF9BBAC06148C089EFD118972CD +:10087E00AB146299AC06A1BC06617900617902F0F5 +:10088E00E1614902DFE05040C18C0B318E31AD1277 +:10089E008C0A318E318D03BDD831FFBDDADADAAD77 +:1008AE00D8FD1D0DC0D2DD06FD0708E2EF19615916 +:1008BE000AEFA68C0B318EFD550AD2DD03E2EF074F +:1008CE0061590BED2808F2100EC6D7C7717B9D71CA +:1008DE007BFAFDEE07300AF9FD000BFD8B0AC6D739 +:1008EE00FDD908FDDA0BFD0708F5ABFFF2D7C731CE +:1008FE006494067110B3FBEF047118B3FB8FB3FB56 +:10090E007B8876D1DD5B8FB3FB9D884004F903DFD6 +:10091E0022665C10D1DD1C8FB3FB5C10D1DD0B5059 +:10092E0080C15011FD1B34C0EF095040C15011FD64 +:10093E001B34C04004F903DD064004F904DF2266CF +:10094E005C02D1DD1C8FB3FB5C02D1DD0B5040C1CC +:10095E005010FD1B34C0EF095020C15010FD1B3448 +:10096E00C0C6D7C7360000665C80D1DD10675C80DC +:10097E00D1DF05711394EF0B711294EF067104071A +:10098E00711194665C40D1DD10675C40D1DF05715A +:10099E002394EF0B712294EF067114057121946666 +:1009AE005C01D1DD10675C01D1DF05713394EF0B73 +:1009BE00713294EF06713407713194665C02D1DDA9 +:1009CE0010675C02D1DF05714394EF1D714294EF05 +:1009DE00184007F901DF08710402714194EF0AC74C +:1009EE0036100571C4C6714194665C04D1DD106782 +:1009FE005C04D1DF05715394EF0B715294EF0671C5 +:100A0E004407715194665C08D1DD10675C08D1DF34 +:100A1E0005716394EF0B716294EF067114077161A7 +:100A2E0094665C10D161E8715AD1C6D7F5F6FBF524 +:0F0A3E00F8FBCFFEFBFFCFFAFBFFCFFBFBFFD791 +:100A4D005208EF065203EF025206FEE600FE1B00AF +:100A5D00DC16089F03088F0408089F040862FE2413 +:100A6D0000089F0408EEBF00EEBA00C1C514410E88 +:100A7D0011D9D0FF118FD1FF312E45C4C0D7F2311E +:100A8D00A2C401E2D79DE261DD4C09DF12717BFA50 +:100A9D00C18F06089F25FDC0CF060800EE27003147 +:100AAD00F2FA04CF0608004C00DF05D50008DD166C +:100ABD0061DD717BFAD50608DD0ACDE31F61CD61DD +:100ACD00CDEE160061CDFED40061FFFE9A00FCF85C +:100ADD00FF0EFEB20061CDFED5004C09DF0EC18FB9 +:100AED0006086F25FD9F0608C0EE0400CF0608001E +:100AFD00F8E3D75200EF025202FE3700CF24FD007B +:100B0D00CF060800BF0408C716629F0008410011F8 +:100B1D008F1A209B4100118F1B209F0108C6510089 +:100B2D00FE62FFEF025205CF060800C1510CFE0A0E +:100B3D0000C0D7C1511DFE0200C0D761DD717BFA27 +:100B4D0070CEC0A59EC47CFF9EC4609EC461CDD7EF +:100B5D0061DD717BFAC18EC45C1BFED6FFCF06082A +:100B6D0001FED7FFC061CDD731F2FA1AC1AEE4BF95 +:100B7D0016FDAEE6BF18FDAED4BF1AFD30FFFFBEA9 +:100B8D00E4BEE6BED4C0D731F2FA11C1AF16FDBE38 +:100B9D00E4AF18FDBEE6AF1AFDBED4C0D7C1BF1C71 +:100BAD00FD13BF1EFD15BF20FD17BF22FDC0D7AF22 +:100BBD001CFDDB1EFDEB20FDFB22FDD7534B305200 +:100BCD005430324E323030475631323000FFC15042 +:100BDD00FEFEAB0061DD717BFACF060800FE0A0058 +:100BED00FEA4FF61CDF8E3EECF00C7FB0408BF16EE +:100BFD00FD8FC0009C05C5C337040600BF18FD3529 +:100C0D00363F0C300000522BFE6600C2C4C630EDDC +:100C1D000BB800300000B8022004AF18FDB800304A +:100C2D000F00B802AF16FD61FF520AFE3AFFECF855 +:100C3D00FF0E717BFAC1C7FB04088C05C65C80FEF4 +:100C4D000200C0D761DD717BFA70CFC0FFA59FC0D8 +:100C5D00007CFF9FC000609FC00061CDD7618BFEFF +:100C6D00E2FF717BBE410011FB000017CEFC00615D +:100C7D00CB089EFDF31161C999A58392DFF7D7FECD +:100C8D00B1FED524FDDF23C1CF0308035109FEF4C6 +:100C9D00FDC0D2DF37FE3800A20408CF030807518C +:100CAD0009FEE1FDD2B20408DF22C7FB040831833F +:100CBD0002C6D7C6510AFECCFD624C1FDF06CF24FB +:100CCD00FD01EF04CF24FD00C0EE5BFEC0EE55FE2E +:100CDD00C7C1FB04088B31196C0161589BC0C6D785 +:100CED00717BFAFE4DFEAF0408040600C1143651A7 +:100CFD000C300000522DF3FE77FF8FC000FE2BFE4F +:100D0D0061CF5C807C8073C0041900CEFC0F61CB79 +:100D1D00C55404EF03C55417FE18FEC7360008BBB3 +:100D2D00629C0288089C03D1DD334C41DE2F70F1AB +:100D3D00312DB161090033081C000851FF612A41B2 +:100D4D000E118FD0FF613B118FD1FF6138DC0E8BFF +:100D5D005C03DF0964C6C4FE2BFDEECAFDC6C4EEFE +:020D6D00C3FDC4 +:100D6F0061CF5100718C7109FECBF800FEFCC101FF +:100D7F0000F6BF00F953C0F693935820FEDFF941F8 +:100D8F000036D64C34CCFCEF05118B99A7A5174430 +:100D9F00204DDFF53602F930CCFCEF04CC0000A774 +:100DAF0047DFF9410036204D3420FEEF05118B99B6 +:100DBF00A7A51744304DDFF53630FE3090FEEF0417 +:100DCF00CC0000A747DFF9FCCE0000EFFE61DD711C +:100DDF007BFABEF0ADD8BEF200AEF661CDD7C361DF +:100DEF00DD717BFABEF0ADD8BEF200DBF6FFADDCF5 +:100DFF00BEF000AEF6BDD8AEF40312ADDABEF2000F +:100E0F00AEF661CD03BDDAC2D7C3F33174D908830F +:100E1F00C1F626D8BDD8C031750683C312F623C2DA +:100E2F00FD3A0E93DF0312F623C2D7440000DD26EE +:100E3F0061DD717BFACFE80080BEF6F6BEF4BEF23C +:100E4F00ADD8BEF0CFE800818FE8003103FAAEF0E5 +:100E5F00F5E80061CDD7B1D7C3F33174D90883C199 +:100E6F00F626D8BDD8C0317505C312F623C2FD884A +:100E7F000E93DF0312F623C2D7440000DD2761DD96 +:100E8F00717BFACFE80080BEF6F6BEF4BEF2ADD8A5 +:100E9F00BEF0CFE800818FE8003103FAAFE000F534 +:100EAF00E80061CDD7ADD8D7C3F33174DB0F83C161 +:100EBF00F626D8BDD861317026DABDDAC031750D8E +:100ECF0083C312F626DCBDDC61317023C2FDF00E48 +:100EDF0093DF0CF626D8BDD861317026DABDDAC2A1 +:100EEF00D7C161686BDC6BDDC0DD2F61DD717BFA13 +:100EFF00CFE80080BEF4ADDCBEF6ADD8BEF0ADDA03 +:100F0F00BEF2CFE800818FE8003103FAAEF0BDD812 +:100F1F00AEF2BDDAF5E80061CDD7F6BDD8BDDAD7B0 +:100F2F008292DD2B61DD717BFACFE80080BEF0F697 +:100F3F00BEF2BEF46208BEF6CFE800818FE8003142 +:100F4F0003FAAFE0006072AEF0F5E80061CDD76054 +:100F5F0072F6B1D706DABDDAADDC06D8BDD861D8E6 +:100F6F00A6DAD7D1DD17C1C3DAD89DD8ADDA311CD7 +:100F7F0061EEB4D8DFF8BDDA13BDD8C2C0D7D1DD6A +:100F8F001BC1C3DADA9DDAADD8311E33311E33718E +:100F9F00F9B4DADFF4BDD813BDDAC2C0D746D8DD55 +:100FAF000771FF7177D971C0D75BDB9DDB605BDAAF +:100FBF009DDAADDC5BD9085BD808BDD8D7C3C7F3C2 +:100FCF00728EFDC162314C410036CC4C1161A07262 +:070FDF00C09EFD62C6C2D7EF +:0A0FF60031393A34373A3430000044 +:0A20000031393A34373A3430000029 :10200A0005214F7B9EC5E9000104080D12171C1F0C :10201A00080100001F003B005A0078009700B50035 :10202A00D400F300110130014E01192634445362E1 @@ -298,492 +296,492 @@ :10226A00FA041225384D5F6E777A776E5F4D3825FE :10227A001204FAF3F0F0F3F7FBFE00020303020282 :02228A00010051 -:10228C008D3AB43AD1DF46CD3A1EFD2F23FDDA222A +:10228C008D3AB43AD1DF52CD3A1EFD3B23FDE62206 :10229C003132900D3104900931129405713304EFF1 -:1022AC0003713204FD0B2331229005714202EF03BE -:1022BC00714302D432DD05B432714202314402065C -:1022CC007140B3FBEF047148B3FBFDF925D74A30DD -:1022DC004BDC114A30B9DE0C4A3B28DE03A43BD759 -:1022EC00713390D74A303EDC054A30BDDC0C4A3C99 -:1022FC0028DE03A43CD7713290D7F43BF43CD731A1 -:10230C0022940C4A3D02DE03A43DD7712390D731B1 -:10231C0032040A40AFFB3CDE04712390D77122904B -:10232C00F43DD7C7C1FBF8FF714490711794DE5789 -:10233C00711494714190311294127130B3FB5002AC -:10234C00C15011FD2534C0CD3232EF3B7138B3FB97 -:10235C00E0C15011FD2534C0F43217C15002FD020A -:10236C002BC0D2DF0D8B318E318D080E01081C0075 -:10237C00BD34AD3444009BDC05D5AFFBDF095020E8 -:10238C00C15011FD2534C0C0C6D7C78D2076FDD7EE -:10239C0023FD362BD507F9DD05710390EF2B664B2A -:1023AC002061F83154901A715390FDD804664C0793 -:1023BC00DD0381DF098F06F9310303FD6024FD7411 -:1023CC00247102903057256194C6D7C77162017190 -:1023DC0072015005FD4A025008FDA236629D305034 -:1023EC0009FDA2366276716301711806F94A30F163 -:1023FC00DC05E507F9EF224A3004DE1ACF07F902B3 -:10240C005008C1506CFDE002C092DF0DD44DDF09C5 -:10241C00711006F9EF03F507F94007F901DF0571B3 -:10242C000A22EF06710B22710302CD2007570067B9 -:10243C004C08DE1073090A20614EDC05679D20EF05 -:10244C000387EFEB4A2007DF09D507F961F8CF07BF -:10245C00F903C6D7500AFD4A02304000C15006FDB0 -:10246C00E52AC05096ED4A02C72006FBF8FFD507B7 -:10247C00F961E8ED5325304A57C1503EFDE52AC0BD -:10248C00D2DD077100B2FBED53257108B2FB1704C6 -:10249C000200C15004C1500CC1506CFD0803100661 -:1024AC00EA38AA48318D12AA48318E616B08616AEC -:1024BC0008C1500EFDE52AC0F690C1500CFDE52A6E -:1024CC00C0CC01008C014C04DE2831249102EFFABF -:1024DC00711291EA388C015010D605C15010C18C84 -:1024EC0001D6044000C1506CFDB0031006615901C7 -:1024FC00EFD250A5FD4A02EA38AA48318D12AA48FB -:10250C00318E616B08616A08C1500EFDE52AC0501E -:10251C00A5FD4A025004C1506CFDE002C0629C0152 -:10252C00EA388A4B4E0161C3048A4A4E01170402F1 -:10253C0000C15004C1500CC1506CFDB0031006F624 -:10254C00C1503EFDE52AC01006C6D7C78D3E4B30A4 -:10255C0061F8EDF6254A4028DE05A440EDF625F499 -:10256C00408D309D3E8D305070D612307351230407 -:10257C0080001231FF318E039D3F9FAEFBF68D3FE5 -:10258C007C804C95DC1B8D3F318F241400EA38BDC8 -:10259C00D8AA44FDE60D1231FF318E03318F16EFB0 -:1025AC00198D3F318F241400EA38BDD8AA46FDE6B8 -:1025BC000D1231FF318E03318F16EA388A427217B1 -:1025CC00F3031644000171FE61C836FF001701DEEB -:1025DC0002F61617BD76C7500CFDE52AC0D2DF06F1 -:1025EC008D309D3EEF047100B2FBF2C6D7C72008B8 -:1025FC00FBF8FF4007F901DD064007F902DF1C1765 -:10260C00040600FDDD2BD2DF0A8C069C058C079C92 -:10261C0004EF4ACC0563CC0400EF4217040600FD1E -:10262C00DD2BD2DD0F7100B2FB710390CC05007174 -:10263C000291EF298C06318E318D080E07081C0093 -:10264C00BBEA388A4072ABFD390FBB8C019C05D1BB -:10265C00DF08CC0501CC0400EF038B9C04170406A7 -:10266C0000FDE82BD2DD06CC06C8CC07008C069FFB -:10267C00B1FB8C06318E318D080E07081C00BD3461 -:10268C00AD344401A5DC08CC0364F6BD42EF48AD83 -:10269C003426424401A0DC08CC031EF6BD42EF37C1 -:1026AC00AD3444819DDC09CC030AC942F401EF2707 -:1026BC00AD3444019BDC09CC0305C942F401EF178E -:1026CC00AD34440191DC09CC0300C942F401EF079D -:1026DC00710291C942F4013132040C31249008CCBE -:1026EC000564CC0400EF0D8C034E05DE078C039CB7 -:1026FC0005CC04008C059FAFFB8C049FB0FBFD6ADE -:10270C002B8D444E05DD2840AFFB0BDE054A440BF8 -:10271C00DE1440AFFB06DE054A4406DE09D5AFFBEE -:10272C00DF0DD444DD095020C15011FD2534C08F7C -:10273C00AFFB9D44FDA72B1008C6D7C7D837C15097 -:10274C0002FD1A2BC04008F90161F87120100550E8 -:10275C0012FD4A028D376C0870C15002FD1A2BC055 -:10276C005003FD4A028D376C1870C15002FD1A2BB4 -:10277C00C05016FD4A025003FD2B2B625C01D1DDCB -:10278C00107170B3FB5002C15013FD2534C0F2EF31 -:10279C0001E2C6D7C75004FD2B2B625C03D1DD4090 -:1027AC005014FD372834B3FB895C9F998A0C7CFF4D -:1027BC0050FF5C14D1DD228A0C7CFF5C147234B7A0 -:1027CC00FB89616A9971620756003162070586665A -:1027DC00D1DFF7716307716B2734C6FB895CEB990A -:1027EC00712810055002FD2B2BD2DD354008F90164 -:1027FC00DF05500AFD4A028D376C1070C15002FD86 -:10280C001A2BC0E0FD4A02D837C15002FD1A2BC06A -:10281C005033FD4A02F0C15002FD1A2BC07178B33F -:10282C00FBE0C15013FD2534C0C6D7C7C12004FB43 -:10283C00F8FFCC02005004FD2B2B629C038C045C33 -:10284C0020D1DD0E8C036C019C038C026C209C024D -:10285C00EF138C045C10D1DD0C8C035CFE9C038CA0 -:10286C00026C109C028C045C08D1DD0E8C036C0293 -:10287C009C038C026C089C02EF138C045C04D1DD6D -:10288C000C8C035CFD9C038C026C049C028C03D1AD -:10289C00DD05501AFD4A028C0370C15004FD1A2B41 -:1028AC00C08FB3FB5C9F728C03318E316D148C0323 -:1028BC00318E314D616D08616C5C606162629FB3F9 -:1028CC00FB8FBFFB7CFF50FF5E02D1DD278FBFFB70 -:1028DC007CFF5E027234B7FB89616A99716207CC26 -:1028EC000100316207086159018C01D1DFF4716379 -:1028FC0007716B27F21006C6D7D9A7FBC15006FD8E -:10290C001A2BC0D9A8FBC15007FD1A2BC0D7FD0547 -:10291C0029F2D7C7711300711B20710303710205D3 -:10292C00E0C15003FD1A2BC05013FD4A02F0C150F8 -:10293C0005FD1A2BC0500FC1E0FD1A2BC0500AFD2B -:10294C004A027103055008FD4A02501FC1E0FD1AEE -:10295C002BC05012FD4A025003FD2B2B625C01D19F -:10296C00DF03E2EF24F0FD2B2B629D363602F9C714 -:10297C005008FD022BC05003C1FD1A2BC07102037D -:10298C00711A20FDC22AF431F2C6D75003FD2B2B4D -:10299C00625C01D1DD155014FD3728FDA0275014C1 -:1029AC00FD4A02E0C15003FD1A2BC0711300711BCC -:1029BC00207103035014FD4A02F0C1E0FD1A2BC034 -:1029CC00F0C15003FD1A2BC0D7C72004FBF8FFCC75 -:1029DC0002008D319C035010C150A4FDE002C06276 -:1029EC009D31D44DDD04F2ED9F2A8C037B315C08C4 -:1029FC00D1DD0F8D315C08D1DF05CC0210EF03CC9B -:102A0C0002208C037B315C04D1DD158D315C04D14B -:102A1C00DF088C026C049C02EF068C026C089C0292 -:102A2C008FB2FB5CF3728D315C0C6162629FB2FB06 -:102A3C008FBEFB7CFF50FF5E029C02D1DD1F34B6C3 -:102A4C00FB896E0299716207CC0100316207086143 -:102A5C0059018C01D1DFF4716307716B278D315CE7 -:102A6C0040D1DD095002C15012FD2534C08D315CBE -:102A7C0001D1DD08E0C15012FD2534C0717AFA8D08 -:102A8C00315C41D1DD0C5A31BED831C15010FD4EF4 -:102A9C0005C0F21004C6D7FD4727F2D7FDA027F2D8 -:102AAC00D7C78FC6FB7617FD3728664FC6FBDFF2FC -:102ABC00F5C6FBF2C6D75064FD4A02FDF32B6261EA -:102ACC00FB711190F171149061DC70C15012FD4ECC -:102ADC0005C0FDD335CD5D03D7C7C1C1FBF8FFAC35 -:102AEC000ABB17C15002C18C0270C1506CFDB003FF -:102AFC0010061004C6D7C7C1FBF8FFAC08C15002C2 -:102B0C00C18B70C1506CFD08031006C0C6D7C788B6 -:102B1C0006166770C1C75084FD7A031004C6D7C768 -:102B2C0016C75084FDE002C0C6D7C74A2004DE0495 -:102B3C005600EF0256014008F901DF048686EF0AC1 -:102B4C004008F902DF045104610666318F12504CC3 -:102B5C00D633514CD6610A045420BD38C6D740AF89 -:102B6C00FB51DC05CF04FC0FD740AFFB33DC05CFAA -:102B7C0004FC0BD740AFFB0BDC05CF04FC07D740A4 -:102B8C00AFFB0661D831320405CF04FC03D7D5AFB7 -:102B9C00FBDD04E504FCD7F504FCD7D504F9DF0410 -:102BAC00716390D7FDF32B6261FB7171907114907E -:102BBC0071779061C83162901771629071749071E5 -:102BCC001190F171749061DC70C15012FD4E05C012 -:102BDC00D7C716C75004FD022BC0C6D7C716C7509F -:102BEC0002FD022BC0C6D740AFFB0BDE02E2D7F2D0 -:102BFC00D77100010571785005713AD5713BD18FB1 -:102C0C0010055CFC9F1005CF54054AE54205711078 -:102C1C004205710042057148500571305005712014 -:102C2C005005CF530505CF52050A7130510571205F -:102C3C005105713BD5717050058F11055CFC9F11CE -:102C4C0005F422D77178500571080105D77140F051 -:102C5C000071783002713AE6713BE2713BEA713BEC -:102C6C00EE8F10055CFC9F1005CF34024AE552FF35 -:102C7C00711A52710A52714830027130300271204F -:102C8C003002CF330205CF32020A71303102713B70 -:102C9C00E6717030028F11055CFC9F11057160307C -:102CAC0002D7717830027148F000D7C788061666D3 -:102CBC00614FDD0967614EDE0396EF01866672C6D1 -:102CCC00D7C7161714AA0412A943DD29AA0412A9FE -:102CDC0023FD304DC3AC02FD304D13C2BDD813FDE6 -:102CEC00B60FDE0C1714AA0212AA0403BA04EF05DD -:102CFC001714A9BA04AC041231FF319E03317F08BA -:102D0C007208C6D77100F200304400BFB601300122 -:102D1C0088BF9001300984BF9E01BF9C01BF9A01FE -:102D2C00BF9801BF9601BF9401BF9201F53CFF30E3 -:102D3C00FE00BFBE01F6BFBC01BFB80150EEBFBA6A -:102D4C0001A1BFB201C918FE00F6BE6EBE64BE6A18 -:102D5C007123047153078F06F9310507F5CDFBCBB1 -:102D6C006CFF00715391714291D730EF00BFB401E9 -:102D7C00F6BFBA017108F200712304715307714355 -:102D8C0091D78D50B450D1DF6931D4D105715BD15D -:102D9C00E452D452DD2E7140B2FBD851F1E734022B -:102DAC000023DD0625DD0325DF05F6BE66EF06D91B -:102DBC00CCFBF1BE66A4514A5120DF04F451B4524D -:102DCC00CD5019D7CD501E7148B2FBD5CEFBDF04C8 -:102DDC00F6BE66D7D9CCFBF14266FFDD15D9CCFB2C -:102DEC00F112AE6643DE05A266FFEF03B266FFCDBD -:102DFC005003D7C7161714F6B9AA0412F6231231CA -:102E0C00FF31AE03316FBA02C6D7C7C1FBF8FF8CD6 -:102E1C00085080D612AB1413B9AB14AA0412A92310 -:102E2C0012D927FBF133BDD813FD220EBA02C0C64E -:102E3C00D731649101D74004F902DF10F6BE64BEAD -:102E4C006EBE6ABF8EFBBF94FBBF9AFB31549114CC -:102E5C00308AFBFDFF2D3090FBFDFF2D3096FBFDE6 -:102E6C00FF2DEF713174910D7173917108D2FBF4D8 -:102E7C0054F453EF60D453DF5A8F26FB9D534A54BE -:102E8C001FDC177100D2FB4028FBFFDD1CA4558F03 -:102E9C0028FB4B55DE13F454EF0FD854F1A1605CB2 -:102EAC001F9D547108D2FBF455E854092AFB70C1DC -:102EBC00308AFBFD162EC0E854094AFB70C13090D5 -:102ECC00FBFD162EC0E854096AFB70C13096FBFD61 -:102EDC00162EC0B453308AFBFDCD2CF313BE6E30CE -:102EEC0090FBFDCD2CF313BE6A3096FBFDCD2CF37D -:102EFC0013BE64D7C736F00071F4DC297170F00092 -:102F0C00CE9D08CE9EC0CE9F80F594FFF593FFF525 -:102F1C0092FFE597FFE596FFE595FFE598FFCE9CC0 -:102F2C007F7100A6FB711BE3712BE3711AE7712B08 -:102F3C00E7717A9D710A9E31929E02EFFA710B9E97 -:102F4C00710392711392712392C6D7C73102921EEC -:102F5C00710292710A9E31929E02EFFA34D4FB36C2 -:102F6C0092FF52078B99A5A792DFF9710B9EC6D7DA -:102F7C00C788061631129215711292C7349CFB3019 -:102F8C0092FF1652078B99A5A792DFF9C666736755 -:102F9C00189CFBC6D7C77103923114921E71139201 -:102FAC00710A9E31929E02EFFA3492FF369CFB52CC -:102FBC00078B99A5A792DFF9710B9E31249213719F -:102FCC002392717B9E8FDCFB9E9A8FDDFB9E9B7107 -:102FDC007A9EC6D7CFA7FB5CCFA8FB5FCFC8FB5DA3 -:102FEC00CFFCFB36CFFDFBC9E5D3FBD7C7CFA4FB8A -:102FFC0012CFA5FB06CFCCFBFFF5CDFBF5CEFBF539 -:10300C00CFFBF5D0FB5600664C64DE08723826FB0D -:10301C000086EFF3C6D7C788061617F1E73403000E -:10302C002361E3ED5D332361F8ED1331B12361E3EB -:10303C00ED1D312561F8ED2B31B1240D0061D8ED7A -:10304C005D33240B0061F8ED4B312361F8ED8E31CB -:10305C002361F8ED5E312361F8ED22332406006123 -:10306C00F8EDF731B12561D8ED133224000061F889 -:10307C00ED20322361F8ED5D332361F8ED3B33B184 -:10308C002361E3ED43322361F8ED54322361F8ED13 -:10309C0065322361F8ED54322361F8ED7632236109 -:1030AC00F8ED87322361F8ED96322361F8EDB832F2 -:1030BC002361F8EDC4322361F8EDD0322361F8EDD1 -:1030CC00D9322402002361E3ED5D3324020061F860 -:1030DC00EDE2322361F8EDED322561F8EDF832B115 -:1030EC0024060061D8ED5D3324000061F8ED5F33F8 -:1030FC002561F8ED033324120061F8ED1D332361D3 -:10310C00F8ED0E33ED5F3334A6FB89615F99ED6901 -:10311C0033301A29619466736718A4FBED69334048 -:10312C00A9FB6ADF1340AAFB68DF0D674C6CDF0854 -:10313C0030C43F6194713AD5679FABFBED6933673F -:10314C00D1DD0C30FF3A619434C4FB89616F99ED89 -:10315C006933675C02D1DD0730A32A6194EF0B67FA -:10316C005C01D1DD0530A82A6194675C3CD1DD0F90 -:10317C0030AD2A6194675C3C7266736218A4FBEDF7 -:10318C00693367D1DD625C01D1DD05300800EF01E8 -:10319C00F6609F01FC675C02D1DD03E6EF01F634BB -:1031AC0001FC89616899675C04D1DD04E6A1EF013B -:1031BC00F63401FC89616899675C08D1DD05302023 -:1031CC0000EF01F63401FC89616899675C10D1DD70 -:1031DC0005301000EF01F63401FC89616899675CD9 -:1031EC0020D161E8716001FCED6933D446DF0867DA -:1031FC009FCDFBA446EF0D4A4605DE08E84667184E -:10320C0011FDA446ED6933675C0F7266736218A4F6 -:10321C00FBED69334A4664DE1B4A4601DF0667D183 -:10322C0061F85701E846671826FBA4464A46056133 -:10323C00C8717291ED6933675C7F70C117F12430EE -:10324C0000FD7C2FC0ED6933675C3F70C117F12422 -:10325C003000FD7C2FC0ED6933675C0770C117F13E -:10326C00243000FD7C2FC0ED6933675C1F70C117E3 -:10327C00F1243000FD7C2FC0ED69336770C117F16C -:10328C00243000FD7C2FC0ED6933CEABAC710A9EAF -:10329C0031929E02EFFAD592FFDF05710B9EEFED96 -:1032AC00679E99710B9E9FDBFBED693371229267D0 -:1032BC005C7F9FDCFBED6933712292675C3F9FDD85 -:1032CC00FBED6933675C3F9FDEFBED6933675C1F89 -:1032DC009FDFFBED693330BD386194679FE4FBEFF2 -:1032EC007C3078386194679FE5FBEF71309A3861D8 -:1032FC0094679FE8FBEF66675C01D161E8FD87424C -:10330C00EF5B4A56C8DE56E85667185AFAA456EFD1 -:10331C004C679D56EF4767318E247000DD0C2402FC -:10332C0000DF3A30F8086194EF33715293EF2E6757 -:10333C005C01D1DD05711202EF03711302675C02AF -:10334C00D1DD05712202EF03712302679FD3FBEFDE -:10335C000CEF0A664C5BDE05736718A4FBC6D7C777 -:10336C0016664C30DC094C37DE05FD572FEF6B66CB -:10337C004C02DF1F8FA6FB5C03728F03FC5C0331D6 -:10338C008E316D08616A08128F03FC5C80312A61F2 -:10339C0062EF56664C3DDF08AE90BD58F858EF49C9 -:1033AC00664C3EDF04F859EF40664C4FDF05FDAF2D -:1033BC0042EF36664C61DF08E856095AFA72EF297B -:1033CC00664C7FDF05FD753BEF1F664C4EDF0B3106 -:1033DC006493045210EF12F2EF0F664C5BDC045254 -:1033EC00FFEF06667309A4FB72C6D7C788061617CB -:1033FC00F1241000240500DC07244C00DD17EF1726 -:10340C00FDB40217F104A4FB1489617F99717AFA57 -:10341C00713292EF02A456C6D7C7C1C1FBF8FF4068 -:10342C0004F903DD064004F904DF38717BFA8C02E1 -:10343C007309ACFB5E0AD1DF278C02318E04A4FB2E -:10344C0014896E0A99716207717AFACC01003162A3 -:10345C0007086159018C01D1DFF4716307716B2787 -:10346C00717AFA1004C6D7CF03FC03F501FCF505FD -:10347C00FCF507FCD7C788061617F1E734020025C0 -:10348C00DD3D23DD1725DD1C23DD0523DD2BEF3B87 -:10349C00716292679F06FCCD5D03EF2F675C839F83 -:1034AC0003FCEF27675C039F05FC675C034C026120 -:1034BC00F8710294FD9D44EF12679F07FCEF0C67B7 -:1034CC0091DF08E0C15012FD2534C0C6D7C71617CE -:1034DC00F1E7240000DD2A23DD1E240300DD072490 -:1034EC00FB00DD24EF2531129405308000EF01F64E -:1034FC00086F04FC7208EF198F01FCF501FC72EFE8 -:10350C00107132935235EF09F2EF0666730900FC25 -:10351C0072C6D7C71617F1E7240000DD3824100057 -:10352C00DD1C23DD1C23DD30240E00DD18241100EE -:10353C00DD1B240F00DD12243000DD15EF1EE2EF41 -:10354C001D5202EF195204EF155206EF115205EFFE -:10355C000D5207EF09F2EF065203EF0252FFC6D7E6 -:10356C00C7314492377143928D5C9FACFB8D5B9F4E -:10357C00CBFB36D2FCC7D85BFDD336618A70618A2F -:10358C00FD1837C0D860F1312F609D5F8D5A4B5FAD -:10359C00DD0A7152928D5F9D5ACD5D034A5D05DE49 -:1035AC000830DD356194CD5D6BB45D7150F000CEAB -:1035BC00300BCF170006CE3106FDBC02717A30718C -:1035CC000BE3710BE7C6D78D5F9D5A8D5F9FADFBEB -:1035DC00D74004F903DF064004F904DF02F2D731C7 -:1035EC0054920C7153927173928D5F9D61EF3131D6 -:1035FC0064921F716392717292D506FCDF04F462BF -:10360C00EF0A8F06FC5002D6A1609D628D629D610F -:10361C00EF0E317492068D629D61EF048D5F9D619A -:10362C008D619FADFBD861FD4536E861091C2270A8 -:10363C00C15013FD4E05C0F2D7C7C1C1FBF8FF8CBA -:10364C0002D1DF05F506FCEF1A8C024C05DE06CF25 -:10365C0006FC02EF0E8C02318E1231FE03311F601C -:10366C009F06FC8D634F06FCDD28CC011F8F06FCEA -:10367C009D63CC00008B4C08DE148B730912204F19 -:10368C0006FCDC058B9C01EF05615900EFE78C0112 -:10369C009D5E1004C6D7C716710AE7710BE3715013 -:1036AC00F000CE300BCF170006669E31FDBC0271C8 -:1036BC007A30710BE33182E302EFFA8D1F7158F00F -:1036CC0000710BE772C6D7C7C1C1FBF8FF8FFCFBBB -:1036DC004E02DC03F2EF318C024FFDFBDC0452FF97 -:1036EC00EF268C022FFCFB706131318D128FFDFBAC -:1036FC002FFCFB70613133BDD813FD440EBB44006D -:10370C0001DC03F690BB8B721004C6D7C7C1FBF863 -:10371C00FFAC0814A91489708B6128706131FD30DD -:10372C004D1344030071FEDC23AC08148A04819A07 -:10373C0004AC08148A044C11DC10A9148B99AC0845 -:10374C0014CA0200AC0814CA0310EF72AC0814CAF5 -:10375C000400AC0814A914894DDE0AAC08148A02C2 -:10376C00819A02EF12AC0814A914894D61D308ACEC -:10377C0008148A02919A02AC08148A03919A03D114 -:10378C00DF3CAC08148A024C10DF10A91489318E6E -:10379C00A112AC0814A9146299EF17AC08148A0290 -:1037AC004CF0DF0EA91489318EB112AC0814A91497 -:1037BC006299AC0814CA0200AC0814CA0310C0C643 -:1037CC00D7EDD037C75600664C0ADE0BF0317E12AF -:1037DC00F67810FC86EFF0C6D7C7200CFBF8FF1765 -:1037EC00040600C15006C150A8C15030FD0803109A -:1037FC0006D2DD1BA4664A6608DE03E2EF6A34E4F7 -:10380C00FB895CFC99FDBD387110B2FBF2EF5930AD -:10381C000600C117040600C130E9FBFD384D100449 -:10382C00F4668FE4FB5C01D1DD264004F903DF2054 -:10383C005010C180FD2534C0C736100571D4C6DECA -:10384C000F17C15006C150A8C15030FD0803100617 -:10385C004004F901DD114004F905DD0B8FE4FB5C3C -:10386C0002D161E8FDC93FF2100CC6D7D9E5FBC106 -:10387C005030FDE002C0629FE8FB7130B5FB8FBD9C -:10388C00FB5C08D1DF06716307716B27F2D7D9E8AF -:10389C00FBC1D9E7FBC15030FD7A0310047130B580 -:1038AC00FB8FBDFB5C08D1DF06716307716B27F2E0 -:1038BC00D7C72006FBF8FF17040500C1E0C1500F65 -:1038CC00C15030FD08031006624C02DF077110B2C4 -:1038DC00FBF2EF5F7118B2FBCC03004007F901DF7C -:1038EC0005CC0402EF03CC0410CC05808FE4FB5C08 -:1038FC0003D1DF08717AD5CC0207EF06717BD5CCEA -:10390C00022F17040200C15004C150A0C15030FD59 -:10391C00B0031006C736100571D4C6DE154004F985 -:10392C0003DF0F17C15006C150A8C15030FD08036A -:10393C001006F21006C6D7D504F9DF03F6BD6840B1 -:10394C0004F901DD0AD472DD03B472D7CD72038F92 -:10395C0004F9318FE723DD0B24020024030061C836 -:10396C00ED683A8F06F931233E301B004668DF0ABA -:10397C00E0C15010FD2534C0EF1D3077014668DFE3 -:10398C00165002C15010FD2534C0F6466EDF088F6C -:10399C00C8FB5010D6BD6EF6466EDD36B66E466E62 -:1039AC00DF30710291EF2B301B004668DF13F646B7 -:1039BC0070DF18E0C15010FD2534C0C9705307EFFB -:1039CC000A307701466861F8710291F6467061E839 -:1039DC00B67031349408712393F6BD68EF1431241A -:1039EC009305F6BD68EF0BA668F6466861F8C968E2 -:1039FC00FFFF314294194A6A05DE16A46A4A6A0529 -:103A0C00DF0FA46A5004C15010FD2534C0EF02F43E -:103A1C006A314494194A6C05DE16A46C4A6C05DFB5 -:103A2C000FA46C5008C15010FD2534C0EF02F46C8B -:103A3C00D46DDD03B46DD7315294174A6B05DE1487 -:103A4C00A46B4A6B05DF0DA46B5010C1FD2534C06F -:103A5C00EF02F46B4A6B0661F8CD6D25D7C73610B3 -:103A6C000571D4DE0630E5376194D24004F903DFEA -:103A7C001C3122070530D52961943134930C7133F4 -:103A8C00935080C15012FD2534C0FDAB3AFDD13AA4 -:103A9C0031549306715393FD8141FDC446C6D78FB3 -:103AAC0003FC5C01D1DD1DD475DD03B475D7CD7578 -:103ABC00098D5E4B74DD0D8D5E9D745040C15012AE -:103ACC00FD2534C0D74004F903DD04F6BD1AD7D563 -:103ADC00D0FBDF08F6461ADD19B61AD7D9CCFBF1A4 -:103AEC00461ADD0ED9CCFB12AD1A43DE03A61AD74B -:103AFC00B61AD7C7FDB4028FC4FB76F5C4FB717A36 -:103B0C00FA5C10D161E8714293665C0FD1DD5766A7 -:103B1C005C01D1DD05F504F9EF4C665C02D1DD11D9 -:103B2C00E0C15003FD1A2BC0711300711B207103EF -:103B3C0003665C04D1DD11711300711B20D503FCED -:103B4C0061F8710303FD7334665C08D161E871039D -:103B5C00035005FD4A027102035003C1FD1A2BC02C -:103B6C00711A20FDC22AF2C6D7C756FF4A46136106 -:103B7C00C8ED4F3C8F06F9311505300400EF0F8F5F -:103B8C0006F9314505300500EF04D907F9F1609FBE -:103B9C0028FC8D769F29FC713490E66130127104FB -:103BAC009061DC31196162629F2AFCE52BFC3114B7 -:103BBC000205308000EF01F6C1312494053040003D -:103BCC00EF01F6C2616B08616A08C131340405303B -:103BDC002000EF01F6C2616B08616A08C131240252 -:103BEC0005300800EF01F6C2616B08616A08C1314B -:103BFC00549405300400EF01F6C2616B08616A0849 -:103C0C00C131449404E6A1EF01F6C2616B08616A0C -:103C1C0008C131349403E6EF01F6C2616B08616AA6 -:103C2C009F2CFCF171240461DC9F26FCF17154077C -:103C3C0061DC9F27FCD846F10104ECFC14A9148923 -:103C4C0076A4466672C6D7C7FD7B098F04F9318FFF -:103C5C00E724000061F8ED2C3E23DD1B2361F8ED19 -:103C6C00363D2361F8EDB23D2361F8EDFB3D236158 -:103C7C00F8EDCC3EED293E4005F901DF2D311494D1 -:103C8C001CF64668DD04F424EF02A4244A2465DC07 -:103C9C000FF6BD68F504F9710293ED473FFD9623CD -:103CAC00AD68440A0061D8ED473F712293FDD804FA -:103CBC00715390FD96234007F903DF09710293F5C8 -:103CCC0004F9ED473FFDF92540B1FB9BDE0D3114A6 -:103CDC009409710293F504F9ED473F714A2771403D -:103CEC00110571301105713A22715A22715011056A -:103CFC00FD1F29D2DD09710293F504F9ED473F71DF -:103D0C00103500CF37001D714012054005F901DD5B -:103D1C00064005F903DF05F5CDFBEF04CFCDFB0322 -:103D2C00CF04F902FD0529ED473FFDFD2BFD592C74 -:103D3C00714A9DFD7334FDF82FF537FF712BE0F5BB -:103D4C0005F9710293CBE43FEFCBE6F6F0FDD80416 -:103D5C00713BD47112027123028F06F93105285080 -:103D6C0004FD2B2B625C03318E315D34B3FB896116 -:103D7C0068995002FD2B2BD2DD067170B3FBEF045A -:103D8C007178B3FBFD9623FD102D710806F9CF0455 -:103D9C00F9038FA6FB5C02D1DD095080C15010FDE8 -:103DAC002534C0ED473FFD493F3144932FA478D4CF -:103DBC0078DD0831A4E00A31020C06712BE0FDB568 -:103DCC003F31A4E01731040C13712BE05027C15084 -:103DDC0005FD1A2BC0CF04F904710293FDAA3F8F85 -:103DEC0006F931250731149403F504F9ED473FFD2D -:103DFC00493F31020C14F0C15005FD1A2BC050057F -:103E0C00FD4A02FDB53FCF04F903FDAA3F8F06F929 -:103E1C0031250731149403F504F9ED473FF504F906 -:103E2C00CFCDFB03F5CEFBF5D0FB715291F6426C76 -:103E3C00FF61E8ED473FF6BD6E710391F5E4FBFDC4 -:103E4C00BD38FD762DFD502CFDAE2C714B9D7113A4 +:1022AC0003713204FD172331229005714202EF03B2 +:1022BC00714302D432DD11B4328FB2FB5C01D1DD3B +:1022CC0004F432EF03714202314402067140B3FB55 +:1022DC00EF047148B3FBFD0526D74A304BDC114A9D +:1022EC0030B9DE0C4A3B28DE03A43BD7713390D7C0 +:1022FC004A303EDC054A30BDDC0C4A3C28DE03A4E7 +:10230C003CD7713290D7F43BF43CD73122940C4A31 +:10231C003D02DE03A43DD7712390D73132040A402D +:10232C00AFFB3CDE04712390D7712290F43DD7C7EC +:10233C00C1FBF8FF714490711794DE5771149471BE +:10234C004190311294127130B3FB5002C15011FD07 +:10235C001B34C0CD3232EF3B7138B3FBE0C15011AE +:10236C00FD1B34C0F43217C15002FD0E2BC0D2DF5E +:10237C000D8B318E318D080E01081C00BD34AD342F +:10238C0044009BDC05D5AFFBDF095020C15011FD8B +:10239C001B34C0C0C6D7C78D2076FDE323FD422B6E +:1023AC00D507F9DD05710390EF2B664B2061F831F1 +:1023BC0054901A715390FDCE04664C07DD0381DFF7 +:1023CC00098F06F9310303FD6C24FD802471029002 +:1023DC003063256194C6D7C77162017172015005D3 +:1023EC00FD40025008FD9836629D305009FD98362C +:1023FC006276716301711806F94A30F1DC05E50764 +:10240C00F9EF224A3004DE1ACF07F9025008C15006 +:10241C006CFDD602C092DF0DD44DDF09711006F9A8 +:10242C00EF03F507F94007F901DF05710A22EF0602 +:10243C00710B22710302CD20075700674C08DE1088 +:10244C0073090A20614EDC05679D20EF0387EFEBD3 +:10245C004A2007DF09D507F961F8CF07F903C6D77A +:10246C00500AFD4002304000C15006FDF12AC05018 +:10247C0096ED4002C72006FBF8FFD507F961E8EDA1 +:10248C005F25304A57C1503EFDF12AC0D2DD07719D +:10249C0000B2FBED5F257108B2FB17040200C150BE +:1024AC0004C1500CC1506CFDFE021006EA38AA485B +:1024BC00318D12AA48318E616B08616A08C1500EC9 +:1024CC00FDF12AC0F690C1500CFDF12AC0CC0100E0 +:1024DC008C014C04DE2831249102EFFA711291EA3E +:1024EC00388C015010D605C15010C18C01D6044057 +:1024FC0000C1506CFDA6031006615901EFD250A526 +:10250C00FD4002EA38AA48318D12AA48318E616B1F +:10251C0008616A08C1500EFDF12AC050A5FD4002A9 +:10252C005004C1506CFDD602C0629C01EA388A4B43 +:10253C004E0161C3048A4A4E0117040200C15004C3 +:10254C00C1500CC1506CFDA6031006F6C1503EFDE7 +:10255C00F12AC01006C6D7C78D3E4B3061F8ED028C +:10256C00264A4028DE05A440ED0226F4408D309D1D +:10257C003E8D305070D612307351230480001231CE +:10258C00FF318E039D3F9FAEFBF68D3F7C804C95BB +:10259C00DC1B8D3F318F241400EA38BDD8AA44FDD2 +:1025AC00DC0D1231FF318E03318F16EF198D3F3157 +:1025BC008F241400EA38BDD8AA46FDDC0D1231FF79 +:1025CC00318E03318F16EA388A427217F3031644A0 +:1025DC00000171FE61C836FF001701DE02F6161706 +:1025EC00BD76C7500CFDF12AC0D2DF068D309D3E62 +:1025FC00EF047100B2FBF2C6D7C72008FBF8FF400E +:10260C0007F901DD064007F902DF1C17040600FD7F +:10261C00E92BD2DF0A8C069C058C079C04EF4ACC74 +:10262C000563CC0400EF4217040600FDE92BD2DD54 +:10263C000F7100B2FB710390CC0500710291EF2970 +:10264C008C06318E318D080E07081C00BBEA388AC7 +:10265C004072ABFD2F0FBB8C019C05D1DF08CC0564 +:10266C0001CC0400EF038B9C0417040600FDF42B33 +:10267C00D2DD06CC06C8CC07008C069FB1FB8C06BD +:10268C00318E318D080E07081C00BD34AD34440169 +:10269C00A5DC08CC0364F6BD42EF48AD34264244B9 +:1026AC0001A0DC08CC031EF6BD42EF37AD344481EB +:1026BC009DDC09CC030AC942F401EF27AD34440177 +:1026CC009BDC09CC0305C942F401EF17AD3444017E +:1026DC0091DC09CC0300C942F401EF07710291C9E6 +:1026EC0042F4013132040C31249008CC0564CC0442 +:1026FC0000EF0D8C034E05DE078C039C05CC04000B +:10270C008C059FAFFB8C049FB0FBFD762B8D444E4C +:10271C0005DD2840AFFB0BDE054A440BDE1440AF51 +:10272C00FB06DE054A4406DE09D5AFFBDF0DD444BB +:10273C00DD095020C15011FD1B34C08FAFFB9D44EF +:10274C00FDB32B1008C6D7C7D837C15002FD262BB6 +:10275C00C04008F90161F8712010055012FD4002CB +:10276C008D376C0870C15002FD262BC05003FD4004 +:10277C00028D376C1870C15002FD262BC05016FD0F +:10278C0040025003FD372B625C01D1DD107170B338 +:10279C00FB5002C15013FD1B34C0F2EF01E2C6D74F +:1027AC00C75004FD372B625C03D1DD405014FD4350 +:1027BC002834B3FB895C9F998A0C7CFF50FF5C1416 +:1027CC00D1DD228A0C7CFF5C147234B7FB89616A00 +:1027DC00997162075600316207058666D1DFF77181 +:1027EC006307716B2734C6FB895CEB997128100564 +:1027FC005002FD372BD2DD354008F901DF05500AB8 +:10280C00FD40028D376C1070C15002FD262BC0E0CC +:10281C00FD4002D837C15002FD262BC05033FD407D +:10282C0002F0C15002FD262BC07178B3FBE0C15001 +:10283C0013FD1B34C0C6D7C7C12004FBF8FFCC0264 +:10284C00005004FD372B629C038C045C20D1DD0E00 +:10285C008C036C019C038C026C209C02EF138C0487 +:10286C005C10D1DD0C8C035CFE9C038C026C109C08 +:10287C00028C045C08D1DD0E8C036C029C038C0270 +:10288C006C089C02EF138C045C04D1DD0C8C035C93 +:10289C00FD9C038C026C049C028C03D1DD05501A48 +:1028AC00FD40028C0370C15004FD262BC08FB3FB7E +:1028BC005C9F728C03318E316D148C03318E314DD3 +:1028CC00616D08616C5C606162629FB3FB8FBFFBE2 +:1028DC007CFF50FF5E02D1DD278FBFFB7CFF5E02C9 +:1028EC007234B7FB89616A99716207CC010031625D +:1028FC0007086159018C01D1DFF4716307716B27F3 +:10290C00F21006C6D7D9A7FBC15006FD262BC0D99D +:10291C00A8FBC15007FD262BC0D7FD1129F2D7C744 +:10292C00711300711B20710303710205E0C1500388 +:10293C00FD262BC05013FD4002F0C15005FD262B87 +:10294C00C0500FC1E0FD262BC0500AFD40027103A0 +:10295C00055008FD4002501FC1E0FD262BC050124F +:10296C00FD40025003FD372B625C01D1DF03E2EF27 +:10297C0024F0FD372B629D363602F9C75008FD0E48 +:10298C002BC05003C1FD262BC0710203711A20FD10 +:10299C00CE2AF431F2C6D75003FD372B625C01D13D +:1029AC00DD155014FD4328FDAC275014FD4002E00A +:1029BC00C15003FD262BC0711300711B2071030342 +:1029CC005014FD4002F0C1E0FD262BC0F0C15003B5 +:1029DC00FD262BC0D7C72004FBF8FFCC02008D319D +:1029EC009C035010C150A4FDD602C0629D31D44D41 +:1029FC00DD04F2EDAB2A8C037B315C08D1DD0F8D4D +:102A0C00315C08D1DF05CC0210EF03CC02208C0323 +:102A1C007B315C04D1DD158D315C04D1DF088C0277 +:102A2C006C049C02EF068C026C089C028FB2FB5C5F +:102A3C00F3728D315C0C6162629FB2FB8FBEFB7CCA +:102A4C00FF50FF5E029C02D1DD1F34B6FB896E0283 +:102A5C0099716207CC0100316207086159018C0140 +:102A6C00D1DFF4716307716B278D315C40D1DD09C7 +:102A7C005002C15012FD1B34C08D315C01D1DD08F8 +:102A8C00E0C15012FD1B34C0717AFA8D315C41D11A +:102A9C00DD0C5A31BED831C15010FD4405C0F210C6 +:102AAC0004C6D7FD5327F2D7FDAC27F2D7C78FC684 +:102ABC00FB7617FD4328664FC6FBDFF2F5C6FBF22B +:102ACC00C6D75064FD4002FDFF2B6261FB71119073 +:102ADC00F171149061DC70C15012FD4405C0FDC948 +:102AEC0035CD5D03D7C7C1C1FBF8FFAC0ABB17C11D +:102AFC005002C18C0270C1506CFDA603100610046C +:102B0C00C6D7C7C1FBF8FFAC08C15002C18B70C15E +:102B1C00506CFDFE021006C0C6D7C788061667703B +:102B2C00C1C75084FD70031004C6D7C716C75084A4 +:102B3C00FDD602C0C6D7C74A2004DE045600EF02F9 +:102B4C0056014008F901DF048686EF0A4008F902B5 +:102B5C00DF045104610666318F12504CD633514C50 +:102B6C00D6610A045420BD38C6D740AFFB51DC05F2 +:102B7C00CF04FC0FD740AFFB33DC05CF04FC0BD7E5 +:102B8C0040AFFB0BDC05CF04FC07D740AFFB066165 +:102B9C00D831320405CF04FC03D7D5AFFBDD04E5F7 +:102BAC0004FCD7F504FCD7D504F9DF04716390D786 +:102BBC00FDFF2B6261FB71719071149071779061C4 +:102BCC00C831629017716290717490711190F171AB +:102BDC00749061DC70C15012FD4405C0D7C716C794 +:102BEC005004FD0E2BC0C6D7C716C75002FD0E2BC6 +:102BFC00C0C6D740AFFB0BDE02E2D7F2D7710001A3 +:102C0C000571785005713AD5713BD18F10055CFC7C +:102C1C009F1005CF54054AE542057110420571001D +:102C2C004205714850057130500571205005CF5345 +:102C3C000505CF52050A7130510571205105713BC4 +:102C4C00D5717050058F11055CFC9F1105F422D7CE +:102C5C007178500571080105D77140F0007178301A +:102C6C0002713AE6713BE2713BEA713BEE8F100563 +:102C7C005CFC9F1005CF34024AE552FF711A527169 +:102C8C000A52714830027130300271203002CF3359 +:102C9C000205CF32020A71303102713BE67170309D +:102CAC00028F11055CFC9F110571603002D77178A1 +:102CBC0030027148F000D7C788061666614FDD09EF +:102CCC0067614EDE0396EF01866672C6D7C716178C +:102CDC0014AA0412A943DD29AA0412A923FD304D1C +:102CEC00C3AC02FD304D13C2BDD813FDAC0FDE0CCE +:102CFC001714AA0212AA0403BA04EF051714A9BAEE +:102D0C0004AC041231FF319E03317F087208C6D720 +:102D1C007100F200304400BFB601300188BF900151 +:102D2C00300984BF9E01BF9C01BF9A01BF9801BFAF +:102D3C009601BF9401BF9201F53CFF30FE00BFBE6F +:102D4C0001F6BFBC01BFB80150EEBFBA01A1BFB2C2 +:102D5C0001C918FE00F6BE6EBE64BE6A7123047112 +:102D6C0053078F06F9310507F5CDFBCB6CFF0071CE +:102D7C005391714291D730EF00BFB401F6BFBA0145 +:102D8C007108F200712304715307714391D78D5070 +:102D9C00B450D1DF6931D4D105715BD1E452D45236 +:102DAC00DD2E7140B2FBD851F1E734020023DD0671 +:102DBC0025DD0325DF05F6BE66EF06D9CCFBF1BE9B +:102DCC0066A4514A5120DF04F451B452CD5019D7A6 +:102DDC00CD501E7148B2FBD5CEFBDF04F6BE66D7D4 +:102DEC00D9CCFBF14266FFDD15D9CCFBF112AE66F6 +:102DFC0043DE05A266FFEF03B266FFCD5003D7C7D3 +:102E0C00161714F6B9AA0412F6231231FF31AE03C9 +:102E1C00316FBA02C6D7C7C1FBF8FF8C085080D6F9 +:102E2C0012AB1413B9AB14AA0412A92312D927FBA1 +:102E3C00F133BDD813FD180EBA02C0C6D731649158 +:102E4C0001D74004F902DF10F6BE64BE6EBE6ABF45 +:102E5C008EFBBF94FBBF9AFB31549114308AFBFD5F +:102E6C000B2E3090FBFD0B2E3096FBFD0B2EEF71D5 +:102E7C003174910D7173917108D2FBF454F453EFCA +:102E8C0060D453DF5A8F26FB9D534A541FDC1771B5 +:102E9C0000D2FB4028FBFFDD1CA4558F28FB4B55B3 +:102EAC00DE13F454EF0FD854F1A1605C1F9D5471E4 +:102EBC0008D2FBF455E854092AFB70C1308AFBFD9B +:102ECC00222EC0E854094AFB70C13090FBFD222E23 +:102EDC00C0E854096AFB70C13096FBFD222EC0B4C9 +:102EEC0053308AFBFDD92CF313BE6E3090FBFDD909 +:102EFC002CF313BE6A3096FBFDD92CF313BE64D7AA +:102F0C00C736F00071F4DC297170F000CE9D08CE4C +:102F1C009EC0CE9F80F594FFF593FFF592FFE59749 +:102F2C00FFE596FFE595FFE598FFCE9C7F7100A627 +:102F3C00FB711BE3712BE3711AE7712BE7717A9D1F +:102F4C00710A9E31929E02EFFA710B9E710392717F +:102F5C001392712392C6D7C73102921E71029271DD +:102F6C000A9E31929E02EFFA34D4FB3692FF52073E +:102F7C008B99A5A792DFF9710B9EC6D7C788061649 +:102F8C0031129215711292C7349CFB3092FF16527B +:102F9C00078B99A5A792DFF9C6667367189CFBC6C9 +:102FAC00D7C77103923114921E711392710A9E311C +:102FBC00929E02EFFA3492FF369CFB52078B99A536 +:102FCC00A792DFF9710B9E31249213712392717BBE +:102FDC009E8FDCFB9E9A8FDDFB9E9B717A9EC6D7E3 +:102FEC00CFA7FB5CCFA8FB5FCFC8FB5DCFFCFB364C +:102FFC00CFFDFBC9E5D3FBD7C7CFA4FB12CFA5FBF5 +:10300C0006CFCCFBFFF5CDFBF5CEFBF5CFFBF5D01A +:10301C00FB5600664C64DE08723826FB0086EFF324 +:10302C00C6D7C788061617F1E73403002361E3ED12 +:10303C0053332361F8ED1F31B12361E3ED293125C1 +:10304C0061F8ED3731B1240D0061D8ED5333240B09 +:10305C000061F8ED57312361F8ED9A312361F8EDF9 +:10306C006A312361F8ED4E3324060061F8ED03322A +:10307C00B12561D8ED1F3224000061F8ED2C32230C +:10308C0061F8ED53332361F8ED2C33B12361E3ED9B +:10309C004F322361F8ED60322361F8ED7132236118 +:1030AC00F8ED60322361F8ED82322361F8ED933252 +:1030BC002361F8EDA2322361F8EDC4322361F8EDFF +:1030CC00D0322361F8EDDC322361F8EDE4322402D6 +:1030DC00002361E3ED533324020061F8EDEC32235D +:1030EC0061F8EDF7322561F8ED0233B12406006189 +:1030FC00D8ED533324000061F8ED55332561F8ED1C +:10310C000D3324120061F8ED27332361F8ED1833E9 +:10311C00ED553334A6FB89615F99ED5F3330262979 +:10312C00619466736718A4FBED5F3340A9FB6ADFFB +:10313C001340AAFB68DF0D674C6CDF0830C43F619D +:10314C0094713AD5679FABFBED5F3367D1DD0C30E3 +:10315C00F73A619434C4FB89616F99ED5F33675C16 +:10316C0002D1DD0730AF2A6194EF0B675C01D1DD32 +:10317C000530B42A6194675C3CD1DD0F30B92A610B +:10318C0094675C3C7266736218A4FBED5F3367D185 +:10319C00DD625C01D1DD05300800EF01F6609F01B6 +:1031AC00FC675C02D1DD03E6EF01F63401FC8961BA +:1031BC006899675C04D1DD04E6A1EF01F63401FCEB +:1031CC0089616899675C08D1DD05302000EF01F654 +:1031DC003401FC89616899675C10D1DD0530100001 +:1031EC00EF01F63401FC89616899675C20D161E8D4 +:1031FC00716001FCED5F33D446DF08679FCDFBA403 +:10320C0046EF0D4A4605DE08E846671811FDA44650 +:10321C00ED5F33675C0F7266736218A4FBED5F336E +:10322C004A4664DE1B4A4601DF0667D161F8570146 +:10323C00E846671826FBA4464A460561C871729198 +:10324C00ED5F33675C7F70C117F1243000FD882F70 +:10325C00C0ED5F33675C3F70C117F1243000FD880F +:10326C002FC0ED5F33675C0770C117F1243000FD90 +:10327C00882FC0ED5F33675C1F70C117F1243000DD +:10328C00FD882FC0ED5F336770C117F1243000FD4E +:10329C00882FC0ED5F33CEABAC710A9E31929E028B +:1032AC00EFFAD592FFDF05710B9EEFED679E9971DA +:1032BC000B9E9FDBFBED5F33712292675C7F9FDC83 +:1032CC00FBED5F33712292675C3F9FDDFBED5F335B +:1032DC00675C3F9FDEFBEF7B675C1F9FDFFBEF7341 +:1032EC0030B3386194679FE4FBEF68306E386194BB +:1032FC00679FE5FBEF5D3090386194679FE8FBEFCB +:10330C0052675C01D1DD4CFD8742EF474A56C8DE5F +:10331C0042E85667185AFAA456EF38679D56EF33B1 +:10332C00675C01D1DD05711202EF03711302675C5A +:10333C0002D1DD05712202EF03712302679FD3FBDB +:10334C00EF1167318EEF0CEF0A664C5BDE0573678D +:10335C0018A4FBC6D7C716664C30DC094C37DE0503 +:10336C00FD632FEF6B664C02DF1F8FA6FB5C0372B5 +:10337C008F03FC5C03318E316D08616A08128F0378 +:10338C00FC5C80312A6162EF56664C3DDF08AE90E2 +:10339C00BD58F858EF49664C3EDF04F859EF4066CB +:1033AC004C4FDF05FDAF42EF36664C61DF08E85647 +:1033BC00095AFA72EF29664C7FDF05FD6D3BEF1F52 +:1033CC00664C4EDF0B316493045210EF12F2EF0F88 +:1033DC00664C5BDC0452FFEF06667309A4FB72C6F5 +:1033EC00D7C788061617F1241000240500DC072423 +:1033FC004C00DD17EF17FDAA0217F104A4FB14898A +:10340C00617F99717AFA713292EF02A456C6D7C7CE +:10341C00C1C1FBF8FF4004F903DD064004F904DFE9 +:10342C0038717BFA8C027309ACFB5E0AD1DF278CF6 +:10343C0002318E04A4FB14896E0A99716207717AA9 +:10344C00FACC0100316207086159018C01D1DFF41B +:10345C00716307716B27717AFA1004C6D7CF03FC1E +:10346C0003F501FCF505FCF507FCD7C78806161714 +:10347C00F1E734020025DD3D23DD1725DD1C23DDBE +:10348C000523DD2BEF3B716292679F06FCCD5D033C +:10349C00EF2F675C839F03FCEF27675C039F05FCA2 +:1034AC00675C034C0261F8710294FD9D44EF126756 +:1034BC009F07FCEF0C6791DF08E0C15012FD1B3435 +:1034CC00C0C6D7C71617F1E7240000DD2A23DD1E7E +:1034DC00240300DD0724FB00DD24EF2531129405C5 +:1034EC00308000EF01F6086F04FC7208EF198F01B1 +:1034FC00FCF501FC72EF107132935235EF09F2EFCB +:10350C000666730900FC72C6D7C71617F1E72400CC +:10351C0000DD38241000DD1C23DD1C23DD30240EDF +:10352C0000DD18241100DD1B240F00DD12243000F7 +:10353C00DD15EF1EE2EF1D5202EF195204EF15528A +:10354C0006EF115205EF0D5207EF09F2EF06520389 +:10355C00EF0252FFC6D7C7314492377143928D5C4C +:10356C009FACFB8D5B9FCBFB36D2FCC7D85BFDC9F8 +:10357C0036618A70618AFD0E37C0D860F1312F60D8 +:10358C009D5F8D5A4B5FDD0A7152928D5F9D5ACDB6 +:10359C005D034A5D05DE0830D3356194CD5D6BB4B7 +:1035AC005D7150F000CE300BCF170006CE3106FD0A +:1035BC00B202717A30710BE3710BE7C6D78D5F9D48 +:1035CC005A8D5F9FADFBD74004F903DF064004F929 +:1035DC0004DF02F2D73154920C7153927173928DB5 +:1035EC005F9D61EF313164921F716392717292D55C +:1035FC0006FCDF04F462EF0A8F06FC5002D6A160D1 +:10360C009D628D629D61EF0E317492068D629D619B +:10361C00EF048D5F9D618D619FADFBD861FD3B36E5 +:10362C00E861091C2270C15013FD4405C0F2D7C7D4 +:10363C00C1C1FBF8FF8C02D1DF05F506FCEF1A8C3B +:10364C00024C05DE06CF06FC02EF0E8C02318E1208 +:10365C0031FE03311F609F06FC8D634F06FCDD2895 +:10366C00CC011F8F06FC9D63CC00008B4C08DE1434 +:10367C008B730912204F06FCDC058B9C01EF056156 +:10368C005900EFE78C019D5E1004C6D7C716710A6E +:10369C00E7710BE37150F000CE300BCF17000666CC +:1036AC009E31FDB202717A30710BE33182E302EF8D +:1036BC00FA8D1F7158F000710BE772C6D7C7C1C1E4 +:1036CC00FBF8FF8FFCFB4E02DC03F2EF318C024F58 +:1036DC00FDFBDC0452FFEF268C022FFCFB706131EA +:1036EC00318D128FFDFB2FFCFB70613133BDD81374 +:1036FC00FD3A0EBB440001DC03F690BB8B72100448 +:10370C00C6D7C7C1FBF8FFAC0814A91489708B612C +:10371C0028706131FD304D1344030071FEDC23AC85 +:10372C0008148A04819A04AC08148A044C11DC1025 +:10373C00A9148B99AC0814CA0200AC0814CA031063 +:10374C00EF72AC0814CA0400AC0814A914894DDE3D +:10375C000AAC08148A02819A02EF12AC0814A9145C +:10376C00894D61D308AC08148A02919A02AC0814F2 +:10377C008A03919A03D1DF3CAC08148A024C10DF07 +:10378C0010A91489318EA112AC0814A9146299EFF6 +:10379C0017AC08148A024CF0DF0EA91489318EB1D3 +:1037AC0012AC0814A9146299AC0814CA0200AC0833 +:1037BC0014CA0310C0C6D7EDC637C75600664C0AEC +:1037CC00DE0BF0317E12F67810FC86EFF0C6D7C710 +:1037DC00200CFBF8FF17040600C15006C150A8C10D +:1037EC005030FDFE021006D2DD1BA4664A6608DED0 +:1037FC0003E2EF6A34E4FB895CFC99FDB338711089 +:10380C00B2FBF2EF59300600C117040600C130E9D3 +:10381C00FBFD384D1004F4668FE4FB5C01D1DD2612 +:10382C004004F903DF205010C180FD1B34C0C736A3 +:10383C00100571D4C6DE0F17C15006C150A8C15077 +:10384C0030FDFE0210064004F901DD114004F905BB +:10385C00DD0B8FE4FB5C02D161E8FDC93FF2100C7B +:10386C00C6D7D9E5FBC15030FDD602C0629FE8FB3C +:10387C007130B5FB8FBDFB5C08D1DF06716307713E +:10388C006B27F2D7D9E8FBC1D9E7FBC15030FD70EB +:10389C000310047130B5FB8FBDFB5C08D1DF0671E2 +:1038AC006307716B27F2D7C7200CFBF8FFCC09001C +:1038BC004007F901DF05CC0A02EF03CC0A10CC0B50 +:1038CC00808FE4FB5C039C07717AFA8C07D1DF08CC +:1038DC00717AD5CC0807EF06717BD5CC082F17046D +:1038EC000800C15004C150A0C15030FDA603100601 +:1038FC00624C02DF067110B2FBEF047118B2FBC709 +:10390C0036100571D4C6DE164004F903DF1017A17A +:10391C00C15006C150A8C15030FDFE021006FDAAD0 +:10392C00028FE4FB5C034E07DF9EF2100CC6D7D56A +:10393C0004F9DF03F6BD684004F901DD0AD472DD39 +:10394C0003B472D7CD72038F04F9318FE723DD0BEB +:10395C0024020024030061C8ED603A8F06F931237C +:10396C003E301B004668DF0AE0C15010FD1B34C01E +:10397C00EF1D3077014668DF165002C15010FD1B59 +:10398C0034C0F6466EDF088FC8FB5010D6BD6EF6FD +:10399C00466EDD36B66E466EDF30710291EF2B301F +:1039AC001B004668DF13F64670DF18E0C15010FDAF +:1039BC001B34C0C9705307EF0A307701466861F8B1 +:1039CC00710291F6467061E8B67031349408712337 +:1039DC0093F6BD68EF1431249305F6BD68EF0BA682 +:1039EC0068F6466861F8C968FFFF314294194A6A63 +:1039FC0005DE16A46A4A6A05DF0FA46A5004C1509A +:103A0C0010FD1B34C0EF02F46A314494194A6C0562 +:103A1C00DE16A46C4A6C05DF0FA46C5008C1501064 +:103A2C00FD1B34C0EF02F46CD46DDD03B46DD731E3 +:103A3C005294174A6B05DE14A46B4A6B05DF0DA478 +:103A4C006B5010C1FD1B34C0EF02F46B4A6B066166 +:103A5C00F8CD6D25D7C736100571D4DE0630DB37AF +:103A6C006194D24004F903DF1C3122070530E129AF +:103A7C0061943134930C7133935080C15012FD1BFF +:103A8C0034C0FDA33AFDC93A31549306715393FDEA +:103A9C008141FDC446C6D78F03FC5C01D1DD1DD42A +:103AAC0075DD03B475D7CD75098D5E4B74DD0D8D49 +:103ABC005E9D745040C15012FD1B34C0D74004F9B8 +:103ACC0003DD04F6BD1AD7D5D0FBDF08F6461ADDA8 +:103ADC0019B61AD7D9CCFBF1461ADD0ED9CCFB128C +:103AEC00AD1A43DE03A61AD7B61AD7C7FDAA028FA2 +:103AFC00C4FB76F5C4FB717AFA5C10D161E87142B3 +:103B0C0093665C0FD1DD57665C01D1DD05F504F9D8 +:103B1C00EF4C665C02D1DD11E0C15003FD262BC0D9 +:103B2C00711300711B20710303665C04D1DD1171EC +:103B3C001300711B20D503FC61F8710303FD69347C +:103B4C00665C08D161E87103035005FD4002710207 +:103B5C00035003C1FD262BC0711A20FDCE2AF2C6DC +:103B6C00D7C756FF4A461361C8ED473C8F06F9315B +:103B7C001505300400EF0F8F06F9314505300500AF +:103B8C00EF04D907F9F1609F28FC8D769F29FC7111 +:103B9C003490E661301271049061DC31196162621B +:103BAC009F2AFCE52BFC31140205308000EF01F656 +:103BBC00C131249405304000EF01F6C2616B0861FD +:103BCC006A08C131340405302000EF01F6C2616B84 +:103BDC0008616A08C131240205300800EF01F6C201 +:103BEC00616B08616A08C131549405300400EF011F +:103BFC00F6C2616B08616A08C131449404E6A1EF16 +:103C0C0001F6C2616B08616A08C131349403E6EFB6 +:103C1C0001F6C2616B08616A9F2CFCF1712404618E +:103C2C00DC9F26FCF171540761DC9F27FCD846F120 +:103C3C000104ECFC14A9148976A4466672C6D7C795 +:103C4C00FD71098F04F9318FE724000061F8ED292B +:103C5C003E23DD1B2361F8ED333D2361F8EDAF3DD1 +:103C6C002361F8EDF83D2361F8EDCC3EED263EF6F0 +:103C7C00BD6E7103914005F901DF2C3114941B4684 +:103C8C0068DD04F424EF02A4244A2465DC0FF6BD9D +:103C9C0068F504F9710293ED473FFDA223AD68442A +:103CAC000A0061D8ED473F712293FDCE0471539009 +:103CBC00FDA2234007F903DF09710293F504F9ED26 +:103CCC00473FFD052640B1FB9BDE0D311494097175 +:103CDC000293F504F9ED473F714A277140110571C4 +:103CEC00301105713A22715A2271501105FD2B29A0 +:103CFC00D2DD09710293F504F9ED473F71103500DF +:103D0C00CF37001D714012054005F901DD06400555 +:103D1C00F903DF05F5CDFBEF04CFCDFB03CF04F9A1 +:103D2C0002FD1129ED473FFD092CFD652C714A9DC3 +:103D3C00FD6934FD0430F537FF712BE0F505F971A1 +:103D4C000293CBE43FEFCBE6F6F0FDCE04713BD40F +:103D5C007112027123028F06F93105285004FD37C8 +:103D6C002B625C03318E315D34B3FB8961689950F1 +:103D7C0002FD372BD2DD067170B3FBEF047178B303 +:103D8C00FBFDA223FD1C2D710806F9CF04F9038F4E +:103D9C00A6FB5C02D1DD095080C15010FD1B34C064 +:103DAC00ED473FFD493F3144932FA478D478DD088B +:103DBC0031A4E00A31020C06712BE0FDB53F31A4B1 +:103DCC00E01731040C13712BE05027C15005FD2670 +:103DDC002BC0CF04F904710293FDAA3F8F06F93171 +:103DEC00250731149403F504F9ED473FFD493F31A4 +:103DFC00020C14F0C15005FD262BC05005FD4002ED +:103E0C00FDB53FCF04F903FDAA3F8F06F931250715 +:103E1C0031149403F504F9ED473FF504F9CFCDFBCC +:103E2C0003F5CEFBF5D0FB715291F6426CFF61E8C5 +:103E3C00ED473FF6BD6E710391F5E4FBFDB33871B0 +:103E4C007AFAFD822DFD5C2CFDBA2C714B9D711301 :103E5C0002712302F5B4FBF5B5FBF5B6FBF5B7FB28 :103E6C0031249102EFFACE3708CBE4BFFFCBE6FF4B :103E7C00F3CED4FFCF37000971481205F6BEE0BE71 -:103E8C00E2BED0716A27FD9729714307714B2771E8 +:103E8C00E2BED0716A27FDA329714307714B2771DC :103E9C0048100571481105713810057138110571FC :103EAC003302713B22715302715B22715810057100 -:103EBC00581105CF04F905712293F6BD68FD440A2B +:103EBC00581105CF04F905712293F6BD68FD3A0A35 :103ECC00F505F9F42431149404D432DD20E505F918 :103EDC00E504F98F06F9312562F5F8FBF5F6FB5090 -:103EEC002EFD4A02CF05F903E504F9EF4EFD34052A -:103EFC00FD2F2371730171320471430271039071B0 -:103F0C00529031949E02EFFA712AE7CEA409311433 -:103F1C00940261FDCEA408F464FD7B093112940671 +:103EEC002EFD4002CF05F903E504F9EF4EFD2A053E +:103EFC00FD3B2371730171320471430271039071A4 +:103F0C00529031949E02EFFA712AE7CEA409310443 +:103F1C00070261FDCEA408F464FD71093112940608 :103F2C00CF04F905EF09712393E505F9E504F9715F :103F3C002BE78F06F9312503F504F9C6D7D479DFC1 -:103F4C0019310200585003FD2B2B625C01D1DF07A5 +:103F4C0019310200585003FD372B625C01D1DF0799 :103F5C00F504F9710293D7E479D74A79F0DF073188 :103F6C0004003AF479D74A79C8DF0AF504F97102EA :103F7C0093CD79F0D7310200084A79FFDD1FA4797F -:103F8C00D7F0C15004FD1A2BC08FB3FB5C9F9FB3BD -:103F9C00FB7110C4FB30FF3A6194CD79F0D731043A +:103F8C00D7F0C15004FD262BC08FB3FB5C9F9FB3B1 +:103F9C00FB7110C4FB30F73A6194CD79F0D7310442 :103FAC009106F504F9710293D7714393F478717209 -:103FBC0007FDBC02717307D7FD9305F2D7C7200C20 -:103FCC00FBF8FFFDB4028FEAFBF0F9E9FBF303FD0C +:103FBC0007FDB202717307D7FD8905F2D7C7200C34 +:103FCC00FBF8FFFDAA028FEAFBF0F9E9FBF303FD16 :103FDC00304D13BC048FECFBF0F9EBFBF303FD301D :103FEC004D13BC028FEEFBF0F9EDFBF303FD304DEE :103FFC0013BB717AFAAC04BDD8F6BDDAAC04311E31 -:10400C00BDDCF6BDDEFDF70DADD8BDDCADDABDDE39 +:10400C00BDDCF6BDDEFDED0DADD8BDDCADDABDDE43 :10401C00AC02BDD8F6BDDAAC02311EDADCC3DADE96 -:10402C00C3BDDCF6BDDEFDF70DC0BDDEC0BDDCAD35 -:10403C00DEFD6D0FADD8BDDCADDABDDEABBDD8F6A7 +:10402C00C3BDDCF6BDDEFDED0DC0BDDEC0BDDCAD3F +:10403C00DEFD630FADD8BDDCADDABDDEABBDD8F6B1 :10404C00BDDAAB311EDADCC3DADEC3BDDCF6BDDEB5 -:10405C00FDF70DC0BDDEC0BDDCADDEFD6D0FDADAE7 +:10405C00FDED0DC0BDDEC0BDDCADDEFD630FDADAFB :10406C00ADD8FD9843C3C58D865C3FF0317E0440CE :10407C00FC14C2C0B9A486F6BC08BC0A9C078C0709 :10408C004C2EDD3D8D860E0770F161DC605C3FF0DF :10409C00317E127940FCBDD8F6BDDA8C0773095C11 -:1040AC0022318FBDDC70BDDEFDF70DAC08BDDCAC84 -:1040BC000AFD6D0FADDABC0AADD8BC08615907EF2B -:1040CC00BDAC08BDD8AC0ABDDAC9DC0004F6FDC134 -:1040DC000EC9DCFFFFF6FDC20FADD8BD80AF3AFCB8 +:1040AC0022318FBDDC70BDDEFDED0DAC08BDDCAC8E +:1040BC000AFD630FADDABC0AADD8BC08615907EF35 +:1040CC00BDAC08BDD8AC0ABDDAC9DC0004F6FDB73E +:1040DC000EC9DCFFFFF6FDB80FADD8BD80AF3AFCC2 :1040EC004680DD11AF3CFCBF3EFCAF3AFCBF3CFC54 :1040FC00AD80BF3AFCAF3CFC423EFCDC46AF3AFC28 :10410C00423CFCDE3EAD26423AFCDE374A2A16DC47 @@ -793,10 +791,10 @@ :10414C002AEF074A2AFF61E8A42AAF3EFC423CFC56 :10415C00DC18AF3CFC423AFCDE10AF3AFC4628DEE1 :10416C0009F482AF3AFCBD84EF074A82FF61E8A4F0 -:10417C0082100CC6D7C7FDB402710A9E31929E0202 +:10417C0082100CC6D7C7FDAA02710A9E31929E020C :10418C00EFFA8E949F34FC8E969F35FC8E979F365B :10419C00FC8E989F37FC8E939F38FC8E929F39FC37 -:1041AC00710B9E717AFA8F37FCFDD60F76FD164394 +:1041AC00710B9E717AFA8F37FCFDCC0F76FD16439E :1041BC0013BD7ED5EFFBDF0AD5F0FBDF05D5F1FB98 :1041CC00DD25F6B1467EDF11C97E3722665C039190 :1041DC00DF060A7E181A7F009617FD394413FD5925 @@ -804,23 +802,23 @@ :1041FC00FCDFF6AD7EBD7CF87AF3311C790AF9440C :10420C00FEFFDD44D87AF101040AF914A944FFFF3A :10421C00DF04E6B9EF0BD87AF101040AF914A9A16D -:10422C00B9FDB402A0EFFBD5EFFBDF1CA0F0FBD572 +:10422C00B9FDAA02A0EFFBD5EFFBDF1CA0F0FBD57C :10423C00F0FBDF14A0F1FBD5F1FBDF0CCFEFFBFFA4 :10424C00CFF0FBFFCFF1FBFFC6717AFAD7C716D8B8 :10425C007AF10744A800DC05716293EF1CF647DD88 :10426C0018A47A4A7AA8DC05716293EF0CF87AF3F9 :10427C00311CF6780AF9B7EFE4C6D7C756A896668C -:10428C00F0317E12F6B1780AF966D1DFF1FDB40295 +:10428C00F0317E12F6B1780AF966D1DFF1FDAA029F :10429C00F5EFFBF5F0FBF5F1FBF47A716393C67166 :1042AC007AFAD7C72004FBF8FFD446DF168D7A9D27 -:1042BC0087FDB40252069292692EFC68C0FCDFF6B0 +:1042BC0087FDAA0252069292692EFC68C0FCDFF6BA :1042CC00717AFA4A4606DE0EE84609C0FC9C03A445 :1042DC00468C0372EF30F887F3311C790AF9BB3145 :1042EC007293058B9C03EF0F8C019C03D487DF0525 :1042FC00CD87A7EF02B487718071779361DC61FB86 :10430C007171938C03721004C6D7C72008FBF8FF99 -:10431C008F37FCFDD60F9C078F36FCFDD60F9C0605 -:10432C008F35FCFDD60F9C058F34FCFDD60F9C04FD +:10431C008F37FCFDCC0F9C078F36FCFDCC0F9C0619 +:10432C008F35FCFDCC0F9C058F34FCFDCC0F9C0411 :10433C008F38FC9C038F39FC9C028C06318E011249 :10434C00791A20BB8C075C03D1DF098C064C036106 :10435C00C86179008C05318EB1610900BB313D1209 @@ -830,20 +828,20 @@ :10439C0008FBF8FFF661490A61F8614908DF07F785 :1043AC00340000ED3544E6BC04F6BC06AC0ABC0295 :1043BC00AC08BBAC06614902AC0461F8614900DE93 -:1043CC0028AC04BDD8AC06BDDAE1FD7C0FADDABC7F -:1043DC0006ADD8BC04ABBDD8AC02BDDAE1FD970F7D +:1043CC0028AC04BDD8AC06BDDAE1FD720FADDABC89 +:1043DC0006ADD8BC04ABBDD8AC02BDDAE1FD8D0F87 :1043EC00ADDABC02ADD8BBEFCAAC06BC02AC04BBA8 -:1043FC00AC08BDD8AC0ABDDAAC04BDDCAC06FDFA29 -:10440C000EAC04BDDCAC06FD6D0FE1FD970FADDA13 +:1043FC00AC08BDD8AC0ABDDAAC04BDDCAC06FDF033 +:10440C000EAC04BDDCAC06FD630FE1FD8D0FADDA27 :10441C00BC06ADD8BC04AC06614902AC0461F861C1 :10442C004900DCC5AC0214AB12100CC6D7C7C120B6 -:10443C0004FBF8FF8F31FCFDD60F9C034E04DF1CF0 +:10443C0004FBF8FF8F31FCFDCC0F9C034E04DF1CFA :10444C00AD7C467EDE07AD7E267C12EF40F6467EC6 :10445C00DF07467CDD03E7EF34F7EF318C04318E58 :10446C00B1128C03318E43DF18303822267C067E45 :10447C00BB8C045C0391DF05AB041800BBAB12EFE3 :10448C000C8C034E04DE0532A900EF01F71006C6B2 -:10449C00D7FDB40231029408F6468ADD03B68AD7FA +:10449C00D7FDAA0231029408F6468ADD03B68AD704 :1044AC00710394717AFA4004F904DF06715307F42E :1044BC002CD7D9CFFBF1E7240000DD0F23DD182327 :1044CC00DD0F23DD4C23DD2423DD33715307F42C66 @@ -857,54 +855,54 @@ :10454C002D01D7715207E42CD731429101D77163F9 :10455C0091D9CDFBF1E7240000DD1223DD1923DD19 :10456C001123DD2623DD3423DD3923DD3FFDE14539 -:10457C00EF3DFD0246EF38D9CCFBC1AE6CFDB72C3C -:10458C00C0F313BE6C712304EF25F0C1AE6CFDB704 +:10457C00EF3DFD0246EF38D9CCFBC1AE6CFDC32C30 +:10458C00C0F313BE6C712304EF25F0C1AE6CFDC3F8 :10459C002CC0F313BE6C712304EF14F6BE6C7122A5 :1045AC0004EF0CCB6CFF00712304EF03FD76464047 :1045BC0004F905DD064004F901DF0671230471637B :1045CC00913164910FF6BE64BE6A31220402EF028F :1045DC00F690BE6ED7CD2E47F48CAE6C317DBFCA33 -:1045EC00FCFD4B46D2DF0ED9CCFBC1AE6CFDB72C1B +:1045EC00FCFD4B46D2DF0ED9CCFBC1AE6CFDC32C0F :1045FC00C0F313BE6CD7FD4B46D2DD0DCD2E47F468 :10460C008CAE6C317DBFCAFCD7E88C09342050804D -:10461C00D6BFC6FC22CAFCBDD8304700FD220EBF57 -:10462C00C8FC30C6FCFDCD2CF313BE6CB42ED42EBE +:10461C00D6BFC6FC22CAFCBDD8304700FD180EBF61 +:10462C00C8FC30C6FCFDD92CF313BE6CB42ED42EB2 :10463C00DF0CCD2E47A48C4A8C1F61C8F48CD7405C :10464C00AFFB0BDC05712304F2D740AFFB0661D83E -:10465C0031229011F0C1AE6CFDB72CC0F313BE6CBF +:10465C0031229011F0C1AE6CFDC32CC0F313BE6CB3 :10466C00712204EF03FD7646E2D7716291F0C1AE80 -:10467C006CFDB72CC0F313BE6CA48D4A8D40DC3797 +:10467C006CFDC32CC0F313BE6CA48D4A8D40DC378B :10468C00F48DD88EF1313F0412FD14D88EF1BDD8C3 -:10469C005008FD710E087208E6D2DD040192DFFCB1 +:10469C005008FD670E087208E6D2DD040192DFFCBB :1046AC00896158D1DD05712204EF03712304A48EB6 :1046BC004A8E2061C8F48ED7C73026FDC6D77180CC :0B46CC00717DFADE035201D75200D7C7 :1046D70061FC61FCC1C3C5C7520C929269D4FEC18B :1046E700DFF88EFD708EFCC1717AFA4004F903DFA2 -:1046F7000530D5296194C09EFC609EFD34D4FE52DE +:1046F7000530E1296194C09EFC609EFD34D4FE52D2 :1047070006C0B9A5A592DFF9C6C4C2C061FC61DFC6 :10471700520C929269D4FEC1DFF88EFD708EFCC1F7 :104727008F4105775C04D1DD06675C01D1DD50312F :104737003492367162077133928FB4FB5FBCFBD141 :10474700DF1B8FB5FB5FBDFBD1DF128FB6FB5FBEF3 :10475700FBD1DF098FB7FB5FBFFBD1DD0C316207F0 -:1047670002EFFA716307716B27717393FDA12FF441 +:1047670002EFFA716307716B27717393FDAD2FF435 :10477700227148500571605005717AFAED714867EA :104787005C02D1DD16D422DD124A2202DD0DF422AD :104797007148500571605005717AFA717AFA8D2265 :1047A700318FE7240000DD0823DD1423DD2CEF4AD9 :1047B700F4467140500571505005E422ED71488F61 -:1047C70040059D47715050058D479D49D847FD6B62 +:1047C70040059D47715050058D479D49D847FD616C :1047D70033629D48CD2202ED7148675C02D1DD1737 :1047E700675C10D1DD05CD2203EF0F7148500571CD :1047F700605005F422EF73CD22044A2203DF108DA7 -:10480700489F4005D848C1D847FDF733C0EF1F8FF1 +:10480700489F4005D848C1D847FDED33C0EF1F8FFB :10481700400576717447DC054A4702DE0671605031 -:1048270005EF47C7D847FD2230C071505005D8491A +:1048270005EF47C7D847FD2E30C071505005D8490E :10483700F1242900DD27240400DD22242200DD1DC8 :10484700241100DD0C240100DD13241E00DD0EEF12 :104857000A4A4760DF07CD4761EF02A4474A2203B0 -:10486700DF08D847FD6B33629D48C09EFC609EFD04 +:10486700DF08D847FD6133629D48C09EFC609EFD0E :1048770034D4FE5206C0B9A5A592DFF961FCC1C7C1 :10488700717AFA714AE5717BBD51405F0401D1DD50 :1048970006F616A747DFF2300400BF2401F6BF2A49 @@ -920,19 +918,19 @@ :1049370002CEABACCC0400F6BB31B2E21061790019 :10494700F6614900DFF371603002EDD7498E519C63 :1049570003713BE28C035C02D1DD1E8C035C08D142 -:10496700DF0971503002CC0400EFCC8C0570FDD903 +:10496700DF0971503002CC0400EFCC8C0570FDCF0D :1049770034629E50CC0402EFBE8C035C03D1DF404F :104987008E509C02715030028C04D1DF0E8C027065 -:10499700FD1F35629C05CC0401EF328C044C02DF0D +:10499700FD1535629C05CC0401EF328C044C02DF17 :1049A7000671603002EF29CF34025A716030028CF1 -:1049B7000270C18C0570FD8134C0CF34024AEF10FC +:1049B7000270C18C0570FD7734C0CF34024AEF1006 :1049C7008C035C01D1DD0671603002EF03ED3E49D7 :1049D7001006C09EFC609EFD34D4FE5206C0B9A5E9 :1049E700A592DFF961FCC1C3C5C7520C929269D485 :1049F700FEC1DFF88EFD708EFCC1710A9E31929E5A :104A070002EFFA8FDEFB4F96FFDF198FDFFB4F9721 :104A1700FFDF118FE0FB4F98FFDF095004C15011F2 -:104A2700FD2534C0710B9EC09EFC609EFD34D4FEF4 +:104A2700FD1B34C0710B9EC09EFC609EFD34D4FEFE :104A37005206C0B9A5A592DFF9C6C4C2C061FCA4DD :104A47006461FCC1C3C5C7520C929269D4FEC1DF31 :104A5700F88EFD708EFCC1C1FBF8FF8D1F9C018E87 @@ -940,27 +938,27 @@ :104A770038717AFA8C019D5CEF2F717AFA4007F949 :104A870001DF068C019D5BEF2051FF2E019D5BEF3F :104A970018717AFA8C019D304004F903DD06400451 -:104AA700F904DF0530572561944031FF09DE05A081 +:104AA700F904DF0530632561944031FF09DE05A075 :104AB70031FFEF077158F000714292710BE3C0C0EC :104AC7009EFC609EFD34D4FE5206C0B9A5A592DFB8 -:104AD700F9C6C4C2C061FCC7FDB402D46461F83131 +:104AD700F9C6C4C2C061FCC7FDAA02D46461F8313B :104AE700049327710393D464DD05B464CEABAC7132 :104AF7007AFA5600664C0ADD1172F3311C79D8FC3C :104B0700CEFC0061CA61A486EFEA717AFAF2C6D7D1 :104B1700C7C1C1FBF8FFCC01008C014C0ADE36FD92 -:104B2700B4028C01F0317E0410FC14A96168DF091E +:104B2700AA028C01F0317E0410FC14A96168DF0928 :104B3700AC02B9717AFAF2EF1D8C01F0317E12796D :104B470010FC614902DF06717AFAE2EF09717AFA1D :104B5700615901EFC4E21004C6D7C72004FBF8FF70 -:104B6700F64210FC61F8ED444CFDB402CC03008C16 +:104B6700F64210FC61F8ED444CFDAA02CC03008C20 :104B7700034C0ADE3C8C03F0317E0410FC14A9615F :104B870068DF05717AFAEF29717AFA8C0372F331CB :104B97001C7910FCCEFC0061CA629C02D1DF0A8C32 -:104BA70003F0317E12E67810FCFDB402615903EF81 +:104BA70003F0317E12E67810FCFDAA02615903EF8B :104BB700BECC0200CC01018C02F0317E0410FC1443 :104BC700A96168DD788C02F0317E127910FCE74329 :104BD700DF658C014C0ADE5F8C01F0317E127910A3 -:104BE700FCE743DD4DFDB4028C01F0317E0410FC7F +:104BE700FCE743DD4DFDAA028C01F0317E0410FC89 :104BF70014A96168DF186169018C01F0317E12F632 :104C07007810FC8C024E01DCED717AFAEF2F8C01E3 :104C1700F0317E0410FC14A9128C02F0317E337837 @@ -969,15 +967,15 @@ :104C470004C6D761FF520C929269D4FEC1DFF88E79 :104C5700FD708EFCC1717AFA8FE4FB5C03D1DD181D :104C67004004F903DD064004F904DF0C3610057132 -:104C7700D4DE0530E5376194C09EFC609EFD34D4D8 +:104C7700D4DE0530DB376194C09EFC609EFD34D4E2 :104C8700FE5206C0B9A5A592DFF961FC61FC61FC83 :104C970061FC61FC61FC61FC61FC61FC61FC61FC25 :104CA70061FC61FC61FC61FC61FC61FC61FC61FC15 :104CB70061FC61FC61FC61FC61FC61FC61FC61FC05 :044CC70061FC61FC2F :0A4CCC0000060C12181E242A3036D0 -:104CD600ACFB0000000060FE0000000043396C35AC -:104CE6008C2255458E2D3D2E9D44693A0609533C2E +:104CD600ACFB0000000060FE000000003B396235BE +:104CE6008C2255459A2D492E9D44613AFC084B3C31 :104CF60028FC36FE20FE02F903F929FC30FE2AFCC8 :104D06002BFC08F926FC6CFF1AFF6EFF6AFF64FF96 :0A4D160027FC66FF2CFC555555558F @@ -986,6 +984,6 @@ :104D4000C5AC0416F643DD078B99A7A5B3EFF5C2F2 :024D5000C6D7C4 :024FF4000206B3 -:0A4FF60031333A33393A3239000002 +:0A4FF60031393A34373A3430000004 :00000001FF  \ No newline at end of file diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index 8f43972..b3461db 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 2df03b8..dcc7052 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,22 +1,22 @@ -78K0R Linker W1.33 Date:23 Aug 2011 Page: 1 +78K0R Linker W1.33 Date:24 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 -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 + 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 Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map @@ -25,9 +25,9 @@ Direc-file:bsr_mcu.dr *** Link information *** - 73 output segment(s) - 3CB9H byte(s) real data - 6282 symbol(s) defined + 71 output segment(s) + 3CADH byte(s) real data + 6298 symbol(s) defined *** Memory map *** @@ -61,8 +61,7 @@ Direc-file:bsr_mcu.dr 00002H 00000H LDR_CNSL 00002H 00000H CSEG PAGE64KP LDR_CNSL hal 00002H 00000H - ??NMIROM 00002H 00002H CSEG -* gap * 00004H 0000CH +* gap * 00002H 0000EH @@VECT10 00010H 00004H CSEG AT @@VECT10 ini_VECT 00010H 00004H * gap * 00014H 00008H @@ -147,55 +146,54 @@ Direc-file:bsr_mcu.dr 000C4H 00000H LDR_CODL hal 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - ?OCDSTAD 000CEH 0000AH CSEG - LDR_CODE 000D8H 0097FH CSEG - LDR_CODE loader 000D8H 00196H - LDR_CODE main 0026EH 0004EH - LDR_CODE WDT 002BCH 00000H - LDR_CODE i2c_mcu 002BCH 002D7H + LDR_CODE 000CEH 0097FH CSEG + LDR_CODE loader 000CEH 00196H + LDR_CODE main 00264H 0004EH + LDR_CODE WDT 002B2H 00000H + LDR_CODE i2c_mcu 002B2H 002D7H LDR_CODE self_flash - 00593H 00373H + 00589H 00373H LDR_CODE task_debug - 00906H 00000H + 008FCH 00000H LDR_CODE task_status - 00906H 00075H - LDR_CODE hal 0097BH 000DCH - FSL_CODE 00A57H 00322H CSEG + 008FCH 00075H + LDR_CODE hal 00971H 000DCH + FSL_CODE 00A4DH 00322H CSEG FSL_CODE fsl_block_cmd - 00A57H 0002BH + 00A4DH 0002BH FSL_CODE fsl_block_check - 00A82H 00013H + 00A78H 00013H FSL_CODE fsl_common - 00A95H 0014FH + 00A8BH 0014FH FSL_CODE fsl_reset - 00BE4H 00001H + 00BDAH 00001H FSL_CODE fsl_si_ibf - 00BE5H 00064H + 00BDBH 00064H FSL_CODE fsl_phySwap - 00C49H 0004DH + 00C3FH 0004DH FSL_CODE fsl_si_common - 00C96H 00061H - FSL_CODE fsl_swap 00CF7H 00030H + 00C8CH 00061H + FSL_CODE fsl_swap 00CEDH 00030H FSL_CODE fsl_write - 00D27H 00052H - @@LCODE 00D79H 00277H CSEG - @@LCODE @cstart 00D79H 0006DH - @@LCODE @imul 00DE6H 00011H - @@LCODE @lumul 00DF7H 0002BH - @@LCODE @isdiv 00E22H 00022H - @@LCODE @iudiv 00E44H 0002DH - @@LCODE @isrem 00E71H 00021H - @@LCODE @iurem 00E92H 0002FH - @@LCODE @lsdiv 00EC1H 00039H - @@LCODE @ludiv 00EFAH 0003FH - @@LCODE @divuw 00F39H 00034H - @@LCODE @ladd 00F6DH 0000FH - @@LCODE @llsh 00F7CH 0001BH - @@LCODE @lursh 00F97H 0001FH - @@LCODE @iscmp 00FB6H 0000CH - @@LCODE @lband 00FC2H 00014H - @@LCODE @bcdtob 00FD6H 0001AH -* gap * 00FF0H 00006H + 00D1DH 00052H + @@LCODE 00D6FH 00277H CSEG + @@LCODE @cstart 00D6FH 0006DH + @@LCODE @imul 00DDCH 00011H + @@LCODE @lumul 00DEDH 0002BH + @@LCODE @isdiv 00E18H 00022H + @@LCODE @iudiv 00E3AH 0002DH + @@LCODE @isrem 00E67H 00021H + @@LCODE @iurem 00E88H 0002FH + @@LCODE @lsdiv 00EB7H 00039H + @@LCODE @ludiv 00EF0H 0003FH + @@LCODE @divuw 00F2FH 00034H + @@LCODE @ladd 00F63H 0000FH + @@LCODE @llsh 00F72H 0001BH + @@LCODE @lursh 00F8DH 0001FH + @@LCODE @iscmp 00FACH 0000CH + @@LCODE @lband 00FB8H 00014H + @@LCODE @bcdtob 00FCCH 0001AH +* gap * 00FE6H 00010H MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -246,20 +244,20 @@ Direc-file:bsr_mcu.dr @@CNST kanaria_c 0228CH 00000H ROM_CODE 0228CH 0244BH CSEG - ROM_CODE pm 0228CH 00971H - ROM_CODE i2c_ctr 02BFDH 0005CH - ROM_CODE i2c_twl 02C59H 0005EH - ROM_CODE led 02CB7H 00249H - ROM_CODE rtc 02F00H 000E0H - ROM_CODE vreg_ctr 02FE0H 00493H - ROM_CODE vreg_twl 03473H 000F9H - ROM_CODE adc 0356CH 00261H - ROM_CODE renge 037CDH 00018H - ROM_CODE accero 037E5H 0015EH - ROM_CODE sw 03943H 00126H + ROM_CODE pm 0228CH 0097DH + ROM_CODE i2c_ctr 02C09H 0005CH + ROM_CODE i2c_twl 02C65H 0005EH + ROM_CODE led 02CC3H 00249H + ROM_CODE rtc 02F0CH 000E0H + ROM_CODE vreg_ctr 02FECH 0047DH + ROM_CODE vreg_twl 03469H 000F9H + ROM_CODE adc 03562H 00261H + ROM_CODE renge 037C3H 00018H + ROM_CODE accero 037DBH 00160H + ROM_CODE sw 0393BH 00126H ROM_CODE task_misc - 03A69H 001EAH - ROM_CODE task_sys 03C53H 00376H + 03A61H 001EAH + ROM_CODE task_sys 03C4BH 0037EH ROM_CODE pedo_alg_thre_det2 03FC9H 004D4H ROM_CODE led_cam 0449DH 000B8H diff --git a/trunk/config.h b/trunk/config.h index fd28cb8..180bdac 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -12,17 +12,15 @@ //#define _ALLOW_NOBATT_ // 実機電池なし（=アダプタのみ）での起動を許可 //#define _DBG_PEDO_AUTO_ENABLE_ // 電源投入の瞬間から歩数計on //#define _DBG_LED_PRINT_ // LED print デバッグをしたいとき(自己アップデート用) -//#define _ENABLE_WDT_TEST_ +//#define _ENABLE_COMMAND3_ // mcuリセットやwdtコマンドを有効にする //#define _FORCE_TAIKENDAI_ //#define _FORCE_TAIKENDAI_NBD_ -//#define _DBG_CHK_OFF_LEAK_ // OFF時リーク電流のチェック(デバッガで確認) +//#define _DBG_CHK_OFF_LEAK_ // OFF時リーク電流のチェック(デバッガで確認) //#define _DBG_NOP_ // ブレークを貼るためにNOP()を有効にしたいとき -#define _I2C_ERR_ABORT_ //#define _ENABLE_HAL_ // デバッグ用にHALを有効にする。コメントアウトでスルーになる。 - #ifdef _DBG_NOP_ // コード上必要なNOPと区別するため # define dbg_nop() NOP() #else @@ -30,6 +28,9 @@ #endif +#define _I2C_ERR_ABORT_ // *標準でon* I2Cで誤書き込みらしきが発生したら以降無視　 + //. ブレーク張っても全然引っかからなくなりましたが... + // 特殊仕様ファーム //#define _TAIKENDAI_ // homeメニューに入れてしまうのを回避する特殊ファームをつくる。ROMが足りないので電池パラメータ周りをパスする diff --git a/trunk/hoge.bin b/trunk/hoge.bin index a252c7f..e24392c 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/pm.c b/trunk/pm.c index 93fc0c4..b5a4e38 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -126,7 +126,7 @@ void tsk_batt( ) bt_get_charge_status(); // CCIC制御 - if( ! BT_IN_CHG_delayed_n ) // LEDに反映 + if( ! BT_IN_CHG_delayed_n ) // LEDに反映。bt_get_charge_status()で更新されます。 { LED_CHARGE = 1; } @@ -138,7 +138,15 @@ void tsk_batt( ) // アダプタつないだ瞬間、満充電でも数秒わざと点灯させる。給電してることをわからせるため。 if( chg_led_override != 0 ){ // ↑から見ればわかるが、瞬間(数クロック)消える事がある。気がつく人いるかな…？ chg_led_override --; - LED_CHARGE = 1; + + if(( vreg_ctr[ VREG_C_STATUS_1 ] & REG_BIT_MGIC_ERR ) != 0 ) // アダプタ有り、電池無しですぐに消す。 + { + chg_led_override = 0; + } + else + { + LED_CHARGE = 1; + } } // レジスタの充電中ビットはLEDに同期する @@ -891,14 +899,14 @@ err PM_BL_set( u8 dat ) #if 0 // SoCがPWMを出すようレジスタをセットしてから遅延が有るため、ステータスを先に -// 更新してしまう。 +// 更新してしまう。してほしいとの要求。 #endif // PMICのBLのビットと、MCUのSTATUSレジスタのビット位置が逆なため入れ替え vreg_ctr[VREG_C_STATUS] = (( vreg_ctr[VREG_C_STATUS] & bits8(1,0,0,1, 1,1,1,1) ) | ( (( blset << 6 ) | ( blset << 4 )) & bits8(0,1,1,0, 0,0,0,0) )); // 割り込み - /// 複数ビットまとめて行うので、いつもの関数使用不可 + /// 複数ビットまとめて行うので、set_irq()使用不可 { u8 tot; diff --git a/trunk/renge/renge.c b/trunk/renge/renge.c index 55b9748..ac90db3 100644 --- a/trunk/renge/renge.c +++ b/trunk/renge/renge.c @@ -215,11 +215,12 @@ __callt err renge_task_immed_run(){ u8 rv; EI(); - rv = tasks_immed[ list_id ](); + rv = tasks_immed[ list_id ](); // タスク実行 if( rv == ERR_SUCCESS ) { tasks_immed[ list_id ] = TSK_IMM_DELETED_; } + // きわどいタイミングで同じタスクの登録があると困るのでDI状態でかえって来る事がある } DI_wt_chk(); } diff --git a/trunk/renge/renge_task_immediate.h b/trunk/renge/renge_task_immediate.h index 7c5016d..9ac3bd2 100644 --- a/trunk/renge/renge_task_immediate.h +++ b/trunk/renge/renge_task_immediate.h @@ -11,7 +11,7 @@ extern task_status_immed tski_do_command0( ); extern task_status_immed tski_ntr_pmic_comm(); extern task_status_immed tski_acc_read(); extern task_status_immed tski_acc_write(); -//extern task_status_immed tski_acc_hosu_set(); // accero.h +//extern task_status_immed tski_acc_setup(); // accero.h extern task_status_immed tski_mcu_reset(); extern task_status_immed tski_vol_update(); diff --git a/trunk/task_debug.c b/trunk/task_debug.c index 54b594b..f00d613 100644 --- a/trunk/task_debug.c +++ b/trunk/task_debug.c @@ -33,7 +33,7 @@ void tsk_debug( ) if( system_status.pwr_state == ON_TRIG ){ // 歩数計を起動時にonにする vreg_ctr[ VREG_C_ACC_CONFIG ] = 0x03; - renge_task_immed_add( tski_acc_hosu_set ); + renge_task_immed_add( tski_acc_setup ); } #endif diff --git a/trunk/task_sys.c b/trunk/task_sys.c index f4c4e07..e9604f5 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -31,6 +31,9 @@ extern void nop8(); static void chk_emergencyExit(); static void force_off_check(); static void send_getup_to_soc(); +#ifdef _DBG_CHK_OFF_LEAK_ +static void leak_check(); +#endif @@ -65,6 +68,9 @@ void tsk_sys( ) switch ( system_status.pwr_state ) { case ON_CHECK: //------------------------------------------------------- + // 強制電源断カウントダウンタイマクリア + clear_pow_off_countdown(); + // 他の割り込みでHALT(スリープ)が解除 ／　アダプタ有時 // 電源スイッチでHALT解除 // @@ -287,7 +293,7 @@ void tsk_sys( ) force_off_check(); #ifndef _TAIKENDAI_SEISAN_SPECIAL_ - if( system_status.taikendai ) // アダプタが刺さっていたら自動で電源on + if( system_status.taikendai ) // アダプタが抜けたら自動で電源off { if( PM_EXTDC_n ) { @@ -317,7 +323,8 @@ void tsk_sys( ) // 加速度センサ停止 vreg_ctr[ VREG_C_ACC_CONFIG ] = 0x00; - tski_acc_hosu_set(); + tski_acc_setup(); + EI(); // DI状態でかえって来るので、I2C_mcu 完了させるのに必要を // その他ペリフェラル停止 LED_stop( ); @@ -429,43 +436,11 @@ void tsk_sys( ) RTCIMK = 1; // systick用インターバルタイマー割り込みマスク #ifdef _DBG_CHK_OFF_LEAK_ - { - // off中のpin設定ミスチェック - volatile u8 ports_i[12]; - volatile u8 ports_o[12]; - - ports_i[0] = ( PM0 & PU0 & ~P0 ); // プルアップ切り忘れ？ - ports_i[1] = ( PM1 & PU1 & ~P1 ); - ports_i[2] = 0; - ports_i[3] = ( PM3 & PU3 & ~P3 ); - ports_i[4] = ( PM4 & PU4 & ~P4 ); - ports_i[5] = ( PM5 & PU5 & ~P5 ); - ports_i[6] = 0; - ports_i[7] = ( PM7 & PU7 & ~P7 ); - ports_i[8] = ( PM12 & PU12 & ~P12 ); - ports_i[9] = ( PM14 & PU14 & ~P14 ); - ports_i[10] = 0; - ports_i[11] = ( PM20 & PU20 & ~P20 ); - - ports_o[0] = ( ~PM0 & P0 ); // H 出力しちゃってるかも - ports_o[1] = ( ~PM1 & P1 ); - ports_o[2] = ( ~PM2 & P2 ); - ports_o[3] = ( ~PM3 & P3 & ~POM3 ); - ports_o[4] = ( ~PM4 & P4 ); // bit3はchg_enなので1でもよい - ports_o[5] = ( ~PM5 & P5 ); - ports_o[6] = ( ~PM6 & P6 ); - ports_o[7] = ( ~PM7 & P7 ); - ports_o[8] = ( ~PM12 & P12 ); - ports_o[9] = ( ~PM14 & P14 ); - ports_o[10] = ( ~PM15 & P15 ); - ports_o[11] = ( ~PM20 & P20 ); - NOP(); // ←ブレーク置くため - } - +// leak_check(); #endif CKC = bits8(0,0,0,0, 1,0,0,1); // 4MHzに落としてからSTOPしなくてはならない - if( PM_EXTDC_n ) // きわどいタイミングで挿抜が起きることがある + if( PM_EXTDC_n_RAW ) // きわどいタイミングで挿抜が起きることがある。HAL通さないべき（off中ですし） { STOP(); } @@ -635,3 +610,42 @@ task_status_immed tski_firm_update(){ return( ERR_SUCCESS ); } + + +#ifdef _DBG_CHK_OFF_LEAK_ +/* ======================================================== + pin設定ミスチェック + ======================================================== */ +static void leak_check() +{ + volatile u8 ports_i[12]; + volatile u8 ports_o[12]; + + ports_i[0] = ( PM0 & PU0 & ~P0 ); // プルアップ切り忘れ？ + ports_i[1] = ( PM1 & PU1 & ~P1 ); + ports_i[2] = 0; + ports_i[3] = ( PM3 & PU3 & ~P3 ); + ports_i[4] = ( PM4 & PU4 & ~P4 ); + ports_i[5] = ( PM5 & PU5 & ~P5 ); + ports_i[6] = 0; + ports_i[7] = ( PM7 & PU7 & ~P7 ); + ports_i[8] = ( PM12 & PU12 & ~P12 ); + ports_i[9] = ( PM14 & PU14 & ~P14 ); + ports_i[10] = 0; + ports_i[11] = ( PM20 & PU20 & ~P20 ); + + ports_o[0] = ( ~PM0 & P0 ); // H 出力しちゃってるかも + ports_o[1] = ( ~PM1 & P1 ); + ports_o[2] = ( ~PM2 & P2 ); + ports_o[3] = ( ~PM3 & P3 & ~POM3 ); + ports_o[4] = ( ~PM4 & P4 ); // bit3はchg_enなので1でもよい + ports_o[5] = ( ~PM5 & P5 ); + ports_o[6] = ( ~PM6 & P6 ); + ports_o[7] = ( ~PM7 & P7 ); + ports_o[8] = ( ~PM12 & P12 ); + ports_o[9] = ( ~PM14 & P14 ); + ports_o[10] = ( ~PM15 & P15 ); + ports_o[11] = ( ~PM20 & P20 ); + NOP(); // ←ブレーク置くため +} +#endif _DBG_CHK_OFF_LEAK_ diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index 6fe6950..caa82a1 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -275,7 +275,7 @@ void vreg_ctr_write( u8 adrs, u8 data ) break; case ( VREG_C_ACC_CONFIG ): - renge_task_immed_add( tski_acc_hosu_set ); + renge_task_immed_add( tski_acc_setup ); vreg_ctr[ VREG_C_ACC_CONFIG ] = data; break; @@ -308,36 +308,6 @@ void vreg_ctr_write( u8 adrs, u8 data ) vreg_free_adrs = data; break; - - case ( VREG_C_COMMAND3 ): - switch ( data ) - { - case ( 'r' ): - // 割り込みルーチンからFSLライブラリを呼ぶのは禁止 - // マイコンを再起動。　レジスタ類も初期化される。 - renge_task_immed_add( tski_mcu_reset ); - break; - -#ifdef _ENABLE_WDT_TEST_ - case ( 'w' ): - // WDTで再起動（テスト向け） - while(1) - { - NOP(); - } -// mcu_wdt_reset; // このコマンド使ったら意味ないでしょ！ - break; -#endif - case( 'p' ): - reserve_pedo_increnent = 1; - // ここで増やすにはスタックが足りない。↑で予約のみ、task_misc内で処理 -// hosu_increment_if_necessary(); // 今、一歩増えた - break; - } - -// vreg_ctr[ VREG_C_COMMAND3 ] = data; // 書く必要なし - break; - case ( VREG_C_RBR_CONTROL ): if(( data & REG_BIT_RESET_n ) != 0 ) { @@ -358,7 +328,39 @@ void vreg_ctr_write( u8 adrs, u8 data ) vreg_ctr[ VREG_C_RBR_CONTROL ] = data; break; - // read only ////////////////////////////////////////// + case ( VREG_C_COMMAND3 ): + switch ( data ) + { +#ifdef _ENABLE_COMMAND3_ + case ( 'r' ): + // 割り込みルーチンからFSLライブラリを呼ぶのは禁止 + // マイコンを再起動。　レジスタ類も初期化される。 + renge_task_immed_add( tski_mcu_reset ); + break; + + case ( 'w' ): + // WDTで再起動（テスト向け） +// mcu_wdt_reset; // このコマンド使ったら意味ないでしょ！ + while(1) + { + dbg_NOP(); + } + break; +#endif //_ENABLE_COMMAND3_ + +#ifdef _ENABLE_HAL_ + case( 'p' ): + reserve_pedo_increnent = 1; + // ここで増やすにはスタックが足りない。↑で予約のみ、task_misc内で処理 +// hosu_increment_if_necessary(); // 今、一歩増えた + break; +#endif //_ENABLE_HAL_ + + } +// vreg_ctr[ VREG_C_COMMAND3 ] = data; // 書く必要なし + break; + + // read only ////////////////////////////////////////// case VREG_C_MCU_VER_MAJOR: case VREG_C_MCU_VER_MINOR: case VREG_C_3D: // すぐにリフレッシュされる @@ -435,6 +437,7 @@ void vreg_ctr_write( u8 adrs, u8 data ) + // ******************************************************** // I2C仮想レジスタから読みます。 // 戻り： xx データ @@ -549,7 +552,7 @@ void vreg_ctr_after_read( u8 adrs, u8 data ) IRQを読むタスクが積んであるので、読みには来る。 　それと、念のため、マスクをいじるときは空読みしてもらう。 ★すでにDIかのチェック不要。 - 　DI中に来るのはI2C_twlか、RTC_アラーム。この中で無頓着にEIして問題ない + 　DI中に来るのはI2C_twlか、RTC_アラーム。この中で無頓着にEIして実使用上問題ない *****************************************************************************/ void set_irq( u8 irqreg, u8 irq_flg ) { diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index 6f0946f..c5658f4 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,9 +1,182 @@ 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\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 +"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(212) : 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(559) : 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\task_sys.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -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\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx kanaria.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\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx get_ei.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 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' @@ -23,6 +196,9 @@ 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 -133 -!E debug enable!! -Build Total error(s) : 0 Total warning(s) : 13 +4 +intel-HEX to bsr bin converter + file converted! + + +Build Total error(s) : 0 Total warning(s) : 66 diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 0e64b78..8d026dc 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=1 +GO=0 GOValue=85 GOStart=FC00 GOSizeValue=1024