From 5588bf8c93c5cfe45c5dfb019a5037e5f5825fc3 Mon Sep 17 00:00:00 2001 From: fujita_ryohei Date: Wed, 18 Nov 2009 06:44:33 +0000 Subject: [PATCH] git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@28 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/accero.c | 174 +++++-------- trunk/adc.c | 29 +-- trunk/config.h | 4 +- trunk/i2c_ctr.c | 3 +- trunk/i2c_mcu.c | 36 ++- trunk/led.c | 34 +-- trunk/led.h | 7 + trunk/loader.c | 6 +- trunk/pm.c | 250 ++++++++++++------ trunk/pm.h | 14 +- trunk/rtc.c | 10 +- trunk/sw.c | 8 +- trunk/task_debug.c | 12 +- trunk/task_misc.c | 55 ++-- trunk/vreg_ctr.h | 54 +++- trunk/vreg_twl.c | 2 +- trunk/yav_mcu_bsr.plg | 128 +--------- trunk/yav_mcu_bsr.pri | 119 ++++----- trunk/yav_mcu_bsr.prj | 582 +++++++++++++++++++++--------------------- trunk/yav_mcu_bsr.prk | 48 ++-- trunk/yav_mcu_bsr.sdb | 95 +++---- 21 files changed, 823 insertions(+), 847 deletions(-) diff --git a/trunk/accero.c b/trunk/accero.c index 3d921a1..673dec5 100644 --- a/trunk/accero.c +++ b/trunk/accero.c @@ -49,7 +49,8 @@ #define VREG_BITMASK_ACC_CONF_ACQ ( 1 << 0 ) // ======================================================== -static u16 hyst_pedometer[256]; +extern u8 pool[]; +u16* hyst_pedometer; // ======================================================== @@ -72,100 +73,6 @@ task_status_immed tsk_cbk_accero( ) // 加速度センサデータレジスタへの反映 iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | 0x80 ), 6, &vreg_ctr[VREG_C_ACC_XL] ); - { - // 歩数計 // - unsigned int mean; // 二乗平均はあまりにも処理が重いので(!) 絶対値の合計にします - static u8 direction; - - static s16 th_H = 0x2380; // 閾値。暫定。動的変更とかしたい… - static s16 th_L = 0x2180; - - static u16 interval; // 山と谷の間の時間。短すぎても長すぎてもはじく。 - - - s16 sx16 = vreg_ctr[VREG_C_ACC_XH] * 256 + vreg_ctr[VREG_C_ACC_XL]; - s16 sy16 = vreg_ctr[VREG_C_ACC_YH] * 256 + vreg_ctr[VREG_C_ACC_YL]; - s16 sz16 = vreg_ctr[VREG_C_ACC_ZH] * 256 + vreg_ctr[VREG_C_ACC_ZL]; - - // そのうちローコストな方法を考え - mean = sqrt( (long)abs( sx16 ) * abs( sx16 ) /4 + - (long)abs( sy16 ) * abs( sy16 ) /4 + - (long)abs( sz16 ) * abs( sz16 ) /4 ); - - { - static u8 count_H = 0; - static u8 count_L = 0; - - if( direction == 0 ) // 前回に下限を下回っていて - { - if( mean > th_H ) // 今回、上の閾値を上回った - { - if( count_H == 5 ){ // 突発的なノイズは省く... - direction = 1; - count_L = 0; - } - if( count_H <= 5 ){ - count_H += 1; - } - } - else - { - count_H = 0; - } - } - - if( count_H >= 5 ){ - interval += 1; - } - if( 500 < interval ){ - interval = 0; - direction = 0; - count_H = 0; - count_L = 0; - } - - // 下の閾値を超えるのを待つ - if( direction == 1 ) - { - if( mean < th_L ) - { - if( count_L == 5 ){ - direction = 0; // 次は上の閾値を待つ - if( count_H >= 5 ){ - if( 70 < interval ) - { - vreg_ctr[ VREG_C_ACC_HOSU_L ] += 1; // 一歩加算 - hyst_pedometer[0] += 1; - } - } - count_H = 0; - } - if( count_L <= 5 ){ - count_L += 1; - } - } - else - { - count_L = 0; - } - } - } - - // debug - if( mean > th_H ) - { - DBG_LED_WIFI_on; - DBG_LED_WIFI_2_off; - } - - if( mean < th_L ) - { - DBG_LED_WIFI_off; - DBG_LED_WIFI_2_on; - } - - } - if( ( vreg_ctr[VREG_C_ACC_CONFIG] & ( VREG_BITMASK_ACC_CONF_ACQ | VREG_BITMASK_ACC_CONF_HOSU ) ) != 0 ) @@ -174,16 +81,61 @@ task_status_immed tsk_cbk_accero( ) } } - // 歩数計 offでなければ、電源off中でも計測 - if( ( vreg_ctr[VREG_C_ACC_CONFIG] & VREG_BITMASK_ACC_CONF_HOSU ) != 0x00 ) + // 歩数計 ///////////////////////////////////////////// + // offでなければ、電源off中でも計測 +// if( ( vreg_ctr[VREG_C_ACC_CONFIG] & VREG_BITMASK_ACC_CONF_HOSU ) != 0x00 ) + if( 1 ) { - if( ( vreg_ctr[VREG_C_ACC_CONFIG] & VREG_BITMASK_ACC_CONF_ACQ ) != 0x00 ) + static s16 th_H = 0x3500; // 閾値。暫定。動的変更とかしたい… + static s16 th_L = 0x2A00; + static u16 acc_norm[3]; // 加速度の大きさのヒストリ。数字が大きい方が古い + static u8 direction; // (0)極大を待つか (1)極小を待つか + static u16 interval; // 山と谷の間の時間。短すぎても長すぎてもはじく。 + + u16 sx16 = abs( (u16)vreg_ctr[VREG_C_ACC_XH] * 256 + vreg_ctr[VREG_C_ACC_XL] ); + u16 sy16 = abs( (u16)vreg_ctr[VREG_C_ACC_YH] * 256 + vreg_ctr[VREG_C_ACC_YL] ); + u16 sz16 = abs( (u16)vreg_ctr[VREG_C_ACC_ZH] * 256 + vreg_ctr[VREG_C_ACC_ZL] ); + + acc_norm[2] = acc_norm[1]; + acc_norm[1] = acc_norm[0]; + // そのうちローコストな方法を考える、かも + acc_norm[0] = sqrt( (long)sx16 * ( sx16 / 2 ) + + (long)sy16 * ( sy16 / 2 ) + + (long)sz16 * ( sz16 / 2 ) ); + + if( direction == 0 ) // 前回は谷 { - // 歩数計アルゴリズム 100Hz版 + if( acc_norm[2] <= acc_norm[1] && acc_norm[1] > acc_norm[0] + && acc_norm[0] > th_H ) // 極大で、閾値を超えていた + { + direction = 1; // 極小を待つ + interval = 0; // 極小までの時間を計る + } } else { - // 同　省電力版 + if( acc_norm[2] >= acc_norm[1] && acc_norm[1] < acc_norm[0] + && acc_norm[0] < th_L ) + { + direction = 0; + if( 2 < interval && interval < 20 ) // 早すぎず、遅すぎず + { + // 一歩加算。　いろいろ失敗した + if( ++vreg_ctr[ VREG_C_ACC_HOSU_L ] == 0 ) + { + if( ++vreg_ctr[ VREG_C_ACC_HOSU_M ] == 0 ) + { + ++vreg_ctr[ VREG_C_ACC_HOSU_H ]; + } + } + if( ++*hyst_pedometer == 0 ) + { + *hyst_pedometer = 65535; + } + } + interval = 0; + } + interval += 1; } } @@ -271,28 +223,18 @@ task_status_immed acc_hosu_set( ) // 完全停止 str_send_buf[0] = ( ACC_BITS_PM_PDN << ACC_bP_PM0 | 0 << ACC_bP_DR0 | ACC_BITS_ALL_AXIS_ON ); + hyst_pedometer = (u16*)pool; // 止めるとヒストリが無効になります（暫定） } else { #ifdef _MCU_BSR_ PMK23 = 0; #endif - if( ( vreg_ctr[VREG_C_ACC_CONFIG] & VREG_BITMASK_ACC_CONF_ACQ ) != 0x00 ) - { - // 100Hz 自動取り込み - str_send_buf[0] = - ( ACC_BITS_PM_NORM << ACC_bP_PM0 | ACC_BITS_DR_100Hz << - ACC_bP_DR0 | ACC_BITS_ALL_AXIS_ON ); - } - else - { - // 100Hz 自動取り込み - str_send_buf[0] = - ( ACC_BITS_PM_NORM << ACC_bP_PM0 | ACC_BITS_DR_100Hz << - ACC_bP_DR0 | ACC_BITS_ALL_AXIS_ON ); -// // 10Hz 自動取り込み(歩数計向け省電力モード) -// str_send_buf[0] = ( ACC_BITS_PM_LP10 << ACC_bP_PM0 | ACC_BITS_ALL_AXIS_ON ); - } + // 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 ); diff --git a/trunk/adc.c b/trunk/adc.c index c1708c8..2cc0ce5 100644 --- a/trunk/adc.c +++ b/trunk/adc.c @@ -34,13 +34,13 @@ void tsk_adc( ) static u8 sndvol_codec; static u8 bt_temp_old; - if( task_interval != system_time ) + if( task_interval-- != 0 ) { return; } else { - task_interval += (u8)( INTERVAL_TSK_ADC / SYS_INTERVAL_TICK ); + task_interval = (u8)( INTERVAL_TSK_ADC / SYS_INTERVAL_TICK ); } @@ -103,27 +103,22 @@ void tsk_adc( ) // TUNE_LED // + // ここで？仕様？ { - // ここで？仕様？ switch ( vreg_ctr[VREG_C_LED_TUNE] ) { - case ( 1 ): // 点灯 + case LED_TUNE_ILM_ON: LED_duty_TUNE = vreg_ctr[VREG_C_LED_BRIGHT]; break; - case ( 2 ): // - default: // 消灯 -#ifdef _MODEL_WM0_ + case LED_TUNE_ILM_SVR: LED_duty_TUNE = vreg_ctr[VREG_C_TUNE] / 16; -#else - LED_duty_TUNE = LED_BRIGHT_MAX - vreg_ctr[VREG_C_TUNE]; -#endif break; -#if 0 - default: // 消灯 + + case LED_TUNE_ILM_OFF: + default: LED_duty_TUNE = 0; break; -#endif } } @@ -132,12 +127,12 @@ void tsk_adc( ) ADCEN = 1; - ADM = 0b00011011; // セレクトモード、章圧、fCLK/6 ///ここから + ADM = 0b00011011; // セレクトモード、章圧、fCLK/6 ///ここから ↓ ADPC = 0x06; // ADCポートのセレクト ADS = ADC_SEL_TUNE; // NOP(); - ADCS = 1; // AD開始。 /// ここまでに、1us以上開ける + ADCS = 1; // AD開始。 /// ここまで　↑　までに1us以上開ける ADIF = 0; ADMK = 0; @@ -249,11 +244,11 @@ u8 get_adc( u8 ch ) ADCEN = 1; ADCS = 0; - ADM = 0b00100011; // セレクトモード、章圧、fCLK/6 ///ここから + ADM = 0b00100011; // セレクトモード、昇圧、fCLK/6 ///ここから↓ ADPC = 0x06; // ADCポートのセレクト ADS = ch; - ADCS = 1; // AD開始。 /// ここまでに、1us以上開ける + ADCS = 1; // AD開始。 /// ここまで↑　に、1us以上開ける ADMK = 0; while( ADIF == 0 ) diff --git a/trunk/config.h b/trunk/config.h index 9e28bfd..24a7b5a 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -3,9 +3,11 @@ #define _debug_ // #define _debug_led_ +//#define _VREG_C_NEW_ + #define MCU_VER_MAJOR 0; -#define MCU_VER_MINOR 7; +#define MCU_VER_MINOR 8; //#define _PARRADIUM_ diff --git a/trunk/i2c_ctr.c b/trunk/i2c_ctr.c index 3de7b4a..c9c0015 100644 --- a/trunk/i2c_ctr.c +++ b/trunk/i2c_ctr.c @@ -94,8 +94,7 @@ __interrupt void int_iic_ctr( ) if( !( ( vreg_ctr[VREG_C_IRQ0] == 0 ) && ( vreg_ctr[VREG_C_IRQ1] == 0 ) && ( vreg_ctr[VREG_C_IRQ2] == 0 ) - && ( vreg_ctr[VREG_C_IRQ3] == 0 ) - && ( vreg_ctr[VREG_C_IRQ4] == 0 ) ) ) + && ( vreg_ctr[VREG_C_IRQ3] == 0 ) ) ) { while( !IRQ0 ){;} // 時間稼ぎ不要かも IRQ0_ast; diff --git a/trunk/i2c_mcu.c b/trunk/i2c_mcu.c index d51f135..9c95e7f 100644 --- a/trunk/i2c_mcu.c +++ b/trunk/i2c_mcu.c @@ -15,22 +15,38 @@ // ======================================================== +// レジスタのビット名 +// プリフィックスbだが、一部のビット名がレジスタ名にかぶるため... +// SMR0n +#define bCKS0 ( 1 << 15 ) +#define bCCS0 ( 1 << 14 ) +#define bSTS0 ( 1 << 8 ) +#define bSIS0 ( 1 << 6 ) +#define bMD0n2 ( 1 << 2 ) +#define bMD0n1 ( 1 << 1 ) +#define bMD0n0 ( 1 << 0 ) +#define bSMR0n_FIXEDBIT ( 1 << 5 ) + // SSR0n #define bit_TSF0 6 -// SIR0n -#define PECT0 ( 1 << 1 ) -// SSR0n #define PEF0 ( 1 << 1 ) +// SIR0n +#define PECT0 ( 1 << 1 ) + +// SCR0n #define TXE0 ( 1 << 15 ) #define RXE0 ( 1 << 14 ) #define SLC02 4 #define DLS02 0 #define TSF0 ( 1 << 6 ) +// SOn +#define TAUS_MASK 0b0000101100001011; + +// DMCn #define DRS ( 1 << 6 ) -#define TAUS_MASK 0b0000101100001011; @@ -394,6 +410,7 @@ __interrupt void int_dma1( ) NOP( ); SO0 = 0x0404 | TAUS_MASK; } + IICMK10 = 1; iic_mcu_busy = 0; } @@ -402,6 +419,8 @@ __interrupt void int_dma1( ) /* ======================================================== IIC MCUのバイト送出完了割り込み ※DMA使用時は使用されません。 + 　他の割り込み処理中でDMAの割り込みにすぐ飛ばない場合、 + 　IIC割り込みのセットが間に合わず困ることがあります。 ======================================================== */ __interrupt void int_iic10( ) { @@ -448,7 +467,7 @@ static err iic_mcu_call_slave( u8 slave ) iic_mcu_send_st( ); // SIR02 = SSR02; // NAKエラーのフラグクリア - if( iic_mcu_send_a_byte( slave ) != 0 ) + if( iic_mcu_send_a_byte( slave ) != ERR_SUCCESS ) { iic_mcu_send_sp( ); return ( ERR_NAK ); // 指定のスレーブがいない / busy @@ -465,7 +484,7 @@ static err iic_mcu_call_slave( u8 slave ) ======================================================== */ static err iic_mcu_send_a_byte( u8 dat ) { - + IICMK10 = 1; IICIF10 = 0; SIO10 = dat; while( IICIF10 == 0 ) @@ -553,6 +572,8 @@ static void iic_mcu_send_sp( ) void iic_mcu_start( ) { DST1 = 0; + NOP( ); // 2clkもしくは、DSTn==0をポーリング + NOP( ); DEN1 = 0; I2C_PU = 1; SAU0EN = 1; @@ -561,13 +582,14 @@ void iic_mcu_start( ) NOP( ); NOP( ); SPS0 = 0x0000; // シリアルユニットのクロック０。(8M/2)/1 - SMR02 = 0 << 15 | 0 << 14 | 0 << 7 | 0 << 5 | 1 << 4 | 1 << 2; // I2Cとそのクロックなど設定 + SMR02 = bSMR0n_FIXEDBIT | bMD0n2; // I2Cとそのクロックなど設定 SDR02 = 5 << 9; // ボーレート設定 (8M/2)/1/(x+1)/2 SO0 = 0x0404 | TAUS_MASK; // 最初はHH iic_mcu_busy = 0; iic_mcu_wo_dma = 0; + // バスのリセット IICIF10 = 0; IICMK10 = 1; diff --git a/trunk/led.c b/trunk/led.c index 141487e..348e6ca 100644 --- a/trunk/led.c +++ b/trunk/led.c @@ -12,8 +12,8 @@ // ======================================================== // TPS0 -#define BIT_PRS01 4 -#define BIT_PRS00 0 +#define BIT_PRS012 ( 1 << 2 ) +#define BIT_PRS002 ( 1 << 6 ) // TMR0 #define BIT_CKS0 15 @@ -50,7 +50,7 @@ void LED_init( ) 　　　　　　　　７　電源 Ｈ */ TAU0EN = 1; - TPS0 = 1 << BIT_PRS01 | 1 << BIT_PRS00; // マスタークロックはCK01,8M/2/2^4 = 250kHz + TPS0 = BIT_PRS012 | BIT_PRS002; // マスタークロックはCK01,8M/2 /2^4 = 250kHz TMR00 = 1 << BIT_CKS0 | 0 << BIT_CCS0 | 1 << BIT_MASTER0 | 0 << BIT_STS0 | 0 @@ -310,7 +310,7 @@ void tsk_led_wifi( ) static u8 flag_wifi_TX; - if( task_interval != system_time ) + if( task_interval-- != 0 ) { return; } @@ -371,7 +371,7 @@ void tsk_led_wifi( ) state_wifi_tx = 0; flag_wifi_TX -= 1; } - task_interval += 22; + task_interval = 22; return; } @@ -379,7 +379,7 @@ void tsk_led_wifi( ) { LED_duty_WiFi = vreg_ctr[VREG_C_LED_BRIGHT]; LED_WIFI_2 = 1; - task_interval += 200; + task_interval = 200; return; } break; @@ -402,7 +402,7 @@ void tsk_led_wifi( ) { state_wifi_tx = 0; } - task_interval += 50; + task_interval = 50; return; case ( WIFI_LED_PTN1 ): @@ -415,7 +415,7 @@ void tsk_led_wifi( ) { LED_duty_WiFi = 0; remain_wifi_tx = 0; - task_interval += MSG_SPD; + task_interval = MSG_SPD; return; } @@ -427,26 +427,26 @@ void tsk_led_wifi( ) case ( 0b00000000 ): LED_duty_WiFi = 0; remain_wifi_tx = 0; - task_interval += ( MSG_SPD * 3 ); + task_interval = ( MSG_SPD * 3 ); break; case ( 0b01000000 ): default: LED_duty_WiFi = 0; remain_wifi_tx = 1; - task_interval += ( MSG_SPD ); + task_interval = ( MSG_SPD ); break; case ( 0b10000000 ): LED_duty_WiFi = vreg_ctr[VREG_C_LED_BRIGHT]; remain_wifi_tx = 1; - task_interval += ( MSG_SPD ); + task_interval = ( MSG_SPD ); break; case ( 0b11000000 ): LED_duty_WiFi = vreg_ctr[VREG_C_LED_BRIGHT]; remain_wifi_tx = 1; - task_interval += ( MSG_SPD * 3 ); + task_interval = ( MSG_SPD * 3 ); break; } return; @@ -469,7 +469,7 @@ void tsk_led_cam( ) static u8 task_interval; static u8 state_led_cam_twl; - if( task_interval != system_time ) + if( task_interval-- != 0 ) { return; } @@ -499,7 +499,7 @@ void tsk_led_cam( ) LED_duty_CAM = 0; state_led_cam = 0; } - task_interval += 250; + task_interval = 250; break; case ( CAM_LED_ON_PLUSE ): @@ -507,7 +507,7 @@ void tsk_led_cam( ) { LED_duty_CAM = vreg_ctr[VREG_C_LED_BRIGHT]; state_led_cam = 1; - task_interval += 250; + task_interval = 250; } else { @@ -520,7 +520,7 @@ void tsk_led_cam( ) { LED_duty_CAM = 0; state_led_cam = 1; - task_interval += 250; + task_interval = 250; } else { @@ -546,7 +546,7 @@ void tsk_led_cam( ) LED_duty_CAM = 0; state_led_cam = 0; } - task_interval += 250; + task_interval = 250; break; case( TWL_CAMLED_ON ): diff --git a/trunk/led.h b/trunk/led.h index de58a62..5ba2505 100644 --- a/trunk/led.h +++ b/trunk/led.h @@ -38,6 +38,13 @@ enum LED_ILUM_MODE }; +enum LED_MODE_TUNE +{ + LED_TUNE_ILM_OFF = 0, + LED_TUNE_ILM_ON, + LED_TUNE_ILM_SVR +}; + // ==================================== void LED_init( ); void LED_stop( ); diff --git a/trunk/loader.c b/trunk/loader.c index c98dc1f..32e5b7f 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -80,7 +80,7 @@ void main( ) /* { u8 temp; - + #asm mov A,PSW and A,#06h @@ -357,8 +357,8 @@ void hdwinit2( ) #endif /*--- クロック出力/ブザー出力停止 ---*/ - CKS0 = 0b0000000; - CKS1 = 0b0000000; + CKS0 = 0b00000000; + CKS1 = 0b00000000; /*--- ADCの動作停止 ---*/ ADCEN = 0; /* ADCへのクロック供給停止 */ diff --git a/trunk/pm.c b/trunk/pm.c index b9aace3..8cf2856 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -14,7 +14,7 @@ // ======================================================== -u8 command_bl_set; + @@ -40,11 +40,18 @@ static const float BT_PANA_TEMPCODN = 0.5; // ======================================================== -u8 raw_adc_temperature; +u8 raw_adc_temperature; u8 rcomp; float temp_co_up; float temp_co_dn; +u8 command_bl_set; + + +// ======================================================== +static void PM_get_batt_left(); + + /******************************************************//** @@ -79,27 +86,27 @@ void PM_init( ) // 0. バッテリ残量IC クイックスタート dat_16._u16 = swap_endian_16( 0x4000 ); // quick start - if( iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_MODE, 2, &dat_16.chars.lsb ) != ERR_SUCCESS ) + if( iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_MODE, 2, &dat_16 ) != ERR_SUCCESS ) { - vreg_ctr[ VREG_C_STATUS_1 ] |= 0x01; + vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_GASGAUGE_ERR; } else { // 1. ロック解除 dat_16._u16 = swap_endian_16( 0x4057 ); // unlock key - iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_LOCK, 2, &dat_16._u16 ); + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_LOCK, 2, &dat_16 ); // 2. 初期パラメータを一時保存 iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 4, origParam ); // 3. 一時的にOCVを変更 dat_16._u16 = swap_endian_16( 0xD4C0 ); // マジックナンバー的なもの。メーカー指定 - iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_OCV, 2, &dat_16._u16 ); + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_OCV, 2, &dat_16 ); // 4. 一時的にRCOMPを変更 dat_16._u16 = swap_endian_16( 0xFF00 ); - iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 2, &dat_16._u16 ); + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 2, &dat_16 ); // 電池メーカーの識別 BT_DET_P = 1; @@ -124,7 +131,7 @@ void PM_init( ) // 7. OCVに「とある値」を書く dat_16._u16 = swap_endian_16( 0xD4C0 ); - iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_OCV, 2, &dat_16._u16 ); + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_OCV, 2, &dat_16 ); // 8. 150〜600ms待つ。600msは厳守 wait_ms( 200 ); @@ -143,7 +150,7 @@ void PM_init( ) // 11. ロック dat_16._u16 = swap_endian_16( 0x0000 ); // lock key - iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_LOCK, 2, &dat_16._u16 ); + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_LOCK, 2, &dat_16 ); // おしまい // } @@ -246,25 +253,42 @@ err PM_LCD_off( ) return ( ERR_SUCCESS ); } +err PM_BL_on( ) +{ + wait_ms( 10 ); + vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL; + return ( PM_chk_LDSW( ) ); +} + +err PM_BL_off( ) +{ + vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_BL; + return ( ERR_SUCCESS ); +} + + err PM_BL_set( ) { // 何もしない wait_ms( 10 ); - vreg_ctr[VREG_C_STATUS] = ( vreg_ctr[VREG_C_STATUS] & ~( REG_BIT_BL_U | REG_BIT_BL_L ) +#ifdef _VREG_C_NEW_ + vreg_ctr[VREG_C_STATUS] = ( vreg_ctr[VREG_C_STATUS] & ~( REG_BIT_BL_U | REG_BIT_BL_L ) | ( command_bl_set & REG_BIT_CMD_BL_U_ON )? REG_BIT_BL_U | ( command_bl_set & REG_BIT_CMD_BL_L_ON )? REG_BIT_BL_L ); - return ( ERR_SUCCESS ); +#else + vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL; +#endif + return ( PM_chk_LDSW( ) ); } + err PM_LCD_vcom_set( ) { - // 何もしない return ( ERR_SUCCESS ); } - #else # ifdef _PARRADIUM_ // パラディウム上のSoCでチェックしたいとき、PMICも液晶もつながってないので @@ -285,13 +309,32 @@ err PM_LCD_off( ) } +err PM_BL_on( ) +{ + vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL; + return ( ERR_SUCCESS ); +} + + +err PM_BL_off( ) +{ + vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_BL; + return ( ERR_SUCCESS ); +} + + err PM_BL_set( ) { - vreg_ctr[VREG_C_STATUS] = ( vreg_ctr[VREG_C_STATUS] & ~( REG_BIT_BL_U | REG_BIT_BL_L ) - vreg_ctr[VREG_C_STATUS] = ( vreg_ctr[VREG_C_STATUS] & ~( REG_BIT_BL_U | REG_BIT_BL_L ) + wait_ms( 10 ); +#ifdef _VREG_C_NEW_ + vreg_ctr[VREG_C_STATUS] = ( vreg_ctr[VREG_C_STATUS] & ~( REG_BIT_BL_U | REG_BIT_BL_L ) | ( command_bl_set & REG_BIT_CMD_BL_U_ON )? REG_BIT_BL_U | ( command_bl_set & REG_BIT_CMD_BL_L_ON )? REG_BIT_BL_L - return ( ERR_SUCCESS ); + ); +#else + vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL; +#endif + return ( PM_chk_LDSW( ) ); } @@ -301,6 +344,10 @@ err PM_LCD_vcom_set( ) } + + + + # else // PMIC CTR @@ -347,14 +394,33 @@ err PM_LCD_off( ) } + +err PM_BL_on( ) +{ + PM_set_BL( 0x03 ); + wait_ms( 10 ); + + vreg_ctr[VREG_C_STATUS] |= REG_BIT_BL; + return ( PM_chk_LDSW( ) ); +} + + + +err PM_BL_off( ) +{ + PM_set_BL( 0x00 ); + vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_BL; + return ( ERR_SUCCESS ); +} + + + /* ======================================================== 　バックライトの個別on/off 　現状から　on/off/維持　のフラグなので面倒 ======================================================== */ err PM_BL_set( ) { - u8 temp; - // まじめにRMW // temp = iic_mcu_read_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL ); @@ -435,6 +501,18 @@ task_status_immed tski_PM_LCD_off( ) return ( ERR_FINISED ); } +task_status_immed tski_PM_BL_on( ) +{ + PM_BL_on( ); + return ( ERR_FINISED ); +} + +task_status_immed tski_PM_BL_off( ) +{ + PM_BL_off( ); + return ( ERR_FINISED ); +} + task_status_immed tski_PM_BL_set( ) { PM_BL_set( ); @@ -446,7 +524,6 @@ task_status_immed tski_PM_BL_set( ) - /* ======================================================== シーケンスの通り電源を立ち上げてゆきます。 返値 0 最後まで正常に完了した。 @@ -470,8 +547,7 @@ err PM_sys_pow_on( ) PM_bt_temp_update( ); // 温度のtemp。　残量ICに行きます // 残量チェック - vreg_ctr[VREG_C_BT_REMAIN] = PM_get_batt_left( ); - vreg_ctr[VREG_C_BT_REMAIN] = 99; + PM_get_batt_left(); // 先に、PM_init()が実行されている必要があります。(大丈夫) if( vreg_ctr[VREG_C_BT_REMAIN] < 0 ) { return ( 1 ); @@ -521,8 +597,7 @@ err PM_sys_pow_on( ) // 残量確認 - temp = PM_get_batt_left( ); - temp = 200; + temp = 99; if( temp < ( 255 * 0.03 ) ) { return ( ERR_ERR ); @@ -611,14 +686,13 @@ void tsk_batt( ) static u8 task_interval = 0; static u8 charge_hys = 0; // ヒステリシスで上限下限を拡張するとき１ - if( task_interval != 0 ) + if( task_interval-- != 0 ) { - task_interval -= 1; return; } else { - task_interval = ( INTERVAL_TSK_BATT / SYS_INTERVAL_TICK ); + task_interval = (u8)( INTERVAL_TSK_BATT / SYS_INTERVAL_TICK ); } // 電源周りのステータスが変化？ /// @@ -663,18 +737,8 @@ void tsk_batt( ) // 充電LED LED_duty_CHARGE = !BT_CHG_n ? vreg_ctr[VREG_C_LED_BRIGHT] : 0; - if(( vreg_ctr[ VREG_C_STATUS_1 ] & REG_BIT_GASGAUGE_ERR ) == 0 ) - { - { - // 電池残量の取得 // - iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VCELL, 2, &vreg_ctr[ VREG_C_BT_REMAIN ] ); - // todo 閾値を超えたら割り込み - } - } - else - { - vreg_ctr[ VREG_C_BT_REMAIN ] = 99; - } + // 電池残量 + PM_get_batt_left(); // PMIC-NTRに電池残量を教えてあげる if( vreg_ctr[ VREG_C_BT_REMAIN ] < 5 ) @@ -686,9 +750,7 @@ void tsk_batt( ) iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_BT, 0 ); } - - - + // dubug monitor vreg_ctr[ VREG_C_FREE0 ] = vreg_ctr[ VREG_C_BT_REMAIN ]; vreg_ctr[ VREG_C_FREE1 ] = iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VCELL ); @@ -746,27 +808,18 @@ task_status_immed ntr_pmic_comm( ) { return ( ERR_FINISED ); } - DI( ); - // バックライト 上 がどうかした +#ifdef _VREG_C_NEW_ if( ( ( reg1_old ^ reg_shadow ) & REG_BIT_TWL_REQ_BL_U ) != 0 ) { if( ( reg_shadow & REG_BIT_TWL_REQ_BL_U ) == 0 ) // 消えた { - vreg_ctr[VREG_C_IRQ4] |= REG_BIT_TWL_BL_U_OFF; - if( ( vreg_ctr[VREG_C_IRQ_MASK4] & REG_BIT_TWL_BL_U_OFF ) == 0 ) - { - IRQ0_ast; - } + set_irq( VREG_C_IRQ4, REG_BIT_TWL_BL_U_OFF ); } else { - vreg_ctr[VREG_C_IRQ4] |= REG_BIT_TWL_BL_U_ON; - if( ( vreg_ctr[VREG_C_IRQ_MASK4] & REG_BIT_TWL_BL_U_ON ) != 0 ) - { - IRQ0_ast; - } + set_irq( VREG_C_IRQ4, REG_BIT_TWL_BL_U_ON ); } } @@ -775,56 +828,93 @@ task_status_immed ntr_pmic_comm( ) { if( ( reg_shadow & REG_BIT_TWL_REQ_BL_L ) == 0 ) // 消えた { - vreg_ctr[VREG_C_IRQ4] |= REG_BIT_TWL_BL_L_OFF; - if( ( vreg_ctr[VREG_C_IRQ_MASK4] & REG_BIT_TWL_BL_L_OFF ) == 0 ) - { - IRQ0_ast; - } + set_irq( VREG_C_IRQ4, REG_BIT_TWL_BL_L_OFF ); } else { - vreg_ctr[VREG_C_IRQ4] |= REG_BIT_TWL_BL_L_OFF; - if( ( vreg_ctr[VREG_C_IRQ_MASK4] & REG_BIT_TWL_BL_L_OFF ) != 0 ) - { - IRQ0_ast; - } + set_irq( VREG_C_IRQ4, REG_BIT_TWL_BL_L_OFF ); + } + } +#else + + if( ( ( reg1_old ^ reg_shadow ) & REG_BIT_TWL_REQ_BL ) != 0 ) // バックライトの2ビットが何らか変化して、 + { + if( ( reg_shadow & REG_BIT_TWL_REQ_BL ) == 0x00 ) // 00になった + { + // 両方消された + set_irq( VREG_C_IRQ3, REG_BIT_TWL_BL_OFF ); + } + else if( ( reg_shadow & REG_BIT_TWL_REQ_BL ) == REG_BIT_TWL_REQ_BL ) + { + // 両方ついた + set_irq( VREG_C_IRQ3, REG_BIT_TWL_BL_ON ); } } - // offリクエスト +#endif + + else + + +// offリクエスト if( ( reg_shadow & REG_BIT_TWL_REQ_OFF_REQ ) != 0 ) { +#ifdef _VREG_C_NEW_ set_irq( VREG_C_IRQ4, REG_BIT_TWL_OFF_REQ ); - vreg_ctr[VREG_C_IRQ4] |= REG_BIT_TWL_OFF_REQ; - if( ( vreg_ctr[VREG_C_IRQ_MASK4] & REG_BIT_TWL_OFF_REQ ) == 0 ) - { - IRQ0_ast; - } +#else + set_irq( VREG_C_IRQ3, REG_BIT_TWL_OFF_REQ ); +#endif } else // リセットリクエスト - - // CODECバグ回避 - // リセット単品でなかったら無視 -// if( ( reg_shadow & REG_BIT_TWL_REQ_RST_REQ ) != 0 ) - if( ( reg1_old ^ reg_shadow ) == REG_BIT_TWL_REQ_RST_REQ ) + if( ( reg_shadow & REG_BIT_TWL_REQ_RST_REQ ) != 0 ) { - vreg_ctr[VREG_C_IRQ4] |= REG_BIT_TWL_RESET_REQ; - if( ( vreg_ctr[VREG_C_IRQ_MASK4] & REG_BIT_TWL_RESET_REQ ) == 0 ) + // CODECバグ回避 + // リセット単品でなかったら無視 + if( ( reg1_old ^ reg_shadow ) == REG_BIT_TWL_REQ_RST_REQ ) { - IRQ0_ast; +#ifdef _VREG_C_NEW_ + set_irq( VREG_C_IRQ4, REG_BIT_TWL_RESET_REQ ); +#else + set_irq( VREG_C_IRQ3, REG_BIT_TWL_RESET_REQ ); } } - +#endif // バックライトが... - - EI( ); reg_shadow &= ~( REG_BIT_TWL_REQ_OFF_REQ | REG_BIT_TWL_REQ_RST_REQ ); iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_PM, reg_shadow ); #endif return ( ERR_FINISED ); } + + + +/********************************************************** + 電池残量ICから残量を取得し、レジスタに書き込む。 + 　電池残量ICが無い・故障などの時はとりあえず残量99%とする。 + 　　　　　　　　↑は status_1で確認可能。電源投入時にチェックしています。 + 　PM_init()が実行されている必要があります。 +**********************************************************/ +static void PM_get_batt_left(){ + if(( vreg_ctr[ VREG_C_STATUS_1 ] & REG_BIT_GASGAUGE_ERR ) == 0 ) + { + // 電池残量の取得 + { + u8 temp[2]; + + iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_SOC, 2, temp ); + + vreg_ctr[ VREG_C_BT_REMAIN ] = temp[0]; + vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = temp[1]; + // todo 閾値を超えたら割り込み + } + } + else + { + vreg_ctr[ VREG_C_BT_REMAIN ] = 99; + } +} diff --git a/trunk/pm.h b/trunk/pm.h index 4151c04..5210adf 100644 --- a/trunk/pm.h +++ b/trunk/pm.h @@ -44,8 +44,8 @@ enum PMIC_REG_ADRS // TWLがSPIでPMICに投げたコマンド #define REG_BIT_TWL_REQ_OFF_REQ ( 1 << 6 ) #define REG_BIT_TWL_REQ_RST_REQ ( 1 << 0 ) -#define REG_BIT_TWL_REQ_BL_U ( 1 << 3 ) -#define REG_BIT_TWL_REQ_BL_L ( 1 << 2 ) +#define REG_BIT_TWL_REQ_BL ( 3 << 2 ) + @@ -89,17 +89,17 @@ void PM_init( ); err PM_LCD_vcom_set( ); task_status_immed tski_vcom_set( ); -err PM_BL_set( ); +err PM_BL_on( ); +err PM_BL_off( ); -task_status_immed tski_PM_BL_set( ); +task_status_immed tski_PM_BL_on( ); +task_status_immed tski_PM_BL_off( ); task_status_immed tski_PM_LCD_on( ); task_status_immed tski_PM_LCD_off( ); // 　これを呼ぶ前に、現在温度を教えておく必要があります。 -#define PM_get_batt_left() ( iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_SOC ) ) - #define PM_reset() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_CONT, 0x00 ) ) @@ -147,7 +147,7 @@ task_status_immed tski_PM_LCD_off( ); #define PM_TCOM_VCS_off() PM_VDDLCD_on() #define PM_VDDLCD_off() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_LCD, 0 ) ) -//#define PM_set_BL( dat ) ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL, dat ) ) +#define PM_set_BL( dat ) ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL, dat ) ) #define PM_set_adc1( dat ) ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_DAC1, dat ) ) #define PM_set_adc2( dat ) ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_DAC2, dat ) ) diff --git a/trunk/rtc.c b/trunk/rtc.c index 27f8df2..0a8f5f8 100644 --- a/trunk/rtc.c +++ b/trunk/rtc.c @@ -176,13 +176,5 @@ void rtc_unlock( ) ======================================================== */ __interrupt void int_rtc_int( ) { - if( renge_flg_interval == 0 ) - { - renge_flg_interval = 1; - system_time += 1; - } - else - { - NOP(); - } + renge_flg_interval = 1; } diff --git a/trunk/sw.c b/trunk/sw.c index 486758c..f3c74ec 100644 --- a/trunk/sw.c +++ b/trunk/sw.c @@ -17,7 +17,7 @@ //========================================================= #define INTERVAL_TSK_SW 16 #define CLICK_THRESHOLD 3 -#define HOLD_THREASHOLD ( 600 / INTERVAL_TSK_SW ) +#define HOLD_THREASHOLD (u8)( 600 / INTERVAL_TSK_SW ) @@ -56,13 +56,13 @@ void tsk_sw( ) static u8 cnt_force_off = 0; static u8 task_interval = 0; - if( task_interval != system_time ) + if( task_interval-- != 0 ) { return; } else { - task_interval += (u8)( INTERVAL_TSK_SW / SYS_INTERVAL_TICK ); + task_interval = (u8)( INTERVAL_TSK_SW / SYS_INTERVAL_TICK ); } @@ -131,7 +131,7 @@ void tsk_sw( ) } // wifi sw // - if( SW_wifi_count == 10 ) + if( SW_wifi_count == HOLD_THREASHOLD ) { set_irq( VREG_C_IRQ0, REG_BIT_SW_WIFI_CLICK ); } diff --git a/trunk/task_debug.c b/trunk/task_debug.c index ec76d1e..0d94a60 100644 --- a/trunk/task_debug.c +++ b/trunk/task_debug.c @@ -7,6 +7,7 @@ #include "renge.h" #include "pm.h" +#include "accero.h" extern u8 command_bl_set; @@ -27,7 +28,7 @@ void tsk_debug( ) if( !SW_SEL_n ){ command_bl_set = REG_BIT_CMD_BL_U_ON | REG_BIT_CMD_BL_L_ON; PM_LCD_on(); - PM_BL_set(); + PM_BL_on(); } // vreg_ctr[ VREG_C_ACC_CONFIG ] = 0x03; @@ -58,11 +59,10 @@ void tsk_debug2( ) str[1] = vreg_ctr[ VREG_C_STATUS ]; str[0] = vreg_ctr[ VREG_C_RTC_SEC ]; */ - str[3] = vreg_ctr[ VREG_C_IRQ1 ]; - str[2] = vreg_ctr[ VREG_C_IRQ2 ]; - str[1] = vreg_ctr[ VREG_C_IRQ3 ]; -// str[0] = vreg_ctr[ VREG_C_STATUS ]; - str[0] = temp_debug_3; + str[3] = vreg_ctr[ VREG_C_ACC_HOSU_L ]; + str[2] = SEC; + str[1] = vreg_ctr[ VREG_C_BT_TEMP ]; + str[0] = vreg_ctr[ VREG_C_BT_REMAIN ]; // iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 2, vreg_ctr[ VREG_C_IRQ1 ] ); // iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 1, boot_ura ); diff --git a/trunk/task_misc.c b/trunk/task_misc.c index ce94af5..1b5beee 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -11,6 +11,8 @@ #define INTERVAL_TSK_MISC_STAT 4 + + /* ======================================================== ステータスレジスタなど ======================================================== */ @@ -55,7 +57,23 @@ void tsk_misc_stat( ) } } - if( diff & REG_BIT_BL_U ) + if( diff & REG_BIT_BL ) + { + // バックライトに変化有り + if( vreg_ctr[VREG_C_STATUS] & REG_BIT_BL ) + { + // ついた + set_irq( VREG_C_IRQ3, REG_BIT_BL_ON ); + } + else + { + // 消えた + set_irq( VREG_C_IRQ3, REG_BIT_BL_OFF ); + } + } +#if 0 + todo + if( diff & REG_BIT_BL_U ) { // バックライトに変化有り if( vreg_ctr[VREG_C_STATUS] & REG_BIT_BL_U ) @@ -84,7 +102,7 @@ void tsk_misc_stat( ) set_irq( VREG_C_IRQ4, REG_BIT_BL_L_OFF ); } } - +#endif if( diff & REG_BIT_BATT_CHARGE ) { // 充電状態に以下略 @@ -167,18 +185,14 @@ void tsk_misc_stat( ) ======================================================== */ task_status_immed do_command( ) { - // cmd0 本体電源など + + // 本体電源など if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_OFF_REQ ) { system_status.pwr_state = OFF_TRIG; } else { - if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_FCRAM_RESET_REQ ) - { - FCRAM_RST_ast; - wait_ms( 5 ); - } if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_RESET1_REQ ) { PM_reset_ast( ); @@ -186,34 +200,41 @@ task_status_immed do_command( ) FCRAM_RST_ast; wait_ms( 5 ); } - else if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_RESET2_REQ ) + if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_RESET2_REQ ) { RESET2_ast; wait_ms( 5 ); } + if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_FCRAM_RESET_REQ ) + { + FCRAM_RST_ast; + wait_ms( 5 ); + } PM_reset_neg( ); RESET2_neg; FCRAM_RST_neg; } - vreg_ctr[VREG_C_COMMAND0] = 0; - // cmd1 液晶電源など - command_bl_set = ( vreg_ctr[VREG_C_COMMAND1] & ( REG_BIT_CMD_BL_U_ON | REG_BIT_CMD_BL_U_OFF | REG_BIT_CMD_BL_L_ON | REG_BIT_CMD_BL_L_OFF )); - if( command_bl_set != 0 ) + // 液晶電源など + if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_CMD_BL_ON ) { - renge_task_immed_add( tski_PM_BL_set ); + renge_task_immed_add( tski_PM_BL_on ); + } + else if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_CMD_BL_OFF ) + { + renge_task_immed_add( tski_PM_BL_off ); } - if( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_CMD_LCD_ON ) + if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_CMD_LCD_ON ) { renge_task_immed_add( tski_PM_LCD_on ); } - else if( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_CMD_LCD_OFF ) + else if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_CMD_LCD_OFF ) { renge_task_immed_add( tski_PM_LCD_off ); } - vreg_ctr[VREG_C_COMMAND1] = 0; + vreg_ctr[VREG_C_COMMAND0] = 0; return ( ERR_FINISED ); } diff --git a/trunk/vreg_ctr.h b/trunk/vreg_ctr.h index aa74859..878dd89 100644 --- a/trunk/vreg_ctr.h +++ b/trunk/vreg_ctr.h @@ -37,6 +37,7 @@ #define REG_BIT_SHELL_OPEN ( 1 << 1 ) #define REG_BIT_SHELL_CLOSE ( 1 << 0 ) +#ifdef _VREG_C_NEW_ // VREG_C_IRQ3 #define REG_BIT_LCD_ON ( 1 << 5 ) #define REG_BIT_LCD_OFF ( 1 << 4 ) @@ -53,20 +54,36 @@ #define REG_BIT_TWL_OFF_REQ ( 1 << 1 ) #define REG_BIT_TWL_RESET_REQ ( 1 << 0 ) +#else +// VREG_C_IRQ3 +#define REG_BIT_TWL_BL_ON ( 1 << 7 ) +#define REG_BIT_TWL_BL_OFF ( 1 << 6 ) +#define REG_BIT_TWL_OFF_REQ ( 1 << 5 ) +#define REG_BIT_TWL_RESET_REQ ( 1 << 4 ) +#define REG_BIT_LCD_ON ( 1 << 3 ) +#define REG_BIT_LCD_OFF ( 1 << 2 ) +#define REG_BIT_BL_ON ( 1 << 1 ) +#define REG_BIT_BL_OFF ( 1 << 0 ) + +#endif + // VREG_C_STATUS, #define REG_BIT_LCD_POW ( 1 << 7 ) -#define REG_BIT_BL_U ( 1 << 6 ) -#define REG_BIT_BL_L ( 1 << 5 ) +#define REG_BIT_BL ( 1 << 6 ) #define REG_BIT_BATT_CHARGE ( 1 << 4 ) #define REG_BIT_POW_SUPPLY ( 1 << 3 ) #define REG_BIT_ST_SHELL_OPEN ( 1 << 1 ) +#define REG_BIT_BL_U ( 1 << 6 ) +#define REG_BIT_BL_L ( 1 << 5 ) + + // VREG_C_STATUS_1 #define REG_BIT_GASGAUGE_ERR ( 1 << 0 ) #define REG_BIT_ACCERO_ERR ( 1 << 1 ) -// VREG_C_COMMAND0 +#ifdef _VREG_C_NEW_ #define REG_BIT_FCRAM_RESET_REQ ( 1 << 3 ) #define REG_BIT_RESET2_REQ ( 1 << 2 ) #define REG_BIT_RESET1_REQ ( 1 << 1 ) @@ -86,6 +103,31 @@ #define REG_BIT_SEND_TWL_OFF_REQ ( 1 << 2 ) #define REG_BIT_SEND_TWL_RESET_REQ ( 1 << 1 ) #define REG_BIT_SEND_TWL_PWSW_DET ( 1 << 0 ) +#else + +// 暫定　コンパイルを通すため +#define REG_BIT_CMD_BL_U_ON ( 1 << 3 ) +#define REG_BIT_CMD_BL_U_OFF ( 1 << 2 ) +#define REG_BIT_CMD_BL_L_ON ( 1 << 1 ) +#define REG_BIT_CMD_BL_L_OFF ( 1 << 0 ) + +// VREG_C_COMMAND0 +#define REG_BIT_CMD_LCD_ON ( 1 << 7 ) +#define REG_BIT_CMD_LCD_OFF ( 1 << 6 ) +#define REG_BIT_CMD_BL_ON ( 1 << 5 ) +#define REG_BIT_CMD_BL_OFF ( 1 << 4 ) +#define REG_BIT_FCRAM_RESET_REQ ( 1 << 3 ) +#define REG_BIT_RESET2_REQ ( 1 << 2 ) +#define REG_BIT_RESET1_REQ ( 1 << 1 ) +#define REG_BIT_OFF_REQ ( 1 << 0 ) + +// VREG_C_COMMAND1 +#define REG_BIT_SEND_TWL_BATT_EMPTY ( 1 << 4 ) +#define REG_BIT_SEND_TWL_BATT_LOW ( 1 << 3 ) +#define REG_BIT_SEND_TWL_OFF_REQ ( 1 << 2 ) +#define REG_BIT_SEND_TWL_RESET_REQ ( 1 << 1 ) +#define REG_BIT_SEND_TWL_PWSW_DET ( 1 << 0 ) +#endif // VREG_C_WIFI_LED @@ -162,9 +204,15 @@ enum VREG_C VREG_C_TUNE = 0x08, VREG_C_SND_VOL, +#ifdef _VREG_C_NEW_ VREG_C_BT_TEMP, VREG_C_BT_REMAIN, VREG_C_BT_REMAIN_FINE, +#else + VREG_C_BT_REMAIN, + VREG_C_BT_TEMP, + VREG_C_BT_REMAIN_FINE, // ダミーですが +#endif VREG_C_STATUS_1 = 0x0E, VREG_C_STATUS = 0x0F, diff --git a/trunk/vreg_twl.c b/trunk/vreg_twl.c index f75c6f6..857fe6d 100644 --- a/trunk/vreg_twl.c +++ b/trunk/vreg_twl.c @@ -38,7 +38,7 @@ void vreg_twl_write( u8 adrs, u8 data ) { case ( REG_TWL_INT_ADRS_VOL ): { - set_irq(&vreg_ctr[ VREG_C_IRQ0 ], REG_BIT_VR_SNDVOL_CHANGE ); + set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE ); break; } diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index ef86b7e..521fa8d 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,134 +1,16 @@ C:\WINDOWS\system32\cmd.exe /c echo touch magic.c touch magic.c -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no loader.c -loader.c(138) : CC78K0R warning W0401: Conversion may lose significant digits -loader.c(142) : CC78K0R warning W0401: Conversion may lose significant digits -loader.c(145) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 3 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\loader.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no pm.c -pm.c(189) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(201) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(205) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(380) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(621) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 5 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pm.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no i2c_ctr.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no main.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\main.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no magic.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\magic.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no WDT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\WDT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no i2c_mcu.c -i2c_mcu.c(103) : CC78K0R warning W0401: Conversion may lose significant digits -i2c_mcu.c(180) : CC78K0R warning W0401: Conversion may lose significant digits +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl2wt -sainter_asm -zp -no i2c_mcu.c +i2c_mcu.c(119) : CC78K0R warning W0401: Conversion may lose significant digits +i2c_mcu.c(196) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 2 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_mcu.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no i2c_twl.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no ini_VECT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\ini_VECT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no led.c -led.c(422) : CC78K0R warning W0401: Conversion may lose significant digits -led.c(423) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\led.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no rtc.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\rtc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no vreg_ctr.c -vreg_ctr.c(60) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(102) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(103) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(105) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(107) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(108) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(110) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 7 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no vreg_twl.c -vreg_twl.c(41) : CC78K0R warning W0511: Different argument types in function 'set_irq' -vreg_twl.c(47) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no adc.c -adc.c(73) : CC78K0R warning W0745: Expected function prototype -adc.c(78) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(81) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(96) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(99) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(224) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(44) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 7 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\adc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no renge\renge.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\renge.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no accero.c -accero.c(91) : CC78K0R warning W0745: Expected function prototype -accero.c(93) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\accero.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no self_flash.c -self_flash.c(234) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\self_flash.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no reboot.c -reboot.c(14) : CC78K0R warning W0915: Asm statement found. skip to jump optimize this function 'my_reboot' -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\reboot.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no sw.c -sw.c(66) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\sw.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no task_debug.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_debug.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no task_misc.c -task_misc.c(38) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(201) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(30) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 3 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_misc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl1wt -sainter_asm -zp -no task_sys.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_sys.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lk78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r\s0rm.rel" -go85h,0FC00h,1024 -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map -nkd -kp -gb7EFBFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r" -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel ini_VECT.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel reboot.rel sw.rel task_debug.rel task_misc.rel task_sys.rel +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lk78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r\s0rm.rel" -go85h,0FC00h,1024 -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map -nkd -kp -gb6EFFFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r" -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel ini_VECT.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel reboot.rel sw.rel task_debug.rel task_misc.rel task_sys.rel Link complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\oc78k0r.exe" -y"C:\Program Files\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 C:\Cygwin\home\fujita_ryohei\ctr\nec_s_2_bsrbin.rb bsr.hex C:/Cygwin/home/fujita_ryohei/ctr/nec_s_2_bsrbin.rb:2: warning: variable $KCODE is no longer effective; ignored -Build Total error(s) : 0 Total warning(s) : 36 +Build Total error(s) : 0 Total warning(s) : 2 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 5fa2fb9..6950868 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -17,12 +17,12 @@ NMI=OFF TRESET=ON IRESET=OFF WAIT=OFF -SysClock=None -SubClock=None +SysClock=8.00 +SubClock=32.768 [Mapping] Count=0 [Main] -Geometry=123, 8, 1395, 1124 +Geometry=176, 176, 1200, 882 Window=Max MDI_MAX=OFF Button=ON @@ -55,7 +55,7 @@ HighSpeed1=OFF CPU Reset1=ON Symbol Reset1=ON [View File] -Dir=. +Dir=renge\ Filter=Source [Debugger Option] Source Path=".;renge" @@ -66,9 +66,9 @@ Offset Label=OFF Offset Mnemonic=ON Tab Count=4 Tab Size1=*.*, 8 -Tab Size2=*.c, 8 -Tab Size3=*.s, 8 -Tab Size4=*.asm, 8 +Tab Size2=*.asm, 8 +Tab Size3=*.c, 8 +Tab Size4=*.s, 8 Default Source=*.c;*.s;*.asm Default Module=*.lnk;*.lmf Startup Start=_@cstart @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=325, 260, 834, 813 +Geometry=7, 328, 821, 747 Window=Normal -DispStart=46 -CaretPos=89,0 +DispStart=443 +CaretPos=471,0 Mode=Normal DispFile= Address1= @@ -142,7 +142,7 @@ Accumulative=ON [Assemble] Geometry=0, 0, 0, 0 Window=Hide -DispStart=864531456 +DispStart=864338944 CaretPos=0,0 Address1= Address2= @@ -185,7 +185,7 @@ SaveRange=Screen SaveStart= SaveEnd= [Memory] -Geometry=859, 4, 550, 1064 +Geometry=0, 0, 0, 0 Window=Hide Boundary=0 Format=Hex @@ -194,7 +194,7 @@ Endian= Ascii=OFF Idtag=OFF Address= -DispStart=00004390 +DispStart=FFFFFFFF CaretPosData=0, 0 CaretPosAscii=0, 0 Address1= @@ -251,9 +251,9 @@ Destination=0 [I/O Port] Line=0 [Stack] -Geometry=0, 0, 0, 0 -Window=Hide -Boundary=0 +Geometry=12, 14, 400, 300 +Window=Normal +Boundary=13762687 Mode=Proper [Sfr] Geometry=0, 0, 0, 0 @@ -814,7 +814,7 @@ L529=IICWL1 L530=IICWH1 L531=SVA1 [Local Variable] -Geometry=442, 879, 400, 212 +Geometry=1174, 786, 400, 300 Window=Normal Boundary=13041851 Mode=Proper @@ -883,8 +883,8 @@ PSW=3 ES=3 CS=3 [Event Manager] -Geometry=0, 0, 0, 0 -Window=Hide +Geometry=662, 893, 500, 200 +Window=Normal Sort by=Unsort Detail=OFF [Event Set] @@ -894,17 +894,7 @@ Manager=ON Sort by=Unsort Detail=OFF Last Name= -Name0=vreg_001 -Status0=W -Access Size0=B -Address Range0=EQ -Address0= - <> -Mask Address0=00000000 -Data Range0=NC -Data0=<00000000> - <00000000> -Mask Data0=FFFFFFFF -Pass0=0001 -Count=1 +Count=0 [Event Link] Geometry=0, 0, 0, 0 Window=Hide @@ -920,10 +910,7 @@ Manager=ON Sort by=Unsort Detail=OFF Last Name= -Name0=vreg_002 -Element0=vreg_001 -Set0=ON -Count=1 +Count=0 [Trace] Geometry=0, 0, 0, 0 Window=Hide @@ -970,58 +957,46 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=1143, 7, 440, 503 +Geometry=1165, 10, 420, 597 Window=Normal Boundary=13762700 -0=.hist_tune,P,N,A,+,1 -1=.vreg_ctr[8],P,N,A,+,1 -2=.comp,P,N,A,+,1 -3=.pool,P,N,A,+,1 -4=.p_buff,P,N,A,+,1 -5=.p_rom,P,N,A,+,1 -6=.SVA0,P,S,A,+,1 -7=.IICA0EN,P,S,A,+,1 -8=.IICAIF1,P,S,A,+,1 -9=.IICAIF0,P,S,A,+,1 -10=.system_status.pwr_state,P,N,A,+,1 -11=.P2,B,S,A,+,1 -12=.PM2,B,S,A,+,1 -13=.raw_adc_temperature,P,N,A,+,1 -14=.vreg_ctr,P,N,A,+,1 -15=.reg1_old,P,N,A,+,1 -16=.reg_shadow,P,N,A,+,1 -Line=17 +0=.SIO10,P,S,A,+,1 +1=.system_status.pwr_state,P,N,A,+,1 +2=.tasks_immed,P,N,A,+,1 +3=.SDR02,H,S,A,+,1 +4=.hyst_pedometer,.,N,A,+,1 +Line=5 [Quick Watch] -0=raw_adc_temperature,P,A,1 -1=PM2,P,A,1 -2=P2,B,A,1 +0=hyst_pedometer,P,A,1 +1=SDR02,P,A,1 +2=tasks_immed,P,A,1 3=system_status.pwr_state,P,A,1 -4=IICA0IF0,P,A,1 -5=IICA0IF,P,A,1 -6=IICAIF0,P,A,1 -7=IICAIF1,P,A,1 -8=IICA0EN,P,A,1 -9=SVA0,P,A,1 -10=p_rom,P,A,1 -11=p_buff,P,A,1 -12=pool,P,A,1 -13=comp,P,A,1 -14=vreg_ctr[8],P,A,1 -15=hist_tune,P,A,1 +4=SIO10,P,A,1 +5= +6= +7= +8= +9= +10= +11= +12= +13= +14= +15= [Software Break] -Geometry=1069, 522, 500, 272 +Geometry=848, 671, 500, 200 Window=Normal Width=150 30 200 100 Name0=Swb00001 -Address0=task_sys.c#_tsk_sys+0x171 +Address0=accero.c#_tsk_cbk_accero+0x17a Window0=ASM Status0=ON Name1=Swb00002 -Address1=task_sys.c#_tsk_sys+0x159 +Address1=accero.c#_acc_hosu_set+0x38 Window1=ASM Status1=ON Name2=Swb00003 -Address2=adc.c#_tsk_adc+0x102 +Address2=task_sys.c#_tsk_sys+0xcf Window2=ASM Status2=ON Count=3 diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 59780f8..8d7f484 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -223,297 +223,6 @@ ZF=0 S=1 E=0 CommandFile=0 -[Options.LK78K0R 0] -Version=100 -O0=bsr_k0r.lmf -O1=bsr.lmf -O2=flash.lmf -O3=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_k0r.map -P1=bsr.map -P2=flash.map -P3=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=0 -SELFCheck=1 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LK78K0R 1] -Version=100 -O0=a.lmf -G=0 -E=0 -E0=a.elk -GO=0 -GOValue= -GOStart=FC00 -GOSizeValue=1024 -GI=0 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=1 -MemInfoCheck=0 -P=1 -P0=a.map -MI=0 -GB=0 -GBValue= -KM=1 -KD=1 -KP=0 -KL=0 -LF=0 -LL=0 -S=0 -W=1 -SELFCheck=0 -SELF=0 -ZB= -CommandFile=0 -[Options.LK78K0R 2] -Version=100 -O0=bsr.lmf -O1=bsr_k0r.lmf -O2=flash.lmf -O3=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_k0r.map -P1=bsr.map -P2=flash.map -P3=a.map -MI=0 -GB=1 -GBValue=7EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=0 -SELFCheck=0 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -OFILE=C:\78k_data\yav-mcu-basara\bsr.lmf -[Options.LK78K0R 3] -Version=100 -O0=bsr_bsr.lmf -O1=bsr_k0r.lmf -O2=bsr.lmf -O3=flash.lmf -O4=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_bsr.map -P1=bsr_k0r.map -P2=bsr.map -P3=flash.map -P4=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=2 -SELFCheck=0 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LK78K0R 4] -Version=100 -O0=bsr_k0r.lmf -O1=bsr.lmf -O2=flash.lmf -O3=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_k0r.map -P1=bsr.map -P2=flash.map -P3=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=0 -SELFCheck=1 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LK78K0R 5] -Version=100 -O0=bsr_bsr.lmf -O1=bsr_k0r.lmf -O2=bsr.lmf -O3=flash.lmf -O4=a.lmf -G=1 -E=0 -E0=flash.elk -E1=a.elk -GO=1 -GOValue=85 -GOStart=FC00 -GOSizeValue=1024 -GI=1 -GIValue=FFFFFFFFFFFFFFFFFFFF -CCZA=0 -MemInfoCheck=1 -P=1 -P0=bsr_bsr.map -P1=bsr_k0r.map -P2=bsr.map -P3=flash.map -P4=a.map -MI=0 -GB=1 -GBValue=6EFBFF -KM=1 -KD=0 -KP=1 -KL=0 -LF=0 -LL=0 -B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -D0=bsr_mcu.dr -D1=user_area.dr -S=1 -W=2 -SELFCheck=0 -SELF=0 -ZB= -Etcetera0= -Etcetera1=boot.lmf -CommandFile=0 -[Options.LCNV78K0R 0] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 1] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 2] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 3] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 4] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.LCNV78K0R 5] -Version=100 -LCNV_GO=0 -E=0 -CommandFile=0 -[Options.78K0R] -BuildMode=2 -BuildMode2=K0R_dbg -BuildMode3=BSR_dbg -BuildMode4=BSR_rel -BuildMode5=BSR_WM0 -DefaultMode2=1 -DefaultMode3=1 -DefaultMode4=1 -DefaultMode5=1 [SrcFile] Source1=loader.c Source2=pm.c @@ -1038,3 +747,294 @@ ToolSetName=( Tool1=CC78K0R|W2.10 Tool2=RA78K0R|W1.31 Tool3=ID78K0R-QB|V3.60 +[Options.LK78K0R 0] +Version=100 +O0=bsr_k0r.lmf +O1=bsr.lmf +O2=flash.lmf +O3=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_k0r.map +P1=bsr.map +P2=flash.map +P3=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=0 +SELFCheck=1 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LK78K0R 1] +Version=100 +O0=a.lmf +G=0 +E=0 +E0=a.elk +GO=0 +GOValue= +GOStart=FC00 +GOSizeValue=1024 +GI=0 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=1 +MemInfoCheck=0 +P=1 +P0=a.map +MI=0 +GB=0 +GBValue= +KM=1 +KD=1 +KP=0 +KL=0 +LF=0 +LL=0 +S=0 +W=1 +SELFCheck=0 +SELF=0 +ZB= +CommandFile=0 +[Options.LK78K0R 2] +Version=100 +O0=bsr.lmf +O1=bsr_k0r.lmf +O2=flash.lmf +O3=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_k0r.map +P1=bsr.map +P2=flash.map +P3=a.map +MI=0 +GB=1 +GBValue=6EFFFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=0 +SELFCheck=0 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +OFILE=C:\78k_data\yav-mcu-basara\bsr.lmf +[Options.LK78K0R 3] +Version=100 +O0=bsr_bsr.lmf +O1=bsr_k0r.lmf +O2=bsr.lmf +O3=flash.lmf +O4=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_bsr.map +P1=bsr_k0r.map +P2=bsr.map +P3=flash.map +P4=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=2 +SELFCheck=0 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LK78K0R 4] +Version=100 +O0=bsr_k0r.lmf +O1=bsr.lmf +O2=flash.lmf +O3=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_k0r.map +P1=bsr.map +P2=flash.map +P3=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=0 +SELFCheck=1 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LK78K0R 5] +Version=100 +O0=bsr_bsr.lmf +O1=bsr_k0r.lmf +O2=bsr.lmf +O3=flash.lmf +O4=a.lmf +G=1 +E=0 +E0=flash.elk +E1=a.elk +GO=1 +GOValue=85 +GOStart=FC00 +GOSizeValue=1024 +GI=1 +GIValue=FFFFFFFFFFFFFFFFFFFF +CCZA=0 +MemInfoCheck=1 +P=1 +P0=bsr_bsr.map +P1=bsr_k0r.map +P2=bsr.map +P3=flash.map +P4=a.map +MI=0 +GB=1 +GBValue=6EFBFF +KM=1 +KD=0 +KP=1 +KL=0 +LF=0 +LL=0 +B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib +D0=bsr_mcu.dr +D1=user_area.dr +S=1 +W=2 +SELFCheck=0 +SELF=0 +ZB= +Etcetera0= +Etcetera1=boot.lmf +CommandFile=0 +[Options.LCNV78K0R 0] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 1] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 2] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 3] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 4] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.LCNV78K0R 5] +Version=100 +LCNV_GO=0 +E=0 +CommandFile=0 +[Options.78K0R] +BuildMode=2 +BuildMode2=K0R_dbg +BuildMode3=BSR_dbg +BuildMode4=BSR_rel +BuildMode5=BSR_WM0 +DefaultMode2=1 +DefaultMode3=1 +DefaultMode4=1 +DefaultMode5=1 diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index f289a9f..0c58c1f 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -4,32 +4,32 @@ FrameX=2 FrameY=2 FrameCX=1022 FrameCY=766 -OpenFile1=i2c_mcu.c,0,330,330,1204,1087,48,321,48,0 -OpenFile2=renge\\renge_defs.h,0,330,330,1574,1087,0,47,0,0 -OpenFile3=user_define.h,0,176,176,1420,933,0,33,20,0 -OpenFile4=rtc.c,0,308,308,1491,934,0,31,17,0 -OpenFile5=magic.c,0,242,242,1486,999,3,8,0,0 -OpenFile6=inter_asm\self_flash.asm,0,118,281,1362,1038,0,933,0,0 -OpenFile7=main.c,0,124,87,1368,844,0,45,0,0 -OpenFile8=led.c,0,286,286,1469,912,45,278,46,0 -OpenFile9=task_debug.c,0,22,22,1266,779,0,21,0,0 -OpenFile10=task_sys.c,0,88,88,1332,845,44,294,44,0 -OpenFile11=i2c_twl.c,0,110,110,1354,867,0,156,0,0 -OpenFile12=ProjectWindow +OpenFile1=renge\\renge_defs.h,0,330,330,1574,1087,0,47,0,0 +OpenFile2=user_define.h,0,176,176,1420,933,0,33,20,0 +OpenFile3=rtc.c,0,308,308,1491,934,0,31,17,0 +OpenFile4=magic.c,0,242,242,1486,999,3,8,0,0 +OpenFile5=inter_asm\self_flash.asm,0,118,281,1362,1038,0,933,0,0 +OpenFile6=led.c,0,286,286,1469,912,45,278,46,0 +OpenFile7=task_debug.c,0,22,22,1266,779,0,21,0,0 +OpenFile8=task_sys.c,0,88,88,1332,845,44,294,44,0 +OpenFile9=i2c_twl.c,0,110,110,1354,867,0,156,0,0 +OpenFile10=loader.c,0,186,351,1369,977,0,145,0,0 +OpenFile11=vreg_twl.c,0,314,110,1264,895,12,63,19,0 +OpenFile12=reboot.c,0,110,110,1354,867,5,14,14,0 +OpenFile13=sw.c,0,198,198,1442,955,12,137,19,0 +OpenFile14=vreg_ctr.c,0,66,66,1310,823,5,261,14,0 +OpenFile15=main.c,0,124,87,1368,844,0,1,0,0 +OpenFile16=task_misc.c,0,130,277,1374,1034,58,30,58,0 +OpenFile17=pm.c,0,563,282,1807,1039,0,423,0,0 +OpenFile18=vreg_ctr.h,0,154,154,1398,911,9,108,0,0 +OpenFile19=adc.c,0,275,163,1065,610,0,96,75,0 +OpenFile20=accero.c,0,176,176,1420,933,55,97,63,0 +OpenFile21=ProjectWindow PrjPos=0,2,754,3,253 -OpenFile13=config.h,0,225,465,1115,1086,18,39,18,0 -OpenFile14=vreg_ctr.h,0,154,154,1398,911,30,232,30,0 -OpenFile15=vreg_ctr.c,0,66,66,1310,823,0,157,17,0 -OpenFile16=loader.c,0,186,351,1369,977,0,145,0,0 -OpenFile17=pm.c,0,132,132,1376,889,0,189,0,0 -OpenFile18=vreg_twl.c,0,314,110,1264,895,12,63,19,0 -OpenFile19=adc.c,0,275,163,1065,610,0,96,43,0 -OpenFile20=accero.c,0,176,176,1420,933,12,173,19,0 -OpenFile21=reboot.c,0,110,110,1354,867,5,14,14,0 -OpenFile22=sw.c,0,198,198,1442,955,12,137,19,0 -OpenFile23=task_misc.c,0,130,277,1374,1034,0,49,0,0 +OpenFile22=config.h,0,225,465,1115,1086,0,1,0,0 +OpenFile23=i2c_mcu.c,0,330,330,1204,1087,10,500,48,0 OpenFile24=OutputWindow -OutputPos=0,153,1097,771,1571 +OutputPos=0,76,1020,758,1558 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 965ba75..901dbba 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4afa979d +T=4afd21ca 1=incs_loader.h 2=fsl.h 3=fsl_user.h @@ -11,16 +11,16 @@ T=4afa979d 7=rtc.h 8=reboot.h [pm.c] -T=4afbbfd8 +T=4b033701 1=incs.h 2=adc.h 3=led.h 4=pm.h [i2c_ctr.c] -T=4afa8711 +T=4b024862 1=incs.h [main.c] -T=4afbb86a +T=4b026384 1=incs.h 2=WDT.h 3=rtc.h @@ -28,31 +28,31 @@ T=4afbb86a 5=accero.h 6=led.h [magic.c] -T=4ad3e9ff +T=4afd21ca 1=config.h [WDT.c] -T=4aca8ef0 +T=4afd21ca 1=incs_loader.h [i2c_mcu.c] -T=4af931e2 +T=4b0272b2 1=incs.h 2=i2c_mcu.h [i2c_twl.c] -T=4afb74bf +T=4afd21ca 1=incs.h 2=i2c_twl_defs.h [ini_VECT.c] -T=4ae986c0 +T=4afd21ca 1=config.h [led.c] -T=4af37126 +T=4b026f97 1=incs.h 2=led.h [rtc.c] -T=4af7b267 +T=4b026f97 1=incs.h [vreg_ctr.c] -T=4afbbee0 +T=4b0254a4 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -60,39 +60,39 @@ T=4afbbee0 5=accero.h 6=pm.h [vreg_twl.c] -T=4afbbfd8 +T=4b0245c3 1=incs.h 2=jhl_defs.h 3=vreg_twl.h 4=vreg_ctr.h [adc.c] -T=4afbbfd8 +T=4b026f96 1=incs.h 2=adc.h 3=pm.h 4=led.h [renge\renge.c] -T=4afbb784 +T=4b024862 1=renge\renge_defs.h 2=renge\renge_task_intval.h 3=renge\renge_task_immediate.h 4=WDT.h 5=bsr_system.h [accero.c] -T=4afbbfd8 +T=4b026036 1=incs.h 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] -T=4af2385f +T=4b024862 1=incs_loader.h 2=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 3=fsl_user.h 4=i2c_ctr.h [reboot.c] -T=4ae01bca +T=4afd21cb 1=incs_loader.h [sw.c] -T=4afbbfd8 +T=4b026f96 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -101,18 +101,19 @@ T=4afbbfd8 6=pm.h 7=rtc.h [task_debug.c] -T=4afbb1ae +T=4b0265df 1=incs.h 2=renge\renge.h 3=pm.h +4=accero.h [task_misc.c] -T=4afbbfd8 +T=4b024578 1=incs.h 2=renge\renge.h 3=pm.h 4=accero.h [task_sys.c] -T=4afb75c7 +T=4b023fdb 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -122,7 +123,7 @@ T=4afb75c7 7=rtc.h 8=sw.h [incs_loader.h] -T=4aca8c17 +T=4afd21cb 1=jhl_defs.h 2=user_define.h 3=bsr_system.h @@ -132,51 +133,51 @@ T=4aca8c17 7=i2c_mcu.h 8=WDT.h [jhl_defs.h] -T=4afbb6e1 +T=4b023fdb 1=config.h [user_define.h] -T=4afb7698 +T=4afd21cb 1=config.h [config.h] -T=4afa41be +T=4b0253bf [bsr_system.h] -T=4af27e29 +T=4afd21ca [renge\renge.h] -T=4abc82ef +T=4b024862 1=renge\renge_defs.h 2=renge\renge_task_immediate.h [renge\renge_defs.h] -T=4ac96e5c +T=4b024862 [renge\renge_task_immediate.h] T=4afa8168 1=renge\renge_defs.h [vreg_ctr.h] -T=4afbbf1a +T=4b025567 1=config.h [loader.h] -T=4aca8c17 +T=4afd21ca 1=jhl_defs.h [i2c_mcu.h] -T=4af25faf +T=4afd21cb [WDT.h] -T=4aca8c17 +T=4afd21ca [fsl.h] -T=4aca8c17 +T=4afd21cb [fsl_user.h] -T=4aca8c17 +T=4afd21cb [i2c_ctr.h] -T=4aca8c17 +T=4afd21cb [pm.h] -T=4afbb7e1 +T=4b024ba8 [rtc.h] -T=4af40cbb +T=4afd21cb [adc.h] -T=4ae64633 +T=4afd21cb 1=jhl_defs.h [led.h] -T=4ae98e8b +T=4afd21cb [incs.h] -T=4ae508d8 +T=4afd21ca 1=jhl_defs.h 2=user_define.h 3=bsr_system.h @@ -186,22 +187,22 @@ T=4ae508d8 7=i2c_mcu.h 8=rtc.h [vreg_twl.h] -T=4af37c30 +T=4afd21cb [accero.h] -T=4aca8c17 +T=4afd21ca 1=jhl_defs.h [i2c_twl_defs.h] -T=4aca8c17 +T=4afd21ca [renge\renge_task_intval.h] T=4ac9ab84 1=renge\renge_defs.h [i2c_twl.h] -T=4aca8c17 +T=4afd21ca [..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h] T=49a3bd4e [..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h] T=45f12258 [reboot.h] -T=4ae008e4 +T=4afd21ca [sw.h] -T=4af2326b +T=4afd21cb