diff --git a/trunk/WDT.c b/trunk/WDT.c index 341f82a..c39323c 100644 --- a/trunk/WDT.c +++ b/trunk/WDT.c @@ -8,7 +8,7 @@ //========================================================= // ウォッチドッグタイマのリスタート // 0xACはマジック -void WDT_Restart( void ){ - WDTE = WDT_RESTART_MAGIC; +void WDT_Restart( void ) +{ + WDTE = WDT_RESTART_MAGIC; } - diff --git a/trunk/WDT.h b/trunk/WDT.h index 0744ffd..6c6e9e4 100644 --- a/trunk/WDT.h +++ b/trunk/WDT.h @@ -9,7 +9,7 @@ //========================================================= -void WDT_Restart(void); +void WDT_Restart( void ); // 規定値以外を書くと例外でリセットがかかる #define mcu_reset WDTE = 0x5A diff --git a/trunk/accero.c b/trunk/accero.c index 99b80b9..c6883fe 100644 --- a/trunk/accero.c +++ b/trunk/accero.c @@ -9,8 +9,12 @@ #pragma NOP #pragma HALT #pragma STOP +#pragma ROT +// rorb, rolb, rorw, rolw +#pragma MUL #include "incs.h" +#include // ======================================================== @@ -44,11 +48,13 @@ #define VREG_BITMASK_ACC_CONF_HOSU ( 1 << 1 ) #define VREG_BITMASK_ACC_CONF_ACQ ( 1 << 0 ) - +// ======================================================== +static u8 hyst_pedometer[256]; // ======================================================== -task_interval tsk_soft_int(); +task_interval tsk_soft_int( ); + @@ -58,43 +64,149 @@ task_interval tsk_soft_int(); I2Cが使用中だったら？とか考えると私ではそこまでできないのです。 ・自動歩数計とかでも結局 ======================================================== */ -task_status_immed tsk_cbk_accero(){ // （疑似）isrから登録されます +task_status_immed tsk_cbk_accero( ) +{ // （疑似）isrから登録されます - if( system_status.pwr_state == ON ){ + if( system_status.pwr_state == ON ) + { + // 加速度センサデータレジスタへの反映 + iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | 0x80 ), 6, &vreg_ctr[VREG_C_ACC_XL] ); - // 加速度センサデータレジスタへの反映 - iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | 0x80 ), 6, &vreg_ctr[VREG_C_ACC_XL] ); - if(( vreg_ctr[ VREG_C_ACC_CONFIG ] & ( VREG_BITMASK_ACC_CONF_ACQ | VREG_BITMASK_ACC_CONF_HOSU ) ) != 0 ){ - set_irq( VREG_C_IRQ1, REG_BIT_ACC_DAT_RDY ); + { + // 歩数計 // + 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 ) + { + set_irq( VREG_C_IRQ1, REG_BIT_ACC_DAT_RDY ); + } } - } - // 歩数計 offでなければ、電源off中でも計測 - if(( vreg_ctr[ VREG_C_ACC_CONFIG ] & VREG_BITMASK_ACC_CONF_HOSU ) != 0x00 ){ - if(( vreg_ctr[ VREG_C_ACC_CONFIG ] & VREG_BITMASK_ACC_CONF_ACQ ) != 0x00 ){ - // 歩数計アルゴリズム 100Hz版 - }else{ - // 同　省電力版 + // 歩数計 offでなければ、電源off中でも計測 + if( ( vreg_ctr[VREG_C_ACC_CONFIG] & VREG_BITMASK_ACC_CONF_HOSU ) != 0x00 ) + { + if( ( vreg_ctr[VREG_C_ACC_CONFIG] & VREG_BITMASK_ACC_CONF_ACQ ) != 0x00 ) + { + // 歩数計アルゴリズム 100Hz版 + } + else + { + // 同　省電力版 + } + } - } - - return( ERR_SUCCESS ); + return ( ERR_SUCCESS ); } + /*========================================================= 　加速度センサ透過アクセス　リード ========================================================*/ -task_status_immed acc_read(){ - vreg_ctr[ VREG_C_ACC_W_BUF ] = iic_mcu_read_a_byte( IIC_SLA_ACCEL, vreg_ctr[VREG_C_ACC_R_ADRS] ); +task_status_immed acc_read( ) +{ + vreg_ctr[VREG_C_ACC_W_BUF] = iic_mcu_read_a_byte( IIC_SLA_ACCEL, vreg_ctr[VREG_C_ACC_R_ADRS] ); // vreg_ctr[ VREG_C_ACC_R_BUF ] = iic_mcu_read_a_byte( IIC_SLA_ACCEL, vreg_ctr[VREG_C_ACC_R_ADRS] ); - vreg_ctr[ VREG_C_IRQ1 ] |= REG_BIT_ACC_ACK; - if( ( vreg_ctr[ VREG_C_IRQ_MASK1 ] & REG_BIT_ACC_ACK ) == 0 ){ - IRQ0_ast; - } - return( ERR_SUCCESS ); + vreg_ctr[VREG_C_IRQ1] |= REG_BIT_ACC_ACK; + if( ( vreg_ctr[VREG_C_IRQ_MASK1] & REG_BIT_ACC_ACK ) == 0 ) + { + IRQ0_ast; + } + return ( ERR_SUCCESS ); } @@ -102,13 +214,15 @@ task_status_immed acc_read(){ /*========================================================= 　加速度センサ透過アクセス　ライト ========================================================*/ -task_status_immed acc_write(){ - iic_mcu_write_a_byte( IIC_SLA_ACCEL, vreg_ctr[VREG_C_ACC_W_ADRS], vreg_ctr[VREG_C_ACC_W_BUF] ); - vreg_ctr[ VREG_C_IRQ1 ] |= REG_BIT_ACC_ACK; - if( ( vreg_ctr[ VREG_C_IRQ_MASK1 ] & REG_BIT_ACC_ACK ) == 0 ){ - IRQ0_ast; - } - return( ERR_SUCCESS ); +task_status_immed acc_write( ) +{ + iic_mcu_write_a_byte( IIC_SLA_ACCEL, vreg_ctr[VREG_C_ACC_W_ADRS], vreg_ctr[VREG_C_ACC_W_BUF] ); + vreg_ctr[VREG_C_IRQ1] |= REG_BIT_ACC_ACK; + if( ( vreg_ctr[VREG_C_IRQ_MASK1] & REG_BIT_ACC_ACK ) == 0 ) + { + IRQ0_ast; + } + return ( ERR_SUCCESS ); } @@ -118,42 +232,70 @@ task_status_immed acc_write(){ todo 他のモードだったら止めたり、復帰させたり 割り込みルーチンなどでカウント判定が必要 ========================================================*/ -task_status_immed acc_hosu_set(){ - u8 str_send_buf[4]; +task_status_immed acc_hosu_set( ) +{ + u8 str_send_buf[4]; - iic_mcu_read_a_byte( IIC_SLA_ACCEL, ACC_REG_WHOAMI ); - if( iic_mcu_bus_status == ERR_NOSLAVE ){ - return( ERR_SUCCESS ); // とりあえず、タスクは削除しなくてはならない - } - - str_send_buf[1] = 0x10; // ctrl2 HPF:normal, filterd, HPF for IRQ : dis/dis, HPF coeff:norm -#ifdef _MCU_WM0_ - str_send_buf[2] = 0x10; // 3 IRQ pol :Active HI, Drive:Pushpull, - // IRQ2flg latch: auto clear after read, IRQ2 conf: IRQ( fall,shock,...) - // 1 : auto clear after read, conf: data ready -#else - str_send_buf[2] = 0x02; // 3 IRQ pol :Active HI, Drive:Pushpull, - // IRQ2flg latch: auto clear after read, IRQ2 conf: IRQ( fall,shock,...) - // 1 : auto clear after read, conf: data ready -#endif - 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 ){ - // 完全停止 - str_send_buf[0] = ( ACC_BITS_PM_PDN << ACC_bP_PM0 | 0 << ACC_bP_DR0 | ACC_BITS_ALL_AXIS_ON ); - } - else + iic_mcu_read_a_byte( IIC_SLA_ACCEL, ACC_REG_WHOAMI ); + if( iic_mcu_bus_status == ERR_NOSLAVE ) { - 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{ - // 10Hz 自動取り込み(歩数計向け省電力モード) - str_send_buf[0] = ( ACC_BITS_PM_LP10 << ACC_bP_PM0 | ACC_BITS_ALL_AXIS_ON ); - } + return ( ERR_SUCCESS ); // とりあえず、タスクは削除しなくてはならない } - iic_mcu_write( IIC_SLA_ACCEL, ( ACC_REG_CTRL1 | 0x80 ), 4, str_send_buf ); - return( ERR_SUCCESS ); + + str_send_buf[1] = 0x00; // ctrl2 HPF:normal, filterd, HPF for IRQ : dis/dis, HPF coeff:norm +#ifdef _MODEL_WM0_ + str_send_buf[2] = 0x10; // 3 IRQ pol :Active HI, Drive:Pushpull, + /// IRQ2flg latch: auto clear after read, IRQ2 conf: IRQ( fall,shock,...) + /// 1 : auto clear after read, conf: data ready +#else + str_send_buf[2] = 0x02; // 3 IRQ pol :Active HI, Drive:Pushpull, + /// IRQ2flg latch: auto clear after read, IRQ2 conf: IRQ( fall,shock,...) + /// 1 : auto clear after read, conf: data ready +#endif + 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 ) + { +#ifdef _MCU_BSR_ + PMK23 = 1; +#endif + // 完全停止 + str_send_buf[0] = + ( ACC_BITS_PM_PDN << ACC_bP_PM0 | 0 << ACC_bP_DR0 | ACC_BITS_ALL_AXIS_ON ); + } + 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 ); + } + } + iic_mcu_write( IIC_SLA_ACCEL, ( ACC_REG_CTRL1 | 0x80 ), 4, str_send_buf ); + if( ACC_VALID == 1 ) + { + if( system_status.pwr_state == ON ) + { + renge_task_immed_add( tsk_cbk_accero ); + } + } + + return ( ERR_SUCCESS ); } @@ -162,37 +304,16 @@ task_status_immed acc_hosu_set(){ 加速度センサ割り込み I2Cが使用中かもしれないので、読み出しタスクの登録を行うのみ ======================================================== */ -__interrupt void intp23_ACC_ready(){ - if( ( vreg_ctr[ VREG_C_ACC_CONFIG ] & 0x03 ) != 0x00 ){ - if(( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP ) ){ - if( ACC_VALID ){ - renge_task_immed_add( tsk_cbk_accero ); - } +__interrupt void intp23_ACC_ready( ) +{ + if( ( vreg_ctr[VREG_C_ACC_CONFIG] & 0x03 ) != 0x00 ) + { + if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP ) ) + { + if( ACC_VALID ) + { + renge_task_immed_add( tsk_cbk_accero ); + } + } } - } } - - - -/* ======================================================== - 加速度センサ割り込みピンがオリジナルマイコンには無いので - ポーリングする。 - 歩数計用 - todo : // 本物のマイコンなら、割り込みでタスクを登録 - ======================================================== */ -task_interval tsk_soft_int(){ - if( ( vreg_ctr[ VREG_C_ACC_CONFIG ] & 0x03 ) != 0x00 ){ - - if(( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP ) ){ - // Hエッジ検出 - // pin = ( pin << 1 ) + ( ACC_VALID? 1: 0 ); - // if( ( pin & 0x03 ) == 0x01 ){ - if( ACC_VALID ){ - renge_task_immed_add( tsk_cbk_accero ); - } - } - return( 0 ); - } - return( 248 ); -} - diff --git a/trunk/accero.h b/trunk/accero.h index ea552e2..a0efd9e 100644 --- a/trunk/accero.h +++ b/trunk/accero.h @@ -4,8 +4,8 @@ #include "jhl_defs.h" -task_status_immed tsk_cbk_accero(); +task_status_immed tsk_cbk_accero( ); -task_status_immed acc_hosu_set(); +task_status_immed acc_hosu_set( ); #endif diff --git a/trunk/adc.c b/trunk/adc.c index 7c6fb62..4b815f6 100644 --- a/trunk/adc.c +++ b/trunk/adc.c @@ -9,9 +9,10 @@ #include "led.h" -bit adc_updated; +bit adc_updated; +#define INTERVAL_TSK_ADC 16 /* ======================================================== ADC設定と、開始 @@ -26,86 +27,118 @@ bit adc_updated; ・8tics毎に呼ばれ、３チャンネル分取り込むとADCを停止します。 　タスク起動時、レジスタには前回の取り込み値が入っています。 ======================================================== */ -task_interval tsk_adc(){ - static u8 old_tune; - static u8 sndvol_codec; - static u8 bt_temp_old; +void tsk_adc( ) +{ + static u8 task_interval = 0; + static u8 old_tune; + static u8 sndvol_codec; + static u8 bt_temp_old; + + if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP ) ) + { + if( adc_updated ) + { + + if( task_interval != 0 ) + { + task_interval -= 1; + return; + } + else + { + task_interval = ( INTERVAL_TSK_ADC / SYS_INTERVAL_TICK ); + } + + + - if(( system_status.pwr_state == ON ) - || ( system_status.pwr_state == SLEEP )){ - if( adc_updated ){ #if 0 - tune の変化では割り込みを入れない - // tune - if( abs( old_tune - vreg_ctr[ VREG_TUNE ] ) >= 4 ){ - old_tune = vreg_ctr[ VREG_TUNE ]; - vreg_ctr[ VREG_C_IRQ0 ] |= REG_BIT_VR_TUNE_CHANGE; - if( ( vreg_ctr[ VREG_C_IRQ_MASK0 ] & REG_BIT_VR_TUNE_CHANGE ) == 0 ){ - IRQ0_ast; - } - } + tune ﾌ変化では割り込みを入れない + // tune + if( abs( old_tune - vreg_ctr[VREG_TUNE] ) >= 4 ) + { + old_tune = vreg_ctr[VREG_TUNE]; + vreg_ctr[VREG_C_IRQ0] |= REG_BIT_VR_TUNE_CHANGE; + if( ( vreg_ctr[VREG_C_IRQ_MASK0] & REG_BIT_VR_TUNE_CHANGE ) == 0 ) + { + IRQ0_ast; + } + } #endif - // Volume - { - static u8 class_old; - u8 class; - static u8 direction = 0; // 0:上り方向 - u8 comp; // 補正値 + // Volume + { + static u8 vol_old; + static u8 class_old; + u8 class; + static u8 direction = 0; // 0:上り方向 + u8 comp; // 補正値 - class = ( vreg_ctr[ VREG_C_SND_VOL ] + ( ( direction != 0 )? 0: 2 ) ) / ( 200 / 8 ) ; - if( class != class_old ){ - direction = ( class > class_old )? 0: 1; - class_old = class; +//* + if( abs( vol_old - vreg_ctr[VREG_C_SND_VOL] ) > 3 ) + { + vol_old = vreg_ctr[VREG_C_SND_VOL]; + class = vreg_ctr[VREG_C_SND_VOL] / ( 256 / 8 ); + if( class != class_old ) + { + class_old = class; +/*/ + if( vol_old != vreg_ctr[ VREG_C_SND_VOL ] ){ + vol_old = vreg_ctr[ VREG_C_SND_VOL ]; + class = ( vreg_ctr[ VREG_C_SND_VOL ] + ( ( direction != 0 )? 0: 2 ) ) / ( 200 / 8 ) ; + if( class != class_old ){ + direction = ( class > class_old )? 0: 1; + class_old = class; +*/ + set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE ); + } + } - set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE ); - } + } - } - - // codecに伝える - if( vreg_ctr[ VREG_C_SND_VOL ] != sndvol_codec ){ - sndvol_codec = vreg_ctr[ VREG_C_SND_VOL ]; + // codecに伝える + if( vreg_ctr[VREG_C_SND_VOL] != sndvol_codec ) + { + sndvol_codec = ( vreg_ctr[VREG_C_SND_VOL] / 2 + vreg_ctr[VREG_C_SND_VOL] / 4 ); #ifndef _CODEC_CTR_ - iic_mcu_write_a_byte( IIC_SLA_DCP, 0, sndvol_codec ); + iic_mcu_write_a_byte( IIC_SLA_DCP, 0, sndvol_codec ); // iic_mcu_write_a_byte( IIC_SLA_DCP, 0, (u8)((unsigned int)sndvol_codec * 4 / 5 ) ); #else - なんとかする - iic_mcu_write_a_byte( IIC_SLA_CODEC, REG_ADRS_CODEC_VOL, sndvol_codec ); + なんとかするiic_mcu_write_a_byte( IIC_SLA_CODEC, REG_ADRS_CODEC_VOL, sndvol_codec ); #endif - } - adc_updated = 0; - } + } + adc_updated = 0; + } - ADCEN = 1; - ADM = 0b00011011; // セレクトモード、章圧、fCLK/6 ///ここから + ADCEN = 1; + ADM = 0b00011011; // セレクトモード、章圧、fCLK/6 ///ここから - ADPC = 0x06; // ADCポートのセレクト - ADS = ADC_SEL_TUNE; + ADPC = 0x06; // ADCポートのセレクト + ADS = ADC_SEL_TUNE; // NOP(); - ADCS = 1; // AD開始。 /// ここまでに、1us以上開ける + ADCS = 1; // AD開始。 /// ここまでに、1us以上開ける - ADIF = 0; - ADMK = 0; + ADIF = 0; + ADMK = 0; - // TUNE_LED ここかよ！ - switch( vreg_ctr[ VREG_C_LED_TUNE ] ){ - case( 1 ): // 点灯 - LED_duty_TUNE = 0; - break; + // TUNE_LED ここかよ！ + switch ( vreg_ctr[VREG_C_LED_TUNE] ) + { + case ( 1 ): // 点灯 + LED_duty_TUNE = vreg_ctr[VREG_C_LED_BRIGHT]; + break; - case( 2 ): // - LED_duty_TUNE = LED_BRIGHT_MAX - vreg_ctr[ VREG_C_TUNE ]; - break; + case ( 2 ): // + LED_duty_TUNE = LED_BRIGHT_MAX - vreg_ctr[VREG_C_TUNE]; + break; - default: // 消灯 - LED_duty_TUNE = vreg_ctr[ VREG_C_LED_BRIGHT ]; - break; + default: // 消灯 + LED_duty_TUNE = 0; + break; + } } - return( 8 ); - } } @@ -114,24 +147,32 @@ task_interval tsk_adc(){ 　突発的なノイズを除く。 　根本対策ではないが、これはこれで使い道がある。 ======================================================== */ -static u8 getmean3( u8* hist ){ - u8 temp; +static u8 getmean3( u8 * hist ) +{ + u8 temp; - if( *hist < *( hist+1 ) ){ - temp = *hist; - *hist = *(hist+1); - *(hist+1) = temp; - } - - if( !( *hist > *(hist+1) )){ - return *hist; - }else{ - if( *(hist+1) > *(hist+2) ){ - return *(hist+1); - }else{ - return *(hist+2); + if( *hist < *( hist + 1 ) ) + { + temp = *hist; + *hist = *( hist + 1 ); + *( hist + 1 ) = temp; + } + + if( !( *hist > *( hist + 1 ) ) ) + { + return *hist; + } + else + { + if( *( hist + 1 ) > *( hist + 2 ) ) + { + return *( hist + 1 ); + } + else + { + return *( hist + 2 ); + } } - } } @@ -139,46 +180,51 @@ static u8 getmean3( u8* hist ){ 　自前で次のチャンネル 　　一通り終わったら止める ======================================================== */ -__interrupt void int_adc(){ - static u8 hist_tune[3]; - static u8 hist_snd_vol[3]; - static u8 hist_bt_temp[3]; - static u8 index; - u8 temp; +__interrupt void int_adc( ) +{ + static u8 hist_tune[3]; + static u8 hist_snd_vol[3]; + static u8 hist_bt_temp[3]; + static u8 index; + u8 temp; - EI(); - switch( ADS ){ - case( ADC_SEL_TUNE ): - hist_tune[ index ] = ADCRH; - vreg_ctr[ VREG_C_TUNE ] = getmean3( hist_tune ); - break; + EI( ); + switch ( ADS ) + { + case ( ADC_SEL_TUNE ): + hist_tune[index] = ADCRH; + vreg_ctr[VREG_C_TUNE] = getmean3( hist_tune ); + break; - case( ADC_SEL_VOL ): - hist_snd_vol[ index ] = ADCRH; - vreg_ctr[ VREG_C_SND_VOL ] = getmean3( hist_snd_vol ); - break; + case ( ADC_SEL_VOL ): + hist_snd_vol[index] = ADCRH; + vreg_ctr[VREG_C_SND_VOL] = getmean3( hist_snd_vol ); + break; - case( ADC_SEL_BATT_TEMP ): - hist_bt_temp[ index ] = ADCRH; - raw_adc_temperature = getmean3( hist_tune ); - renge_task_immed_add( PM_bt_temp_update ); - break; + case ( ADC_SEL_BATT_TEMP ): + hist_bt_temp[index] = ADCRH; + raw_adc_temperature = getmean3( hist_tune ); + renge_task_immed_add( PM_bt_temp_update ); + break; - case( ADC_SEL_BATT_DET ): + case ( ADC_SEL_BATT_DET ): // vreg_ctr[ VREG_C_DBG_BATT_DET ] = ADCRH; - break; - } + break; + } // もっとまともな書き方がありそうだ // if( ADS == ADC_SEL_BATT_DET ){ - if( ADS != ADC_SEL_BATT_TEMP ){ // 電池判別は電源投入の一回のみ - ADS += 1; // 次のチャンネル - }else{ - ADCEN = 0; // 止めてしまう - adc_updated = 1; - index = ( index == 2 )? 0: ( index + 1 ); - } + if( ADS != ADC_SEL_BATT_TEMP ) + { // 電池判別は電源投入の一回のみ + ADS += 1; // 次のチャンネル + } + else + { + ADCEN = 0; // 止めてしまう + adc_updated = 1; + index = ( index == 2 ) ? 0 : ( index + 1 ); + } } @@ -186,25 +232,27 @@ __interrupt void int_adc(){ /* ======================================================== tsk_adcと競合することを考慮していません。 ======================================================== */ -u8 get_adc( u8 ch ){ - u8 temp; +u8 get_adc( u8 ch ) +{ + u8 temp; - ADMK = 1; - ADIF = 0; + ADMK = 1; + ADIF = 0; - ADCEN = 1; - ADCS = 0; - ADM = 0b00100011; // セレクトモード、章圧、fCLK/6 ///ここから + ADCEN = 1; + ADCS = 0; + ADM = 0b00100011; // セレクトモード、章圧、fCLK/6 ///ここから - ADPC = 0x06; // ADCポートのセレクト - ADS = ch; - ADCS = 1; // AD開始。 /// ここまでに、1us以上開ける + ADPC = 0x06; // ADCポートのセレクト + ADS = ch; + ADCS = 1; // AD開始。 /// ここまでに、1us以上開ける - ADMK = 0; - while( ADIF == 0 ){;} - temp = ADCRH; - ADCEN = 0; + ADMK = 0; + while( ADIF == 0 ) + {; + } + temp = ADCRH; + ADCEN = 0; - return( temp ); + return ( temp ); } - diff --git a/trunk/bsr_mcu.dr b/trunk/bsr_mcu.dr index d787298..b01b336 100644 --- a/trunk/bsr_mcu.dr +++ b/trunk/bsr_mcu.dr @@ -3,6 +3,7 @@ MEMORY BCL0:(00000H, 01000H ) ;MEMORY BCL1:(01000H, 01000H ) ; バックアップ領域 MEMORY ROM :(02000H, 02800H ) +;MEMORY ROM :(02000H, 04000H ) ;MEMORY ROM_:(04800H, 02800H ) ; バックアップ領域 ;MEMORY FSL :(07000H, 00C00H ) ; 過去の名残。いらない ;MEMORY OCD :(0FC00H, 00400H ) ; OCDが使っているらしい @@ -13,7 +14,8 @@ MEMORY ROM :(02000H, 02800H ) ; ブートブロック0に割り当てる MERGE LDR_CODE: =BCL0 MERGE LDR_CODL: =BCL0 -MERGE @@LCODE : AT( 0E00H ) =BCL0 ; スタートアップルーチン +;MERGE @@LCODE : AT( 0E00H ) =BCL0 ; スタートアップルーチン +MERGE @@LCODE : =BCL0 ; スタートアップルーチン ;MERGE LDR_RINT:=BCL0 ;MERGE LDR_CNST:=BCL0 @@ -44,7 +46,7 @@ MERGE FSL_CODE:=BCL0 ; RAM1,RAM2領域はユーザープログラムで使用しても良いですが、セルフプログラム時は ; セルフプログラムのライブラリが使用するため、値は破壊されます。 ; -memory RAM2 : (0FFE20H, 00C0H) ; セルフプログラム時、使用禁止領域 -;memory SLF_RAM : (0FFE00H ,0020H) ; Slef Program予約領域[使用禁止] -memory RAM : (0FF900H, 0500H) ; ユーザーＲＡＭ領域 -;memory SLF_RAM : (0FF900H ,0020H) ; Slef Program予約領域[使用禁止] +memory RAM2 : (0FFE20H, 00C0H) ; セルフプログラム時、使用禁止領域 +;memory SLF_RAM : (0FFE00H, 0020H) ; Slef Program予約領域[使用禁止] +memory RAM : (0FF900H, 0500H) ; ユーザーＲＡＭ領域 +;memory SLF_RAM : (0FF900H, 0020H) ; Slef Program予約領域[使用禁止] diff --git a/trunk/bsr_system.h b/trunk/bsr_system.h index b3c6c06..4d166a8 100644 --- a/trunk/bsr_system.h +++ b/trunk/bsr_system.h @@ -2,7 +2,8 @@ #define __bsr_system__ // イベントループのステート -enum pwr_state_{ +enum pwr_state_ +{ OFF_TRIG = 0, OFF, ON_TRIG, @@ -12,21 +13,24 @@ enum pwr_state_{ // WAKE, }; -enum poweron_reason_{ - PWSW = 0, - RTC_ALARM, +enum poweron_reason_ +{ + PWSW = 0, + RTC_ALARM, }; // タスクシステムの状態情報など -typedef struct{ - enum pwr_state_ pwr_state; - enum poweron_reason_ poweron_reason; - unsigned char dipsw0 :1; - unsigned char dipsw1 :1; - unsigned char dipsw2 :1; - unsigned char reboot :1; -}system_status_; +typedef struct +{ + enum pwr_state_ pwr_state; + enum poweron_reason_ poweron_reason; + unsigned char dipsw0:1; + unsigned char dipsw1:1; + unsigned char dipsw2:1; + unsigned char reboot:1; +} +system_status_; extern system_status_ system_status; diff --git a/trunk/config.h b/trunk/config.h index 80ad8e6..4448af7 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -3,11 +3,10 @@ #define _debug_ -// #define _debug_led_ - +//#define _debug_led_ #define MCU_VER_MAJOR 0; -#define MCU_VER_MINOR 4; +#define MCU_VER_MINOR 6; //#define _MODEL_TEG2_ diff --git a/trunk/fsl.h b/trunk/fsl.h index f0dc3e5..0e806b5 100644 --- a/trunk/fsl.h +++ b/trunk/fsl.h @@ -41,7 +41,7 @@ /*==============================================================================================*/ /* Environment: PM plus (V6.30) */ /* RA78K0(V1.20) */ -/* CC78K0(V2.00) */ +/* CC78K0(V2.00) */ /*==============================================================================================*/ #ifndef __FSL_H_INCLUDED @@ -51,9 +51,9 @@ /*==============================================================================================*/ /* FSL type definitions */ /*==============================================================================================*/ -typedef unsigned char fsl_u08; -typedef unsigned int fsl_u16; -typedef unsigned long int fsl_u32; +typedef unsigned char fsl_u08; +typedef unsigned int fsl_u16; +typedef unsigned long int fsl_u32; /*==============================================================================================*/ @@ -98,8 +98,8 @@ typedef unsigned long int fsl_u32; /* = 0x00(FSL_OK), normal and means initialization OK */ /* = 0x1F(FSL_ERR_INTERRUPTION), initialization interrupted by user interrupt*/ /*----------------------------------------------------------------------------------------------*/ -extern fsl_u08 FSL_Init(fsl_u08* data_buffer_pu08); -extern fsl_u08 FSL_Init_cont(fsl_u08* data_buffer_pu08); +extern fsl_u08 FSL_Init( fsl_u08 * data_buffer_pu08 ); +extern fsl_u08 FSL_Init_cont( fsl_u08 * data_buffer_pu08 ); /*----------------------------------------------------------------------------------------------*/ @@ -112,7 +112,7 @@ extern fsl_u08 FSL_Init_cont(fsl_u08* data_buffer_pu08); /* = 0x00(FSL_OK), normal and means FLMD0=HIGH */ /* = 0x01(FSL_ERR_FLMD0), error, FLMD0=LOW */ /*----------------------------------------------------------------------------------------------*/ -extern fsl_u08 FSL_ModeCheck(void); +extern fsl_u08 FSL_ModeCheck( void ); /*----------------------------------------------------------------------------------------------*/ @@ -127,7 +127,7 @@ extern fsl_u08 FSL_ModeCheck(void); /* = 0x1B(FSL_ERR_BLANKCHECK), blank-check error, means "block not blank" */ /* = 0x1F(FSL_ERR_INTERRUPTION), blank-check interrupted by user interrupt */ /*----------------------------------------------------------------------------------------------*/ -extern fsl_u08 FSL_BlankCheck(fsl_u16 block_u16); +extern fsl_u08 FSL_BlankCheck( fsl_u16 block_u16 ); /*----------------------------------------------------------------------------------------------*/ @@ -143,7 +143,7 @@ extern fsl_u08 FSL_BlankCheck(fsl_u16 block_u16); /* = 0x1A(FSL_ERR_ERASE), erase error, retry up to max. 255 times */ /* = 0x1F(FSL_ERR_INTERRUPTION), erasing interrupted by user interrupt */ /*----------------------------------------------------------------------------------------------*/ -extern fsl_u08 FSL_Erase(fsl_u16 block_u16); +extern fsl_u08 FSL_Erase( fsl_u16 block_u16 ); /*----------------------------------------------------------------------------------------------*/ @@ -158,7 +158,7 @@ extern fsl_u08 FSL_Erase(fsl_u16 block_u16); /* = 0x1B(FSL_ERR_IVERIFY), internal verify error */ /* = 0x1F(FSL_ERR_INTERRUPTION), verify interrupted by user interrupt */ /*----------------------------------------------------------------------------------------------*/ -extern fsl_u08 FSL_IVerify(fsl_u16 block_u16); +extern fsl_u08 FSL_IVerify( fsl_u16 block_u16 ); /*----------------------------------------------------------------------------------------------*/ @@ -181,7 +181,7 @@ extern fsl_u08 FSL_IVerify(fsl_u16 block_u16); /* = 0x1C(FSL_ERR_WRITE), write error */ /* = 0x1F(FSL_ERR_INTERRUPTION), write interrupted by user interrupt */ /*----------------------------------------------------------------------------------------------*/ -extern fsl_u08 FSL_Write(fsl_u32 s_address_u32, fsl_u08 word_count_u08); +extern fsl_u08 FSL_Write( fsl_u32 s_address_u32, fsl_u08 word_count_u08 ); /*----------------------------------------------------------------------------------------------*/ @@ -205,7 +205,8 @@ extern fsl_u08 FSL_Write(fsl_u32 s_address_u32, fsl_u08 word_count_u08); /* = 0x1E(FSL_ERR_EEP_BLANKCHECK), blankcheck error */ /* = 0x1F(FSL_ERR_INTERRUPTION), write interrupted by user interrupt */ /*----------------------------------------------------------------------------------------------*/ -extern fsl_u08 FSL_EEPROMWrite(fsl_u32 s_address_u32, fsl_u08 word_count_u08); +extern fsl_u08 FSL_EEPROMWrite( fsl_u32 s_address_u32, + fsl_u08 word_count_u08 ); /*----------------------------------------------------------------------------------------------*/ @@ -228,7 +229,7 @@ extern fsl_u08 FSL_EEPROMWrite(fsl_u32 s_address_u32, fsl_u08 word_count_u08); /* = 0x00(FSL_OK), normal */ /* = 0x05(FSL_ERR_PARAMETER), parameter error */ /*----------------------------------------------------------------------------------------------*/ -extern fsl_u08 FSL_GetSecurityFlags(fsl_u16* destination_pu16); +extern fsl_u08 FSL_GetSecurityFlags( fsl_u16 * destination_pu16 ); /*----------------------------------------------------------------------------------------------*/ @@ -244,7 +245,7 @@ extern fsl_u08 FSL_GetSecurityFlags(fsl_u16* destination_pu16); /* = 0x00(FSL_OK), normal */ /* = 0x05(FSL_ERR_PARAMETER), parameter error */ /*----------------------------------------------------------------------------------------------*/ -extern fsl_u08 FSL_GetActiveBootCluster(fsl_u08* destination_pu08); +extern fsl_u08 FSL_GetActiveBootCluster( fsl_u08 * destination_pu08 ); /*----------------------------------------------------------------------------------------------*/ @@ -259,7 +260,8 @@ extern fsl_u08 FSL_GetActiveBootCluster(fsl_u08* destination_pu08); /* = 0x00(FSL_OK), normal */ /* = 0x05(FSL_ERR_PARAMETER), parameter error */ /*----------------------------------------------------------------------------------------------*/ -extern fsl_u08 FSL_GetBlockEndAddr(fsl_u32* destination_pu32, fsl_u16 block_u16); +extern fsl_u08 FSL_GetBlockEndAddr( fsl_u32 * destination_pu32, + fsl_u16 block_u16 ); /*----------------------------------------------------------------------------------------------*/ @@ -273,7 +275,8 @@ extern fsl_u08 FSL_GetBlockEndAddr(fsl_u32* destination_pu32, fsl_u16 block_u16 /* = 0x00(FSL_OK), normal */ /* = 0x05(FSL_ERR_PARAMETER), parameter error */ /*----------------------------------------------------------------------------------------------*/ -extern fsl_u08 FSL_GetFlashShieldWindow(fsl_u16* start_block_pu16, fsl_u16* end_block_pu16); +extern fsl_u08 FSL_GetFlashShieldWindow( fsl_u16 * start_block_pu16, + fsl_u16 * end_block_pu16 ); /*----------------------------------------------------------------------------------------------*/ @@ -291,7 +294,8 @@ extern fsl_u08 FSL_GetFlashShieldWindow(fsl_u16* start_block_pu16, fsl_u16* end /* = 0x1B(FSL_ERR_IVERIFY), internal verify error */ /* = 0x1F(FSL_ERR_INTERRUPTION), write interrupted by user interrupt */ /*----------------------------------------------------------------------------------------------*/ -extern fsl_u08 FSL_SetFlashShieldWindow(fsl_u16 start_block_u16, fsl_u16 end_block_u16); +extern fsl_u08 FSL_SetFlashShieldWindow( fsl_u16 start_block_u16, + fsl_u16 end_block_u16 ); /*----------------------------------------------------------------------------------------------*/ @@ -311,7 +315,7 @@ extern fsl_u08 FSL_SetFlashShieldWindow(fsl_u16 start_block_u16, fsl_u16 end_bl /* = 0x1B(FSL_ERR_IVERIFY), internal verify error */ /* = 0x1F(FSL_ERR_INTERRUPTION), write interrupted by user interrupt */ /*----------------------------------------------------------------------------------------------*/ -extern fsl_u08 FSL_SwapBootCluster(void); +extern fsl_u08 FSL_SwapBootCluster( void ); /*----------------------------------------------------------------------------------------------*/ @@ -338,10 +342,10 @@ extern fsl_u08 FSL_SwapBootCluster(void); /* = 0x1B(FSL_ERR_IVERIFY), internal verify error */ /* = 0x1F(FSL_ERR_INTERRUPTION), write interrupted by user interrupt */ /*----------------------------------------------------------------------------------------------*/ -extern fsl_u08 FSL_SetChipEraseProtectFlag(void); -extern fsl_u08 FSL_SetBlockEraseProtectFlag(void); -extern fsl_u08 FSL_SetWriteProtectFlag(void); -extern fsl_u08 FSL_SetBootClusterProtectFlag(void); +extern fsl_u08 FSL_SetChipEraseProtectFlag( void ); +extern fsl_u08 FSL_SetBlockEraseProtectFlag( void ); +extern fsl_u08 FSL_SetWriteProtectFlag( void ); +extern fsl_u08 FSL_SetBootClusterProtectFlag( void ); /*----------------------------------------------------------------------------------------------*/ @@ -353,6 +357,6 @@ extern fsl_u08 FSL_SetBootClusterProtectFlag(void); /* Changed: - */ /* Returned: - */ /*----------------------------------------------------------------------------------------------*/ -extern void FSL_SetInterruptMode(fsl_u08 mode_u08); +extern void FSL_SetInterruptMode( fsl_u08 mode_u08 ); #endif diff --git a/trunk/fsl_user.h b/trunk/fsl_user.h index 0db1eef..823eb8d 100644 --- a/trunk/fsl_user.h +++ b/trunk/fsl_user.h @@ -85,12 +85,12 @@ /*#define FSL_MK2L_MASK 0xF7 -> allow INTP6 interrupt during selfprogramming */ /*#define FSL_MK2H_MASK 0xFF -> all interrupts disabled during selfprogramming */ /*------------------------------------------------------------------------------------------ */ -#define FSL_MK0L_MASK 0xFF /* all interrupts disabled during selfprogramming */ -#define FSL_MK0H_MASK 0xFF /* all interrupts disabled during selfprogramming */ -#define FSL_MK1L_MASK 0xFF /* all interrupts disabled during selfprogramming */ -#define FSL_MK1H_MASK 0xFF /* all interrupts disabled during selfprogramming */ -#define FSL_MK2L_MASK 0xFF /* all interrupts disabled during selfprogramming */ -#define FSL_MK2H_MASK 0xFF /* all interrupts disabled during selfprogramming */ +#define FSL_MK0L_MASK 0xFF /* all interrupts disabled during selfprogramming */ +#define FSL_MK0H_MASK 0xFF /* all interrupts disabled during selfprogramming */ +#define FSL_MK1L_MASK 0xFF /* all interrupts disabled during selfprogramming */ +#define FSL_MK1H_MASK 0xFF /* all interrupts disabled during selfprogramming */ +#define FSL_MK2L_MASK 0xFF /* all interrupts disabled during selfprogramming */ +#define FSL_MK2H_MASK 0xFF /* all interrupts disabled during selfprogramming */ /* FLMD0 control bit */ @@ -102,7 +102,7 @@ /* switch interrupt backu functionality ON/OFF using #define/#undef */ /*----------------------------------------------------------------------------------------------*/ /* #define FSL_INT_BACKUP */ - #undef FSL_INT_BACKUP +#undef FSL_INT_BACKUP #endif diff --git a/trunk/i2c_ctr.c b/trunk/i2c_ctr.c index a685e12..1daad04 100644 --- a/trunk/i2c_ctr.c +++ b/trunk/i2c_ctr.c @@ -10,8 +10,10 @@ #ifndef _PMIC_CTR_ #define IRQ0_neg { PM3.0 = 1; } +#define IRQ0 ( P3.0 ) #else #define IRQ0_neg { PM7.6 = 1; } +#define IRQ0 ( P7.6 ) #endif @@ -54,234 +56,289 @@ /* ======================================================== ======================================================== */ -enum{ - IIC_IDLE = 0, - IIC_RCV_REG_ADRS, - IIC_TX_OR_RX, - IIC_TX, - IIC_RX +enum +{ + IIC_IDLE = 0, + IIC_RCV_REG_ADRS, + IIC_TX_OR_RX, + IIC_TX, + IIC_RX }; // 1バイト送受の度に割り込みが発生するバージョン -__interrupt void int_iic_ctr(){ - static u8 state = IIC_IDLE; - static u8 reg_adrs; - static u8 reg_adrs_internal; - static u8 trx_buf; +__interrupt void int_iic_ctr( ) +{ + static u8 state = IIC_IDLE; + static u8 reg_adrs; + static u8 reg_adrs_internal; + static u8 trx_buf; - if( SPD ){ - state = IIC_IDLE; - SPIE = 0; - // I2C終了時に何かする物 // - rtc_unlock(); - return; - } - - // 読み出し終了 - if( !ACKD ){ - state = IIC_IDLE; - SPIE = 0; - LREL = 1; - - rtc_unlock(); - - // レジスタリードで、割り込みピンの設定 - IRQ0_neg; - 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 ) - ) ){ - IRQ0_ast; - } - - return; - } - - - switch( state ){ - case( IIC_IDLE ): - // 自局呼び出しに応答。 - // 初期化など - SPIE = 1; - WREL = 1; // ウェイト解除 - state = IIC_RCV_REG_ADRS; - break; - - case( IIC_RCV_REG_ADRS ): - // レジスタアドレス受信 - reg_adrs = IICA; - WREL = 1; -// reg_adrs_internal = adrs_table_ctr_ext2int( reg_adrs ); - trx_buf = vreg_ctr_read( reg_adrs ); // データの準備をしておく - state = IIC_TX_OR_RX; - break; - - case( IIC_TX_OR_RX ): -// if( TRC ){ // 送信方向フラグ - if( STD ){ // スタートコンディション検出フラグ - // リードされる - if( COI ){ // アドレス一致フラグ - state = IIC_TX; - // no break, no return // - }else{ - // リスタートで違うデバイスが呼ばれた！ - state = IIC_IDLE; // 終了処理 + if( SPD ) + { + state = IIC_IDLE; SPIE = 0; - LREL = 1; // ウェイト解除? + // I2C終了時に何かする物 // + rtc_unlock( ); return; - } - }else{ - state = IIC_RX; // データ1バイト受信の割り込みだった - // no break, no return // } - default: - if( state == IIC_TX ){ // 送信 - IICA = trx_buf; - vreg_ctr_after_read( reg_adrs ); // 読んだらクリアなどの処理 - }else{ - // RX - trx_buf = IICA; - vreg_ctr_write( reg_adrs, trx_buf ); - WREL = 1; + // 読み出し終了 + if( !ACKD ) + { + state = IIC_IDLE; + SPIE = 0; + LREL = 1; + + rtc_unlock( ); + + // レジスタリードで、割り込みピンの設定 +// if( ( reg_adrs - 1 ) == VREG_C_IRQ3 ){ +// IRQ0_neg; + 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 ) ) ) + { + IRQ0_neg; + while( !IRQ0 ) + {; + } + IRQ0_ast; + } + else + { + IRQ0_neg; +// } + } + return; } - reg_adrs += 1; + + if( STD ) + { + if( ( state == IIC_TX ) || ( state == IIC_RX ) ) + { + state = IIC_IDLE; + rtc_unlock( ); + } + } + + switch ( state ) + { + case ( IIC_IDLE ): + // 自局呼び出しに応答。 + // 初期化など + SPIE = 1; + WREL = 1; // ウェイト解除 + state = IIC_RCV_REG_ADRS; + break; + + case ( IIC_RCV_REG_ADRS ): + // レジスタアドレス受信 + reg_adrs = IICA; + WREL = 1; // reg_adrs_internal = adrs_table_ctr_ext2int( reg_adrs ); - if( state == IIC_TX ){ - trx_buf = vreg_ctr_read( reg_adrs ); + trx_buf = vreg_ctr_read( reg_adrs ); // データの準備をしておく + state = IIC_TX_OR_RX; + break; + + case ( IIC_TX_OR_RX ): +// if( TRC ){ // 送信方向フラグ + if( STD ) + { // スタートコンディション検出フラグ + // リードされる + if( COI ) + { // アドレス一致フラグ + state = IIC_TX; + // no break, no return // + } + else + { + // リスタートで違うデバイスが呼ばれた！ + state = IIC_IDLE; // 終了処理 + SPIE = 0; + LREL = 1; // ウェイト解除? + return; + } + } + else + { + state = IIC_RX; // データ1バイト受信の割り込みだった + // no break, no return // + } + + default: + if( state == IIC_TX ) + { // 送信 + IICA = trx_buf; + vreg_ctr_after_read( reg_adrs ); // 読んだらクリアなどの処理 + } + else + { + // RX + trx_buf = IICA; + vreg_ctr_write( reg_adrs, trx_buf ); + WREL = 1; + } + reg_adrs += 1; +// reg_adrs_internal = adrs_table_ctr_ext2int( reg_adrs ); + if( state == IIC_TX ) + { + trx_buf = vreg_ctr_read( reg_adrs ); // temp = vreg_ctr[ reg_adrs ]; + } + break; } - break; - } } #if 0 // 一度通信が始まったら終わるまで戻らないバージョン -__interrupt void int_iic_ctr(){ - static u8 state = 0; - static u8 reg_adrs; +__interrupt void int_iic_ctr( ) +{ + static u8 state = 0; + static u8 reg_adrs; // static u8 reg_adrs_internal; - static u8 trx_buf; + static u8 trx_buf; - if( SPD ){ - return; - } - - // 自局呼び出しに応答。 - // 初期化など - WREL = 1; // ウェイト解除 - - while( !IICAIF ){;} - IICAIF = 0; - - // レジスタアドレス受信 - reg_adrs = IICA; - WREL = 1; - trx_buf = vreg_ctr_read( reg_adrs ); // データの準備をしておく - - while( !IICAIF ){;} - IICAIF = 0; - - if( STD ){ // リスタートコンディション - // リードされる - if( COI ){ - state = IIC_TX; - }else{ - // リスタートで違うデバイスが呼ばれた！ - WREL = 1; // ウェイト解除? - state = IIC_IDLE; // 終了処理 - SPIE = 0; - return; + if( SPD ) + { + return; } - }else{ // ライト続行 - state = IIC_RX; - } - if( state == IIC_TX ){ - // 送信 // - do{ - IICA = trx_buf; - vreg_ctr_after_read( reg_adrs ); // 読んだらクリアなどの処理 - reg_adrs += 1; - trx_buf = vreg_ctr_read( reg_adrs ); - while( !IICAIF ){;} - IICAIF = 0; - }while( ACKD ); - LREL = 1; + // 自局呼び出しに応答。 + // 初期化など + WREL = 1; // ウェイト解除 - }else{ - // 受信 // - SPIE = 1; - do{ - trx_buf = IICA; - vreg_ctr_write( reg_adrs, trx_buf ); - reg_adrs += 1; - WREL = 1; - while( !IICAIF ){;} - IICAIF = 0; - }while( !SPD ); - SPIE = 0; - } - state = IIC_IDLE; + while( !IICAIF ) + {; + } + IICAIF = 0; + + // レジスタアドレス受信 + reg_adrs = IICA; + WREL = 1; + trx_buf = vreg_ctr_read( reg_adrs ); // データの準備をしておく + + while( !IICAIF ) + {; + } + IICAIF = 0; + + if( STD ) + { // リスタートコンディション + // リードされる + if( COI ) + { + state = IIC_TX; + } + else + { + // リスタートで違うデバイスが呼ばれた！ + WREL = 1; // ウェイト解除? + state = IIC_IDLE; // 終了処理 + SPIE = 0; + return; + } + } + else + { // ライト続行 + state = IIC_RX; + } + + if( state == IIC_TX ) + { + // 送信 // + do + { + IICA = trx_buf; + vreg_ctr_after_read( reg_adrs ); // 読んだらクリアなどの処理 + reg_adrs += 1; + trx_buf = vreg_ctr_read( reg_adrs ); + while( !IICAIF ) + {; + } + IICAIF = 0; + } + while( ACKD ); + LREL = 1; + + } + else + { + // 受信 // + SPIE = 1; + do + { + trx_buf = IICA; + vreg_ctr_write( reg_adrs, trx_buf ); + reg_adrs += 1; + WREL = 1; + while( !IICAIF ) + {; + } + IICAIF = 0; + } + while( !SPD ); + SPIE = 0; + } + state = IIC_IDLE; } #endif // ======================================================== -void IIC_ctr_Init( void ){ +void IIC_ctr_Init( void ) +{ - IICAEN = 1; + IICAEN = 1; - IICE = 0; /* IICA disable */ + IICE = 0; /* IICA disable */ - IICAMK = 1; /* INTIICA disable */ - IICAIF = 0; /* clear INTIICA interrupt flag */ + IICAMK = 1; /* INTIICA disable */ + IICAIF = 0; /* clear INTIICA interrupt flag */ - IICAPR0 = 0; /* set INTIICA high priority */ - IICAPR1 = 0; /* set INTIICA high priority */ + IICAPR0 = 0; /* set INTIICA high priority */ + IICAPR1 = 0; /* set INTIICA high priority */ #ifdef _MODEL_WM0_ - P20 &= ~0x3; + P20 &= ~0x3; #else - P6 &= ~0x3; + P6 &= ~0x3; #endif - SVA = IIC_C_SLAVEADDRESS; - IICF = 0x01; + SVA = IIC_C_SLAVEADDRESS; + IICF = 0x01; - STCEN = 1; // リスタートの許可 - IICRSV = 1; // 通信予約をさせない:スレーブに徹する + STCEN = 1; // リスタートの許可 + IICRSV = 1; // 通信予約をさせない:スレーブに徹する - SPIE = 0; // ストップコンディションでの割り込みを禁止 - WTIM = 1; // 自動でACKを返した後clkをLに固定する - ACKE = 1; // ダメCPUは無視して次の通信をはじめるかもしれないんで早くclkを開放しないといけない + SPIE = 0; // ストップコンディションでの割り込みを禁止 + WTIM = 1; // 自動でACKを返した後clkをLに固定する + ACKE = 1; // ダメCPUは無視して次の通信をはじめるかもしれないんで早くclkを開放しないといけない - IICWH = 8; - IICWL = 10; // L期間の長さ + IICWH = 8; + IICWL = 10; // L期間の長さ - SMC = 1; + SMC = 1; // 高速モード - IICAMK = 0; // 割り込みを許可 + IICAMK = 0; // 割り込みを許可 - IICE = 1; + IICE = 1; #ifdef _MODEL_WM0_ - PM20 &= ~0x3; /* set clock pin for IICA */ + PM20 &= ~0x3; /* set clock pin for IICA */ #else - PM6 &= ~0x3; /* set clock pin for IICA */ + PM6 &= ~0x3; /* set clock pin for IICA */ #endif } // ======================================================== -void IIC_ctr_Stop( void ){ - IICE = 0; /* IICA disable */ - IICAEN = 0; +void IIC_ctr_Stop( void ) +{ + IICE = 0; /* IICA disable */ + IICAEN = 0; } - diff --git a/trunk/i2c_ctr.h b/trunk/i2c_ctr.h index e1f9bfe..16234ff 100644 --- a/trunk/i2c_ctr.h +++ b/trunk/i2c_ctr.h @@ -4,109 +4,109 @@ /* IIC operation enable (IICE0) */ #define IIC0_OPERATION 0x80 -#define IIC0_OPERATION_DISABLE 0x00 /* stop operation */ -#define IIC0_OPERATION_ENABLE 0x80 /* enable operation */ +#define IIC0_OPERATION_DISABLE 0x00 /* stop operation */ +#define IIC0_OPERATION_ENABLE 0x80 /* enable operation */ /* Exit from communications (LREL0) */ #define IIC0_COMMUNICATION 0x40 -#define IIC0_COMMUNICATION_NORMAL 0x00 /* normal operation */ -#define IIC0_COMMUNICATION_EXIT 0x40 /* exit from current communication */ +#define IIC0_COMMUNICATION_NORMAL 0x00 /* normal operation */ +#define IIC0_COMMUNICATION_EXIT 0x40 /* exit from current communication */ /* Wait cancellation (WREL0) */ #define IIC0_WAITCANCEL 0x20 -#define IIC0_WAIT_NOTCANCEL 0x00 /* do not cancel wait */ -#define IIC0_WAIT_CANCEL 0x20 /* cancel wait */ +#define IIC0_WAIT_NOTCANCEL 0x00 /* do not cancel wait */ +#define IIC0_WAIT_CANCEL 0x20 /* cancel wait */ /* Generation of interrupt when stop condition (SPIE0) */ #define IIC0_STOPINT 0x10 -#define IIC0_STOPINT_DISABLE 0x00 /* disable */ -#define IIC0_STOPINT_ENABLE 0x10 /* enable */ +#define IIC0_STOPINT_DISABLE 0x00 /* disable */ +#define IIC0_STOPINT_ENABLE 0x10 /* enable */ /* Wait and interrupt generation (WTIM0) */ #define IIC0_WAITINT 0x08 -#define IIC0_WAITINT_CLK8FALLING 0x00 /* generate at the eighth clocks falling edge */ -#define IIC0_WAITINT_CLK9FALLING 0x08 /* generated at the ninth clocks falling edge */ +#define IIC0_WAITINT_CLK8FALLING 0x00 /* generate at the eighth clocks falling edge */ +#define IIC0_WAITINT_CLK9FALLING 0x08 /* generated at the ninth clocks falling edge */ /* Acknowledgement control (ACKE0) */ #define IIC0_ACK 0x04 -#define IIC0_ACK_DISABLE 0x00 /* enable acknowledgement */ -#define IIC0_ACK_ENABLE 0x04 /* disable acknowledgement */ +#define IIC0_ACK_DISABLE 0x00 /* enable acknowledgement */ +#define IIC0_ACK_ENABLE 0x04 /* disable acknowledgement */ /* Start condition trigger (STT0) */ #define IIC0_STARTCONDITION 0x02 -#define IIC0_START_NOTGENERATE 0x00 /* do not generate start condition */ -#define IIC0_START_GENERATE 0x02 /* generate start condition */ +#define IIC0_START_NOTGENERATE 0x00 /* do not generate start condition */ +#define IIC0_START_GENERATE 0x02 /* generate start condition */ /* Stop condition trigger (SPT0) */ #define IIC0_STOPCONDITION 0x01 -#define IIC0_STOP_NOTGENERATE 0x00 /* do not generate stop condition */ -#define IIC0_STOP_GENERATE 0x01 /* generate stop condition */ +#define IIC0_STOP_NOTGENERATE 0x00 /* do not generate stop condition */ +#define IIC0_STOP_GENERATE 0x01 /* generate stop condition */ /* IIC Status Register 0 (IICS0) */ /* Master device status (MSTS0) */ #define IIC0_MASTERSTATUS 0x80 -#define IIC0_STATUS_NOTMASTER 0x00 /* slave device status or communication standby status */ -#define IIC0_STATUS_MASTER 0x80 /* master device communication status */ +#define IIC0_STATUS_NOTMASTER 0x00 /* slave device status or communication standby status */ +#define IIC0_STATUS_MASTER 0x80 /* master device communication status */ /* Detection of arbitration loss (ALD0) */ #define IIC0_ARBITRATION 0x40 -#define IIC0_ARBITRATION_NO 0x00 /* arbitration win or no arbitration */ -#define IIC0_ARBITRATION_LOSS 0x40 /* arbitration loss */ +#define IIC0_ARBITRATION_NO 0x00 /* arbitration win or no arbitration */ +#define IIC0_ARBITRATION_LOSS 0x40 /* arbitration loss */ /* Detection of extension code reception (EXC0) */ #define IIC0_EXTENSIONCODE 0x20 -#define IIC0_EXTCODE_NOT 0x00 /* extension code not received */ -#define IIC0_EXTCODE_RECEIVED 0x20 /* extension code received */ +#define IIC0_EXTCODE_NOT 0x00 /* extension code not received */ +#define IIC0_EXTCODE_RECEIVED 0x20 /* extension code received */ /* Detection of matching addresses (COI0) */ #define IIC0_ADDRESSMATCH 0x10 -#define IIC0_ADDRESS_NOTMATCH 0x00 /* addresses do not match */ -#define IIC0_ADDRESS_MATCH 0x10 /* addresses match */ +#define IIC0_ADDRESS_NOTMATCH 0x00 /* addresses do not match */ +#define IIC0_ADDRESS_MATCH 0x10 /* addresses match */ /* Detection of transmit/receive status (TRC0) */ #define IIC0_STATUS 0x08 -#define IIC0_STATUS_RECEIVE 0x00 /* receive status */ -#define IIC0_STATUS_TRANSMIT 0x08 /* transmit status */ +#define IIC0_STATUS_RECEIVE 0x00 /* receive status */ +#define IIC0_STATUS_TRANSMIT 0x08 /* transmit status */ /* Detection of acknowledge signal (ACKD0) */ #define IIC0_ACKDETECTION 0x04 -#define IIC0_ACK_NOTDETECTED 0x00 /* ACK signal was not detected */ -#define IIC0_ACK_DETECTED 0x04 /* ACK signal was detected */ +#define IIC0_ACK_NOTDETECTED 0x00 /* ACK signal was not detected */ +#define IIC0_ACK_DETECTED 0x04 /* ACK signal was detected */ /* Detection of start condition (STD0) */ #define IIC0_STARTDETECTION 0x02 -#define IIC0_START_NOTDETECTED 0x00 /* start condition not detected */ -#define IIC0_START_DETECTED 0x02 /* start condition detected */ +#define IIC0_START_NOTDETECTED 0x00 /* start condition not detected */ +#define IIC0_START_DETECTED 0x02 /* start condition detected */ /* Detection of stop condition (SPD0) */ #define IIC0_STOPDETECTION 0x01 -#define IIC0_STOP_NOTDETECTED 0x00 /* stop condition not detected */ -#define IIC0_STOP_DETECTED 0x01 /* stop condition detected */ +#define IIC0_STOP_NOTDETECTED 0x00 /* stop condition not detected */ +#define IIC0_STOP_DETECTED 0x01 /* stop condition detected */ /* IIC Flag Register 0 (IICF0) */ /* STT0 clear flag (STCF) */ #define IIC0_STARTFLAG 0x80 -#define IIC0_STARTFLAG_GENERATE 0x00 /* generate start condition */ -#define IIC0_STARTFLAG_UNSUCCESSFUL 0x80 /* start condition generation unsuccessful */ +#define IIC0_STARTFLAG_GENERATE 0x00 /* generate start condition */ +#define IIC0_STARTFLAG_UNSUCCESSFUL 0x80 /* start condition generation unsuccessful */ /* IIC bus status flag (IICBSY) */ #define IIC0_BUSSTATUS 0x40 -#define IIC0_BUS_RELEASE 0x00 /* bus release status */ -#define IIC0_BUS_COMMUNICATION 0x40 /* bus communication status */ +#define IIC0_BUS_RELEASE 0x00 /* bus release status */ +#define IIC0_BUS_COMMUNICATION 0x40 /* bus communication status */ /* Initial start enable trigger (STCEN) */ #define IIC0_STARTWITHSTOP 0x02 -#define IIC0_START_WITHSTOP 0x00 /* generation of a start condition without detecting a stop condition */ -#define IIC0_START_WITHOUTSTOP 0x02 /* generation of a start condition upon detection of a stop condition */ +#define IIC0_START_WITHSTOP 0x00 /* generation of a start condition without detecting a stop condition */ +#define IIC0_START_WITHOUTSTOP 0x02 /* generation of a start condition upon detection of a stop condition */ /* Communication reservation function disable bit (IICRSV) */ #define IIC0_RESERVATION 0x01 -#define IIC0_RESERVATION_ENABLE 0x00 /* enable communication reservation */ -#define IIC0_RESERVATION_DISABLE 0x01 /* disable communication reservation */ +#define IIC0_RESERVATION_ENABLE 0x00 /* enable communication reservation */ +#define IIC0_RESERVATION_DISABLE 0x01 /* disable communication reservation */ /* IIC clock selection register 0 (IICCL0) @@ -114,23 +114,23 @@ #define IICCL0_INITIALVALUE 0x00 /* Detection of SCL0 pin level (CLD0) */ #define IIC0_SCLLEVEL 0x20 -#define IIC0_SCL_LOW 0x00 /* clock line at low level */ -#define IIC0_SCL_HIGH 0x20 /* clock line at high level */ +#define IIC0_SCL_LOW 0x00 /* clock line at low level */ +#define IIC0_SCL_HIGH 0x20 /* clock line at high level */ /* Detection of SDA0 pin level (DAD0) */ #define IIC0_SDALEVEL 0x10 -#define IIC0_SDA_LOW 0x00 /* data line at low level */ -#define IIC0_SDA_HIGH 0x10 /* data line at high level */ +#define IIC0_SDA_LOW 0x00 /* data line at low level */ +#define IIC0_SDA_HIGH 0x10 /* data line at high level */ /* Operation mode switching (SMC0) */ #define IIC0_OPERATIONMODE 0x08 -#define IIC0_MODE_STANDARD 0x00 /* operates in standard mode */ -#define IIC0_MODE_HIGHSPEED 0x08 /* operates in high-speed mode */ +#define IIC0_MODE_STANDARD 0x00 /* operates in standard mode */ +#define IIC0_MODE_HIGHSPEED 0x08 /* operates in high-speed mode */ /* Digital filter operation control (DFC0) */ #define IIC0_DIGITALFILTER 0x04 -#define IIC0_FILTER_OFF 0x00 /* digital filter off */ -#define IIC0_FILTER_ON 0x04 /* digital filter on */ +#define IIC0_FILTER_OFF 0x00 /* digital filter off */ +#define IIC0_FILTER_ON 0x04 /* digital filter on */ /* Operation mode switching (CL01, CL00) */ #define IIC0_CLOCKSELECTION 0x03 diff --git a/trunk/i2c_mcu.c b/trunk/i2c_mcu.c index 2518915..03e647d 100644 --- a/trunk/i2c_mcu.c +++ b/trunk/i2c_mcu.c @@ -35,25 +35,25 @@ // ======================================================== -static void iic_mcu_send_st(); -static void iic_mcu_send_re_st(); -static void iic_mcu_send_sp(); +static void iic_mcu_send_st( ); +static void iic_mcu_send_re_st( ); +static void iic_mcu_send_sp( ); static err iic_mcu_send_a_byte( u8 ); static err iic_mcu_call_slave( u8 slave ); // ======================================================== -bit iic_mcu_wo_dma; +bit iic_mcu_wo_dma; volatile bit iic_mcu_busy; volatile bit iic_mcu_initialized; -u8 iic_send_work[4]; -u8* p_iic_send_wo_dma_dat; -u8 iic_send_wo_dma_len; +u8 iic_send_work[4]; +u8 *p_iic_send_wo_dma_dat; +u8 iic_send_wo_dma_len; -u8 iic_mcu_bus_status; // 一文字リードの時はデータを返す。 +u8 iic_mcu_bus_status; // 一文字リードの時はデータを返す。 // ステータスが必要ならこっちを呼んで @@ -63,54 +63,62 @@ u8 iic_mcu_bus_status; // 返値がデータそのものです。 エラー判定ができません。 ======================================================== */ -u8 iic_mcu_read_a_byte( u8 SLA, u8 adrs ){ - u8 dat; +u8 iic_mcu_read_a_byte( u8 SLA, u8 adrs ) +{ + u8 dat; - if( iic_mcu_initialized == 0 ){ + if( iic_mcu_initialized == 0 ) + { #ifdef _debug_ - iic_mcu_start(); + iic_mcu_start( ); #else - while(1){}; + while( 1 ) + { + }; #endif } - while( iic_mcu_busy ){ - NOP(); - } - iic_mcu_busy = 1; + while( iic_mcu_busy ) + { + NOP( ); + } + iic_mcu_busy = 1; - iic_mcu_bus_status = ERR_OK; - // スタートコンディションとスレーブの呼び出し、レジスタアドレスの送信 - if( iic_mcu_call_slave( SLA ) != 0 ){ - iic_mcu_bus_status = ERR_NOSLAVE; + iic_mcu_bus_status = ERR_OK; + // スタートコンディションとスレーブの呼び出し、レジスタアドレスの送信 + if( iic_mcu_call_slave( SLA ) != 0 ) + { + iic_mcu_bus_status = ERR_NOSLAVE; + iic_mcu_busy = 0; + return ( 0 ); + } + + // レジスタアドレスの送信 + iic_mcu_send_a_byte( adrs ); // 終わるまで帰ってこない + // if( err != ERR_SUCCESS )〜 + + // データ受信 // + iic_mcu_send_re_st( ); // リスタートコンディション + iic_mcu_send_a_byte( SLA | 0x01 ); // 送信完了まで戻ってきません。 + + ST0 = 0x0004; // 受信モードに設定を変えるのでロジック停止 + SCR02 = RXE0 | 1 << SLC02 | 7 << DLS02; // 受信設定 + SS0 = 0x0004; // 通信待機 + + SOE0 = 0x0000; // 1バイト送信なので、最後のNAKを送る + IICIF10 = 0; + SIO10 = 0xFF; // ダミーデータを書くと受信開始 + + while( IICIF10 == 0 ) + { // 受信完了待ち + ; + } + dat = SIO10; + + iic_mcu_send_sp( ); + IICIF10 = 0; // 後を濁さないこと iic_mcu_busy = 0; - return( 0 ); - } - - // レジスタアドレスの送信 - iic_mcu_send_a_byte( adrs ); // 終わるまで帰ってこない - // if( err != ERR_SUCCESS )〜 - - // データ受信 // - iic_mcu_send_re_st(); // リスタートコンディション - iic_mcu_send_a_byte( SLA | 0x01 ); // 送信完了まで戻ってきません。 - - ST0 = 0x0004; // 受信モードに設定を変えるのでロジック停止 - SCR02 = RXE0 | 1 << SLC02 | 7 << DLS02; // 受信設定 - SS0 = 0x0004; // 通信待機 - - SOE0 = 0x0000; // 1バイト送信なので、最後のNAKを送る - IICIF10 = 0; - SIO10 = 0xFF; // ダミーデータを書くと受信開始 - - while( IICIF10 == 0 ){ // 受信完了待ち - ;} - dat = SIO10; - - iic_mcu_send_sp(); - IICIF10 = 0; // 後を濁さないこと - iic_mcu_busy = 0; - return( dat ); + return ( dat ); } @@ -125,20 +133,25 @@ u8 iic_mcu_read_a_byte( u8 SLA, u8 adrs ){ スレーブがウェイトコンディションを出すことは禁止です。 その場合でもエラー検出などできません ======================================================== */ -err iic_mcu_read( u8 slave, u8 adrs, u8 len, u8* dest ){ +err iic_mcu_read( u8 slave, u8 adrs, u8 len, u8 * dest ) +{ //* - // 使用中なら待つ - if( iic_mcu_initialized == 0 ){ + // 使用中なら待つ + if( iic_mcu_initialized == 0 ) + { #ifdef _debug_ - iic_mcu_start(); + iic_mcu_start( ); #else - while(1){}; + while( 1 ) + { + }; #endif - } - while( iic_mcu_busy ){ - NOP(); - } + } + while( iic_mcu_busy ) + { + NOP( ); + } /*/ // 使用中なら帰る if( iic_mcu_initialized == 0 ){ @@ -149,44 +162,50 @@ err iic_mcu_read( u8 slave, u8 adrs, u8 len, u8* dest ){ } //*/ - iic_mcu_busy = 1; - // スタートコンディションとスレーブの呼び出し、レジスタアドレスの送信 - if( iic_mcu_call_slave( slave ) != 0 ){ - iic_mcu_busy = 0; - return( ERR_NAK ); - } + iic_mcu_busy = 1; + // スタートコンディションとスレーブの呼び出し、レジスタアドレスの送信 + if( iic_mcu_call_slave( slave ) != 0 ) + { + iic_mcu_busy = 0; + return ( ERR_NAK ); + } - // レジスタアドレスの送信 - iic_mcu_send_a_byte( adrs ); // 終わるまで帰ってこない - // if( err != ERR_SUCCESS )〜 + // レジスタアドレスの送信 + iic_mcu_send_a_byte( adrs ); // 終わるまで帰ってこない + // if( err != ERR_SUCCESS )〜 // データ受信 // - iic_mcu_send_re_st(); // リスタートコンディション - iic_mcu_send_a_byte( slave | 0x01 ); // 送信完了まで戻ってきません。 + iic_mcu_send_re_st( ); // リスタートコンディション + iic_mcu_send_a_byte( slave | 0x01 ); // 送信完了まで戻ってきません。 // データ受信 - ST0 = 0x0004; // 受信モードに設定を変えるのでロジック停止 - SCR02 = RXE0 | 1 << SLC02 | 7 << DLS02; // 受信設定 - SS0 = 0x0004; // 通信待機 + ST0 = 0x0004; // 受信モードに設定を変えるのでロジック停止 + SCR02 = RXE0 | 1 << SLC02 | 7 << DLS02; // 受信設定 + SS0 = 0x0004; // 通信待機 - do{ - if( len == 1 ){ - SOE0 = 0x0000; // 最後のNAK - } - IICIF10 = 0; - SIO10 = 0xFF; // ダミーデータを書くと受信開始 - while( IICIF10 == 0 ){ // 受信完了待ち - ;} - *dest = SIO10; - dest++; - len--; - }while( len != 0 ); + do + { + if( len == 1 ) + { + SOE0 = 0x0000; // 最後のNAK + } + IICIF10 = 0; + SIO10 = 0xFF; // ダミーデータを書くと受信開始 + while( IICIF10 == 0 ) + { // 受信完了待ち + ; + } + *dest = SIO10; + dest++; + len--; + } + while( len != 0 ); - iic_mcu_send_sp(); + iic_mcu_send_sp( ); IICIF10 = 0; iic_mcu_busy = 0; - return( ERR_SUCCESS ); + return ( ERR_SUCCESS ); } @@ -198,35 +217,41 @@ err iic_mcu_read( u8 slave, u8 adrs, u8 len, u8* dest ){ 返値　iic_mcu_write　に同じ ======================================================== */ -err iic_mcu_write_a_byte( u8 SLA, u8 adrs, u8 dat ){ +err iic_mcu_write_a_byte( u8 SLA, u8 adrs, u8 dat ) +{ - if( iic_mcu_initialized == 0 ){ + if( iic_mcu_initialized == 0 ) + { #ifdef _debug_ - iic_mcu_start(); + iic_mcu_start( ); #else - while(1){}; + while( 1 ) + { + }; #endif - } - while( iic_mcu_busy ){ - NOP(); - } - iic_mcu_busy = 1; + } + while( iic_mcu_busy ) + { + NOP( ); + } + iic_mcu_busy = 1; #if 0 - temp = dat; - return( iic_mcu_write( SLA, adrs, 1, &temp ) ); - } + temp = dat; + return ( iic_mcu_write( SLA, adrs, 1, &temp ) ); +} #else - // スタートコンディションとスレーブの呼び出し... - IICMK10 = 1; - if( iic_mcu_call_slave( SLA ) != 0 ){ + // スタートコンディションとスレーブの呼び出し... + IICMK10 = 1; + if( iic_mcu_call_slave( SLA ) != 0 ) + { + iic_mcu_busy = 0; + return ( ERR_NAK ); + } + iic_mcu_send_a_byte( adrs ); + iic_mcu_send_a_byte( dat ); + iic_mcu_send_sp( ); iic_mcu_busy = 0; - return( ERR_NAK ); - } - iic_mcu_send_a_byte( adrs ); - iic_mcu_send_a_byte( dat ); - iic_mcu_send_sp(); - iic_mcu_busy = 0; - return( ERR_SUCCESS ); + return ( ERR_SUCCESS ); #endif } @@ -247,19 +272,24 @@ err iic_mcu_write_a_byte( u8 SLA, u8 adrs, u8 dat ){ その場合でもエラー検出などできません DMA1を使用します。 ******************************************************************************/ -err iic_mcu_write( u8 slave, u8 adrs, u8 len, u8* src ){ +err iic_mcu_write( u8 slave, u8 adrs, u8 len, u8 * src ) +{ //* - // 使用中なら待つ - if( iic_mcu_initialized == 0 ){ + // 使用中なら待つ + if( iic_mcu_initialized == 0 ) + { #ifdef _debug_ - iic_mcu_start(); + iic_mcu_start( ); #else - while(1){}; + while( 1 ) + { + }; #endif - } - while( iic_mcu_busy ){ - NOP(); - } + } + while( iic_mcu_busy ) + { + NOP( ); + } /*/ // 使用中なら帰る if( iic_mcu_initialized == 0 ){ @@ -269,49 +299,55 @@ err iic_mcu_write( u8 slave, u8 adrs, u8 len, u8* src ){ return( 3 ); } //*/ - iic_mcu_busy = 1; - // スタートコンディションとスレーブの呼び出し... - IICMK10 = 1; - IICIF10 = 0; - if( iic_mcu_call_slave( slave ) != 0 ){ - iic_mcu_busy = 0; - EI(); - return( ERR_NAK ); - } + iic_mcu_busy = 1; + // スタートコンディションとスレーブの呼び出し... + IICMK10 = 1; + IICIF10 = 0; + if( iic_mcu_call_slave( slave ) != 0 ) + { + iic_mcu_busy = 0; + EI( ); + return ( ERR_NAK ); + } - IICIF10 = 0; - if( !iic_mcu_wo_dma ){ - // DMAを使用する（通常） + IICIF10 = 0; + if( !iic_mcu_wo_dma ) + { + // DMAを使用する（通常） - // レジスタアドレスを送り、データの準備 - memcpy( iic_send_work, src, 4 ); //バッファとして4バイトしか用意して無いため。 - // DMAセット - while( DST1 ){;}; + // レジスタアドレスを送り、データの準備 + memcpy( iic_send_work, src, 4 ); //バッファとして4バイトしか用意して無いため。 + // DMAセット + while( DST1 ) + {; + }; - DEN1 = 1; - DSA1 = (u8)( &SIO10 ); - DRA1 = (u16)iic_send_work; - DBC1 = len; - DMC1 = DRS | 8; // RAM -> SFR, 8bit, IRQ, IIC10 + DEN1 = 1; + DSA1 = ( u8 ) ( &SIO10 ); + DRA1 = ( u16 ) iic_send_work; + DBC1 = len; + DMC1 = DRS | 8; // RAM -> SFR, 8bit, IRQ, IIC10 - DMAIF1 = 0; - DMAMK1 = 0; - DST1 = 1; + DMAIF1 = 0; + DMAMK1 = 0; + DST1 = 1; - SIO10 = adrs; // 書きっぱなし！ 割り込みが発生してDMAスタート - // 残りは割り込みルーチン内で - }else{ - // DMAを使用しない // + SIO10 = adrs; // 書きっぱなし！ 割り込みが発生してDMAスタート + // 残りは割り込みルーチン内で + } + else + { + // DMAを使用しない // - // レジスタアドレスの送信 - SIO10 = adrs; + // レジスタアドレスの送信 + SIO10 = adrs; - IICMK10 = 0; - iic_send_wo_dma_len = len; - p_iic_send_wo_dma_dat = src; - // 残りは割り込みルーチン内で - } - return( ERR_SUCCESS ); + IICMK10 = 0; + iic_send_wo_dma_len = len; + p_iic_send_wo_dma_dat = src; + // 残りは割り込みルーチン内で + } + return ( ERR_SUCCESS ); } @@ -321,77 +357,81 @@ err iic_mcu_write( u8 slave, u8 adrs, u8 len, u8* src ){ DMA１転送終了割り込み IIC_mcu の送信完了コールバック関数のようなもの 注：DMA転送が終わっただけで、I2Cの転送は終わってません +　 割り込み中などで、DMA1の処理が遅延した場合、 + IIC10の割り込みの準備ができずに、割り込みを発生させられなくなる + 恐れがあります。また、回避方法も特にありません。 + 　そのため、DMA仕様の差異は、最後のバイトは送信完了を + フラグのポーリングで確認します。 ======================================================== */ -__interrupt void int_dma1(){ - IICIF10 = 0; - DMAMK1 = 1; - DEN1 = 0; - IICMK10 = 1; - while(( SSR02L & TSF0 ) != 0 ){; - } - // 最後のバイト転送後、I2C割り込みが発生する - // ↓ +__interrupt void int_dma1( ) +{ + u16 i = 0; - // 共通（最終バイト送信完了） - IICMK10 = 1; - // ISR中で外の関数を呼ぶのは都合が悪いので展開 -// iic_mcu_send_sp(); - { - ST0 = 0x0004; - SOE0 = 0; // 受信の時はもっと前に「も」設定してる。(NACK出力) - SO0 = 0x0000 | TAUS_MASK; // SCL - NOP(); - NOP(); - NOP(); - NOP(); - SO0 = 0x0400 | TAUS_MASK; // SCL - NOP(); - NOP(); - NOP(); - NOP(); - SO0 = 0x0404 | TAUS_MASK; - } - iic_mcu_wo_dma = 0; - iic_mcu_busy = 0; + DMAMK1 = 1; + DEN1 = 0; + while( ( SSR02L & TSF0 ) != 0 ) + { + if( ++i == 0 ) // タイムアウト？ + { + break; + } + } +// iic_mcu_send_sp(); // ISR中で外の関数を呼ぶのは都合が悪いので展開 + { + ST0 = 0x0004; + SOE0 = 0; // 受信の時はもっと前に「も」設定してる。(NACK出力) + SO0 = 0x0000 | TAUS_MASK; // SCL + NOP( ); + NOP( ); + NOP( ); + NOP( ); + SO0 = 0x0400 | TAUS_MASK; // SCL + NOP( ); + NOP( ); + NOP( ); + NOP( ); + SO0 = 0x0404 | TAUS_MASK; + } + iic_mcu_busy = 0; } /* ======================================================== IIC MCUのバイト送出完了割り込み + ※DMA使用時は使用されません。 ======================================================== */ -__interrupt void int_iic10(){ - if( iic_mcu_wo_dma ){ - // DMA使用せず、転送途中 - if( iic_send_wo_dma_len != 0 ){ - SIO10 = *p_iic_send_wo_dma_dat; - p_iic_send_wo_dma_dat++; - iic_send_wo_dma_len--; - return; +__interrupt void int_iic10( ) +{ + if( iic_send_wo_dma_len != 0 ) + { + SIO10 = *p_iic_send_wo_dma_dat; + p_iic_send_wo_dma_dat++; + iic_send_wo_dma_len--; + return; + } + + // 最後のバイト送信完了 + IICMK10 = 1; +// iic_mcu_send_sp(); // ISR中で外の関数を呼ぶのは都合が悪いので展開 + { + ST0 = 0x0004; + SOE0 = 0; // 受信の時はもっと前に「も」設定してる。(NACK出力) + SO0 = 0x0000 | TAUS_MASK; // SCL + NOP( ); + NOP( ); + NOP( ); + NOP( ); + SO0 = 0x0400 | TAUS_MASK; // SCL + NOP( ); + NOP( ); + NOP( ); + NOP( ); + SO0 = 0x0404 | TAUS_MASK; } iic_mcu_wo_dma = 0; - } - // 共通（最終バイト送信完了） - IICMK10 = 1; - // ISR中で外の関数を呼ぶのは都合が悪いので展開 -// iic_mcu_send_sp(); - { - ST0 = 0x0004; - SOE0 = 0; // 受信の時はもっと前に「も」設定してる。(NACK出力) - SO0 = 0x0000 | TAUS_MASK; // SCL - NOP(); - NOP(); - NOP(); - NOP(); - SO0 = 0x0400 | TAUS_MASK; // SCL - NOP(); - NOP(); - NOP(); - NOP(); - SO0 = 0x0404 | TAUS_MASK; - } - iic_mcu_busy = 0; + iic_mcu_busy = 0; } @@ -402,16 +442,18 @@ __interrupt void int_iic10(){ ACK　→　　　　　　　　　　　　　　　　　返：0 　NACK →　ストップコンディションを出す。　返：1 ======================================================== */ -static err iic_mcu_call_slave( u8 slave ){ - iic_mcu_send_st(); +static err iic_mcu_call_slave( u8 slave ) +{ + iic_mcu_send_st( ); // SIR02 = SSR02; // NAKエラーのフラグクリア - if( iic_mcu_send_a_byte( slave ) != 0 ){ - iic_mcu_send_sp(); - return( ERR_NAK ); // 指定のスレーブがいない / busy - } + if( iic_mcu_send_a_byte( slave ) != 0 ) + { + iic_mcu_send_sp( ); + return ( ERR_NAK ); // 指定のスレーブがいない / busy + } - return( ERR_SUCCESS ); + return ( ERR_SUCCESS ); } @@ -420,18 +462,21 @@ static err iic_mcu_call_slave( u8 slave ){ ほんとに１バイト書くのみ 書き終わるまで帰りません ======================================================== */ -static err iic_mcu_send_a_byte( u8 dat ){ +static err iic_mcu_send_a_byte( u8 dat ) +{ - IICIF10 = 0; - SIO10 = dat; - while( IICIF10 == 0 ){ - NOP(); - } // 通信中 - if( SSR02 != 0 ){ - SIR02 = SSR02; - return( ERR_NAK ); - } - return( ERR_SUCCESS ); + IICIF10 = 0; + SIO10 = dat; + while( IICIF10 == 0 ) + { + NOP( ); + } // 通信中 + if( SSR02 != 0 ) + { + SIR02 = SSR02; + return ( ERR_NAK ); + } + return ( ERR_SUCCESS ); } @@ -440,17 +485,18 @@ static err iic_mcu_send_a_byte( u8 dat ){ スタートコンディションを発行 ソフトウェア制御 ======================================================== */ -static void iic_mcu_send_st(){ - SO0 &= ~0x0004; // SDA - NOP(); - NOP(); - NOP(); - NOP(); - SO0 &= ~0x0400; // SCL - SOE0 = 0x0004; // ハード制御へ +static void iic_mcu_send_st( ) +{ + SO0 &= ~0x0004; // SDA + NOP( ); + NOP( ); + NOP( ); + NOP( ); + SO0 &= ~0x0400; // SCL + SOE0 = 0x0004; // ハード制御へ - SCR02 = TXE0 | 1 << SLC02 | 7 << DLS02; // 送信許可、データは８ビット単位 - SS0 = 0x0004; // 通信待機 + SCR02 = TXE0 | 1 << SLC02 | 7 << DLS02; // 送信許可、データは８ビット単位 + SS0 = 0x0004; // 通信待機 } @@ -458,19 +504,20 @@ static void iic_mcu_send_st(){ /* ======================================================== リスタート発行 ======================================================== */ -static void iic_mcu_send_re_st(){ - ST0 |= 0x0004; - SO0 |= 0x0400 | TAUS_MASK; // ( SDA = H ), SCL -> H - NOP(); - NOP(); - NOP(); - NOP(); - SOE0 &= ~0x0004; // ( SCL = H ), SDA -> L - NOP(); - NOP(); - NOP(); - NOP(); - iic_mcu_send_st(); +static void iic_mcu_send_re_st( ) +{ + ST0 |= 0x0004; + SO0 |= 0x0400 | TAUS_MASK; // ( SDA = H ), SCL -> H + NOP( ); + NOP( ); + NOP( ); + NOP( ); + SOE0 &= ~0x0004; // ( SCL = H ), SDA -> L + NOP( ); + NOP( ); + NOP( ); + NOP( ); + iic_mcu_send_st( ); } @@ -479,20 +526,21 @@ static void iic_mcu_send_re_st(){ ストップコンディション発行 この前に、「最後のバイトの送受信」の時に前準備が必要です。 ======================================================== */ -static void iic_mcu_send_sp(){ - ST0 = 0x0004; - SOE0 = 0; // 受信の時はもっと前に「も」設定してる。(NACK出力) - SO0 = 0x0000 | TAUS_MASK; // SCL - NOP(); - NOP(); - NOP(); - NOP(); - SO0 = 0x0400 | TAUS_MASK; // SCL - NOP(); - NOP(); - NOP(); - NOP(); - SO0 = 0x0404 | TAUS_MASK; +static void iic_mcu_send_sp( ) +{ + ST0 = 0x0004; + SOE0 = 0; // 受信の時はもっと前に「も」設定してる。(NACK出力) + SO0 = 0x0000 | TAUS_MASK; // SCL + NOP( ); + NOP( ); + NOP( ); + NOP( ); + SO0 = 0x0400 | TAUS_MASK; // SCL + NOP( ); + NOP( ); + NOP( ); + NOP( ); + SO0 = 0x0404 | TAUS_MASK; } @@ -501,7 +549,8 @@ static void iic_mcu_send_sp(){ バスのリセット (ストップコンディションが出せそうだったらすかさず出す。 ======================================================== */ -void iic2m_bus_reset(){ +void iic2m_bus_reset( ) +{ /* u8 count; for( count = 19; count != 0; count-- ){ @@ -525,23 +574,24 @@ void iic2m_bus_reset(){ /* ======================================================== ペリフェラルモジュールの初期化 ======================================================== */ -void iic_mcu_start(){ - DST1 = 0; - DEN1 = 0; - I2C_PU = 1; - SAU0EN = 1; - NOP(); // 4clkあける - NOP(); - NOP(); - NOP(); - SPS0 = 0x0000; // シリアルユニットのクロック０。(8M/2)/1 - SMR02 = 0 << 15 | 0 << 14 | 0 << 7 | 0 << 5 | 1 << 4 | 1 << 2; // I2Cとそのクロックなど設定 - SDR02 = 5 << 9; // ボーレート設定 (8M/2)/1/(x+1)/2 +void iic_mcu_start( ) +{ + DST1 = 0; + DEN1 = 0; + I2C_PU = 1; + SAU0EN = 1; + NOP( ); // 4clkあける + NOP( ); + NOP( ); + NOP( ); + SPS0 = 0x0000; // シリアルユニットのクロック０。(8M/2)/1 + SMR02 = 0 << 15 | 0 << 14 | 0 << 7 | 0 << 5 | 1 << 4 | 1 << 2; // I2Cとそのクロックなど設定 + SDR02 = 5 << 9; // ボーレート設定 (8M/2)/1/(x+1)/2 - SO0 = 0x0404 | TAUS_MASK; // 最初はHH - iic_mcu_busy = 0; - iic_mcu_wo_dma = 0; - iic_mcu_initialized = 1; + SO0 = 0x0404 | TAUS_MASK; // 最初はHH + iic_mcu_busy = 0; + iic_mcu_wo_dma = 0; + iic_mcu_initialized = 1; } @@ -551,10 +601,13 @@ void iic_mcu_start(){ モジュールの停止 再度使うときは初期化が必要 ======================================================== */ -void iic_mcu_stop(){ - while( iic_mcu_busy ){;} // DMA動作中はもう少し待つ - iic_mcu_send_re_st(); // SCL,SDAをLLにする - I2C_PU = 0; - SAU0EN = 0; - iic_mcu_initialized = 0; +void iic_mcu_stop( ) +{ + while( iic_mcu_busy ) + {; + } // DMA動作中はもう少し待つ + iic_mcu_send_re_st( ); // SCL,SDAをLLにする + I2C_PU = 0; + SAU0EN = 0; + iic_mcu_initialized = 0; } diff --git a/trunk/i2c_mcu.h b/trunk/i2c_mcu.h index 7a728af..f0292ed 100644 --- a/trunk/i2c_mcu.h +++ b/trunk/i2c_mcu.h @@ -18,18 +18,18 @@ extern u8 iic_mcu_bus_status; // ======================================================== -err iic_mcu_read( u8 SLA, u8 adrs, u8 len, u8* dest ); -u8 iic_mcu_read_a_byte( u8 SLA, u8 adrs ); +err iic_mcu_read( u8 SLA, u8 adrs, u8 len, u8 * dest ); +u8 iic_mcu_read_a_byte( u8 SLA, u8 adrs ); -err iic_mcu_write( u8 SLA, u8 adrs, u8 len, u8* src ); +err iic_mcu_write( u8 SLA, u8 adrs, u8 len, u8 * src ); err iic_mcu_write_a_byte( u8 SLA, u8 adrs, u8 dat ); // ↓その通信が完了したら解除されます。 #define iic_mcu_set_wo_dma() { while( iic_mcu_busy ){;} iic_mcu_wo_dma = 1; } -void iic2m_bus_reset(); +void iic2m_bus_reset( ); -void iic_mcu_start(); -void iic_mcu_stop(); +void iic_mcu_start( ); +void iic_mcu_stop( ); #endif diff --git a/trunk/i2c_twl.c b/trunk/i2c_twl.c index 7bcff1a..a427c0a 100644 --- a/trunk/i2c_twl.c +++ b/trunk/i2c_twl.c @@ -1,4 +1,4 @@ -#pragma sfr /* 特殊機能レジスタ使用 */ +#pragma sfr /* 特殊機能レジスタ使用 */ @@ -44,18 +44,22 @@ extern u8 vreg_twl[]; #ifndef _MCU_BSR_ // ke3の時はダミー関数 -void IIC_twl_Stop( void ){} -void IIC_twl_Init( void ){} +void IIC_twl_Stop( void ) +{ +} +void IIC_twl_Init( void ) +{ +} #else /*============================================================================*/ -u8 vreg_adrs; -u8 pre_dat; +u8 vreg_adrs; +u8 pre_dat; -u16 tot; +u16 tot; // 注！　↓はマクロなので、returnはメインループに戻ります。 @@ -75,12 +79,13 @@ u16 tot; } -__interrupt void int_iic_twl(){ - u8 temp; - u16 tot = 0; +__interrupt void int_iic_twl( ) +{ + u8 temp; + u16 tot = 0; // WDT_Restart(); - // フラグ１回目 スレーブアドレス,R/W + // フラグ１回目 スレーブアドレス,R/W /* COI != 1 なら、割り込みはいらない if( COI != 1 ){ // 被呼び出し？ LREL = 1; // 呼ばれたのは他のID @@ -90,110 +95,119 @@ __interrupt void int_iic_twl(){ WREL = 1; // ウェイト解除して次のバイトを待つ } */ - WREL = 1; // ウェイト解除して次のバイトを待つ + WREL = 1; // ウェイト解除して次のバイトを待つ - wait_next; // １バイト受信完了を待つ + wait_next; // １バイト受信完了を待つ - // ２回目 R/W レジスタアドレス - temp = IICA; - WREL = 1; - IICAIF = 0; - vreg_adrs = adrs_table_twl_ext2int( temp ); + // ２回目 R/W レジスタアドレス + temp = IICA; + WREL = 1; + IICAIF = 0; + vreg_adrs = adrs_table_twl_ext2int( temp ); - // ３回目 - // スタートコンディションか、データ受信完了フラグ待ち + // ３回目 + // スタートコンディションか、データ受信完了フラグ待ち - while( 1 ){ - if( IICAIF == 1 ){ - // 受信 // - IICAIF = 0; - temp = IICA; - IICA = 0xFF; + while( 1 ) + { + if( IICAIF == 1 ) + { + // 受信 // + IICAIF = 0; + temp = IICA; + IICA = 0xFF; // WREL = 1; - // 通常アクセス(ライト) // - LREL = 1; // スタートコンディション待ちへ(連続書き込み未対応のため) - vreg_twl_write( vreg_adrs, temp ); - return; // 受信おしまい // + // 通常アクセス(ライト) // + LREL = 1; // スタートコンディション待ちへ(連続書き込み未対応のため) + vreg_twl_write( vreg_adrs, temp ); + return; // 受信おしまい // - }else if( STD ){ - // 送信 // (スタートコンディション検出) - pre_dat = vreg_twl_read( vreg_adrs ); // mcu内部アドレスを渡す。一バイト目の準備 IICBに書き込むとウェイト解除 + } + else if( STD ) + { + // 送信 // (スタートコンディション検出) + pre_dat = vreg_twl_read( vreg_adrs ); // mcu内部アドレスを渡す。一バイト目の準備 IICBに書き込むとウェイト解除 - // 自局をRで呼ばれるのを待つ - wait_next; - IICAIF = 0; - if( COI != 1 ){ // 被呼び出し？ - LREL = 1; // 呼ばれたのは他のID（あれ？） - return; - } - IICA = pre_dat; // データを送る。ウェイトも解除される。 + // 自局をRで呼ばれるのを待つ + wait_next; + IICAIF = 0; + if( COI != 1 ) + { // 被呼び出し？ + LREL = 1; // 呼ばれたのは他のID（あれ？） + return; + } + IICA = pre_dat; // データを送る。ウェイトも解除される。 - wait_next; - // ４回目。(送信データ後の、ACK/NACK後)　どうしても発生してしまう。 - IICAIF = 0; // おしまい - LREL = 1; - return; - }else if( SPD ){ // 強制終了 - LREL = 1; - return; + wait_next; + // ４回目。(送信データ後の、ACK/NACK後)　どうしても発生してしまう。 + IICAIF = 0; // おしまい + LREL = 1; + return; + } + else if( SPD ) + { // 強制終了 + LREL = 1; + return; + } } - } } /*****************************************************/ -void IIC_twl_Init( void ){ +void IIC_twl_Init( void ) +{ - IICAEN = 1; + IICAEN = 1; - IICE = 0; /* IICA disable */ + IICE = 0; /* IICA disable */ - IICAMK = 1; /* INTIICA disable */ - IICAIF = 0; /* clear INTIICA interrupt flag */ + IICAMK = 1; /* INTIICA disable */ + IICAIF = 0; /* clear INTIICA interrupt flag */ - IICAPR0 = 0; /* set INTIICA high priority */ - IICAPR1 = 0; /* set INTIICA high priority */ + IICAPR0 = 0; /* set INTIICA high priority */ + IICAPR1 = 0; /* set INTIICA high priority */ #ifdef _MODEL_WM0_ - P6 &= ~0x3; + P6 &= ~0x3; #else - P20 &= ~0x3; + P20 &= ~0x3; #endif - SVA = IIC_T_SLAVEADDRESS; - IICF = 0x01; + SVA = IIC_T_SLAVEADDRESS; + IICF = 0x01; - STCEN = 1; // リスタートの許可 - IICRSV = 1; // 通信予約をさせない:スレーブに徹する + STCEN = 1; // リスタートの許可 + IICRSV = 1; // 通信予約をさせない:スレーブに徹する - SPIE = 0; // ストップコンディションでの割り込みを禁止 - WTIM = 1; // 自動でACKを返した後clkをLに固定する - ACKE = 1; // ダメCPUは無視して次の通信をはじめるかもしれないんで早くclkを開放しないといけない + SPIE = 0; // ストップコンディションでの割り込みを禁止 + WTIM = 1; // 自動でACKを返した後clkをLに固定する + ACKE = 1; // ダメCPUは無視して次の通信をはじめるかもしれないんで早くclkを開放しないといけない - IICWH = 8; - IICWL = 10; // L期間の長さ（？） + IICWH = 8; + IICWL = 10; // L期間の長さ（？） - SMC = 1; + SMC = 1; - IICAMK = 0; // 割り込みを許可 + IICAMK = 0; // 割り込みを許可 - IICE = 1; + IICE = 1; #ifdef _MODEL_WM0_ - PM6 &= ~0x3; /* set clock pin for IICA */ + PM6 &= ~0x3; /* set clock pin for IICA */ #else - PM20 &= ~0x3; /* set clock pin for IICA */ + PM20 &= ~0x3; /* set clock pin for IICA */ #endif - LREL = 1; + LREL = 1; } //**************************************************************************** -void IIC_twl_Stop( void ){ - IICE = 0; /* IICA disable */ - IICAEN = 0; +void IIC_twl_Stop( void ) +{ + IICE = 0; /* IICA disable */ + IICAEN = 0; } diff --git a/trunk/i2c_twl_defs.h b/trunk/i2c_twl_defs.h index f17616e..be5d566 100644 --- a/trunk/i2c_twl_defs.h +++ b/trunk/i2c_twl_defs.h @@ -4,109 +4,109 @@ /* IIC operation enable (IICE0) */ #define IIC0_OPERATION 0x80 -#define IIC0_OPERATION_DISABLE 0x00 /* stop operation */ -#define IIC0_OPERATION_ENABLE 0x80 /* enable operation */ +#define IIC0_OPERATION_DISABLE 0x00 /* stop operation */ +#define IIC0_OPERATION_ENABLE 0x80 /* enable operation */ /* Exit from communications (LREL0) */ #define IIC0_COMMUNICATION 0x40 -#define IIC0_COMMUNICATION_NORMAL 0x00 /* normal operation */ -#define IIC0_COMMUNICATION_EXIT 0x40 /* exit from current communication */ +#define IIC0_COMMUNICATION_NORMAL 0x00 /* normal operation */ +#define IIC0_COMMUNICATION_EXIT 0x40 /* exit from current communication */ /* Wait cancellation (WREL0) */ #define IIC0_WAITCANCEL 0x20 -#define IIC0_WAIT_NOTCANCEL 0x00 /* do not cancel wait */ -#define IIC0_WAIT_CANCEL 0x20 /* cancel wait */ +#define IIC0_WAIT_NOTCANCEL 0x00 /* do not cancel wait */ +#define IIC0_WAIT_CANCEL 0x20 /* cancel wait */ /* Generation of interrupt when stop condition (SPIE0) */ #define IIC0_STOPINT 0x10 -#define IIC0_STOPINT_DISABLE 0x00 /* disable */ -#define IIC0_STOPINT_ENABLE 0x10 /* enable */ +#define IIC0_STOPINT_DISABLE 0x00 /* disable */ +#define IIC0_STOPINT_ENABLE 0x10 /* enable */ /* Wait and interrupt generation (WTIM0) */ #define IIC0_WAITINT 0x08 -#define IIC0_WAITINT_CLK8FALLING 0x00 /* generate at the eighth clocks falling edge */ -#define IIC0_WAITINT_CLK9FALLING 0x08 /* generated at the ninth clocks falling edge */ +#define IIC0_WAITINT_CLK8FALLING 0x00 /* generate at the eighth clocks falling edge */ +#define IIC0_WAITINT_CLK9FALLING 0x08 /* generated at the ninth clocks falling edge */ /* Acknowledgement control (ACKE0) */ #define IIC0_ACK 0x04 -#define IIC0_ACK_DISABLE 0x00 /* enable acknowledgement */ -#define IIC0_ACK_ENABLE 0x04 /* disable acknowledgement */ +#define IIC0_ACK_DISABLE 0x00 /* enable acknowledgement */ +#define IIC0_ACK_ENABLE 0x04 /* disable acknowledgement */ /* Start condition trigger (STT0) */ #define IIC0_STARTCONDITION 0x02 -#define IIC0_START_NOTGENERATE 0x00 /* do not generate start condition */ -#define IIC0_START_GENERATE 0x02 /* generate start condition */ +#define IIC0_START_NOTGENERATE 0x00 /* do not generate start condition */ +#define IIC0_START_GENERATE 0x02 /* generate start condition */ /* Stop condition trigger (SPT0) */ #define IIC0_STOPCONDITION 0x01 -#define IIC0_STOP_NOTGENERATE 0x00 /* do not generate stop condition */ -#define IIC0_STOP_GENERATE 0x01 /* generate stop condition */ +#define IIC0_STOP_NOTGENERATE 0x00 /* do not generate stop condition */ +#define IIC0_STOP_GENERATE 0x01 /* generate stop condition */ /* IIC Status Register 0 (IICS0) */ /* Master device status (MSTS0) */ #define IIC0_MASTERSTATUS 0x80 -#define IIC0_STATUS_NOTMASTER 0x00 /* slave device status or communication standby status */ -#define IIC0_STATUS_MASTER 0x80 /* master device communication status */ +#define IIC0_STATUS_NOTMASTER 0x00 /* slave device status or communication standby status */ +#define IIC0_STATUS_MASTER 0x80 /* master device communication status */ /* Detection of arbitration loss (ALD0) */ #define IIC0_ARBITRATION 0x40 -#define IIC0_ARBITRATION_NO 0x00 /* arbitration win or no arbitration */ -#define IIC0_ARBITRATION_LOSS 0x40 /* arbitration loss */ +#define IIC0_ARBITRATION_NO 0x00 /* arbitration win or no arbitration */ +#define IIC0_ARBITRATION_LOSS 0x40 /* arbitration loss */ /* Detection of extension code reception (EXC0) */ #define IIC0_EXTENSIONCODE 0x20 -#define IIC0_EXTCODE_NOT 0x00 /* extension code not received */ -#define IIC0_EXTCODE_RECEIVED 0x20 /* extension code received */ +#define IIC0_EXTCODE_NOT 0x00 /* extension code not received */ +#define IIC0_EXTCODE_RECEIVED 0x20 /* extension code received */ /* Detection of matching addresses (COI0) */ #define IIC0_ADDRESSMATCH 0x10 -#define IIC0_ADDRESS_NOTMATCH 0x00 /* addresses do not match */ -#define IIC0_ADDRESS_MATCH 0x10 /* addresses match */ +#define IIC0_ADDRESS_NOTMATCH 0x00 /* addresses do not match */ +#define IIC0_ADDRESS_MATCH 0x10 /* addresses match */ /* Detection of transmit/receive status (TRC0) */ #define IIC0_STATUS 0x08 -#define IIC0_STATUS_RECEIVE 0x00 /* receive status */ -#define IIC0_STATUS_TRANSMIT 0x08 /* transmit status */ +#define IIC0_STATUS_RECEIVE 0x00 /* receive status */ +#define IIC0_STATUS_TRANSMIT 0x08 /* transmit status */ /* Detection of acknowledge signal (ACKD0) */ #define IIC0_ACKDETECTION 0x04 -#define IIC0_ACK_NOTDETECTED 0x00 /* ACK signal was not detected */ -#define IIC0_ACK_DETECTED 0x04 /* ACK signal was detected */ +#define IIC0_ACK_NOTDETECTED 0x00 /* ACK signal was not detected */ +#define IIC0_ACK_DETECTED 0x04 /* ACK signal was detected */ /* Detection of start condition (STD0) */ #define IIC0_STARTDETECTION 0x02 -#define IIC0_START_NOTDETECTED 0x00 /* start condition not detected */ -#define IIC0_START_DETECTED 0x02 /* start condition detected */ +#define IIC0_START_NOTDETECTED 0x00 /* start condition not detected */ +#define IIC0_START_DETECTED 0x02 /* start condition detected */ /* Detection of stop condition (SPD0) */ #define IIC0_STOPDETECTION 0x01 -#define IIC0_STOP_NOTDETECTED 0x00 /* stop condition not detected */ -#define IIC0_STOP_DETECTED 0x01 /* stop condition detected */ +#define IIC0_STOP_NOTDETECTED 0x00 /* stop condition not detected */ +#define IIC0_STOP_DETECTED 0x01 /* stop condition detected */ /* IIC Flag Register 0 (IICF0) */ /* STT0 clear flag (STCF) */ #define IIC0_STARTFLAG 0x80 -#define IIC0_STARTFLAG_GENERATE 0x00 /* generate start condition */ -#define IIC0_STARTFLAG_UNSUCCESSFUL 0x80 /* start condition generation unsuccessful */ +#define IIC0_STARTFLAG_GENERATE 0x00 /* generate start condition */ +#define IIC0_STARTFLAG_UNSUCCESSFUL 0x80 /* start condition generation unsuccessful */ /* IIC bus status flag (IICBSY) */ #define IIC0_BUSSTATUS 0x40 -#define IIC0_BUS_RELEASE 0x00 /* bus release status */ -#define IIC0_BUS_COMMUNICATION 0x40 /* bus communication status */ +#define IIC0_BUS_RELEASE 0x00 /* bus release status */ +#define IIC0_BUS_COMMUNICATION 0x40 /* bus communication status */ /* Initial start enable trigger (STCEN) */ #define IIC0_STARTWITHSTOP 0x02 -#define IIC0_START_WITHSTOP 0x00 /* generation of a start condition without detecting a stop condition */ -#define IIC0_START_WITHOUTSTOP 0x02 /* generation of a start condition upon detection of a stop condition */ +#define IIC0_START_WITHSTOP 0x00 /* generation of a start condition without detecting a stop condition */ +#define IIC0_START_WITHOUTSTOP 0x02 /* generation of a start condition upon detection of a stop condition */ /* Communication reservation function disable bit (IICRSV) */ #define IIC0_RESERVATION 0x01 -#define IIC0_RESERVATION_ENABLE 0x00 /* enable communication reservation */ -#define IIC0_RESERVATION_DISABLE 0x01 /* disable communication reservation */ +#define IIC0_RESERVATION_ENABLE 0x00 /* enable communication reservation */ +#define IIC0_RESERVATION_DISABLE 0x01 /* disable communication reservation */ /* IIC clock selection register 0 (IICCL0) @@ -114,23 +114,23 @@ #define IICCL0_INITIALVALUE 0x00 /* Detection of SCL0 pin level (CLD0) */ #define IIC0_SCLLEVEL 0x20 -#define IIC0_SCL_LOW 0x00 /* clock line at low level */ -#define IIC0_SCL_HIGH 0x20 /* clock line at high level */ +#define IIC0_SCL_LOW 0x00 /* clock line at low level */ +#define IIC0_SCL_HIGH 0x20 /* clock line at high level */ /* Detection of SDA0 pin level (DAD0) */ #define IIC0_SDALEVEL 0x10 -#define IIC0_SDA_LOW 0x00 /* data line at low level */ -#define IIC0_SDA_HIGH 0x10 /* data line at high level */ +#define IIC0_SDA_LOW 0x00 /* data line at low level */ +#define IIC0_SDA_HIGH 0x10 /* data line at high level */ /* Operation mode switching (SMC0) */ #define IIC0_OPERATIONMODE 0x08 -#define IIC0_MODE_STANDARD 0x00 /* operates in standard mode */ -#define IIC0_MODE_HIGHSPEED 0x08 /* operates in high-speed mode */ +#define IIC0_MODE_STANDARD 0x00 /* operates in standard mode */ +#define IIC0_MODE_HIGHSPEED 0x08 /* operates in high-speed mode */ /* Digital filter operation control (DFC0) */ #define IIC0_DIGITALFILTER 0x04 -#define IIC0_FILTER_OFF 0x00 /* digital filter off */ -#define IIC0_FILTER_ON 0x04 /* digital filter on */ +#define IIC0_FILTER_OFF 0x00 /* digital filter off */ +#define IIC0_FILTER_ON 0x04 /* digital filter on */ /* Operation mode switching (CL01, CL00) */ #define IIC0_CLOCKSELECTION 0x03 diff --git a/trunk/incs.h b/trunk/incs.h index 3d6171e..9218681 100644 --- a/trunk/incs.h +++ b/trunk/incs.h @@ -28,6 +28,6 @@ //========================================================= -err firm_update(); +err firm_update( ); #endif diff --git a/trunk/incs_loader.h b/trunk/incs_loader.h index 163c1fd..0f264d2 100644 --- a/trunk/incs_loader.h +++ b/trunk/incs_loader.h @@ -32,6 +32,5 @@ //========================================================= -err firm_update(); -err firm_restore(); - +err firm_update( ); +err firm_restore( ); diff --git a/trunk/ini_VECT.c b/trunk/ini_VECT.c index 7b4139c..914cb3f 100644 --- a/trunk/ini_VECT.c +++ b/trunk/ini_VECT.c @@ -1,50 +1,50 @@ #include "config.h" -//#pragma interrupt INTWDTI fn_intwdti // 未使用 -//#pragma interrupt INTLVI fn_intlvi // 未使用 +//#pragma interrupt INTWDTI fn_intwdti // 未使用 +//#pragma interrupt INTLVI fn_intlvi // 未使用 -#pragma interrupt INTP0 intp0_slp // SLP (CPUより、要求） -//#pragma interrupt INTP1 fn_intp1 // (I2C) -//#pragma interrupt INTP2 fn_intp2 // (I2C) -//#pragma interrupt INTP3 fn_intp3 // 未搭載 -#pragma interrupt INTP4 intp4_extdc // EXTDC, ただし電源offから起こすのみ。通常はポーリング -#pragma interrupt INTP5 intp5_shell // SHELL_CLOSE, ただし電源offから起こすのみ。通常はポーリング -#pragma interrupt INTP6 intp6_PM_irq // CODEC経由で旧PMICへのコマンド書き込み +#pragma interrupt INTP0 intp0_slp // SLP (CPUより、要求） +//#pragma interrupt INTP1 fn_intp1 // (I2C) +//#pragma interrupt INTP2 fn_intp2 // (I2C) +//#pragma interrupt INTP3 fn_intp3 // 未搭載 +#pragma interrupt INTP4 intp4_extdc // EXTDC, ただし電源offから起こすのみ。通常はポーリング +#pragma interrupt INTP5 intp5_shell // SHELL_CLOSE, ただし電源offから起こすのみ。通常はポーリング +#pragma interrupt INTP6 intp6_PM_irq // CODEC経由で旧PMICへのコマンド書き込み #ifdef _MCU_BSR_ -#pragma interrupt INTP21 intp21_RFTx // 電波送信パルス +#pragma interrupt INTP21 intp21_RFTx // 電波送信パルス #else #pragma interrupt INTP7 intp21_RFTx #endif #ifdef _MCU_BSR_ -#pragma interrupt INTP23 intp23_ACC_ready // 加速度センサ、データ準備完了 +#pragma interrupt INTP23 intp23_ACC_ready // 加速度センサ、データ準備完了 #endif -//#pragma interrupt INTCMP0 fn_intcmp0 -//#pragma interrupt INTCMP1 fn_intcmp1 -//#pragma interrupt INTDMA0 fn_intdma0 +//#pragma interrupt INTCMP0 fn_intcmp0 +//#pragma interrupt INTCMP1 fn_intcmp1 +//#pragma interrupt INTDMA0 fn_intdma0 #pragma interrupt INTDMA1 int_dma1 -//#pragma interrupt INTST0 fn_intst0 +//#pragma interrupt INTST0 fn_intst0 /* #pragma interrupt INTCSI00 fn_intcsi00 */ -//#pragma interrupt INTSR0 fn_intsr0 +//#pragma interrupt INTSR0 fn_intsr0 /* #pragma interrupt INTCSI01 fn_intcsi01 */ -//#pragma interrupt INTSRE0 fn_intsre0 +//#pragma interrupt INTSRE0 fn_intsre0 -//#pragma interrupt INTST1 fn_intst1 +//#pragma interrupt INTST1 fn_intst1 /* #pragma interrupt INTCSI10 fn_intcsi10 */ #pragma interrupt INTIIC10 int_iic10 -//#pragma interrupt INTSR1 fn_intsr1 -//#pragma interrupt INTSRE1 fn_intsre1 +//#pragma interrupt INTSR1 fn_intsr1 +//#pragma interrupt INTSRE1 fn_intsre1 #ifdef _MCU_KE3_ -#pragma interrupt INTIICA int_iic_ctr // CTR側 +#pragma interrupt INTIICA int_iic_ctr // CTR側 #else //#ifdef _MODEL_WM0_ -#pragma interrupt INTIICA0 int_iic_twl // テレコのWM0仕様 +#pragma interrupt INTIICA0 int_iic_twl // テレコのWM0仕様 #pragma interrupt INTIICA1 int_iic_ctr /* #else @@ -55,68 +55,190 @@ #endif -//#pragma interrupt INTTM00 fn_inttm00 -//#pragma interrupt INTTM01 fn_inttm01 -//#pragma interrupt INTTM02 fn_inttm02 -//#pragma interrupt INTTM03 fn_inttm03 +//#pragma interrupt INTTM00 fn_inttm00 +//#pragma interrupt INTTM01 fn_inttm01 +//#pragma interrupt INTTM02 fn_inttm02 +//#pragma interrupt INTTM03 fn_inttm03 #pragma interrupt INTAD int_adc #pragma interrupt INTRTC int_rtc #pragma interrupt INTRTCI int_rtc_int #pragma interrupt INTKR int_kr -//#pragma interrupt INTMD fn_intmd +//#pragma interrupt INTMD fn_intmd -//#pragma interrupt INTTM04 fn_inttm04 -//#pragma interrupt INTTM05 fn_inttm05 -//#pragma interrupt INTTM06 fn_inttm06 -//#pragma interrupt INTTM07 fn_inttm07 +//#pragma interrupt INTTM04 fn_inttm04 +//#pragma interrupt INTTM05 fn_inttm05 +//#pragma interrupt INTTM06 fn_inttm06 +//#pragma interrupt INTTM07 fn_inttm07 /****************************************************/ /* 未使用時のダミー関数定義 */ /****************************************************/ -__interrupt void fn_intwdti(){ while(1){}; } -__interrupt void fn_intlvi(){ while(1){}; } -//__interrupt void fn_intp0(){} // tasks.c -__interrupt void fn_intp1(){ while(1){}; } // -__interrupt void fn_intp2(){ while(1){}; } -__interrupt void fn_intp3(){ while(1){}; } -//__interrupt void fn_intp4(){ while(1){}; } // pm.c -//__interrupt void fn_intp5(){ while(1){}; } // pm.c -//__interrupt void fn_intp6(){ while(1){}; } // pm.c -//__interrupt void fn_intp7(){ while(1){}; } // led.c -//__interrupt void fn_intp21(){ while(1){}; } // led.c +__interrupt void fn_intwdti( ) +{ + while( 1 ) + { + }; +} +__interrupt void fn_intlvi( ) +{ + while( 1 ) + { + }; +} -__interrupt void fn_intcmp0(){ while(1){}; } -__interrupt void fn_intcmp1(){ while(1){}; } -__interrupt void fn_intdma0(){ while(1){}; } -//__interrupt void fn_intdma1(){} // i2c_mcu.cにある +//__interrupt void fn_intp0(){} // tasks.c +__interrupt void fn_intp1( ) +{ + while( 1 ) + { + }; +} // +__interrupt void fn_intp2( ) +{ + while( 1 ) + { + }; +} +__interrupt void fn_intp3( ) +{ + while( 1 ) + { + }; +} + +//__interrupt void fn_intp4(){ while(1){}; } // pm.c +//__interrupt void fn_intp5(){ while(1){}; } // pm.c +//__interrupt void fn_intp6(){ while(1){}; } // pm.c +//__interrupt void fn_intp7(){ while(1){}; } // led.c +//__interrupt void fn_intp21(){ while(1){}; } // led.c + +__interrupt void fn_intcmp0( ) +{ + while( 1 ) + { + }; +} +__interrupt void fn_intcmp1( ) +{ + while( 1 ) + { + }; +} +__interrupt void fn_intdma0( ) +{ + while( 1 ) + { + }; +} + +//__interrupt void fn_intdma1(){} // i2c_mcu.cにある + +__interrupt void fn_intst0( ) +{ + while( 1 ) + { + }; +} -__interrupt void fn_intst0(){ while(1){}; } /* __interrupt void fn_intcsi00(){} */ -__interrupt void fn_intsr0(){ while(1){}; } +__interrupt void fn_intsr0( ) +{ + while( 1 ) + { + }; +} + /* __interrupt void fn_intcsi01(){} */ -__interrupt void fn_intsre0(){ while(1){}; } +__interrupt void fn_intsre0( ) +{ + while( 1 ) + { + }; +} + +__interrupt void fn_intst1( ) +{ + while( 1 ) + { + }; +} -__interrupt void fn_intst1(){ while(1){}; } /* __interrupt void fn_intcsi10(){} */ -//__interrupt void fn_intiic10(){ while(1){}; } -__interrupt void fn_intsr1(){ while(1){}; } -__interrupt void fn_intsre1(){ while(1){}; } +//__interrupt void fn_intiic10(){ while(1){}; } +__interrupt void fn_intsr1( ) +{ + while( 1 ) + { + }; +} +__interrupt void fn_intsre1( ) +{ + while( 1 ) + { + }; +} -//__interrupt void fn_intiica(){} // i2c.cにある -/* __interrupt void fn_inttm00(){} */ /* sub.cにて定義 */ -__interrupt void fn_inttm01(){ while(1){}; } -__interrupt void fn_inttm02(){ while(1){}; } -__interrupt void fn_inttm03(){ while(1){}; } +//__interrupt void fn_intiica(){} // i2c.cにある +/* __interrupt void fn_inttm00(){} *//* sub.cにて定義 */ +__interrupt void fn_inttm01( ) +{ + while( 1 ) + { + }; +} +__interrupt void fn_inttm02( ) +{ + while( 1 ) + { + }; +} +__interrupt void fn_inttm03( ) +{ + while( 1 ) + { + }; +} -//__interrupt void fn_intad(){ while(1){}; } // adc.c -__interrupt void fn_intrtc(){ while(1){}; } -//__interrupt void int_rtcint(){} // rtc.cにある -//__interrupt void fn_intkr(){} // main.c -__interrupt void fn_intmd(){ while(1){}; } +//__interrupt void fn_intad(){ while(1){}; } // adc.c +__interrupt void fn_intrtc( ) +{ + while( 1 ) + { + }; +} -__interrupt void fn_inttm04(){ while(1){}; } -__interrupt void fn_inttm05(){ while(1){}; } -__interrupt void fn_inttm06(){ while(1){}; } -__interrupt void fn_inttm07(){ while(1){}; } +//__interrupt void int_rtcint(){} // rtc.cにある +//__interrupt void fn_intkr(){} // main.c +__interrupt void fn_intmd( ) +{ + while( 1 ) + { + }; +} + +__interrupt void fn_inttm04( ) +{ + while( 1 ) + { + }; +} +__interrupt void fn_inttm05( ) +{ + while( 1 ) + { + }; +} +__interrupt void fn_inttm06( ) +{ + while( 1 ) + { + }; +} +__interrupt void fn_inttm07( ) +{ + while( 1 ) + { + }; +} diff --git a/trunk/jhl_defs.h b/trunk/jhl_defs.h index 8121092..d8d6d8a 100644 --- a/trunk/jhl_defs.h +++ b/trunk/jhl_defs.h @@ -1,12 +1,12 @@ #ifndef __jhl_defs_h__ #define __jhl_defs_h__ -typedef unsigned char u8; -typedef char s8; -typedef unsigned short u16; -typedef short s16; +typedef unsigned char u8; +typedef char s8; +typedef unsigned short u16; +typedef short s16; -typedef unsigned char err; +typedef unsigned char err; #define set_bit( cond, reg, pos ) \ diff --git a/trunk/led.c b/trunk/led.c index cf02278..15f4134 100644 --- a/trunk/led.c +++ b/trunk/led.c @@ -2,9 +2,6 @@ LED.c ======================================================== */ - - - #pragma sfr @@ -12,6 +9,7 @@ #include "led.h" + // ======================================================== // TPS0 #define BIT_PRS01 4 @@ -27,21 +25,22 @@ #define BIT_MD0 0 // ======================================================== -static task_interval led_pow_normal(); -static task_interval led_pow_hotaru(); +static void led_pow_normal( ); +static void led_pow_hotaru( ); // ======================================================== -u8 wifi_TX; +u8 wifi_TX; // ======================================================== static const char MSG_MAIL[] = { 0b11110110, 0b11011010, 0b01101110, 0b10010100 }; -#define MSG_SPD 70 +#define MSG_SPD 60 // ======================================================== -void LED_init(){ +void LED_init( ) +{ /** PWMのセット、とりあえず全部消灯 @@ -54,37 +53,33 @@ void LED_init(){ 　　　　　　　　６　電源 Ｌ 　　　　　　　　７　電源 Ｈ */ - TAU0EN = 1; - TPS0 = 1 << BIT_PRS01 | 1 << BIT_PRS00; // マスタークロックはCK01,8M/2/2^4 = 250kHz + TAU0EN = 1; + TPS0 = 1 << BIT_PRS01 | 1 << BIT_PRS00; // マスタークロックはCK01,8M/2/2^4 = 250kHz - TMR00 = 1 << BIT_CKS0 | 0 << BIT_CCS0 | 1 << BIT_MASTER0 | 0 << BIT_STS0 | 0 << BIT_CIS0 | 0 << BIT_MD123 | 1 << BIT_MD0; - TMR01 = TMR02 = TMR03 = TMR04 = TMR05 = TMR06 = TMR07 \ - = 1 << BIT_CKS0 | 0 << BIT_CCS0 | 0 << BIT_MASTER0 | 4 << BIT_STS0 | 0 << BIT_CIS0 | 4 << BIT_MD123 | 1 << BIT_MD0; - ISC = 0; - TOM0 = 0b0000000011111110; // 出力モード。4はPWM出力しないが1にしないとTO5以降にクロックが届かない -#if 0 -#ifdef _MODEL_WM0_ - TOL0 = 0b0000000000000010; // 出力を反転させるかフラグ -#else -#ifdef _MODEL_TS0_ - TOL0 = 0b0000000000000110; - #endif - TOL0 = 0b0000000000000110; -#endif -#endif - TO0 = 0; // タイマー動作中で、タイマー出力にしてないときのピンのラッチ。タイマー出力を使わないなら０ - TOE0 = 0b0000000011101110; // TOxをタイマーモジュールが制御？ - TS0 = 0b0000000011101111; // 動作開始 + TMR00 = + 1 << BIT_CKS0 | 0 << BIT_CCS0 | 1 << BIT_MASTER0 | 0 << BIT_STS0 | 0 + << BIT_CIS0 | 0 << BIT_MD123 | 1 << BIT_MD0; + TMR01 = TMR02 = TMR03 = TMR04 = TMR05 = TMR06 = TMR07 = + 1 << BIT_CKS0 | 0 << BIT_CCS0 | 0 << BIT_MASTER0 | 4 << BIT_STS0 | 0 + << BIT_CIS0 | 4 << BIT_MD123 | 1 << BIT_MD0; + ISC = 0; + TOM0 = 0b0000000011111110; // 出力モード。4はPWM出力しないが1にしないとTO5以降にクロックが届かない + TOL0 = 0b0000000000000100; // 出力を反転させるかフラグ - TDR00 = LED_BRIGHT_MAX - 1; // 10bit, 周期 + TO0 = 0; // タイマー動作中で、タイマー出力にしてないときのピンのラッチ。タイマー出力を使わないなら０ + TOE0 = 0b0000000011101110; // TOxをタイマーモジュールが制御？ + TS0 = 0b0000000011101111; // 動作開始 + + TDR00 = LED_BRIGHT_MAX - 1; // 10bit, 周期 } -void LED_stop(){ - TT0 = 0b0000000011101111; // 一斉停止（しないとだめ） - TOE0 = 0b0000000000000000; // TOxをタイマーモジュールが制御？(GPIOになる) - TAU0EN = 0; +void LED_stop( ) +{ + TT0 = 0b0000000011101111; // 一斉停止（しないとだめ） + TOE0 = 0b0000000000000000; // TOxをタイマーモジュールが制御？(GPIOになる) + TAU0EN = 0; } @@ -113,60 +108,56 @@ enum LED_ILUM_MODE{ LED_POW_ILM_CEOFF }; ======================================================== */ -task_interval tsk_led_pow(){ +void tsk_led_pow( ) +{ + switch ( vreg_ctr[VREG_C_LED_POW] ) + { + // 自動切り替え + case ( LED_POW_ILM_AUTO ): + switch ( system_status.pwr_state ) + { + case ( SLEEP ): + led_pow_hotaru( ); + break; - switch( vreg_ctr[ VREG_C_LED_POW ] ){ - case( LED_POW_ILM_AUTO ): - switch( system_status.pwr_state ){ - case( SLEEP ): - return( led_pow_hotaru() ); - break; + case ( ON ): + default: + led_pow_normal( ); + break; - case( ON ): + case ( ON_TRIG ): + case ( SLEEP_TRIG ): + case ( OFF_TRIG ): + case ( OFF ): + break; + } + break; + + // 強制 + case ( LED_POW_ILM_OFF ): + LED_duty_pow_H -= ( LED_duty_pow_H == 0x0000 ) ? 0 : 1; + LED_duty_pow_L -= ( LED_duty_pow_L == 0x0000 ) ? 0 : 1; + break; + + case ( LED_POW_ILM_HOTARU ): + led_pow_hotaru( ); + break; + + case ( LED_POW_ILM_ON ): default: - return( led_pow_normal() ); - break; + led_pow_normal( ); + break; - case( ON_TRIG ): - case( SLEEP_TRIG ): - case( OFF_TRIG ): - case( OFF ): - return( 250 ); - break; + case ( LED_POW_ILM_ONLY_RED ): + LED_duty_pow_H = 0x0000; + LED_duty_pow_L = LED_BRIGHT_MAX; + break; + + case ( LED_POW_ILM_ONLY_BLUE ): + LED_duty_pow_H = LED_BRIGHT_MAX; + LED_duty_pow_L = 0x0000; + break; } - break; - - case( LED_POW_ILM_OFF ): - LED_duty_pow_H -= ( LED_duty_pow_H == 0x0000 )? 0: 1; - LED_duty_pow_L -= ( LED_duty_pow_L == 0x0000 )? 0: 1; - if(( LED_duty_pow_H == 0 ) && ( LED_duty_pow_L == 0 )){ - return( 250 ); - }else{ - return( 0 ); - } - break; - - case( LED_POW_ILM_HOTARU ): - return( led_pow_hotaru() ); - break; - - case( LED_POW_ILM_ON ): - default: - return( led_pow_normal() ); - break; - - case( LED_POW_ILM_ONLY_RED ): - LED_duty_pow_H = 0x0000; - LED_duty_pow_L = LED_BRIGHT_MAX; - return( 250 ); - break; - - case( LED_POW_ILM_ONLY_BLUE ): - LED_duty_pow_H = LED_BRIGHT_MAX; - LED_duty_pow_L = 0x0000; - return( 250 ); - break; - } } @@ -176,51 +167,54 @@ task_interval tsk_led_pow(){ 電池残量で、　青→赤→赤点滅 ！！ タスクシステムから直接呼ばれるわけではないです！！ ======================================================== */ -static task_interval led_pow_normal(){ - static u8 state; - u8 dirty; +static void led_pow_normal( ) +{ + static u8 state; - dirty = 0; - if( vreg_ctr[ VREG_C_BT_REMAIN ] < ( 255 * 0.05 ) ){ - // 赤点滅 - if( state == 0 ){ - LED_duty_pow_H = 0x0000; - LED_duty_pow_L = 0x0000; - state = 1; - }else{ - LED_duty_pow_L = vreg_ctr[ VREG_C_LED_BRIGHT ]; - state = 0; - } - return( 250 ); + if( vreg_ctr[VREG_C_BT_REMAIN] < ( 255 * 0.05 ) ) + { + // 赤点滅 + state++; + if( state < 127 ) + { + LED_duty_pow_H = 0x0000; + LED_duty_pow_L = 0x0000; + } + else + { + LED_duty_pow_L = vreg_ctr[VREG_C_LED_BRIGHT]; + } + return; - }else if( vreg_ctr[ VREG_C_BT_REMAIN ] < ( 255 * 0.2 ) ){ - // 赤点灯 - if( LED_duty_pow_H != 0x0000 ){ - LED_duty_pow_H -= 1; - dirty = 1; } - if( LED_duty_pow_L != vreg_ctr[ VREG_C_LED_BRIGHT ] ){ - dirty = 1; - LED_duty_pow_L += ( LED_duty_pow_L < vreg_ctr[ VREG_C_LED_BRIGHT ] )? 1 : -1; + else if( vreg_ctr[VREG_C_BT_REMAIN] < ( 255 * 0.2 ) ) + { + // 赤点灯 + if( LED_duty_pow_H != 0x0000 ) + { // 青フェードアウト + LED_duty_pow_H -= 1; + } + if( LED_duty_pow_L != vreg_ctr[VREG_C_LED_BRIGHT] ) + { // 赤フェードイン + LED_duty_pow_L += ( LED_duty_pow_L < vreg_ctr[VREG_C_LED_BRIGHT] ) ? 1 : -1; + } + return; + + } + else + { + // 青点灯 + if( LED_duty_pow_H != vreg_ctr[VREG_C_LED_BRIGHT] ) + { + LED_duty_pow_H += ( LED_duty_pow_H < vreg_ctr[VREG_C_LED_BRIGHT] ) ? 1 : -1; + } + if( LED_duty_pow_L != 0x0000 ) + { + LED_duty_pow_L -= 1; + } } - }else{ - // 青点灯 - if( LED_duty_pow_H != vreg_ctr[ VREG_C_LED_BRIGHT ] ){ - dirty = 1; - LED_duty_pow_H += ( LED_duty_pow_H < vreg_ctr[ VREG_C_LED_BRIGHT ] )? 1 : -1; - } - if( LED_duty_pow_L != 0x0000 ){ - LED_duty_pow_L -= 1; - dirty = 1; - } - } - - if( dirty == 0 ){ - return( 250 ); - }else{ - return( 0 ); - } + return; } @@ -229,60 +223,84 @@ static task_interval led_pow_normal(){ ホタルパターン ！！ タスクシステムから直接呼ばれるわけではないです！！ ======================================================== */ -static task_interval led_pow_hotaru(){ - static u8 state; -// static u8 delay; - static u16 blue_to; - static u16 red_to; - u8 dirty; +static void led_pow_hotaru( ) +{ + static u8 delay; + static u8 state; + static u16 blue_to; + static u16 red_to; - - // LED 調光？ - dirty = 0; - if( LED_duty_pow_H != blue_to ){ - dirty = 1; - if( LED_duty_pow_H > blue_to ){ - LED_duty_pow_H -= 1; - }else{ - LED_duty_pow_H += 2; + if( delay != 0 ) + { + delay -= 1; + return; } - } - - if( LED_duty_pow_L != red_to ){ - dirty = 1; - if( LED_duty_pow_L > red_to ){ - LED_duty_pow_L -= 1; - }else{ - LED_duty_pow_L += 2; + else + { + delay = 3; } - } + if( LED_duty_pow_L != red_to ) + { + if( LED_duty_pow_L > red_to ) + { + LED_duty_pow_L -= 1; + } + else + { + LED_duty_pow_L += 2; + } + } + + if( LED_duty_pow_H != blue_to ) + { + if( LED_duty_pow_H > blue_to ) + { + LED_duty_pow_H -= 1; + } + else + { + LED_duty_pow_H += 2; + } + } + + switch ( state ) + { + // フェードイン + case ( 0 ): + case ( 2 ): + case ( 4 ): + if( vreg_ctr[VREG_C_BT_REMAIN] < ( 255 * 0.2 ) ) + { + // 赤いとき + blue_to = 0; + red_to = vreg_ctr[VREG_C_LED_BRIGHT]; + } + else + { + blue_to = vreg_ctr[VREG_C_LED_BRIGHT]; + red_to = 0; + } + break; - if( dirty == 0 ){ - switch( state ){ - // フェードイン - case( 0 ): - case( 2 ): - case( 4 ): - if( vreg_ctr[ VREG_C_BT_REMAIN ] < ( 255 * 0.2 ) ){ - red_to = vreg_ctr[ VREG_C_LED_BRIGHT ]; - blue_to = 0; - }else{ - red_to = 0; - blue_to = vreg_ctr[ VREG_C_LED_BRIGHT ]; - } - break; default: - // フェードアウト - red_to = 0; - blue_to = 0; - break; + // フェードアウト + if( vreg_ctr[VREG_C_BT_REMAIN] < ( 255 * 0.2 ) ) + { + red_to = 2; + } + else + { + blue_to = 2; + } + break; } - state += 1; - - } - return( 5 ); + if( ( LED_duty_pow_H == blue_to ) && ( LED_duty_pow_L == red_to ) ) + { + state += 1; + } + return; } @@ -292,124 +310,146 @@ static task_interval led_pow_hotaru(){ LED_Wifi 3 2 P24 （未） ======================================================== */ -task_interval tsk_led_wifi(){ - static u8 remain_wifi_tx; - static u8 state_wifi_tx; +void tsk_led_wifi( ) +{ + static u8 task_interval; + static u8 remain_wifi_tx; + static u8 state_wifi_tx; - switch( vreg_ctr[ VREG_C_LED_WIFI ] ){ - case( WIFI_LED_OFF ): - LED_duty_WiFi = 0; - wifi_TX = 0; - state_wifi_tx = 0; - remain_wifi_tx = 0; - LED_WIFI_2 = 0; - return( 250 ); - break; - - case( WIFI_LED_ON ): - default: - LED_duty_WiFi = vreg_ctr[ VREG_C_LED_BRIGHT ]; - wifi_TX = 0; - state_wifi_tx = 0; - remain_wifi_tx = 0; - LED_WIFI_2 = 1; - return( 250 ); - break; - - case( WIFI_LED_TXAUTO ): - // 短いパルスを捕まえるために、割り込みフラグを見る - if( wifi_TX != 0 ){ - wifi_TX = 0; - remain_wifi_tx = 2; + if( task_interval != 0 ) + { + task_interval -= 1; + return; } - // 送信パターン - if( remain_wifi_tx != 0 ){ // TX active - switch( state_wifi_tx ){ - case( 1 ): - case( 3 ): - case( 5 ): + switch ( vreg_ctr[VREG_C_LED_WIFI] ) + { + case ( WIFI_LED_OFF ): LED_duty_WiFi = 0; + wifi_TX = 0; + state_wifi_tx = 0; + remain_wifi_tx = 0; LED_WIFI_2 = 0; break; - default: - LED_duty_WiFi = vreg_ctr[ VREG_C_LED_BRIGHT ]; - LED_WIFI_2 = 1; - } - state_wifi_tx++; - if( state_wifi_tx == 32 ){ - state_wifi_tx = 0; - remain_wifi_tx--; - } - return( 22 ); - }else{ - LED_duty_WiFi = vreg_ctr[ VREG_C_LED_BRIGHT ]; - LED_WIFI_2 = 1; - return( 200 ); - } - break; - case( WIFI_LED_PTN0 ): - LED_WIFI_2 = 1; - switch( state_wifi_tx ){ - case( 1 ): - case( 3 ): - case( 5 ): - LED_duty_WiFi = vreg_ctr[ VREG_C_LED_BRIGHT ]; - break; + case ( WIFI_LED_ON ): default: - LED_duty_WiFi = 0; - } - state_wifi_tx++; - if( state_wifi_tx == 16 ){ - state_wifi_tx = 0; - } - return( 50 ); - break; - - case( WIFI_LED_PTN1 ): - LED_WIFI_2 = 1; - { - u8 dat; - - if( remain_wifi_tx != 0 ){ - LED_duty_WiFi = 0; + LED_duty_WiFi = vreg_ctr[VREG_C_LED_BRIGHT]; + wifi_TX = 0; + state_wifi_tx = 0; remain_wifi_tx = 0; - return( MSG_SPD ); - } - - dat = ( MSG_MAIL[ state_wifi_tx / 4 ] << (( state_wifi_tx % 4 ) *2 ) ) & 0xC0; - state_wifi_tx = ( dat == 0 )? 0: ( state_wifi_tx + 1 ); - - switch( dat ){ - case( 0b00000000 ): - LED_duty_WiFi = 0; - remain_wifi_tx = 0; - return( MSG_SPD * 3 ); + LED_WIFI_2 = 1; break; - case( 0b01000000 ): - default: - LED_duty_WiFi = 0; - remain_wifi_tx = 1; - return( MSG_SPD ); + case ( WIFI_LED_TXAUTO ): + // 短いパルスを捕まえるために、割り込みフラグを見る + if( wifi_TX != 0 ) + { + wifi_TX = 0; + remain_wifi_tx = 2; + } + + // 送信パターン + if( remain_wifi_tx != 0 ) + { // TX active + switch ( state_wifi_tx ) + { + case ( 1 ): + case ( 3 ): + case ( 5 ): + LED_duty_WiFi = 0; + LED_WIFI_2 = 0; + break; + default: + LED_duty_WiFi = vreg_ctr[VREG_C_LED_BRIGHT]; + LED_WIFI_2 = 1; + } + state_wifi_tx++; + if( state_wifi_tx == 32 ) + { + state_wifi_tx = 0; + remain_wifi_tx--; + } + task_interval = 22; + return; + + } + else + { + LED_duty_WiFi = vreg_ctr[VREG_C_LED_BRIGHT]; + LED_WIFI_2 = 1; + task_interval = 200; + return; + } break; - case( 0b10000000 ): - LED_duty_WiFi = vreg_ctr[ VREG_C_LED_BRIGHT ]; - remain_wifi_tx = 1; - return( MSG_SPD ); + case ( WIFI_LED_PTN0 ): + LED_WIFI_2 = 1; + switch ( state_wifi_tx ) + { + case ( 1 ): + case ( 3 ): + case ( 5 ): + LED_duty_WiFi = vreg_ctr[VREG_C_LED_BRIGHT]; + break; + default: + LED_duty_WiFi = 0; + } + state_wifi_tx++; + if( state_wifi_tx == 16 ) + { + state_wifi_tx = 0; + } + task_interval = 50; + return; break; - case( 0b11000000 ): - LED_duty_WiFi = vreg_ctr[ VREG_C_LED_BRIGHT ]; - remain_wifi_tx = 1; - return( MSG_SPD * 3 ); - break; + case ( WIFI_LED_PTN1 ): + LED_WIFI_2 = 1; + { + u8 dat; - } + if( remain_wifi_tx != 0 ) + { + LED_duty_WiFi = 0; + remain_wifi_tx = 0; + task_interval = MSG_SPD; + return; + } + + dat = ( MSG_MAIL[state_wifi_tx / 4] << ( ( state_wifi_tx % 4 ) * 2 ) ) & 0xC0; + state_wifi_tx = ( dat == 0 ) ? 0 : ( state_wifi_tx + 1 ); + + switch ( dat ) + { + case ( 0b00000000 ): + LED_duty_WiFi = 0; + remain_wifi_tx = 0; + task_interval = ( MSG_SPD * 3 ); + break; + + case ( 0b01000000 ): + default: + LED_duty_WiFi = 0; + remain_wifi_tx = 1; + task_interval = ( MSG_SPD ); + break; + + case ( 0b10000000 ): + LED_duty_WiFi = vreg_ctr[VREG_C_LED_BRIGHT]; + remain_wifi_tx = 1; + 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 ); + break; + } + return; + } } - } } @@ -418,8 +458,9 @@ task_interval tsk_led_wifi(){ 　LED点滅のフラグ操作のみ 　実際の点滅などは tsk_led_wifi で行う ======================================================== */ -__interrupt void intp21_RFTx(){ - wifi_TX = 1; +__interrupt void intp21_RFTx( ) +{ + wifi_TX = 1; } @@ -427,59 +468,86 @@ __interrupt void intp21_RFTx(){ /* ======================================================== LED_Cam TO02 ======================================================== */ -task_interval tsk_led_cam(){ - static u8 state_led_cam = 0; +void tsk_led_cam( ) +{ + static u8 state_led_cam = 0; + static u8 task_interval; + static u8 reg_old; - switch( vreg_ctr[ VREG_C_LED_CAM ] ){ - case( CAM_LED_OFF ): - default: - LED_duty_CAM = 0; - state_led_cam = 0; - break; + /* + if( reg_old != vreg_ctr[ VREG_C_LED_CAM ] ){ + reg_old = vreg_ctr[ VREG_C_LED_CAM ]; + task_interval = 1; + } + */ - case( CAM_LED_ON ): - LED_duty_CAM = vreg_ctr[ VREG_C_LED_BRIGHT ]; - state_led_cam = 0; - break; - - case( CAM_LED_BLINK ): - case( CAM_LED_BY_TWL ): - if( state_led_cam == 0 ){ - LED_duty_CAM = vreg_ctr[ VREG_C_LED_BRIGHT ]; - state_led_cam = 1; - }else{ - LED_duty_CAM = 0; - state_led_cam = 0; + if( task_interval != 0 ) + { + task_interval -= 1; + return; } - break; - case( CAM_LED_ON_PLUSE ): - if( state_led_cam == 0 ){ - LED_duty_CAM = vreg_ctr[ VREG_C_LED_BRIGHT ]; - state_led_cam = 1; - }else{ - vreg_ctr[ VREG_C_LED_CAM ] = CAM_LED_OFF; - return( 0 ); + switch ( vreg_ctr[VREG_C_LED_CAM] ) + { + case ( CAM_LED_OFF ): + default: + LED_duty_CAM = 0; + state_led_cam = 0; + break; + + case ( CAM_LED_ON ): + LED_duty_CAM = vreg_ctr[VREG_C_LED_BRIGHT]; + state_led_cam = 0; + break; + + case ( CAM_LED_BLINK ): + case ( CAM_LED_BY_TWL ): + if( state_led_cam == 0 ) + { + LED_duty_CAM = vreg_ctr[VREG_C_LED_BRIGHT]; + state_led_cam = 1; + } + else + { + LED_duty_CAM = 0; + state_led_cam = 0; + } + task_interval = 250; + break; + + case ( CAM_LED_ON_PLUSE ): + if( state_led_cam == 0 ) + { + LED_duty_CAM = vreg_ctr[VREG_C_LED_BRIGHT]; + state_led_cam = 1; + task_interval = 250; + } + else + { + vreg_ctr[VREG_C_LED_CAM] = CAM_LED_OFF; + } + break; + + case ( CAM_LED_OFF_PLUSE ): + if( state_led_cam == 0 ) + { + LED_duty_CAM = 0; + state_led_cam = 1; + task_interval = 250; + } + else + { + vreg_ctr[VREG_C_LED_CAM] = CAM_LED_ON; + } + break; + } - break; - - case( CAM_LED_OFF_PLUSE ): - if( state_led_cam == 0 ){ - LED_duty_CAM = 0; - state_led_cam = 1; - }else{ - vreg_ctr[ VREG_C_LED_CAM ] = CAM_LED_ON; - return( 0 ); - } - break; - - } - return( 250 ); + return; } // 捨て看板 /* ======================================================== - // LED_Charge 5　　　　　→PM - LED_TUNE 4 - ======================================================== */ + // LED_Charge 5　　　　　→PM + LED_TUNE 4 + ======================================================== */ diff --git a/trunk/led.h b/trunk/led.h index 6c47a4b..4b218d8 100644 --- a/trunk/led.h +++ b/trunk/led.h @@ -17,7 +17,8 @@ #define LED_BRIGHT_MAX 0x00FF // ==================================== -enum LED_ILUM_MODE{ +enum LED_ILUM_MODE +{ LED_POW_ILM_AUTO = 0, LED_POW_ILM_ON, LED_POW_ILM_HOTARU, @@ -28,8 +29,8 @@ enum LED_ILUM_MODE{ // ==================================== -void LED_init(); -void LED_stop(); +void LED_init( ); +void LED_stop( ); diff --git a/trunk/loader.c b/trunk/loader.c index 9e96d7a..0708634 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -28,18 +28,18 @@ // ======================================================== #if (FSL_DATA_BUFFER_SIZE>0) - fsl_u08 fsl_data_buffer[FSL_DATA_BUFFER_SIZE]; +fsl_u08 fsl_data_buffer[FSL_DATA_BUFFER_SIZE]; #endif #ifdef FSL_INT_BACKUP - static fsl_u08 fsl_MK0L_bak_u08; /* if (interrupt backup required) */ - static fsl_u08 fsl_MK0H_bak_u08; /* { */ - static fsl_u08 fsl_MK1L_bak_u08; /* reserve space for backup information */ - static fsl_u08 fsl_MK1H_bak_u08; /* of interrupt mask flags */ - static fsl_u08 fsl_MK2L_bak_u08; /* */ - static fsl_u08 fsl_MK2H_bak_u08; /* } */ +static fsl_u08 fsl_MK0L_bak_u08; /* if (interrupt backup required) */ +static fsl_u08 fsl_MK0H_bak_u08; /* { */ +static fsl_u08 fsl_MK1L_bak_u08; /* reserve space for backup information */ +static fsl_u08 fsl_MK1H_bak_u08; /* of interrupt mask flags */ +static fsl_u08 fsl_MK2L_bak_u08; /* */ +static fsl_u08 fsl_MK2H_bak_u08; /* } */ #endif @@ -52,68 +52,80 @@ // ======================================================== -void FSL_Open(void); -void FSL_Close(void); -void hdwinit(void); -void power_save(); -static void hdwinit2(); +void FSL_Open( void ); +void FSL_Close( void ); +void hdwinit( void ); +void power_save( ); +static void hdwinit2( ); -extern void main_loop(); -extern void chk_bootCluster(); +extern void main_loop( ); +extern void chk_bootCluster( ); // ======================================================== -void main(){ - while(1){ +void main( ) +{ + while( 1 ) + { - WDT_Restart(); + WDT_Restart( ); - if( RTCEN ){ - system_status.reboot = 1; - }else{ - u8 pwup_delay0 = 0; - u8 pwup_delay1 = 0; + if( RTCEN ) + { + system_status.reboot = 1; + } + else + { + u8 pwup_delay0 = 0; + u8 pwup_delay1 = 0; - do{ // 電池接続時、16ms待ってみる - pwup_delay0 += 1; - do{ - pwup_delay1 += 1; - }while( pwup_delay1 != 0 ); // コンパイラが不出来のため…。 - }while( pwup_delay0 != 0 ); + do + { // 電池接続時、16ms待ってみる(チャタリング対策) + pwup_delay0 += 1; + do + { + pwup_delay1 += 1; + } + while( pwup_delay1 != 0 ); // u16にするとコンパイラが怒るため…。 + } + while( pwup_delay0 != 0 ); - hdwinit2(); - } + hdwinit2( ); // ? + } #if 1 - // ファームの整合性チェック // - { - u8 i; - u8 comp = 0; - // ローダーと本体は同じバージョンか？ - for( i = 0; i < sizeof( __TIME__ ); i++ ){ // sizeof( __TIME__ ) = 8 らし - comp += ( *(u8*)( MGC_HEAD + i ) == *(__far u8*)( MGC_LOAD + i ) )? 0: 1; - } + // ファームの整合性チェック // + { + u8 i; + u8 comp = 0; + // ローダーと本体は同じバージョンか？ + for( i = 0; i < sizeof( __TIME__ ); i++ ) + { // sizeof( __TIME__ ) = 8 らし + comp += ( *( u8 * ) ( MGC_HEAD + i ) == *( __far u8 * ) ( MGC_LOAD + i ) ) ? 0 : 1; + } - // 本体は壊れていないか？ - comp += ( *(u8*)( MGC_HEAD ) == 0xFF ) ? 1: 0; - for( i = 0; i < sizeof( __TIME__ ); i++ ){ - comp += ( *(u8*)( MGC_HEAD + i ) == *(u8*)( MGC_FOOT + i ) )? 0: 1; - } + // 本体は壊れていないか？ + comp += ( *( u8 * ) ( MGC_HEAD ) == 0xFF ) ? 1 : 0; + for( i = 0; i < sizeof( __TIME__ ); i++ ) + { + comp += ( *( u8 * ) ( MGC_HEAD + i ) == *( u8 * ) ( MGC_FOOT + i ) ) ? 0 : 1; + } - if( comp != 0 ){ - // ファームリストアを試みる - firm_restore(); - // 帰ってこない。リセットをかける。 - } - } + if( comp != 0 ) + { + // ファームリストアを試みる + firm_restore( ); + // 帰ってこない。リセットをかける。 + } + } #endif - chk_bootCluster(); + chk_bootCluster( ); - // 通常運転 - main_loop(); - } + // 通常運転 + main_loop( ); + } } @@ -121,8 +133,9 @@ void main(){ /* ======================================================== 省電力モードへ移行 ======================================================== */ -void power_save(){ - HALT(); +void power_save( ) +{ + HALT( ); } @@ -130,10 +143,12 @@ void power_save(){ /* ======================================================== キーリターン割り込み ======================================================== */ -__interrupt void int_kr(){ - if( system_status.pwr_state == OFF ){ - // 電源onのカウント。特にすることはない - } +__interrupt void int_kr( ) +{ + if( system_status.pwr_state == OFF ) + { + // 電源onのカウント。特にすることはない + } } @@ -141,194 +156,195 @@ __interrupt void int_kr(){ /* ======================================================== ext dc ======================================================== */ -__interrupt void intp4(){ +__interrupt void intp4( ) +{ } /* ======================================================== shell close ======================================================== */ -__interrupt void intp5(){ +__interrupt void intp5( ) +{ } // ======================================================== -void hdwinit(void){ // スタートアップルーチンが勝手に呼びます - DI(); /* マスタ割り込み禁止 */ +void hdwinit( void ) +{ // スタートアップルーチンが勝手に呼びます + DI( ); /* マスタ割り込み禁止 */ - CMC = 0b00010110; /* X1発振せず(入力ポート)、XT1使用、推奨の推奨で超低電力発振 */ - CSC = 0b10000000; /* X1発振なし、XT1発振あり、高速内蔵発振動作 */ - // OSMC = 0x00; /* フラッシュ・メモリの高速動作用昇圧回路 */ - CKC = 0b00001001; /* CPU/周辺クロック=fMAIN、fMAIN=fMX、fCLK=fMX */ + CMC = 0b00010110; /* X1発振せず(入力ポート)、XT1使用、推奨の推奨で超低電力発振 */ + CSC = 0b10000000; /* X1発振なし、XT1発振あり、高速内蔵発振動作 */ + // OSMC = 0x00; /* フラッシュ・メモリの高速動作用昇圧回路 */ + CKC = 0b00001001; /* CPU/周辺クロック=fMAIN、fMAIN=fMX、fCLK=fMX */ /*--- 低電圧検出回路の設定 ---*/ - /* リセット解除時のデフォルトは、オプション・バイトにて指定される */ - LVIS = 0b00000000; /* VLVI = 4.22±0.1V */ - LVIM = 0b00000000; /* LVI動作禁止 */ - /* 電源電圧(VDD)＜検出電圧(VLVI)時に割込発生 */ - /* 電源電圧(VDD)≧検出電圧> 6 ); - BT_DET_P = 0; + // 2. 初期パラメータを一時保存 + iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 4, origParam ); + // 3. 一時的にOCVを変更 + dat[0] = 0xD4; + dat[1] = 0xC0; + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_OCV, 2, dat ); - switch( temp ){ -// case( BT_VENDER_PANA ): - default: - BT_set_batt_vend1(); - break; - } + // 4. 一時的にRCOMPを変更 + dat[0] = 0xFF; + dat[1] = 0x00; + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 2, dat ); - // 電池温度測定 - BT_TEMP_P = 1; // 電池温度監視スタート - raw_adc_temperature = get_adc( ADC_SEL_BATT_TEMP ); // 温度のtemp。 - renge_task_immed_add( PM_bt_temp_update ); + // 電池メーカーの識別 + BT_DET_P = 1; + temp = ( u8 ) ( get_adc( ADC_SEL_BATT_DET ) >> 6 ); + BT_DET_P = 0; - // PMIC バージョン読み出し - temp = iic_mcu_read_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VER ); + iic_mcu_set_wo_dma( ); + // 5.メーカー別パラメータのロード + switch ( temp ) + { + default: + // case( BT_VENDER_PANA ): + // iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM, 64, BT_BT_PARAM_PANA ); + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM, 16, BT_BT_PARAM_PANA ); + iic_mcu_set_wo_dma( ); + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM+16, 16, &BT_BT_PARAM_PANA[16] ); + iic_mcu_set_wo_dma( ); + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM+16*2, 16, &BT_BT_PARAM_PANA[32] ); + iic_mcu_set_wo_dma( ); + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM+16*3, 16, &BT_BT_PARAM_PANA[48] ); + + rcomp = BT_PANA_RCOMP; + temp_co_up = BT_PANA_TEMPCOUP; + temp_co_dn = BT_PANA_TEMPCODN; + break; + } + + // 6. 150ms以上待つ + wait_ms( 200 ); + + // 7. OCVに「とある値」を書く + dat[0] = 0xD4; + dat[1] = 0xC0; + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_OCV, 2, dat ); + + // 8. 150〜600ms待つ。600msは厳守 + wait_ms( 200 ); + + // 9. SOCを読む。ベリファイのため。 + iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_SOC, 2, dat ); + + if( 0x6D == dat[0] || dat[0] == 0x6E || dat[0] == 0x6F ){ + // カスタムモデル書き込みOK！ + }else{ + // 失敗だったらリトライするのか？ + } + + // 10.元のRCOMPとOCVを書き戻す + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 4, origParam ); + + // 11. ロック + dat[0] = 0x00; // lock key + dat[1] = 0x00; + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_LOCK, 2, dat ); + + // おしまい // + } + + // 電池温度測定 + BT_TEMP_P = 1; // 電池温度監視スタート + raw_adc_temperature = get_adc( ADC_SEL_BATT_TEMP ); // 温度のtemp。 + renge_task_immed_add( PM_bt_temp_update ); + + // PMIC バージョン読み出し + temp = iic_mcu_read_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VER ); // vreg_ctr[ VREG_C_PM_INFO ] = temp; - /* - LCD DACの値のセット - */ - } @@ -249,10 +182,17 @@ void PM_init(){ ・レジスタにセット ・残量ICにセット ======================================================== */ -task_status_immed PM_bt_temp_update(){ - u16 newrcomp; - static u8 temp_old = 0; - static u8 count = 0; // たまにしか書きに行かない +task_status_immed PM_bt_temp_update( ) +{ + u16 newrcomp; + static u8 temp_old = 0; + static u8 count = 0; // たまにしか書きに行かない + + volatile static u8 skip = 1; + + if( skip != 0 ){ + return ( ERR_SUCCESS ); + } /* サーミスタ - 10kΩ分圧点の時、 @@ -260,33 +200,39 @@ task_status_immed PM_bt_temp_update(){ 村田 T[℃] = 81.48 - 111.97 x ratio TDK T = 81.406 - 111.81 x ratio */ - vreg_ctr[ VREG_C_BT_TEMP ] = (u8)( (s16)(( 163 - ( 224 * raw_adc_temperature ) ) / 2 ) >> 8 ); + vreg_ctr[VREG_C_BT_TEMP] = + ( u8 ) ( ( s16 ) ( ( 163 - ( 224 * raw_adc_temperature ) ) / 2 ) >> 8 ); - // 時々／大きく変化があったら書きにゆく - if(( abs(vreg_ctr[ VREG_C_BT_TEMP ] - temp_old ) > 3 ) - || ( count == 0 )){ - if( (s8)vreg_ctr[ VREG_C_BT_TEMP ] > 20 ){ - newrcomp = -(( (s16)vreg_ctr[ VREG_C_BT_TEMP ] - 20 ) * temp_co_up ); - }else{ - newrcomp = -(( (s16)vreg_ctr[ VREG_C_BT_TEMP ] - 20 ) * temp_co_dn ); + // 時々／大きく変化があったら書きにゆく + if( ( abs( vreg_ctr[VREG_C_BT_TEMP] - temp_old ) > 3 ) || ( count == 0 ) ) + { + if( ( s8 ) vreg_ctr[VREG_C_BT_TEMP] > 20 ) + { + newrcomp = -( ( ( s16 ) vreg_ctr[VREG_C_BT_TEMP] - 20 ) * temp_co_up ); + } + else + { + newrcomp = -( ( ( s16 ) vreg_ctr[VREG_C_BT_TEMP] - 20 ) * temp_co_dn ); + } + newrcomp += rcomp; + /* + If Temperature > 20 Then + NewRCOMP = StartingRCOMP + ((Temperature - 20) * TempCoUp) + ElseIf Temp < 20 Then + NewRCOMP = StartingRCOMP + ((Temperature - 20) * TempCoDown) + Else + NewRCOMP = StartingRCOMP + End If + */ + if( iic_mcu_write + ( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 2, &newrcomp ) == ERR_SUCCESS ) + { + temp_old = vreg_ctr[VREG_C_BT_TEMP]; + } + count += 1; } - newrcomp += starting_rcomp; - /* -If Temperature > 20 Then - NewRCOMP = StartingRCOMP + ((Temperature - 20) * TempCoUp) -ElseIf Temp < 20 Then - NewRCOMP = StartingRCOMP + ((Temperature - 20) * TempCoDown) -Else -NewRCOMP = StartingRCOMP -End If - */ - if( iic_mcu_write( IIC_SLA_BT_GAUGE, BT_BT_PARAM_PANA_RCOMP_ADRS, 2, &newrcomp ) == ERR_SUCCESS ){ - temp_old = vreg_ctr[ VREG_C_BT_TEMP ]; - } - count += 1; - } - return( ERR_SUCCESS ); + return ( ERR_SUCCESS ); } @@ -296,84 +242,61 @@ End If バックライト周り ======================================================== */ #ifdef _PMIC_TWL_ -err PM_LCD_on(){ - PM_TEG_LCD_OFF = 0; - wait_ms( DELAY_PM_TSS_50B ); - wait_ms( DELAY_PM_TSS_50B ); - iic_mcu_write_a_byte( IIC_SLA_PMIC, 0x22, 0x4A ); // バグ持ちPMIC対策 - vreg_ctr[ VREG_C_STATUS ] |= REG_BIT_LCD_POW; +err PM_LCD_on( ) +{ +// PM_TEG_LCD_dis( 0 ); // 何もしない + wait_ms( DELAY_PM_TSS_50B ); + wait_ms( DELAY_PM_TSS_50B ); + vreg_ctr[VREG_C_STATUS] |= REG_BIT_LCD_POW; - return( PM_chk_LDSW() ); - } - -err PM_BL_on(){ - wait_ms( 10 ); - vreg_ctr[ VREG_C_STATUS ] |= REG_BIT_BL; - return( PM_chk_LDSW() ); + return ( PM_chk_LDSW( ) ); } -err PM_BL_off(){ - vreg_ctr[ VREG_C_STATUS ] &= ~REG_BIT_BL; - return( ERR_SUCCESS ); +err PM_LCD_off( ) +{ +// PM_TEG_LCD_dis( 1 ); + wait_ms( 1 + 50 ); + PM_VDDLCD_off( ); // 残ってたの全部止めます。 + vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW; + return ( ERR_SUCCESS ); } -err PM_LCD_off(){ - PM_TEG_LCD_OFF = 1; - wait_ms( 1 + 50 ); - PM_VDDLCD_off(); // 残ってたの全部止めます。 - vreg_ctr[ VREG_C_STATUS ] &= ~( REG_BIT_BL | REG_BIT_LCD_POW ); - 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_LCD_vcom_set(){ - return( ERR_SUCCESS ); +err PM_LCD_vcom_set( ) +{ + return ( ERR_SUCCESS ); } -task_status_immed tski_vcom_set(){ - PM_LCD_vcom_set(); - return( ERR_FINISED ); +task_status_immed tski_vcom_set( ) +{ + PM_LCD_vcom_set( ); + return ( ERR_FINISED ); } #else -/* ======================================================== - 液晶の対向電圧の設定を行います。 - 仮想レジスタの内容を送るだけ - ======================================================== */ -err PM_LCD_vcom_set(){ - u8 rv; -/* - rv = iic_mcu_write_a_byte( - IIC_SLA_PMIC, - PM_REG_ADRS_POW_DAC1, - 92 ); // がっかりなことに、PMICはバースト書き込み不可 - rv |= iic_mcu_write_a_byte( - IIC_SLA_PMIC, - PM_REG_ADRS_POW_DAC2, - 92 ); -/*/ -rv = iic_mcu_write_a_byte( - IIC_SLA_PMIC, - PM_REG_ADRS_POW_DAC1, - vreg_ctr[ VREG_C_VCOM_T ] ); // がっかりなことに、PMICはバースト書き込み不可 - rv |= iic_mcu_write_a_byte( - IIC_SLA_PMIC, - PM_REG_ADRS_POW_DAC2, - vreg_ctr[ VREG_C_VCOM_B ] ); -// */ - return( rv ); -} - - /* ======================================================== ↑で、レジスタ書き込みから呼び出される時のため 　I2Cの取り合いの関係でここから呼ぶ ======================================================== */ -task_status_immed tski_vcom_set(){ - PM_LCD_vcom_set(); - return( ERR_FINISED ); +task_status_immed tski_vcom_set( ) +{ + PM_LCD_vcom_set( ); + return ( ERR_FINISED ); } @@ -385,68 +308,100 @@ task_status_immed tski_vcom_set(){ 起動失敗であれば電源が落ちる 別のタスクで電源落ちは監視していて、ステータスもクリアする ======================================================== */ -err PM_LCD_on(){ - PM_VDDLCD_on(); - wait_ms( DELAY_PM_TSS_50B ); +err PM_LCD_on( ) +{ + PM_VDDLCD_on( ); + wait_ms( DELAY_PM_TSS_50B ); - PM_TCOM_VCS_on(); + wait_ms( DELAY_PM_5V_TO_VCOM ); - wait_ms( DELAY_PM_TSS_50B ); - iic_mcu_write_a_byte( IIC_SLA_PMIC, 0x22, 0x4A ); // バグ持ちPMIC対策 - vreg_ctr[ VREG_C_STATUS ] |= REG_BIT_LCD_POW; - return( PM_chk_LDSW() ); + PM_TCOM_VCS_on( ); + + wait_ms( DELAY_PM_TSS_50B ); + iic_mcu_write_a_byte( IIC_SLA_PMIC, 0x22, 0x4A ); // バグ持ちPMIC対策 + vreg_ctr[VREG_C_STATUS] |= REG_BIT_LCD_POW; + + SLP_O = 0; // 1でミュート + + return ( PM_chk_LDSW( ) ); +} + +err PM_LCD_off( ) +{ + PM_TCOM_VCS_off( ); + wait_ms( 1 + 50 ); + +// PM_VDDLCD_off(); // 残ってたの全部止めます。 + vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW; + + SLP_O = 1; + + return ( ERR_SUCCESS ); } -err PM_BL_on(){ - PM_set_BL( 0x03 ); - wait_ms( 10 ); +err PM_BL_on( ) +{ + PM_set_BL( 0x03 ); + wait_ms( 10 ); - vreg_ctr[ VREG_C_STATUS ] |= REG_BIT_BL; - return( PM_chk_LDSW() ); + 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 ); +err PM_BL_off( ) +{ + PM_set_BL( 0x00 ); + vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_BL; + return ( ERR_SUCCESS ); } -err PM_LCD_off(){ - PM_TCOM_VCS_off(); - wait_ms( 1 + 50 ); +/* ======================================================== + 液晶の対向電圧の設定を行います。 + 仮想レジスタの内容を送るだけ + ======================================================== */ +err PM_LCD_vcom_set( ) +{ + u8 rv; - PM_VDDLCD_off(); // 残ってたの全部止めます。 - vreg_ctr[ VREG_C_STATUS ] &= ~REG_BIT_LCD_POW; - return( ERR_SUCCESS ); + rv = iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_DAC1, vreg_ctr[VREG_C_VCOM_T] ); // がっかりなことに、PMICはバースト書き込み不可 + rv |= iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_DAC2, vreg_ctr[VREG_C_VCOM_B] ); + return ( rv ); } + + + #endif /* ======================================================== ↑の、I2Cコマンドでの実行の場合の為の、ラッパー的な物 実仕様上は大丈夫だろうけど、同じ関数がキューに2つ以上 乗らないようにしてあるし、ばらばらにしておく。 ======================================================== */ -task_status_immed tski_PM_LCD_on(){ - PM_LCD_on(); - return( ERR_FINISED ); +task_status_immed tski_PM_LCD_on( ) +{ + PM_LCD_on( ); + return ( ERR_FINISED ); } -task_status_immed tski_PM_BL_on(){ - PM_BL_on(); - 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_off( ) +{ + PM_BL_off( ); + return ( ERR_FINISED ); } -task_status_immed tski_PM_LCD_off(){ - PM_LCD_off(); - return( ERR_FINISED ); +task_status_immed tski_PM_LCD_off( ) +{ + PM_LCD_off( ); + return ( ERR_FINISED ); } @@ -462,84 +417,91 @@ task_status_immed tski_PM_LCD_off(){ 以下のピンは主にここで操作・監視されます。 ・POW_CONT1,2 TEG電源のみ ======================================================== */ -err PM_sys_pow_on(){ +err PM_sys_pow_on( ) +{ #ifndef _PMIC_TWL_ - u8 temp; + u8 temp; - // 電池温度測定 - while( ADCEN != 0 ){;} - BT_TEMP_P = 1; - vreg_ctr[ VREG_C_BT_TEMP ] = get_adc( ADC_SEL_BATT_TEMP ); - BT_TEMP_P = 0; - PM_bt_temp_update(); // 温度のtemp。　残量ICに行きます + // 電池温度測定 + while( ADCEN != 0 ) + {; + } + BT_TEMP_P = 1; + vreg_ctr[VREG_C_BT_TEMP] = get_adc( ADC_SEL_BATT_TEMP ); + BT_TEMP_P = 0; + PM_bt_temp_update( ); // 温度のtemp。　残量ICに行きます - // 残量チェック - vreg_ctr[ VREG_C_BT_REMAIN ] = PM_get_batt_left(); - vreg_ctr[ VREG_C_BT_REMAIN ] = 200; - if( vreg_ctr[ VREG_C_BT_REMAIN ] < 0 ){ - return( 1 ); - } + // 残量チェック + vreg_ctr[VREG_C_BT_REMAIN] = PM_get_batt_left( ); + vreg_ctr[VREG_C_BT_REMAIN] = 200; + if( vreg_ctr[VREG_C_BT_REMAIN] < 0 ) + { + return ( 1 ); + } - // 電源順次立ち上げ - RESET2_ast; - FCRAM_RST_ast; + // 電源順次立ち上げ + RESET2_ast; + FCRAM_RST_ast; - PM_LDSW_on(); + PM_LDSW_on( ); - wait_ms( 1 ); - iic_mcu_write_a_byte( IIC_SLA_PMIC, 0x22, 0xCA ); // バグ持ちPMIC対策 OVP解除 + wait_ms( 1 ); + iic_mcu_write_a_byte( IIC_SLA_PMIC, 0x22, 0xCA ); // バグ持ちPMIC対策 OVP解除 - wait_ms( DELAY_PM_TW_PWUP ); + wait_ms( DELAY_PM_TW_PWUP ); - PM_VDD_on(); - wait_ms( DELAY_PM_TW_PWUP ); + PM_VDD_on( ); + wait_ms( DELAY_PM_TW_PWUP ); - PM_VDD50A_on(); + PM_VDD50A_on( ); - wait_ms( DELAY_PM_TW_PWUP ); - iic_mcu_write_a_byte( IIC_SLA_PMIC, 0x05, 0x07 ); // バグ持ちPMIC対策 強制PWM + wait_ms( DELAY_PM_TW_PWUP ); + iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_SAVE, 0x03 ); // バグ持ちPMIC対策 強制PWM - if( PM_chk_LDSW() == 0 ){ - return( ERR_ERR ); - } - PM_reset_neg(); - RESET2_neg; - FCRAM_RST_neg; - return( ERR_SUCCESS ); + if( PM_chk_LDSW( ) == 0 ) + { + return ( ERR_ERR ); + } + PM_reset_neg( ); + RESET2_neg; + FCRAM_RST_neg; + return ( ERR_SUCCESS ); #else - // KE3-L で開発 - u8 temp; + // KE3-L で開発 + u8 temp; - // 電源投入 - RESETs_ast; - FCRAM_RST_ast; - - PM_TEG_PWSW = 1; - wait_ms( 160 ); - PM_TEG_PWSW = 0; - - - // 残量確認 - temp = PM_get_batt_left(); - temp = 200; - if( temp < ( 255 * 0.03 ) ){ - return( ERR_ERR ); - } - vreg_ctr[ VREG_C_BT_REMAIN ] = temp; - - PM_reset_neg(); - RESET2_neg; - FCRAM_RST_neg; - wait_ms( 100 ); - if( !RESET1_n ){ - // 起動失敗 + // 電源投入 RESETs_ast; FCRAM_RST_ast; - return( ERR_ERR ); - } - return( ERR_SUCCESS ); + PM_TEG_PWSW = 1; + wait_ms( 160 ); + PM_TEG_PWSW = 0; + + + // 残量確認 + temp = PM_get_batt_left( ); + temp = 200; + if( temp < ( 255 * 0.03 ) ) + { + return ( ERR_ERR ); + } + vreg_ctr[VREG_C_BT_REMAIN] = temp; + + PM_reset_neg( ); + RESET2_neg; + FCRAM_RST_neg; + wait_ms( 100 ); + if( !RESET1_n ) + { + // 起動失敗 + RESETs_ast; + FCRAM_RST_ast; + return ( ERR_ERR ); + } + + return ( ERR_SUCCESS ); #endif } @@ -549,35 +511,37 @@ err PM_sys_pow_on(){ 電源OFFシーケンス todo: 電源異常断の場合 ======================================================== */ -err PM_sys_pow_off(){ -#ifndef _PMIC_TWL_ - PM_BL_off(); - PM_LCD_off();// TCOM,VCS OFF も消してきます。 +err PM_sys_pow_off( ) +{ +#ifdef _PMIC_CTR_ + PM_BL_off( ); + PM_LCD_off( ); // TCOM,VCS OFF も消してきます。 - PM_reset_ast(); - RESET2_ast; - FCRAM_RST_ast; + PM_reset_ast( ); + RESET2_ast; + FCRAM_RST_ast; - PM_off(); + PM_off( ); - PM_LDSW_off(); + PM_LDSW_off( ); #else - if( RESET1_n ){ + if( RESET1_n ) + { - RESETs_ast; - FCRAM_RST_ast; - PM_TEG_PWSW = 1; - wait_ms( 250 ); - wait_ms( 250 ); - wait_ms( 250 ); - PM_TEG_PWSW = 0; + RESETs_ast; + FCRAM_RST_ast; + PM_TEG_PWSW = 1; + wait_ms( 250 ); + wait_ms( 250 ); + wait_ms( 250 ); + PM_TEG_PWSW = 0; } - RESETs_ast; - FCRAM_RST_ast; + RESETs_ast; + FCRAM_RST_ast; #endif - return( ERR_SUCCESS ); + return ( ERR_SUCCESS ); } @@ -585,13 +549,15 @@ err PM_sys_pow_off(){ /* ======================================================== スリープシーケンス ======================================================== */ -err to_sleep(){ - PM_LCD_off(); - return 0; +err to_sleep( ) +{ + PM_LCD_off( ); + return 0; } + /* ======================================================== 電池の管理 @@ -608,40 +574,78 @@ err to_sleep(){ PM_EXTDCは割り込みメインにするかも ======================================================== */ -task_interval tsk_batt(){ - static u8 charge_hys = 0; // ヒステリシスで上限下限を拡張するとき１ +#define INTERVAL_TSK_BATT 100 - // 電源周りのステータスが変化？ - set_bit( PM_EXTDC, vreg_ctr[ VREG_C_STATUS ], REG_BIT_POW_SUPPLY ); - set_bit( !BT_CHG_n, vreg_ctr[ VREG_C_STATUS ], REG_BIT_BATT_CHARGE ); - // →割り込み。miscの中でよろしくやってくれている。 +void tsk_batt( ) +{ + static u8 task_interval = 0; + static u8 charge_hys = 0; // ヒステリシスで上限下限を拡張するとき１ - // 充電 - // 温度付きヒステリシス - if( (( 345 / 4 ) < vreg_ctr[ VREG_C_BT_TEMP ] ) && ( vreg_ctr[ VREG_C_BT_TEMP ] < ( 739 / 4 )) ){ - charge_hys = 1; - } + if( task_interval != 0 ) + { + task_interval -= 1; + return; + } + else + { + task_interval = ( INTERVAL_TSK_BATT / SYS_INTERVAL_TICK ); + } - if(( (( 345 - 65 ) / 4 ) < vreg_ctr[ VREG_C_BT_TEMP ] ) && ( vreg_ctr[ VREG_C_BT_TEMP ] < (( 739 + 18 ) / 4 )) ){ - charge_hys = 0; - } + // 電源周りのステータスが変化？ /// + set_bit( PM_EXTDC, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY ); + set_bit( !BT_CHG_n, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); + // →割り込み。miscの中でよろしくやってくれている。 - if( ( ( charge_hys == 1 ) - && ( (( 345 - 65 ) / 4 ) < vreg_ctr[ VREG_C_BT_TEMP ] ) - && ( vreg_ctr[ VREG_C_BT_TEMP ] < (( 739 + 18 ) / 4 )) ) - || - ( ( charge_hys == 0 ) - && (( 345 / 4 ) < vreg_ctr[ VREG_C_BT_TEMP ] ) - && ( vreg_ctr[ VREG_C_BT_TEMP ] < ( 739 / 4 )) ) ){ - BT_CHG_EN = 1; - }else{ - BT_CHG_EN = 0; - } + // 充電 /////////////////////////// + // 温度付きヒステリシス + if( ( ( 345 / 4 ) < vreg_ctr[VREG_C_BT_TEMP] ) && ( vreg_ctr[VREG_C_BT_TEMP] < ( 739 / 4 ) ) ) + { + charge_hys = 1; + } - // 充電LED - LED_duty_CHARGE = !BT_CHG_n ? vreg_ctr[ VREG_C_LED_BRIGHT ]: 0; + if( ( ( ( 345 - 65 ) / 4 ) < vreg_ctr[VREG_C_BT_TEMP] ) + && ( vreg_ctr[VREG_C_BT_TEMP] < ( ( 739 + 18 ) / 4 ) ) ) + { + charge_hys = 0; + } - return( 50 ); + if( ( ( charge_hys == 1 ) + && ( ( ( 345 - 65 ) / 4 ) < vreg_ctr[VREG_C_BT_TEMP] ) + && ( vreg_ctr[VREG_C_BT_TEMP] < ( ( 739 + 18 ) / 4 ) ) ) + || + ( ( charge_hys == 0 ) + && ( ( 345 / 4 ) < vreg_ctr[VREG_C_BT_TEMP] ) + && ( vreg_ctr[VREG_C_BT_TEMP] < ( 739 / 4 ) ) ) ) + { + BT_CHG_EN = 1; + } + else + { + BT_CHG_EN = 0; + } + + // 充電LED + LED_duty_CHARGE = !BT_CHG_n ? vreg_ctr[VREG_C_LED_BRIGHT] : 0; + + if(( vreg_ctr[ VREG_C_STATUS_X ] & 0x01 ) == 0 ) + { + // 電池残量の取得 + { + u8 temp; + + temp = PM_get_batt_left(); + vreg_ctr[ VREG_C_BT_REMAIN ] = temp; + // todo 閾値を超えたら割り込み + } + } + else + { + vreg_ctr[ VREG_C_BT_REMAIN ] = 0xFF; + } + 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 ); + + return; } @@ -652,8 +656,9 @@ task_interval tsk_batt(){ 電源OFFから起こす（充電の温度監視のため）のみ 普段はポーリング(pm) =========================================================*/ -__interrupt void intp4_extdc(){ - ; +__interrupt void intp4_extdc( ) +{ + ; } @@ -663,67 +668,80 @@ __interrupt void intp4_extdc(){ 電源OFFから起こす（充電の温度監視のため）のみ 普段はポーング(misc) =========================================================*/ -__interrupt void intp5_shell(){ - ; +__interrupt void intp5_shell( ) +{ + ; } /*========================================================= 旧PMICへのコマンド書き込み =========================================================*/ -__interrupt void intp6_PM_irq(){ - renge_task_immed_add( ntr_pmic_comm ); +__interrupt void intp6_PM_irq( ) +{ + renge_task_immed_add( ntr_pmic_comm ); } /* ======================================================== PMICからの割り込みを受けて、NTRPMIC互換レジスタからリード ======================================================== */ -task_status_immed ntr_pmic_comm(){ +task_status_immed ntr_pmic_comm( ) +{ #ifdef _CODEC_CTR_ - static u8 reg_shadow; - u8 reg_old; + static u8 reg_shadow; + u8 reg_old; - reg_old = reg_shadow; // BL関係 - reg_shadow = iic_mcu_read_a_byte( IIC_SLA_CODEC, CODEC_REG_PMCOMP ); - DI(); + reg_old = reg_shadow; // BL関係 + reg_shadow = iic_mcu_read_a_byte( IIC_SLA_CODEC, CODEC_REG_PMCOMP ); + DI( ); - // offリクエスト - if(( reg_shadow & REG_BIT_TWL_REQ_OFF_REQ ) != 0 ){ - set_irq( VREG_C_IRQ3, REG_BIT_TWL_OFF_REQ ); - vreg_ctr[ VREG_C_IRQ3 ] |= REG_BIT_TWL_OFF_REQ; - if( ( vreg_ctr[ VREG_C_IRQ_MASK3 ] & REG_BIT_TWL_OFF_REQ ) == 0 ){ - IRQ0_ast; - } - } - - // リセットリクエスト - if(( reg_shadow & REG_BIT_TWL_REQ_RST_REQ ) != 0 ){ - vreg_ctr[ VREG_C_IRQ3 ] |= REG_BIT_TWL_RESET_REQ; - if( ( vreg_ctr[ VREG_C_IRQ_MASK3 ] & REG_BIT_TWL_RESET_REQ ) == 0 ){ - IRQ0_ast; - } - } - - // バックライトが... - if( (( reg_old ^ reg_shadow ) & ~( REG_BIT_TWL_REQ_BL )) != 0 ){ - if(( reg_shadow & ( REG_BIT_TWL_REQ_BL )) == 0x00 ){ - // 両方消された - vreg_ctr[ VREG_C_IRQ3 ] |= REG_BIT_TWL_BL_OFF; - if( ( vreg_ctr[ VREG_C_IRQ_MASK3 ] & REG_BIT_TWL_BL_OFF ) == 0 ){ - IRQ0_ast; - } - }else if(( reg_shadow & ( REG_BIT_TWL_REQ_BL )) == ( REG_BIT_TWL_REQ_BL )){ - // 両方ついた - vreg_ctr[ VREG_C_IRQ3 ] |= REG_BIT_TWL_BL_ON; - if( ( vreg_ctr[ VREG_C_IRQ_MASK3 ] & REG_BIT_TWL_BL_ON ) == 0 ){ - IRQ0_ast; + // offリクエスト + if( ( reg_shadow & REG_BIT_TWL_REQ_OFF_REQ ) != 0 ) + { + set_irq( VREG_C_IRQ3, REG_BIT_TWL_OFF_REQ ); + vreg_ctr[VREG_C_IRQ3] |= REG_BIT_TWL_OFF_REQ; + if( ( vreg_ctr[VREG_C_IRQ_MASK3] & REG_BIT_TWL_OFF_REQ ) == 0 ) + { + IRQ0_ast; } - } - } - EI(); - reg_shadow &= ~( REG_BIT_TWL_REQ_BL ); // BLだけマスクして、クリアの準備 - iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_PMCOMP, reg_shadow ); + } + + // リセットリクエスト + if( ( reg_shadow & REG_BIT_TWL_REQ_RST_REQ ) != 0 ) + { + vreg_ctr[VREG_C_IRQ3] |= REG_BIT_TWL_RESET_REQ; + if( ( vreg_ctr[VREG_C_IRQ_MASK3] & REG_BIT_TWL_RESET_REQ ) == 0 ) + { + IRQ0_ast; + } + } + + // バックライトが... + if( ( ( reg_old ^ reg_shadow ) & ~( REG_BIT_TWL_REQ_BL ) ) != 0 ) + { + if( ( reg_shadow & ( REG_BIT_TWL_REQ_BL ) ) == 0x00 ) + { + // 両方消された + vreg_ctr[VREG_C_IRQ3] |= REG_BIT_TWL_BL_OFF; + if( ( vreg_ctr[VREG_C_IRQ_MASK3] & REG_BIT_TWL_BL_OFF ) == 0 ) + { + IRQ0_ast; + } + } + else if( ( reg_shadow & ( REG_BIT_TWL_REQ_BL ) ) == ( REG_BIT_TWL_REQ_BL ) ) + { + // 両方ついた + vreg_ctr[VREG_C_IRQ3] |= REG_BIT_TWL_BL_ON; + if( ( vreg_ctr[VREG_C_IRQ_MASK3] & REG_BIT_TWL_BL_ON ) == 0 ) + { + IRQ0_ast; + } + } + } + EI( ); + reg_shadow &= ~( REG_BIT_TWL_REQ_BL ); // BLだけマスクして、クリアの準備 + iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_PMCOMP, reg_shadow ); #endif - return( ERR_FINISED ); + return ( ERR_FINISED ); } diff --git a/trunk/pm.h b/trunk/pm.h index 85e0433..5daec58 100644 --- a/trunk/pm.h +++ b/trunk/pm.h @@ -7,18 +7,21 @@ //========================================================= -enum BT_GAUGE_REG_ADRS{ - BT_GAUGE_REG_VCELL = 0x02, // それぞれ16ビットのため +enum BT_GAUGE_REG_ADRS +{ + BT_GAUGE_REG_VCELL = 0x02, // それぞれ16ビットのため BT_GAUGE_REG_SOC = 0x04, BT_GAUGE_REG_MODE = 0x06, BT_GAUGE_REG_VERSION = 0x08, BT_GAUGE_REG_OCV = 0x0E, - BT_GAUGE_REG_RCOMP = 0xC0, + BT_GAUGE_REG_RCOMP = 0x0C, BT_GAUGE_REG_LOCK = 0x3E, + BT_GAUGE_REG_BT_PARAM = 0x40, BT_GAUGE_REG_COMMAND = 0xFE }; -enum PMIC_REG_ADRS{ +enum PMIC_REG_ADRS +{ PM_REG_ADRS_VER = 0x00, // verinfo など PM_REG_ADRS_VDD_SYS, // システムが使用する電源 PM_REG_ADRS_VDD_LCD, // 液晶電源 @@ -46,6 +49,7 @@ enum PMIC_REG_ADRS{ #define DELAY_PM_TW_PWUP 16 #define DELAY_PM_TSS_50B 5 +#define DELAY_PM_5V_TO_VCOM 17 @@ -55,22 +59,22 @@ extern u8 raw_adc_temperature; //========================================================= -err PM_sys_pow_on(); -err PM_sys_pow_off(); -err PM_LCD_on(); -err PM_bt_auth(); -task_status_immed PM_bt_temp_update(); -void PM_init(); -err PM_LCD_vcom_set(); -task_status_immed tski_vcom_set(); +err PM_sys_pow_on( ); +err PM_sys_pow_off( ); +err PM_LCD_on( ); +err PM_bt_auth( ); +task_status_immed PM_bt_temp_update( ); +void PM_init( ); +err PM_LCD_vcom_set( ); +task_status_immed tski_vcom_set( ); -err PM_BL_on(); -err PM_BL_off(); +err PM_BL_on( ); +err PM_BL_off( ); -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(); +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( ); diff --git a/trunk/renge/renge.c b/trunk/renge/renge.c index 18f178b..85f012b 100644 --- a/trunk/renge/renge.c +++ b/trunk/renge/renge.c @@ -22,7 +22,7 @@ bit renge_flg_interval; bit renge_task_interval_run_force; -extern task_info tasks[]; +extern const task_info tasks[]; #include "..\bsr_system.h" extern system_status_ system_status; @@ -74,29 +74,10 @@ err renge_task_interval_run(){ for( current_task = &tasks[0]; current_task != &tasks[TSK_LAST]; current_task += 1 ) - { - -// if( current_task -> dispatch_type == INTERVAL ){ - if( current_task -> interval == 0 ){ - current_task -> interval = current_task -> task(); - }else{ - current_task -> interval -= 1; - } -// } - } + { + current_task -> task(); + } } - - // ***_TRIG等で強制起動 - while( renge_task_interval_run_force ){ - renge_task_interval_run_force = 0; // とりあえず、何が何でもフラグ消しちゃうけど... - for( current_task = &tasks[0]; - current_task != &tasks[TSK_LAST]; - current_task += 1 ) - { - current_task -> interval = current_task -> task(); - } - } - return( ERR_SUCCESS ); } diff --git a/trunk/renge/renge_defs.h b/trunk/renge/renge_defs.h index 5a616ab..ac9443b 100644 --- a/trunk/renge/renge_defs.h +++ b/trunk/renge/renge_defs.h @@ -25,6 +25,12 @@ typedef short s16; typedef unsigned char err; //*/ + +// ***************************************************************************** +#define SYS_INTERVAL_TICK 1.953 + + + //****************************************************************************** @@ -42,8 +48,6 @@ typedef task_interval ( *p_task )(); // p_task typedef struct{ p_task task; -// dispatch_type dispatch_type; - task_interval interval; }task_info; /************************************** diff --git a/trunk/renge/renge_task_immediate.h b/trunk/renge/renge_task_immediate.h index bd0484f..7b1bbe5 100644 --- a/trunk/renge/renge_task_immediate.h +++ b/trunk/renge/renge_task_immediate.h @@ -13,7 +13,6 @@ extern task_status_immed ntr_pmic_comm(); extern task_status_immed tsk_cbk_accero(); extern task_status_immed do_command0(); -extern task_status_immed do_command1(); extern task_status_immed acc_read(); extern task_status_immed acc_write(); diff --git a/trunk/renge/renge_task_intval.h b/trunk/renge/renge_task_intval.h index a1407e7..465e24f 100644 --- a/trunk/renge/renge_task_intval.h +++ b/trunk/renge/renge_task_intval.h @@ -6,35 +6,31 @@ #include "renge_defs.h" enum { - TSK_SW, TSK_WIFI, TSK_ADC, TSK_BATT, TSK_LED_POW, TSK_LED_WIFI, TSK_LED_CAM, TSK_MISC_STAT, TSK_DEBUG, TSK_DEBUG2, TSK_SOFT_INT, TSK_SYS, TSK_LAST + TSK_SW, TSK_ADC, TSK_BATT, TSK_LED_POW, TSK_LED_WIFI, TSK_LED_CAM, TSK_MISC_STAT, TSK_DEBUG, TSK_DEBUG2, TSK_SYS, TSK_LAST }; -extern task_interval tsk_sw(); -extern task_interval tsk_wifi(); -extern task_interval tsk_adc(); -extern task_interval tsk_batt(); -extern task_interval tsk_led_pow(); -extern task_interval tsk_led_wifi(); -extern task_interval tsk_led_cam(); -extern task_interval tsk_misc_stat(); -extern task_interval tsk_debug(); -extern task_interval tsk_debug2(); -extern task_interval tsk_soft_int(); -extern task_interval tsk_sys(); +extern void tsk_sw(); +extern void tsk_adc(); +extern void tsk_batt(); +extern void tsk_led_pow(); +extern void tsk_led_wifi(); +extern void tsk_led_cam(); +extern void tsk_misc_stat(); +extern void tsk_debug(); +extern void tsk_debug2(); +extern void tsk_sys(); -task_info tasks[ TSK_LAST ] = { - { tsk_sw, 0 }, - { tsk_wifi, 0 }, - { tsk_adc, 0 }, - { tsk_batt, 0 }, - { tsk_led_pow, 0 }, - { tsk_led_wifi, 0 }, - { tsk_led_cam, 0 }, - { tsk_misc_stat, 0 }, - { tsk_debug, 0 }, - { tsk_debug2, 0 }, - { tsk_soft_int, 0 }, - { tsk_sys, 0 }, +static const task_info tasks[ TSK_LAST ] = { + tsk_sw, + tsk_adc, + tsk_batt, + tsk_led_pow, + tsk_led_wifi, + tsk_led_cam, + tsk_misc_stat, + tsk_debug, + tsk_debug2, + tsk_sys, }; diff --git a/trunk/renge/renge_tasks.txt b/trunk/renge/renge_tasks.txt index a698148..f9bf36f 100644 --- a/trunk/renge/renge_tasks.txt +++ b/trunk/renge/renge_tasks.txt @@ -1,5 +1,4 @@ sw -wifi adc batt led_pow @@ -8,5 +7,4 @@ led_cam misc_stat debug debug2 -soft_int sys diff --git a/trunk/rtc.c b/trunk/rtc.c index 5aff879..464b2f4 100644 --- a/trunk/rtc.c +++ b/trunk/rtc.c @@ -10,24 +10,26 @@ // ======================================================== -u8 rtc_work[7]; -bit rtc_lock; -bit rtc_dirty; -bit rtc_alarm_dirty; +u8 rtc_work[7]; +bit rtc_lock; +bit rtc_dirty; +bit rtc_alarm_dirty; /* ======================================================== ペリフェラルの初期化 レジスタの電池交換ビットのセット ======================================================== */ -void RTC_init(void){ +void RTC_init( void ) +{ -// if( !RTCEN ){ - RTCEN = 1; // モジュールON + if( !RTCEN ) + { + RTCEN = 1; // モジュールON - // RTC設定 - RTCC0 = 0b00001000; /* 動作停止、24時間制、32k出力「まだなし」、定周期割り込みなし */ - RTCC1 = 0b11000000; /* アラーム割り込み有効＆動作開始 */ - RTCC2 = 0b10000000; /* インターバル:32k/2^6=2ms、RTCDIV出力なし */ + // RTC設定 + RTCC0 = 0b00001000; /* 動作停止、24時間制、32k出力「まだなし」、定周期割り込みなし */ + RTCC1 = 0b11000000; /* アラーム割り込み有効＆動作開始 */ + RTCC2 = 0b10000000; /* インターバル:32k/2^6=2ms、RTCDIV出力なし */ /* SEC = 0; MIN = 0; @@ -37,26 +39,28 @@ SEC = 0; MONTH = 9; YEAR = 9; */ - ALARMWW = 0x7F; + ALARMWW = 0x7F; - vreg_ctr[ VREG_C_MCU_STATUS ] = REG_BIT_RTC_BLACKOUT; + vreg_ctr[VREG_C_MCU_STATUS] = REG_BIT_RTC_BLACKOUT; -// } - // 割り込み設定 - RTCIF = 0; - RTCIIF = 0; - RTCMK = 1; /* 割り込み(定周期)禁止 */ - RTCIMK = 0; /* 割り込み(アラーム&インターバル)許可 */ + } + // 割り込み設定 + RTCIF = 0; + RTCIIF = 0; + RTCMK = 1; /* 割り込み(定周期)禁止 */ + RTCIMK = 0; /* 割り込み(アラーム&インターバル)許可 */ - RTCE = 1; /* 動作開始 */ + RTCE = 1; /* 動作開始 */ - RWAIT = 1; - while( !RWST ){;} - RWAIT = 0; + RWAIT = 1; + while( !RWST ) + {; + } + RWAIT = 0; - rtc_lock = 0; - rtc_dirty = 0; - rtc_alarm_dirty = 0; + rtc_lock = 0; + rtc_dirty = 0; + rtc_alarm_dirty = 0; } @@ -65,10 +69,9 @@ SEC = 0; RTC システムチックタイマ割り込みベクタ 2^6/fXT（1.953125 ms） ======================================================== */ -__interrupt void int_rtc_int(){ - DBG_LED_WIFI_2_on; - renge_flg_interval = 1; - DBG_LED_WIFI_2_off; +__interrupt void int_rtc_int( ) +{ + renge_flg_interval = 1; } @@ -76,19 +79,22 @@ __interrupt void int_rtc_int(){ RTC アラーム割り込み 2^6/fXT（1.953125 ms） ======================================================== */ -__interrupt void int_rtc(){ - if(( vreg_ctr[ VREG_C_RTC_ALARM_DAY ] == DAY ) - && ( vreg_ctr[ VREG_C_RTC_ALARM_MONTH ] == MONTH ) - && ( vreg_ctr[ VREG_C_RTC_ALARM_YEAR ] == YEAR )) +__interrupt void int_rtc( ) +{ + if( ( vreg_ctr[VREG_C_RTC_ALARM_DAY] == DAY ) + && ( vreg_ctr[VREG_C_RTC_ALARM_MONTH] == MONTH ) + && ( vreg_ctr[VREG_C_RTC_ALARM_YEAR] == YEAR ) ) { - if( ( vreg_ctr[ VREG_C_IRQ_MASK1 ] & REG_BIT_RTC_ALARM ) == 0 ){ - vreg_ctr[ VREG_C_IRQ1 ] |= REG_BIT_RTC_ALARM; - IRQ0_ast; - // マスクをしてあったら、電源を入れません - if( system_status.pwr_state == OFF ){ - system_status.poweron_reason = RTC_ALARM; + if( ( vreg_ctr[VREG_C_IRQ_MASK1] & REG_BIT_RTC_ALARM ) == 0 ) + { + vreg_ctr[VREG_C_IRQ1] |= REG_BIT_RTC_ALARM; + IRQ0_ast; + // マスクをしてあったら、電源を入れません + if( system_status.pwr_state == OFF ) + { + system_status.poweron_reason = RTC_ALARM; + } } - } } } @@ -98,16 +104,20 @@ __interrupt void int_rtc(){ RTC のリード レジスタは、sec,min,hour,week,day,month,year の順 ======================================================== */ -void get_rtc(){ - if( rtc_lock == 0 ){ - rtc_lock = 1; - RWAIT = 1; - while( !RWST ){;} +void get_rtc( ) +{ + if( rtc_lock == 0 ) + { + rtc_lock = 1; + RWAIT = 1; + while( !RWST ) + {; + } - memcpy( &vreg_ctr[ VREG_C_RTC_SEC ], &SEC, 7 ); - RWAIT = 0; + memcpy( &vreg_ctr[VREG_C_RTC_SEC], &SEC, 7 ); + RWAIT = 0; // renge_task_immed_add( tski_rtc_close ); - } + } } @@ -118,13 +128,15 @@ void get_rtc(){ こいつはバッファにコピーするだけで、 実際にRTCにセットするのはset_rtc_close()です。 ======================================================== */ -void set_rtc( u8 adrs, u8 data ){ - if( rtc_dirty == 0 ){ - rtc_dirty = 1; - memcpy( rtc_work, &SEC, 7 ); +void set_rtc( u8 adrs, u8 data ) +{ + if( rtc_dirty == 0 ) + { + rtc_dirty = 1; + memcpy( rtc_work, &SEC, 7 ); // renge_task_immed_add( tski_rtc_close ); - } - rtc_work[ adrs ] = data; + } + rtc_work[adrs] = data; } @@ -133,29 +145,32 @@ void set_rtc( u8 adrs, u8 data ){ 必要ならば、RTCレジスタの更新 ======================================================== */ // task_status_immed tski_rtc_close(){ -void rtc_unlock(){ - // リードロック +void rtc_unlock( ) +{ + // リードロック // if( rtc_lock != 0 ){ rtc_lock = 0; // } - // ライトロック - if( rtc_dirty != 0 ){ - rtc_dirty = 0; - RWAIT = 1; - while( !RWST ){;} - memcpy( &SEC, rtc_work, 7 ); - RWAIT = 0; - } + // ライトロック + if( rtc_dirty != 0 ) + { + rtc_dirty = 0; + RWAIT = 1; + while( !RWST ) + {; + } + memcpy( &SEC, rtc_work, 7 ); + RWAIT = 0; + } - // アラームセット - if( rtc_alarm_dirty ){ - WALE = 0; - ALARMWM = vreg_ctr[ VREG_C_RTC_ALARM_MIN ]; - ALARMWH = vreg_ctr[ VREG_C_RTC_ALARM_HOUR ]; - rtc_dirty = 0; - WALE = 1; - } + // アラームセット + if( rtc_alarm_dirty ) + { + WALE = 0; + ALARMWM = vreg_ctr[VREG_C_RTC_ALARM_MIN]; + ALARMWH = vreg_ctr[VREG_C_RTC_ALARM_HOUR]; + rtc_dirty = 0; + WALE = 1; + } } - - diff --git a/trunk/rtc.h b/trunk/rtc.h index 1b508f6..3d20624 100644 --- a/trunk/rtc.h +++ b/trunk/rtc.h @@ -2,13 +2,13 @@ #define __rtc_h__ -void RTC_init(void); -__interrupt void int_rtc_int(); -void get_rtc(); -void set_rtc(); +void RTC_init( void ); +__interrupt void int_rtc_int( ); +void get_rtc( ); +void set_rtc( ); //task_status_immed tski_rtc_close(); -void rtc_unlock(); +void rtc_unlock( ); // ------------------------------------ #define RTC_32k_on() { RCLOE0 = 1; } diff --git a/trunk/self_flash.c b/trunk/self_flash.c index dcdbde0..e00d7d0 100644 --- a/trunk/self_flash.c +++ b/trunk/self_flash.c @@ -66,9 +66,9 @@ const u8 fsl_low_voltage_u08 = 1; // ======================================================== -static void FSL_Open(void); -static void FSL_Close(void); -err firm_restore(); +static void FSL_Open( void ); +static void FSL_Close( void ); +err firm_restore( ); extern void self_update_reboot( u8 flag ); @@ -79,156 +79,181 @@ extern void self_update_reboot( u8 flag ); // ======================================================== -u8 boot_ura; // ブートクラスタ 0/1 +u8 boot_ura; // ブートクラスタ 0/1 /* ======================================================== ======================================================== */ -err firm_update(){ - u8 buffer_fill; - u8 target_block; - u8 data_buffer[ SELF_UPDATE_BUFF_SIZE ]; - u8 split_write_count; // ブロックへちまちま書き込むカウンタ - fsl_u08 err; - __far u8* p_rom; +err firm_update( ) +{ + u8 buffer_fill; + u8 target_block; + u8 data_buffer[SELF_UPDATE_BUFF_SIZE]; + u8 split_write_count; // ブロックへちまちま書き込むカウンタ + fsl_u08 err; + __far u8 *p_rom; - TOE0 = 0x0000; - TOE0 = 0x0020; + TOE0 = 0x0000; + TOE0 = 0x0020; - // 書き替え前準備 // - FSL_Open(); // 割り込み禁止など - DI(); + // 書き替え前準備 // + FSL_Open( ); // 割り込み禁止など + DI( ); - err = FSL_Init( data_buffer ); // ライブラリ初期化。割り込み中断考慮せず - err += FSL_ModeCheck(); // ライトプロテクトチェック。失敗することを考慮せず + err = FSL_Init( data_buffer ); // ライブラリ初期化。割り込み中断考慮せず + err += FSL_ModeCheck( ); // ライトプロテクトチェック。失敗することを考慮せず - // ファームのバックアップ // - /* - 0x2000 - 0x47FF (ブロック 8 - 17) を - 0x4800 - 0x7FFF (ブロック 18 - 27) にコピー - */ + // ファームのバックアップ // + /* + 0x2000 - 0x47FF (ブロック 8 - 17) を + 0x4800 - 0x7FFF (ブロック 18 - 27) にコピー + */ - p_rom = (__far u8*)0x2000; - // 書き込み先ブロックの数だけ繰り返す - for( target_block = ( FIRM_TOP + FIRM_SIZE ); - target_block < ( FIRM_TOP + FIRM_SIZE + FIRM_SIZE ); - target_block += 1 ){ + p_rom = ( __far u8 * ) 0x2000; + // 書き込み先ブロックの数だけ繰り返す + for( target_block = ( FIRM_TOP + FIRM_SIZE ); + target_block < ( FIRM_TOP + FIRM_SIZE + FIRM_SIZE ); target_block += 1 ) + { - WDT_Restart(); - // ブロック消去 - while( FSL_BlankCheck( target_block ) != FSL_OK ){ - err = FSL_Erase( target_block ); + WDT_Restart( ); + // ブロック消去 + while( FSL_BlankCheck( target_block ) != FSL_OK ) + { + err = FSL_Erase( target_block ); + } + + // 分割書き込み分繰り返す + for( split_write_count = 0; + split_write_count < SELF_UPDATE_SPLIT_WRITE_NUM; split_write_count += 1 ) + { + + // 書き込みデータをバッファにためる + buffer_fill = 0; + do + { + data_buffer[buffer_fill] = *p_rom; + p_rom += 1; + buffer_fill++; + } + while( buffer_fill != ( u8 ) SELF_UPDATE_BUFF_SIZE ); + + // 書き込み + err = FSL_Write( ( fsl_u32 ) ( target_block * SAM_BLOCK_SIZE + + + split_write_count * + SELF_UPDATE_BUFF_SIZE ), + ( fsl_u08 ) ( SELF_UPDATE_BUFF_SIZE / SAM_WORD_SIZE ) ); + + if( err != FSL_OK ) + { + FSL_Close( ); + NOP( ); + return ( ERR_ERR ); + } + } + + // 1ブロック書き込み完了。内部電圧チェックを行う + while( FSL_IVerify( target_block ) != FSL_OK ) + {; + } } - // 分割書き込み分繰り返す - for( split_write_count = 0; - split_write_count < SELF_UPDATE_SPLIT_WRITE_NUM; - split_write_count += 1 ){ + // 書き替え // + /* + ●書き込み中の電源断を判定するため、最初に全クラスタ消去する（フッタを消したい） + ●ストップコンディションが来るまで続ける（結局、0x1000 - 0x47FF まですべて書き替えることにはなる） + ●終わったら、リセットする。WDTリセットなので自分でわかる。 + */ - // 書き込みデータをバッファにためる - buffer_fill = 0; - do{ - data_buffer[ buffer_fill ] = *p_rom; - p_rom += 1; - buffer_fill++; - }while( buffer_fill != (u8)SELF_UPDATE_BUFF_SIZE ); - - // 書き込み - err = FSL_Write( (fsl_u32)( target_block * SAM_BLOCK_SIZE - + split_write_count * SELF_UPDATE_BUFF_SIZE ), - (fsl_u08)( SELF_UPDATE_BUFF_SIZE / SAM_WORD_SIZE ) ); - - if( err != FSL_OK ){ - FSL_Close(); - NOP(); - return( ERR_ERR ); - } + // 全ブロック消去 + for( target_block = INACTIVE_BOOTSECT_TOP; + target_block <= UPDATE_BLOCK_LAST; target_block += 1 ) + { + err = FSL_Erase( target_block ); } - // 1ブロック書き込み完了。内部電圧チェックを行う - while( FSL_IVerify( target_block ) != FSL_OK ){ ; } - } + WREL = 1; - // 書き替え // - /* - ●書き込み中の電源断を判定するため、最初に全クラスタ消去する（フッタを消したい） - ●ストップコンディションが来るまで続ける（結局、0x1000 - 0x47FF まですべて書き替えることにはなる） - ●終わったら、リセットする。WDTリセットなので自分でわかる。 - */ + // ブロックの数だけ繰り返し + for( target_block = INACTIVE_BOOTSECT_TOP; + target_block <= UPDATE_BLOCK_LAST; target_block += 1 ) + { + // 分割書き込み + for( split_write_count = 0; + ( ( split_write_count < SELF_UPDATE_SPLIT_WRITE_NUM ) + && ( !SPD ) ); split_write_count += 1 ) + { - // 全ブロック消去 - for( target_block = INACTIVE_BOOTSECT_TOP; - target_block <= UPDATE_BLOCK_LAST ; - target_block += 1 ){ - err = FSL_Erase( target_block ); - } + WDT_Restart( ); + // I2Cから書き込みデータをバッファにためる + do + { + while( !IICAIF && !SPD ) + {; + } + IICAIF = 0; + data_buffer[buffer_fill] = IICA; + WREL = 1; + buffer_fill += 1; + } + while( ( buffer_fill != ( u8 ) SELF_UPDATE_BUFF_SIZE ) && !SPD ); - WREL = 1; + // 書き込み + // 最後だと、ゴミをパディングするが別にかまわない + err = FSL_Write( ( fsl_u32 ) ( target_block * SAM_BLOCK_SIZE + + + split_write_count * + SELF_UPDATE_BUFF_SIZE ), + ( fsl_u08 ) ( SELF_UPDATE_BUFF_SIZE / SAM_WORD_SIZE ) ); - // ブロックの数だけ繰り返し - for( target_block = INACTIVE_BOOTSECT_TOP; - target_block <= UPDATE_BLOCK_LAST; - target_block += 1 ){ - // 分割書き込み - for( split_write_count = 0; - (( split_write_count < SELF_UPDATE_SPLIT_WRITE_NUM ) && ( !SPD )); - split_write_count += 1 ){ + if( err != FSL_OK ) + { + FSL_Close( ); + return ( ERR_ERR ); + } - WDT_Restart(); - // I2Cから書き込みデータをバッファにためる - do{ - while( !IICAIF && !SPD ){;} - IICAIF = 0; - data_buffer[ buffer_fill ] = IICA; - WREL = 1; - buffer_fill += 1; - }while(( buffer_fill != (u8)SELF_UPDATE_BUFF_SIZE ) && !SPD ); - - // 書き込み - // 最後だと、ゴミをパディングするが別にかまわない - err = FSL_Write( (fsl_u32)( target_block * SAM_BLOCK_SIZE - + split_write_count * SELF_UPDATE_BUFF_SIZE ), - (fsl_u08)( SELF_UPDATE_BUFF_SIZE / SAM_WORD_SIZE ) ); - - if( err != FSL_OK ){ - FSL_Close(); - return( ERR_ERR ); - } + } + // 1ブロック書き込み完了。内部ベリファイを行う + while( FSL_IVerify( target_block ) != FSL_OK ) + {; + } + if( SPD ) + { + goto firm_update_end; + } } - // 1ブロック書き込み完了。内部ベリファイを行う - while( FSL_IVerify( target_block ) != FSL_OK ){;} - if( SPD ){ - goto firm_update_end; + firm_update_end: + LREL = 1; + + // 書き込んだファームのチェック // + { + u8 i; + u8 comp = 0; + + // 少なくとも、ローダーのマジックと、本文の末尾のマジックは同じか確認 + for( i = 0; i < sizeof( __TIME__ ); i++ ) + { + comp += ( *( u8 * ) ( N_MGC_L + i ) == *( u8 * ) ( N_MGC_T + i ) ) ? 0 : 1; + } + if( comp == 0 ) + { + FSL_InvertBootFlag( ); +// FSL_ForceReset(); + FSL_SwapBootCluster( ); + // 戻ってこない // + } + else + { + FSL_Close( ); + firm_restore( ); + // 戻ってこない // + } } - } - -firm_update_end: - LREL = 1; - - // 書き込んだファームのチェック // - { - u8 i; - u8 comp = 0; - - // 少なくとも、ローダーのマジックと、本文の末尾のマジックは同じか確認 - for( i = 0; i < sizeof( __TIME__ ); i++ ){ - comp += ( *(u8*)( N_MGC_L + i ) == *(u8*)( N_MGC_T + i ) )? 0: 1; - } - if( comp == 0 ){ - FSL_InvertBootFlag(); - FSL_SwapBootCluster(); - // 戻ってこない // - }else{ - FSL_Close(); - firm_restore(); - // 戻ってこない // - } - } } @@ -240,118 +265,130 @@ firm_update_end: 再起動します。 ブートスワップは不要です。 ======================================================== */ -err firm_restore(){ - u8 buffer_fill; - u8 target_block; - u8 data_buffer[ SELF_UPDATE_BUFF_SIZE ]; - u8 split_write_count; // ブロックへちまちま書き込むカウンタ - fsl_u08 err; - __far u8* p_rom; +err firm_restore( ) +{ + u8 buffer_fill; + u8 target_block; + u8 data_buffer[SELF_UPDATE_BUFF_SIZE]; + u8 split_write_count; // ブロックへちまちま書き込むカウンタ + fsl_u08 err; + __far u8 *p_rom; - RTCE = 0; + RTCE = 0; - TOE0 = 0x0000; - TOE0 = 0x0080; - // 書き替え前準備 // - DI(); - FSL_Open(); // 割り込み禁止など + TOE0 = 0x0000; + TOE0 = 0x0080; + // 書き替え前準備 // + DI( ); + FSL_Open( ); // 割り込み禁止など - err = FSL_Init( data_buffer ); // ライブラリ初期化。割り込み中断考慮せず - err += FSL_ModeCheck(); // ライトプロテクトチェック。失敗することを考慮せず + err = FSL_Init( data_buffer ); // ライブラリ初期化。割り込み中断考慮せず + err += FSL_ModeCheck( ); // ライトプロテクトチェック。失敗することを考慮せず - // ファームのリストア - /* - 0x4800 - 0x7FFF (ブロック 18 - 27) から - 0x2000 - 0x47FF (ブロック 8 - 17) へコピー - */ + // ファームのリストア + /* + 0x4800 - 0x7FFF (ブロック 18 - 27) から + 0x2000 - 0x47FF (ブロック 8 - 17) へコピー + */ - p_rom = (__far u8*)0x4800; - // 転送先ブロックの数だけ繰り返す - for( target_block = FIRM_TOP; - target_block <= UPDATE_BLOCK_LAST; - target_block += 1 ){ + p_rom = ( __far u8 * ) 0x4800; + // 転送先ブロックの数だけ繰り返す + for( target_block = FIRM_TOP; target_block <= UPDATE_BLOCK_LAST; target_block += 1 ) + { - WDT_Restart(); - // 壊れたファームを消し - err = FSL_Erase( target_block ); + WDT_Restart( ); + // 壊れたファームを消し + err = FSL_Erase( target_block ); - // 分割書き込み分繰り返す - for( split_write_count = 0; - split_write_count < SELF_UPDATE_SPLIT_WRITE_NUM; - split_write_count += 1 ){ + // 分割書き込み分繰り返す + for( split_write_count = 0; + split_write_count < SELF_UPDATE_SPLIT_WRITE_NUM; split_write_count += 1 ) + { - // 書き込みデータをバッファにためる - buffer_fill = 0; - do{ - data_buffer[ buffer_fill ] = *p_rom; - p_rom += 1; - buffer_fill++; - }while( buffer_fill != (u8)SELF_UPDATE_BUFF_SIZE ); + // 書き込みデータをバッファにためる + buffer_fill = 0; + do + { + data_buffer[buffer_fill] = *p_rom; + p_rom += 1; + buffer_fill++; + } + while( buffer_fill != ( u8 ) SELF_UPDATE_BUFF_SIZE ); - // 書き込み - err = FSL_Write( (fsl_u32)( target_block * SAM_BLOCK_SIZE - + split_write_count * SELF_UPDATE_BUFF_SIZE ), - (fsl_u08)( SELF_UPDATE_BUFF_SIZE / SAM_WORD_SIZE ) ); + // 書き込み + err = FSL_Write( ( fsl_u32 ) ( target_block * SAM_BLOCK_SIZE + + + split_write_count * + SELF_UPDATE_BUFF_SIZE ), + ( fsl_u08 ) ( SELF_UPDATE_BUFF_SIZE / SAM_WORD_SIZE ) ); - if( err != FSL_OK ){ - FSL_Close(); - return( ERR_ERR ); - } + if( err != FSL_OK ) + { + FSL_Close( ); + return ( ERR_ERR ); + } + } + + // 1ブロック書き込み完了したので内部ベリファイを行う + while( FSL_IVerify( target_block ) != FSL_OK ) + {; + } } + // todo + // 　それでもだなら、LEDちかちかとかさせて、サービス送りにしてもらう - // 1ブロック書き込み完了したので内部ベリファイを行う - while( FSL_IVerify( target_block ) != FSL_OK ){ ; } - } - // todo - // 　それでもだなら、LEDちかちかとかさせて、サービス送りにしてもらう - - // リブート - // スワップは不要です！ - FSL_ForceReset(); - return( ERR_SUCCESS ); + // リブート + // スワップは不要です！ + FSL_ForceReset( ); + return ( ERR_SUCCESS ); } -void chk_bootCluster(){ - u8 data_buffer[ SELF_UPDATE_BUFF_SIZE ]; - u8 err; +void chk_bootCluster( ) +{ + u8 data_buffer[SELF_UPDATE_BUFF_SIZE]; + u8 err; - DI(); - FSL_Open(); // 割り込み禁止など + DI( ); + FSL_Open( ); // 割り込み禁止など - err = FSL_Init( data_buffer ); // ライブラリ初期化。割り込み中断考慮せず - err |= FSL_ModeCheck(); // ライトプロテクトチェック。失敗することを考慮せず - err |= FSL_GetActiveBootCluster( &boot_ura ); + err = FSL_Init( data_buffer ); // ライブラリ初期化。割り込み中断考慮せず + err |= FSL_ModeCheck( ); // ライトプロテクトチェック。失敗することを考慮せず + err |= FSL_GetActiveBootCluster( &boot_ura ); - FSL_Close(); + FSL_Close( ); } // ======================================================== -static void FSL_Open(void) +static void FSL_Open( void ) { - /* save the configuration of the interrupt controller and set */ - #ifdef FSL_INT_BACKUP - fsl_MK0L_bak_u08 = MK0L; /* if (interrupt backup required) */ - fsl_MK0H_bak_u08 = MK0H; /* { */ - fsl_MK1L_bak_u08 = MK1L; /* */ - fsl_MK1H_bak_u08 = MK1H; /* save interrupt controller */ - fsl_MK2L_bak_u08 = MK2L; /* configuration */ - fsl_MK2H_bak_u08 = MK2H; /* */ - MK0L = FSL_MK0L_MASK; /* */ - MK0H = FSL_MK0H_MASK; /* */ - MK1L = FSL_MK1L_MASK; /* prepare interrupt controller */ - MK1H = FSL_MK1H_MASK; /* for selfprogramming */ - MK2L = FSL_MK2L_MASK; /* */ - MK2H = FSL_MK2H_MASK; /* } */ - #endif + /* save the configuration of the interrupt controller and set */ +#ifdef FSL_INT_BACKUP + fsl_MK0L_bak_u08 = MK0L; /* if (interrupt backup required) */ + fsl_MK0H_bak_u08 = MK0H; /* { */ + fsl_MK1L_bak_u08 = MK1L; /* */ + fsl_MK1H_bak_u08 = MK1H; /* save interrupt controller */ + fsl_MK2L_bak_u08 = MK2L; /* configuration */ + fsl_MK2H_bak_u08 = MK2H; /* */ + MK0L = FSL_MK0L_MASK; /* */ + MK0H = FSL_MK0H_MASK; /* */ + MK1L = FSL_MK1L_MASK; /* prepare interrupt controller */ + MK1H = FSL_MK1H_MASK; /* for selfprogramming */ + MK2L = FSL_MK2L_MASK; /* */ + MK2H = FSL_MK2H_MASK; /* } */ +#endif - // 何か前準備？ - // todo DMAを止める + // 何か前準備？ + // todo DMAを止める + while( DST1 ) + {; + } + DEN1 = 0; - FSL_FLMD0_HIGH; // フラッシュ書き替え許可 + FSL_FLMD0_HIGH; // フラッシュ書き替え許可 } @@ -359,19 +396,19 @@ static void FSL_Open(void) /*----------------------------------------------------------------------------------------------*/ /* leave the "user room" and restore previous conditions */ /*----------------------------------------------------------------------------------------------*/ -static void FSL_Close(void) +static void FSL_Close( void ) { - // 何か後始末？ + // 何か後始末？ - FSL_FLMD0_LOW; // フラッシュライトプロテクト + FSL_FLMD0_LOW; // フラッシュライトプロテクト - #ifdef FSL_INT_BACKUP - MK0L = fsl_MK0L_bak_u08; /* do{ */ - MK0H = fsl_MK0H_bak_u08; /* restore interrupt controller */ - MK1L = fsl_MK1L_bak_u08; /* configuration */ - MK1H = fsl_MK1H_bak_u08; /* */ - MK2L = fsl_MK2L_bak_u08; /* */ - MK2H = fsl_MK2H_bak_u08; /* } */ - #endif +#ifdef FSL_INT_BACKUP + MK0L = fsl_MK0L_bak_u08; /* do{ */ + MK0H = fsl_MK0H_bak_u08; /* restore interrupt controller */ + MK1L = fsl_MK1L_bak_u08; /* configuration */ + MK1H = fsl_MK1H_bak_u08; /* */ + MK2L = fsl_MK2L_bak_u08; /* */ + MK2H = fsl_MK2H_bak_u08; /* } */ +#endif } diff --git a/trunk/tasks.c b/trunk/tasks.c index 74f0c80..d5437a3 100644 --- a/trunk/tasks.c +++ b/trunk/tasks.c @@ -10,102 +10,141 @@ extern u8 boot_ura; - - -/* ======================================================== - WiFi 関係 - ・WL_TX,RX - ・LED_wifi - ・32kHz - ======================================================== */ -task_interval tsk_wifi(){ - return 10; -} - - +#define INTERVAL_TSK_MISC_STAT 4 /* ======================================================== 他のところでケアされていない部分 ======================================================== */ -task_interval tsk_misc_stat(){ - static u8 state_old; // ステータス変化検出→割り込み の為 - u8 diff; +void tsk_misc_stat( ) +{ + static u8 interval_task_misc_stat = 0; + static u8 state_old; // ステータス変化検出→割り込み の為 + u8 diff; - SHELL_CLOSE_P = 1; - set_bit( EXT_OPT_OPEN, vreg_ctr[ VREG_C_STATUS ], REG_BIT_ST_EXT_OPT_OPEN ); - set_bit( SHELL_CLOSE, vreg_ctr[ VREG_C_STATUS ], REG_BIT_ST_SHELL_CLOSED ); - SHELL_CLOSE_P = 0; - - - // ステータスレジスタ関係 → 割り込み // - if( ( system_status.pwr_state == ON ) - || ( system_status.pwr_state == SLEEP ) ){ - diff = vreg_ctr[ VREG_C_STATUS ] ^ state_old; - if( diff != 0 ){ - - if( diff & REG_BIT_LCD_POW ){ - // 液晶電源セット完了 - if( vreg_ctr[ VREG_C_STATUS ] & REG_BIT_LCD_POW ){ - // on - set_irq( VREG_C_IRQ3, REG_BIT_LCD_ON ); - }else{ - // off - set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF ); - } - } - - 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( diff & REG_BIT_BATT_CHARGE ){ - // 充電状態に以下略 - if( vreg_ctr[ VREG_C_STATUS ] & REG_BIT_BATT_CHARGE ){ - set_irq( VREG_C_IRQ2, REG_BIT_BT_CHG_START ); - }else{ - set_irq( VREG_C_IRQ2, REG_BIT_BT_CHG_STOP ); - } - } - - if( diff & REG_BIT_POW_SUPPLY ){ - // 電源供給 - if( vreg_ctr[ VREG_C_STATUS ] & REG_BIT_POW_SUPPLY ){ - set_irq( VREG_C_IRQ2, REG_BIT_BT_DC_CONNECT ); - }else{ - set_irq( VREG_C_IRQ2, REG_BIT_BT_DC_DISC ); - } - } - - if( diff & REG_BIT_ST_EXT_OPT_OPEN ){ - // オプション蓋ロック - if( vreg_ctr[ VREG_C_STATUS ] & REG_BIT_ST_EXT_OPT_OPEN ){ - set_irq( VREG_C_IRQ2, REG_BIT_EXTOPT_LOCK ); - }else{ - set_irq( VREG_C_IRQ2, REG_BIT_EXTOPT_OPEN ); - } - } - - if( diff & REG_BIT_ST_SHELL_CLOSED ){ - // BL点灯 - if( vreg_ctr[ VREG_C_STATUS ] & REG_BIT_ST_SHELL_CLOSED ){ - set_irq( VREG_C_IRQ2, REG_BIT_SHELL_OPEN ); - }else{ - set_irq( VREG_C_IRQ2, REG_BIT_SHELL_CLOSE ); - } - } + if( interval_task_misc_stat != 0 ) + { + interval_task_misc_stat -= 1; + return; + } + else + { + interval_task_misc_stat = ( INTERVAL_TSK_MISC_STAT / SYS_INTERVAL_TICK ); } - state_old = vreg_ctr[ VREG_C_STATUS ]; - } + SHELL_CLOSE_P = 1; + set_bit( EXT_OPT_OPEN, vreg_ctr[VREG_C_STATUS], REG_BIT_ST_EXT_OPT_OPEN ); + set_bit( SHELL_CLOSE, vreg_ctr[VREG_C_STATUS], REG_BIT_ST_SHELL_CLOSED ); + SHELL_CLOSE_P = 0; - return( 100 ); + + // ステータスレジスタ関係 → 割り込み // + if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP ) ) + { + diff = vreg_ctr[VREG_C_STATUS] ^ state_old; + if( diff != 0 ) + { + state_old = vreg_ctr[VREG_C_STATUS]; + + if( diff & REG_BIT_LCD_POW ) + { + // 液晶電源セット完了 + if( vreg_ctr[VREG_C_STATUS] & REG_BIT_LCD_POW ) + { + // on + set_irq( VREG_C_IRQ3, REG_BIT_LCD_ON ); + } + else + { + // off + set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF ); + } + } + + 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( diff & REG_BIT_BATT_CHARGE ) + { + // 充電状態に以下略 + if( vreg_ctr[VREG_C_STATUS] & REG_BIT_BATT_CHARGE ) + { + set_irq( VREG_C_IRQ2, REG_BIT_BT_CHG_START ); + } + else + { + set_irq( VREG_C_IRQ2, REG_BIT_BT_CHG_STOP ); + } + } + + if( diff & REG_BIT_POW_SUPPLY ) + { + // 電源供給 + if( vreg_ctr[VREG_C_STATUS] & REG_BIT_POW_SUPPLY ) + { + set_irq( VREG_C_IRQ2, REG_BIT_BT_DC_CONNECT ); + } + else + { + set_irq( VREG_C_IRQ2, REG_BIT_BT_DC_DISC ); + } + } + + if( diff & REG_BIT_ST_EXT_OPT_OPEN ) + { + // オプション蓋ロック + if( vreg_ctr[VREG_C_STATUS] & REG_BIT_ST_EXT_OPT_OPEN ) + { + set_irq( VREG_C_IRQ2, REG_BIT_EXTOPT_LOCK ); + } + else + { + set_irq( VREG_C_IRQ2, REG_BIT_EXTOPT_OPEN ); + } + } + + if( diff & REG_BIT_ST_SHELL_CLOSED ) + { + // 蓋の開け閉め + if( vreg_ctr[VREG_C_STATUS] & REG_BIT_ST_SHELL_CLOSED ) + { + set_irq( VREG_C_IRQ2, REG_BIT_SHELL_OPEN ); + } + else + { + set_irq( VREG_C_IRQ2, REG_BIT_SHELL_CLOSE ); + } + } + } + +#ifdef _MCU_KE3_ + /* ======================================================== + 加速度センサ割り込みピンがオリジナルマイコンには無いので + ポーリングする。 + 歩数計用 + BSRマイコンはaccero.cで割り込みルーチンからタスク登録します。 + ======================================================== */ + if( ( vreg_ctr[VREG_C_ACC_CONFIG] & 0x03 ) != 0x00 ) + { + if( ACC_VALID ) + { + renge_task_immed_add( tsk_cbk_accero ); + } + } +#endif + } + return; } @@ -113,38 +152,41 @@ task_interval tsk_misc_stat(){ /* ======================================================== ======================================================== */ -task_interval tsk_debug(){ - u8 temp; - static u8 count = 0; +void tsk_debug( ) +{ + u8 temp; + static u8 count = 0; + static u8 task_interval; + if( !SW_SEL_n ){ - /* - temp = iic_mcu_read_a_byte( IIC_SLA_8LEDS, IIC_8LEDS_REG_DO ); - count += 1; - iic_mcu_write_a_byte( IIC_SLA_8LEDS, IIC_8LEDS_REG_DO, count ); - iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 3, count ); - return 0; -*/ - return 255; + if( system_status.pwr_state == ON_TRIG ){ + renge_task_immed_add( tski_PM_LCD_on ); + wait_ms( 50 ); + renge_task_immed_add( tski_PM_BL_on ); + } + } + + /* + temp = iic_mcu_read_a_byte( IIC_SLA_8LEDS, IIC_8LEDS_REG_DO ); + count += 1; + iic_mcu_write_a_byte( IIC_SLA_8LEDS, IIC_8LEDS_REG_DO, count ); + iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 3, count ); + */ + return; } -task_interval tsk_debug2(){ - u8 str[4]; +void tsk_debug2( ) +{ + u8 str[4]; - return( 3 ); + if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP ) ) + { + str[3] = vreg_ctr[ VREG_C_FREE0 ]; + str[2] = vreg_ctr[ VREG_C_FREE1 ]; + str[1] = vreg_ctr[ VREG_C_STATUS ]; + str[0] = vreg_ctr[ VREG_C_RTC_SEC ]; -if(( system_status.pwr_state == ON ) - || ( system_status.pwr_state == SLEEP )){ - str[3] = boot_ura; - str[2] = vreg_ctr[ VREG_C_IRQ1 ]; - str[1] = vreg_ctr[ VREG_C_IRQ2 ]; - str[0] = vreg_ctr[ VREG_C_STATUS ]; -// str[3] = vreg_ctr[ VREG_C_IRQ0 ]; -// str[2] = vreg_ctr[ VREG_C_IRQ1 ]; -// str[1] = vreg_ctr[ VREG_C_IRQ2 ]; -// str[0] = vreg_ctr[ VREG_C_STATUS ]; - -// iic_mcu_write( IIC_SLA_DBG_MONITOR, 0, 4, &str[0] ); // 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 ); // iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 1, vreg_ctr[ VREG_C_SND_VOL ] ); @@ -154,8 +196,10 @@ if(( system_status.pwr_state == ON ) // iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 2, vreg_ctr[ VREG_C_SND_VOL ] ); // iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 1, vreg_ctr[ VREG_C_STATUS ] ); // iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 0, vreg_ctr[ VREG_C_ACC_ZH ] ); - } - return( 3 ); + + iic_mcu_write( IIC_SLA_DBG_MONITOR, 0, 4, &str[0] ); + } + return; } @@ -163,18 +207,20 @@ if(( system_status.pwr_state == ON ) /* ======================================================== タスクひな形 ======================================================== */ -task_interval tsk_hina(){ - switch( system_status.pwr_state ){ - case OFF: - case ON_TRIG: - case ON: - case SLEEP_TRIG: - case SLEEP: - case OFF_TRIG: - default: - } +task_interval tsk_hina( ) +{ + switch ( system_status.pwr_state ) + { + case OFF: + case ON_TRIG: + case ON: + case SLEEP_TRIG: + case SLEEP: + case OFF_TRIG: + default: + } - return( 次の起動までのシステムtick数 ); // 毎 tic 呼ばれることになります + return ( 次の起 ・ｮまでのシ ・X ・e ・ tick ・・); // 毎 tic 呼ばれることになります } @@ -182,12 +228,12 @@ task_interval tsk_hina(){ /* このように使う renge_task_immed_add( タスク関数へのポインタ ); */ -task_status_immed tsk_imm_hina( u8* arg ){ - - return( ERR_FINISED ); - // ERR_FINISED タスクを削除 - // ERR_CONTINUE 次になんか割り込みなり、ユーザー操作なり、システムチックが - // 来たときに再度実行 +task_status_immed tsk_imm_hina( u8 * arg ) +{ + return ( ERR_FINISED ); + // ERR_FINISED タスクを削除 + // ERR_CONTINUE 次になんか割り込みなり、ユーザー操作なり、システムチックが + // 来たときに再度実行 } @@ -204,83 +250,82 @@ task_status_immed tsk_imm_hina( u8* arg ){ COMMANDレジスタへの書き込み 　 0なら呼ばれません。ケア不要 ======================================================== */ -task_status_immed do_command0(){ +task_status_immed do_command0( ) +{ // 本体電源など - if( vreg_ctr[ VREG_C_COMMAND0 ] & REG_BIT_OFF_REQ ){ - system_status.pwr_state = OFF_TRIG; + 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_RESET1_REQ ){ + } + else + { + if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_RESET1_REQ ) + { #ifdef _PMIC_TWL_ - RESETs_ast; + RESETs_ast; #else - PM_reset_ast(); - RESET2_ast; + PM_reset_ast( ); + RESET2_ast; #endif - FCRAM_RST_ast; - } - if( vreg_ctr[ VREG_C_COMMAND0 ] & REG_BIT_RESET2_REQ ){ - RESET2_ast; - } - if( vreg_ctr[ VREG_C_COMMAND0 ] & REG_BIT_FCRAM_RESET_REQ ){ - FCRAM_RST_ast; - } - wait_ms( 5 ); + FCRAM_RST_ast; + } + if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_RESET2_REQ ) + { + RESET2_ast; + } + if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_FCRAM_RESET_REQ ) + { + FCRAM_RST_ast; + } + wait_ms( 5 ); #ifdef _PMIC_TWL_ - RESETs_neg; + RESETs_neg; #else - PM_reset_neg(); - RESET2_neg; + PM_reset_neg( ); + RESET2_neg; #endif - FCRAM_RST_neg; - } + FCRAM_RST_neg; + } // 液晶電源など - if( vreg_ctr[ VREG_C_COMMAND0 ] & REG_BIT_CMD_BL_ON ){ - 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_COMMAND0 ] & REG_BIT_CMD_LCD_ON ){ - renge_task_immed_add( tski_PM_LCD_on ); - }else if( vreg_ctr[ VREG_C_COMMAND0 ] & REG_BIT_CMD_LCD_OFF ){ - renge_task_immed_add( tski_PM_LCD_off ); - } + if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_CMD_BL_ON ) + { + 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_COMMAND0] & REG_BIT_CMD_LCD_ON ) + { + renge_task_immed_add( tski_PM_LCD_on ); + } + else if( vreg_ctr[VREG_C_COMMAND0] & REG_BIT_CMD_LCD_OFF ) + { + renge_task_immed_add( tski_PM_LCD_off ); + } - vreg_ctr[ VREG_C_COMMAND0 ] = 0; - return( ERR_FINISED ); + vreg_ctr[VREG_C_COMMAND0] = 0; + return ( ERR_FINISED ); } /* ======================================================== 　互換向け、TWLアプリへの割り込み -　 0なら呼ばれません。ケア不要 + 仮想レジスタの書き込み時に行います。 ======================================================== */ -task_status_immed do_command1(){ -// 呼ばれません - while(1){ - NOP(); // 誤り検出 - } - vreg_twl[ REG_TWL_ADRS_IRQ ] = (( vreg_ctr[ VREG_C_COMMAND1 ] & REG_BIT_TWL_CMD_PWSW_DET ) != 0 )? REG_BIT_TWL_IRQ_PWSW_DET: 0x00; //pwsw_det - vreg_twl[ REG_TWL_ADRS_IRQ ] |= (( vreg_ctr[ VREG_C_COMMAND1 ] & REG_BIT_TWL_CMD_RESET ) != 0 )? REG_BIT_TWL_IRQ_RESET: 0x00; //reset_req - - vreg_twl[ REG_TWL_ADRS_IRQ ] |= (( vreg_ctr[ VREG_C_COMMAND1 ] & REG_BIT_TWL_CMD_OFF ) != 0 )? REG_BIT_TWL_IRQ_OFF: 0x00; //off_req - - vreg_twl[ REG_TWL_ADRS_IRQ ] |= (( vreg_ctr[ VREG_C_COMMAND1 ] & REG_BIT_TWL_CMD_BT_LOW ) != 0 )? REG_BIT_TWL_IRQ_BT_LOW: 0x00; //batt_low - vreg_twl[ REG_TWL_ADRS_IRQ ] |= (( vreg_ctr[ VREG_C_COMMAND1 ] & REG_BIT_TWL_CMD_BT_EMPTY ) != 0 )? REG_BIT_TWL_IRQ_BT_EMPTY: 0x00; //batt_empty - - vreg_twl[ REG_TWL_ADRS_IRQ ] |= (( vreg_ctr[ VREG_C_COMMAND1 ] & REG_BIT_TWL_CMD_VOL_CHANGE ) != 0 )? REG_BIT_TWL_IRQ_VOL_CHANGE: 0x00; //vol_changed - return( ERR_FINISED ); -} +// task_status_immed do_command1( ) /* ======================================================== CPUからのスリープ要求 ======================================================== */ -__interrupt void intp0_slp(){ // SLP +__interrupt void intp0_slp( ) +{ // SLP /* if( SLP_REQ ){ system_status.pwr_state = SLEEP_TRIG; @@ -295,5 +340,3 @@ __interrupt void intp0_slp(){ // SLP renge_task_interval_run_force = 1; */ } - - diff --git a/trunk/tasks_sys.c b/trunk/tasks_sys.c index 16d7139..0fa91b5 100644 --- a/trunk/tasks_sys.c +++ b/trunk/tasks_sys.c @@ -12,8 +12,8 @@ #include "pm.h" #include "rtc.h" -u8 SW_pow_count, SW_home_count, SW_tune_count, SW_wifi_count; -bit SW_pow_mask, SW_home_mask, SW_tune_mask, SW_wifi_mask; +u8 SW_pow_count, SW_home_count, SW_tune_count, SW_wifi_count; +bit SW_pow_mask, SW_home_mask, SW_tune_mask, SW_wifi_mask; /* ======================================================== @@ -22,193 +22,191 @@ bit SW_pow_mask, SW_home_mask, SW_tune_mask, SW_wifi_mask; 　system_status.pwr_state == OFF_TRIG で、このタスクが呼ばれると、 省電力モードに入ります ======================================================== */ -task_interval tsk_sys(){ - static u8 timeout = 0; - RTCIMK = 0; // インターバル割り込み許可 +void tsk_sys( ) +{ + static u8 timeout = 0; + RTCIMK = 0; // インターバル割り込み許可 - switch( system_status.pwr_state ){ - case OFF: //------------------------------------------------------- - // スイッチ操作などで割り込みが発生し、スリープが解除されるとここに来ます。 - - switch( system_status.poweron_reason ){ - default: - // スイッチで電源on - if(( SW_pow_count != 0 ) || - ( SW_wifi_count != 0 )){ - timeout = 0; - }else{ - timeout += 1; - } - if( timeout > 127 ){ - system_status.pwr_state = OFF_TRIG; // スイッチはノイズだった。寝る。 - renge_task_interval_run_force = 1; - //iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 3, 0x81 ); - return( 0 ); - } - if(( SW_pow_count < 3 )&& - ( SW_wifi_count < 3 )){ - // もう少しスイッチの様子を見る - //iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 3, 0x82 ); - return( 0 ); - } - break; - - case( RTC_ALARM ): - //iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 3, 0x83 ); - break; - - // 何か他に電源ON要因はあるか？ - // 蓋開け - // アダプタ(充電の温度を監視しなくてはならない) - - } - timeout = 0; - - // 電源投入 - SW_pow_mask = 1; - SW_tune_mask = 1; - SW_wifi_mask = 1; - - // 電源投入 // - iic_mcu_start(); - - PM_init(); // 電池残量ICの設定 - - // todo bt_auth - if( PM_bt_auth() != ERR_SUCCESS ){ - // どうするの？ - renge_task_interval_run_force = 1; - system_status.pwr_state = OFF_TRIG; - while(1){ - NOP(); - } -// return( 0 ); - } - - if( PM_sys_pow_on() != ERR_SUCCESS ){ // 電源起動不可エラー - renge_task_interval_run_force = 1; - iic_mcu_stop(); - system_status.pwr_state = OFF; - return( 0 ); - } - - PM_LCD_vcom_set(); // LCDの対向電圧値など書き込み - // 電源スイッチでの電源投入であれば、バックライトを点ける - if( system_status.poweron_reason == PWSW ){ - // パワースイッチでのonの時は、LEDを点灯させる - vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ILM_AUTO; -#if 0 - if( PM_LCD_on() == 0 ){ - renge_task_interval_run_force = 1; - iic_mcu_stop(); - system_status.pwr_state = OFF; - return( 0 ); - } - - if( PM_BL_on() == 0 ){ - renge_task_interval_run_force = 1; - iic_mcu_stop(); - system_status.pwr_state = OFF; - return( 0 ); - } -#endif - } - else + switch ( system_status.pwr_state ) { - // 他には？ - vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ILM_OFF; - } + case OFF: //------------------------------------------------------- + // スイッチ操作などで割り込みが発生し、スリープが解除されるとここに来ます。 - // ここまで来ると、電源投入確定 - system_status.pwr_state = ON_TRIG; - renge_task_interval_run_force = 1; + switch ( system_status.poweron_reason ) + { + default: + // スイッチで電源on + if( ( SW_pow_count != 0 ) || ( SW_wifi_count != 0 ) ) + { + timeout = 0; + } + else + { + timeout += 1; + } + if( timeout > 127 ) + { + system_status.pwr_state = OFF_TRIG; // スイッチはノイズだった。寝る。 + renge_task_interval_run_force = 1; + return; + } + if( ( SW_pow_count < 3 ) && ( SW_wifi_count < 3 ) ) + { + // もう少しスイッチの様子を見る + return; + } + break; - return( 0 ); - break; + case ( RTC_ALARM ): + break; - case ON_TRIG: //------------------------------------------------------- - LED_init(); - { - PU7 = 0b00011101; // 4:SW_WIFI 3:SW_PWSW 2:PM_IRQ 0:PM_EXTDC - } + // 何か他に電源ON要因はあるか？ + // 蓋開け + // アダプタ(充電の温度を監視しなくてはならない) + } - // アクティブ中に使用するピン変化割り込み - // I2CやDMAは個別にセットしてください - // KRM = 0b00000000; - MK0 = INT_MSK0_RSV; - MK1 = INT_MSK1_RSV; -#ifdef _MCU_BSR_ - MK2 = INT_MSK2_RSV; -#else - MK2L= INT_MSK2L_RSV; + timeout = 0; + + // 電源投入 + SW_pow_mask = 1; + SW_tune_mask = 1; + SW_wifi_mask = 1; + + // 電源投入 // + iic_mcu_start( ); + + PM_init( ); // 電池残量ICの設定 + + // todo bt_auth + if( PM_bt_auth( ) != ERR_SUCCESS ) + { + // どうするの？ + renge_task_interval_run_force = 1; + system_status.pwr_state = OFF_TRIG; + while( 1 ) + { + NOP( ); + } +// return( 0 ); + } + + if( PM_sys_pow_on( ) != ERR_SUCCESS ) + { // 電源起動不可エラー + renge_task_interval_run_force = 1; + iic_mcu_stop( ); + system_status.pwr_state = OFF; + return; + } + + PM_LCD_vcom_set( ); // LCDの対向電圧値など書き込み +#ifdef _PMIC_TWL_ + PM_TEG_LCD_dis( 0 ); #endif - // ほか、必要ペリフェラルの初期化 - IIC_ctr_Init(); // とりあえずはここで初期化 - IIC_twl_Init(); - RTC_32k_on(); - system_status.pwr_state = ON; + if( system_status.poweron_reason == PWSW ) + { + // 電源ボタンでのonの時は、LEDを点灯させる + vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_AUTO; + } + else + { + vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_OFF; + // 他には？ + } + + // ここまで来ると、電源投入確定 + system_status.pwr_state = ON_TRIG; + renge_task_interval_run_force = 1; + + return; + break; + + case ON_TRIG: //------------------------------------------------------- + LED_init( ); + { + PU7 = 0b00011101; // 4:SW_WIFI 3:SW_PWSW 2:PM_IRQ 0:PM_EXTDC + } + + // アクティブ中に使用するピン変化割り込み + // I2CやDMAは個別にセットしてください + // KRM = 0b00000000; + + MK0 = INT_MSK0_RSV; + MK1 = INT_MSK1_RSV; +#ifdef _MCU_BSR_ + MK2 = INT_MSK2_RSV; +#else + MK2L = INT_MSK2L_RSV; +#endif + + // ほか、必要ペリフェラルの初期化 + IIC_ctr_Init( ); // とりあえずはここで初期化 + IIC_twl_Init( ); + RTC_32k_on( ); + + system_status.pwr_state = ON; #ifndef _CODEC_CTR_ - { - u8 temp; + { + u8 temp; // do{ - temp = iic_mcu_write_a_byte( IIC_SLA_DCP, 0x08, 0x80 ); // ACR←0x80 揮発モードへ - NOP(); + temp = iic_mcu_write_a_byte( IIC_SLA_DCP, 0x08, 0x80 ); // ACR←0x80 揮発モードへ + NOP( ); // }while( temp != ERR_SUCCESS ); - } + } #endif - system_status.poweron_reason = PWSW; - break; + system_status.poweron_reason = PWSW; + return; + break; - - case ON: //--------------------------------------------- - if( !RESET1_n ){ - // 電源異常チェック - /// コマンドで、正規にリセットをかけたときには、 - /// このチェックに引っかからないので大丈夫 - NOP(); - // ステータス類の設定、電源のフラグなどの整理 + case ON: //--------------------------------------------- + if( !RESET1_n ) + { + // 電源異常チェック + /// コマンドで、正規にリセットをかけたときには、 + /// このチェックに引っかからないので大丈夫 + NOP( ); + // ステータス類の設定、電源のフラグなどの整理 // system_status.pwr_state = OFF_TRIG; // renge_task_interval_run_force = 1; - } - break; + } + return; + break; - case SLEEP_TRIG: //------------------------------------- - system_status.pwr_state = SLEEP; - PM_BL_off(); - break; + case SLEEP_TRIG: //------------------------------------- + system_status.pwr_state = SLEEP; + // todo PMICのモード切替 + // SoCとのハンドシェイク + PM_BL_off( ); + return; + break; - case SLEEP: //------------------------------------------ - system_status.pwr_state = ON_TRIG; - if( !RESET1_n ){ - NOP(); + case SLEEP: //------------------------------------------ + system_status.pwr_state = ON_TRIG; + if( !RESET1_n ) + { + NOP( ); /* // ステータス類の設定、電源のフラグなどの整理 system_status.pwr_state = OFF_TRIG; renge_task_interval_run_force = 1; */ - } - break; + } + return; + break; - case OFF_TRIG: //--------------------------------------- - DBG_LED_WIFI_2_on; - DBG_LED_WIFI_2_off; - DBG_LED_WIFI_2_on; - DBG_LED_WIFI_2_off; - - - LED_stop(); - IIC_ctr_Stop(); - IIC_twl_Stop(); - vreg_ctr[ VREG_C_IRQ0 ] = 0; - vreg_ctr[ VREG_C_IRQ1 ] = 0; - vreg_ctr[ VREG_C_IRQ2 ] = 0; - vreg_ctr[ VREG_C_IRQ3 ] = 0; - BT_TEMP_P = 0; + case OFF_TRIG: //--------------------------------------- + LED_stop( ); + IIC_ctr_Stop( ); + IIC_twl_Stop( ); + vreg_ctr[VREG_C_IRQ0] = 0; + vreg_ctr[VREG_C_IRQ1] = 0; + vreg_ctr[VREG_C_IRQ2] = 0; + vreg_ctr[VREG_C_IRQ3] = 0; + BT_TEMP_P = 0; // 電源オン条件の割り込みセット // PWSW KR3 押すとL @@ -217,74 +215,70 @@ task_interval tsk_sys(){ // ACアダプタ INTP4 アダプタありでL // RTC - DI(); + DI( ); - PM_sys_pow_off(); - DBG_LED_WIFI_2_on; - DBG_LED_WIFI_2_off; - DBG_LED_WIFI_2_on; - DBG_LED_WIFI_2_off; - DBG_LED_WIFI_2_on; - DBG_LED_WIFI_2_off; +#ifdef _PMIC_TWL_ + PM_TEG_LCD_dis( 1 ); +#endif + + PM_sys_pow_off( ); // iic_mcu_stop(); - // pullup_off(); ↓ - { - PU5 = 0b00000011; // PM_CHG,PM_CHGERR - PU7 = 0b00011001; // SW_WiFi,PWSWI,PM_EXTTDC - } + // pullup_off(); ↓ + { + PU5 = 0b00000011; // PM_CHG,PM_CHGERR + PU7 = 0b00011001; // SW_WiFi,PWSWI,PM_EXTTDC + } // KRM = ( KR_SW_POW | KR_SW_WIFI ); // Mask ではなく、Modeなのだそうだ。紛らわしい - KRM = ( KR_SW_POW ); // Mask ではなく、Modeなのだそうだ。紛らわしい - // intp20系は後ほど - MK0 = 0b1111111110111111; // INT(EXTDC) + KRM = ( KR_SW_POW ); // Mask ではなく、Modeなのだそうだ。紛らわしい + // intp20系は後ほど + MK0 = 0b1111111110111111; // INT(EXTDC) // MK0 = 0b1111111100111111; // INT(SHELL), INT(EXTDC) - MK1 = 0b1111010111111111; // KR(SW_PW,SW_WiFi,...), RTC(Alarm) - MK2L= 0b11111111; + MK1 = 0b1111010111111111; // KR(SW_PW,SW_WiFi,...), RTC(Alarm) + MK2L = 0b11111111; - IF0 = 0; - IF1 = 0; - IF2 = 0; + IF0 = 0; + IF1 = 0; + IF2 = 0; - timeout = 0; + timeout = 0; - system_status.pwr_state = OFF; + system_status.pwr_state = OFF; - while( RWST ){;} + while( RWST ) + {; + } - iic_mcu_stop(); + iic_mcu_stop( ); - STOP(); // 割り込み待ちで寝る // + STOP( ); // 割り込み待ちで寝る // - DBG_LED_WIFI_2_on; - DBG_LED_WIFI_2_off; - DBG_LED_WIFI_2_on; - DBG_LED_WIFI_2_off; - DBG_LED_WIFI_2_on; - DBG_LED_WIFI_2_off; - DBG_LED_WIFI_2_on; - DBG_LED_WIFI_2_off; - // while( SW_POW_n ){;} - KRMK = 1; - RTCIMK = 0; // インターバル割り込み許可 - EI(); + // while( SW_POW_n ){;} + KRMK = 1; + RTCIMK = 0; // インターバル割り込み許可 + EI( ); - renge_task_interval_run_force = 1; - break; + renge_task_interval_run_force = 1; + return; + break; + + default: + while( 1 ) + { + NOP( ); + // あり得ないステート + } - default: - while(1){ - NOP(); - // あり得ないステート } - - } - return 1; + return; } - +#define INTERVAL_TSK_SW 16 +#define CLICK_THRESHOLD 3 +#define LONG_PUSH_THREASHOLD ( 800 / INTERVAL_TSK_SW ) /* ======================================================== スイッチの監視 　チャタリングをはねたり、長押しや、押したトリガなどの検出など @@ -307,82 +301,108 @@ task_interval tsk_sys(){ } \ } -task_interval tsk_sw(){ - static u8 cnt_force_off = 0; - static u8 sw_pow_old = 0; +void tsk_sw( ) +{ + static u8 cnt_force_off = 0; + static u8 sw_pow_old = 0; + static u8 task_interval = 0; - if(( system_status.pwr_state == ON ) - || ( system_status.pwr_state == OFF )){ - count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask ); - count_sw_n( SW_WIFI_n, SW_wifi_count, SW_wifi_mask ); - count_sw_n( SW_TUNE_n, SW_tune_count, SW_tune_mask ); + if( task_interval != 0 ) + { + task_interval -= 1; + return; + } + else + { + task_interval = ( INTERVAL_TSK_SW / SYS_INTERVAL_TICK ); + } + + if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == OFF ) ) + { + count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask ); + count_sw_n( SW_WIFI_n, SW_wifi_count, SW_wifi_mask ); + count_sw_n( SW_TUNE_n, SW_tune_count, SW_tune_mask ); // count_sw_n( SW_HOME_n, SW_home_count, SW_home_mask ); - } - - switch( system_status.pwr_state ){ - case( OFF_TRIG ): - SW_pow_count = 0; - SW_wifi_count = 0; - SW_tune_count = 0; - cnt_force_off = 0; - break; - - case( ON ): - case( SLEEP ): - // 電源スイッチの監視 // - if( SW_pow_count == 0 ){ - if(( 6 < sw_pow_old ) && ( sw_pow_old < 66 )){ - set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); - } - }else if( SW_pow_count == 66 ){ - set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_HOLD ); - }else if( SW_pow_count == 254 ){ // todo -// vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ONLY_RED; - system_status.pwr_state = OFF_TRIG; - renge_task_interval_run_force = 1; } - sw_pow_old = SW_pow_count; - // 電源OFF割り込みを入れたが… - if(( vreg_ctr[ VREG_C_IRQ0 ] & REG_BIT_SW_POW_HOLD ) != 0 ){ - cnt_force_off += 1; - if( cnt_force_off >= 13 ){ // …返事がない。強制的に切る。 - vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ILM_OFF; - if(( LED_duty_pow_H == 0 ) && ( LED_duty_pow_L == 0 )){ - system_status.pwr_state = OFF_TRIG; - renge_task_interval_run_force = 1; + switch ( system_status.pwr_state ) + { + case ( OFF_TRIG ): + SW_pow_count = 0; + SW_wifi_count = 0; + SW_tune_count = 0; + cnt_force_off = 0; + break; + + case ( ON ): + case ( SLEEP ): + // 電源スイッチの監視 // + if( SW_pow_count == 0 ) + { + if( ( CLICK_THRESHOLD < sw_pow_old ) && ( sw_pow_old < LONG_PUSH_THREASHOLD ) ) + { + set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); + } } - } - }else{ - cnt_force_off = 0; - } + else if( SW_pow_count == LONG_PUSH_THREASHOLD ) + { + set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_HOLD ); + } + else if( SW_pow_count == ( LONG_PUSH_THREASHOLD * 4 ) ) + { // todo +// vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ONLY_RED; + system_status.pwr_state = OFF_TRIG; + renge_task_interval_run_force = 1; + } + sw_pow_old = SW_pow_count; - /* todo - // HOME スイッチ…だと？ // - if( SW_home_count == 6 ){ - vreg_ctr[ VREG_C_IRQ0 ] |= REG_BIT_SW_HOME_CLICK; - if( ( vreg_ctr[ VREG_C_IRQ_MASK0 ] & REG_BIT_SW_HOME_CLICK ) == 0 ){ - IRQ0_ast; - } - }else if( SW_pow_count == 66 ){ - vreg_ctr[ VREG_C_IRQ0 ] |= REG_BIT_SW_HOME_HOLD; - if( ( vreg_ctr[ VREG_C_IRQ_MASK0 ] & REG_BIT_SW_HOME_HOLD ) == 0 ){ - IRQ0_ast; - } - } - */ + // 電源OFF割り込みを入れたが… + if( ( vreg_ctr[VREG_C_IRQ0] & REG_BIT_SW_POW_HOLD ) != 0 ) + { + cnt_force_off += 1; + if( cnt_force_off >= 13 ) + { // …返事がない。強制的に切る。 + vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_OFF; + if( ( LED_duty_pow_H == 0 ) && ( LED_duty_pow_L == 0 ) ) + { + system_status.pwr_state = OFF_TRIG; + renge_task_interval_run_force = 1; + } + } + } + else + { + cnt_force_off = 0; + } - // wifi sw - if( SW_wifi_count == 10 ){ - set_irq( VREG_C_IRQ0, REG_BIT_SW_WIFI_CLICK ); - } + /* todo + // HOME スイッチ…だと？ // + if( SW_home_count == 6 ){ + vreg_ctr[ VREG_C_IRQ0 ] |= REG_BIT_SW_HOME_CLICK; + if( ( vreg_ctr[ VREG_C_IRQ_MASK0 ] & REG_BIT_SW_HOME_CLICK ) == 0 ){ + IRQ0_ast; + } + }else if( SW_pow_count == 66 ){ + vreg_ctr[ VREG_C_IRQ0 ] |= REG_BIT_SW_HOME_HOLD; + if( ( vreg_ctr[ VREG_C_IRQ_MASK0 ] & REG_BIT_SW_HOME_HOLD ) == 0 ){ + IRQ0_ast; + } + } + */ - // tune sw - if( SW_tune_count == 10 ){ - set_irq( VREG_C_IRQ0, REG_BIT_SW_TUNE_CLICK ); + // wifi sw + if( SW_wifi_count == 10 ) + { + set_irq( VREG_C_IRQ0, REG_BIT_SW_WIFI_CLICK ); + } + + // tune sw + if( SW_tune_count == 10 ) + { + set_irq( VREG_C_IRQ0, REG_BIT_SW_TUNE_CLICK ); + } + break; } - break; - } /* マスクのせいでできなくなった @@ -395,8 +415,5 @@ task_interval tsk_sw(){ } */ - return( 8 ); + return; } - - - diff --git a/trunk/user_define.h b/trunk/user_define.h index e13c23b..c58bc79 100644 --- a/trunk/user_define.h +++ b/trunk/user_define.h @@ -25,8 +25,8 @@ #endif #ifdef _debug_led_ -#define DBG_LED_WIFI_on ( P1.1 = 1 ) // TO03 -#define DBG_LED_WIFI_off ( P1.1 = 0 ) // TO03 +#define DBG_LED_WIFI_on ( P1.1 = 1 ) // TO03 +#define DBG_LED_WIFI_off ( P1.1 = 0 ) // TO03 #define DBG_LED_WIFI_2_on ( LED_WIFI_2 = 1 ) #define DBG_LED_WIFI_2_off ( LED_WIFI_2 = 0 ) #define DBG_LED_WIFI_2_toggle ( LED_WIFI_2 ^= 1 ) @@ -47,14 +47,14 @@ extern unsigned char temp_teg; #ifdef _PMIC_TWL_ -#define PM_TEG_PWSW P7.5 // TEGのみ -#define PM_TEG_LCD_OFF P7.6 // TEGのみ +#define PM_TEG_PWSW P7.5 // TEGのみ +#define PM_TEG_LCD_dis( val ) ( P7.6 = val ) // TEGのみ #else #endif #define IIC_SLA_CODEC 0xA4 -#define IIC_SLA_ACCEL 0x30 // ST LIS331DLH +#define IIC_SLA_ACCEL 0x30 // ST LIS331DLH // PMxは0で出力モード @@ -90,7 +90,8 @@ extern unsigned char temp_teg; // CODEC -#define PM_IRQ P7.2 // INTP6 +#define PM_IRQ P7.2 // INTP6 + #ifndef _PMIC_CTR_ #define SND_DEPOP P7.7 #else @@ -98,7 +99,7 @@ extern unsigned char temp_teg; #endif // PM -#define PM_EXTDC P7.0 // INTP7 +#define PM_EXTDC P7.0 // INTP7 //#define BT_TEMP P15.0 // ANI8 //#define BT_DET P15.1 // ANI9 #define BT_DET_P P1.6 @@ -118,19 +119,19 @@ extern unsigned char temp_teg; #endif #define SW_TUNE_n P2.0 -#define SW_WIFI_n P7.4 // KR4 -#define SW_POW_n P7.3 // KR3 -#define SW_HOME_n P20.4 // INTP22 +#define SW_WIFI_n P7.4 // KR4 +#define SW_POW_n P7.3 // KR3 +#define SW_HOME_n P20.4 // INTP22 #define SW_SEL_n P2.3 //#define VOL P2.7 // ANI7 // WiFi #ifndef _TEG_ -#define WL_TX P20.3 // INTP21 -#define WL_RX P20.2 // INTP20 +#define WL_TX P20.3 // INTP21 +#define WL_RX P20.2 // INTP20 #else -#define WL_TX P20.3 // INTP21 -#define WL_RX P20.2 // INTP20 +#define WL_TX P20.3 // INTP21 +#define WL_RX P20.2 // INTP20 #endif //#define LED_CAM P1.0 // TO02 @@ -155,10 +156,10 @@ extern unsigned char temp_teg; //#define 32k_I1 P12.3 // XT1 //#define 32k_I2 P12.4 // XT2 -#define DIPSW_0 P4.0 // mini cube ソフトウェアディップスイッチ -#define DIPSW_1 P4.1 // mini cube ソフトウェアディップスイッチ +#define DIPSW_0 P4.0 // mini cube ソフトウェアディップスイッチ +#define DIPSW_1 P4.1 // mini cube ソフトウェアディップスイッチ -#define SHELL_CLOSE P7.1 // INTP5 ふた開閉 (閉じると?) +#define SHELL_CLOSE P7.1 // INTP5 ふた開閉 (閉じると?) #define SHELL_CLOSE_P P3.3 //#define DBG_VR P2.6 // ANI6 diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index 28ae2eb..9cca857 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -12,7 +12,7 @@ CTR MCU I2C // ******************************************************** -u8 vreg_ctr[ VREG_C_ENDMARK_ ]; +u8 vreg_ctr[VREG_C_ENDMARK_]; @@ -25,22 +25,27 @@ u8 vreg_ctr[ VREG_C_ENDMARK_ ]; // ******************************************************** // 非ゼロの初期値の指定が必要なアドレス -void vreg_ctr_init(){ - vreg_ctr[ VREG_C_LED_BRIGHT ] = 0xFF; +void vreg_ctr_init( ) +{ + vreg_ctr[VREG_C_LED_BRIGHT] = 0xFF; #ifdef _debug_ - vreg_ctr[ VREG_C_LED_TUNE ] = 0x01; +// vreg_ctr[ VREG_C_LED_TUNE ] = 0x02; #endif - vreg_ctr[ VREG_C_MCU_VER_MAJOR ] = MCU_VER_MAJOR; + vreg_ctr[VREG_C_MCU_VER_MAJOR] = MCU_VER_MAJOR; #ifdef _MODEL_WM0_ - vreg_ctr[ VREG_C_MCU_VER_MAJOR ] += 0x20; + vreg_ctr[VREG_C_MCU_VER_MAJOR] += 0x20; #endif #ifdef _MODEL_TS0_ - vreg_ctr[ VREG_C_MCU_VER_MAJOR ] += 0x10; + vreg_ctr[VREG_C_MCU_VER_MAJOR] += 0x10; #endif - vreg_ctr[ VREG_C_MCU_VER_MINOR ] = MCU_VER_MINOR; + vreg_ctr[VREG_C_MCU_VER_MINOR] = MCU_VER_MINOR; + + + vreg_ctr[VREG_C_VCOM_T] = 92; + vreg_ctr[VREG_C_VCOM_B] = 95; } @@ -52,164 +57,168 @@ void vreg_ctr_init(){ // 　書けないアドレスにアクセスした場合、何もしません。 // ●書き込んだ結果、I2C_mcu通信が発生する場合、renge_task_immed_add() // を使用しないと、I2C_mcu使用中でエラー終了した場合にリトライしません。 -void vreg_ctr_write( u8 adrs, u8 data ){ - switch( adrs ){ +void vreg_ctr_write( u8 adrs, u8 data ) +{ + switch ( adrs ) + { - case( VREG_C_MCU_STATUS ): - vreg_ctr[ adrs ] = ( data & ~0x40 ); - break; + case ( VREG_C_MCU_STATUS ): + vreg_ctr[adrs] = ( data & ~0x40 ); + break; - case( VREG_C_VCOM_T ): - case( VREG_C_VCOM_B ): - renge_task_immed_add( tski_vcom_set ); - vreg_ctr[ adrs ] = data; - break; + case ( VREG_C_VCOM_T ): + case ( VREG_C_VCOM_B ): + renge_task_immed_add( tski_vcom_set ); + vreg_ctr[adrs] = data; + break; - case( VREG_C_DBG1 ): - case( VREG_C_DBG2 ): - vreg_ctr[ adrs ] = data; - break; - case( VREG_C_DBG3 ): - vreg_ctr[ adrs ] = data; - if(( vreg_ctr[ VREG_C_DBG1 ] == 'j' ) - && ( vreg_ctr[ VREG_C_DBG2 ] == 'h' ) - && ( data == 'l' ) - ){ - firm_update(); // 戻ってこない - } - break; + case ( VREG_C_DBG1 ): + case ( VREG_C_DBG2 ): + vreg_ctr[adrs] = data; + break; + case ( VREG_C_DBG3 ): + vreg_ctr[adrs] = data; + if( ( vreg_ctr[VREG_C_DBG1] == 'j' ) + && ( vreg_ctr[VREG_C_DBG2] == 'h' ) && ( data == 'l' ) ) + { + firm_update( ); // 戻ってこない + } + break; - case( VREG_C_IRQ_MASK0 ): - case( VREG_C_IRQ_MASK1 ): - case( VREG_C_IRQ_MASK2 ): - case( VREG_C_IRQ_MASK3 ): - vreg_ctr[ adrs ] = data; - break; + case ( VREG_C_IRQ_MASK0 ): + case ( VREG_C_IRQ_MASK1 ): + case ( VREG_C_IRQ_MASK2 ): + case ( VREG_C_IRQ_MASK3 ): + vreg_ctr[adrs] = data; + break; - case( VREG_C_COMMAND0 ): - vreg_ctr[ adrs ] = data; - if( data != 0 ){ - renge_task_immed_add( do_command0 ); - } - break; + case ( VREG_C_COMMAND0 ): + vreg_ctr[adrs] = data; + if( data != 0 ) + { + renge_task_immed_add( do_command0 ); + } + break; - case( VREG_C_COMMAND1 ): - vreg_ctr[ adrs ] = data; - if( data != 0 ){ - // renge_task_immed_add( do_command1 ); - /// 持ってきました - vreg_twl[ REG_TWL_ADRS_IRQ ] = (( vreg_ctr[ VREG_C_COMMAND1 ] & REG_BIT_TWL_CMD_PWSW_DET ) != 0 )? REG_BIT_TWL_IRQ_PWSW_DET: 0x00; //pwsw_det - vreg_twl[ REG_TWL_ADRS_IRQ ] |= (( vreg_ctr[ VREG_C_COMMAND1 ] & REG_BIT_TWL_CMD_RESET ) != 0 )? REG_BIT_TWL_IRQ_RESET: 0x00; //reset_req + case ( VREG_C_COMMAND1 ): + vreg_ctr[adrs] = data; + if( data != 0 ) + { + // renge_task_immed_add( do_command1 ); + /// 持ってきました + vreg_twl[REG_TWL_INT_ADRS_IRQ] = ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_PWSW_DET ) != 0 ) ? REG_BIT_TWL_IRQ_PWSW_DET : 0x00; //pwsw_det + vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_RESET ) != 0 ) ? REG_BIT_TWL_IRQ_RESET : 0x00; //reset_req - vreg_twl[ REG_TWL_ADRS_IRQ ] |= (( vreg_ctr[ VREG_C_COMMAND1 ] & REG_BIT_TWL_CMD_OFF ) != 0 )? REG_BIT_TWL_IRQ_OFF: 0x00; //off_req + vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_OFF ) != 0 ) ? REG_BIT_TWL_IRQ_OFF : 0x00; //off_req - vreg_twl[ REG_TWL_ADRS_IRQ ] |= (( vreg_ctr[ VREG_C_COMMAND1 ] & REG_BIT_TWL_CMD_BT_LOW ) != 0 )? REG_BIT_TWL_IRQ_BT_LOW: 0x00; //batt_low - vreg_twl[ REG_TWL_ADRS_IRQ ] |= (( vreg_ctr[ VREG_C_COMMAND1 ] & REG_BIT_TWL_CMD_BT_EMPTY ) != 0 )? REG_BIT_TWL_IRQ_BT_EMPTY: 0x00; //batt_empty + vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_BT_LOW ) != 0 ) ? REG_BIT_TWL_IRQ_BT_LOW : 0x00; //batt_low + vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_BT_EMPTY ) != 0 ) ? REG_BIT_TWL_IRQ_BT_EMPTY : 0x00; //batt_empty - vreg_twl[ REG_TWL_ADRS_IRQ ] |= (( vreg_ctr[ VREG_C_COMMAND1 ] & REG_BIT_TWL_CMD_VOL_CHANGE ) != 0 )? REG_BIT_TWL_IRQ_VOL_CHANGE: 0x00; //vol_changed - } - break; + vreg_twl[REG_TWL_INT_ADRS_IRQ] |= ( ( vreg_ctr[VREG_C_COMMAND1] & REG_BIT_TWL_CMD_VOL_CHANGE ) != 0 ) ? REG_BIT_TWL_IRQ_VOL_CHANGE : 0x00; //vol_changed + } + break; - case( VREG_C_FREE0 ): - case( VREG_C_FREE1 ): - case( VREG_C_FREE2 ): - case( VREG_C_FREE3 ): - vreg_ctr[ adrs ] = data; - break; + case ( VREG_C_FREE0 ): + case ( VREG_C_FREE1 ): + case ( VREG_C_FREE2 ): + case ( VREG_C_FREE3 ): + vreg_ctr[adrs] = data; + break; - case( VREG_C_LED_BRIGHT ): - vreg_ctr[ adrs ] = data; - break; + case ( VREG_C_LED_BRIGHT ): + vreg_ctr[adrs] = data; + break; - case( VREG_C_LED_POW ): - vreg_ctr[ adrs ] = data; - break; + case ( VREG_C_LED_POW ): + vreg_ctr[adrs] = data; + break; - case( VREG_C_LED_WIFI ): - vreg_ctr[ adrs ] = data; - break; + case ( VREG_C_LED_WIFI ): + vreg_ctr[adrs] = data; + break; - case( VREG_C_LED_CAM ): - vreg_ctr[ adrs ] = data; - break; + case ( VREG_C_LED_CAM ): + vreg_ctr[adrs] = data; + break; - case( VREG_C_LED_TUNE ): - vreg_ctr[ adrs ] = data; - break; + case ( VREG_C_LED_TUNE ): + vreg_ctr[adrs] = data; + break; - case( VREG_C_RTC_SEC ): - case( VREG_C_RTC_MIN ): - case( VREG_C_RTC_HOUR ): - case( VREG_C_RTC_YOBI ): - case( VREG_C_RTC_DAY ): - case( VREG_C_RTC_MONTH ): - case( VREG_C_RTC_YEAR ): - // ここでは書かない。セットするだけでstopで書く - /// 非同期で動いているため。 - set_rtc( adrs - VREG_C_RTC_SEC, data ); - break; + case ( VREG_C_RTC_SEC ): + case ( VREG_C_RTC_MIN ): + case ( VREG_C_RTC_HOUR ): + case ( VREG_C_RTC_YOBI ): + case ( VREG_C_RTC_DAY ): + case ( VREG_C_RTC_MONTH ): + case ( VREG_C_RTC_YEAR ): + // ここでは書かない。セットするだけでstopで書く + /// 非同期で動いているため。 + set_rtc( adrs - VREG_C_RTC_SEC, data ); + break; - case( VREG_C_RTC_COMP ): - vreg_ctr[ adrs ] = data; - SUBCUD = data; - break; + case ( VREG_C_RTC_COMP ): + vreg_ctr[adrs] = data; + SUBCUD = data; + break; - case( VREG_C_RTC_ALARM_MIN ): - case( VREG_C_RTC_ALARM_HOUR ): - vreg_ctr[ adrs ] = data; - rtc_alarm_dirty = 1; - break; + case ( VREG_C_RTC_ALARM_MIN ): + case ( VREG_C_RTC_ALARM_HOUR ): + vreg_ctr[adrs] = data; + rtc_alarm_dirty = 1; + break; - // 書くだけでよい - case( VREG_C_RTC_ALARM_DAY ): - case( VREG_C_RTC_ALARM_MONTH ): - case( VREG_C_RTC_ALARM_YEAR ): - vreg_ctr[ adrs ] = data; - break; + // 書くだけでよい + case ( VREG_C_RTC_ALARM_DAY ): + case ( VREG_C_RTC_ALARM_MONTH ): + case ( VREG_C_RTC_ALARM_YEAR ): + vreg_ctr[adrs] = data; + break; - case( VREG_C_ACC_CONFIG ): - vreg_ctr[ adrs ] = data; - renge_task_immed_add( acc_hosu_set ); - break; + case ( VREG_C_ACC_CONFIG ): + vreg_ctr[adrs] = data; + renge_task_immed_add( acc_hosu_set ); + break; - case( VREG_C_ACC_R_ADRS ): - vreg_ctr[ adrs ] = data; - renge_task_immed_add( acc_read ); - break; + case ( VREG_C_ACC_R_ADRS ): + vreg_ctr[adrs] = data; + renge_task_immed_add( acc_read ); + break; - case( VREG_C_ACC_W_ADRS ): - vreg_ctr[ adrs ] = data; - break; + case ( VREG_C_ACC_W_ADRS ): + vreg_ctr[adrs] = data; + break; - case( VREG_C_ACC_W_BUF ): - vreg_ctr[ adrs ] = data; - renge_task_immed_add( acc_write ); - break; + case ( VREG_C_ACC_W_BUF ): + vreg_ctr[adrs] = data; + renge_task_immed_add( acc_write ); + break; - case( VREG_C_ACC_HOSU_L ): - case( VREG_C_ACC_HOSU_M ): - case( VREG_C_ACC_HOSU_H ): - vreg_ctr[ adrs ] = data; - break; + case ( VREG_C_ACC_HOSU_L ): + case ( VREG_C_ACC_HOSU_M ): + case ( VREG_C_ACC_HOSU_H ): + vreg_ctr[adrs] = data; + break; #ifdef _debug_ - case( VREG_C_BT_REMAIN ): - case( VREG_C_BT_TEMP ): - vreg_ctr[ adrs ] = data; - break; + case ( VREG_C_BT_REMAIN ): + case ( VREG_C_BT_TEMP ): + vreg_ctr[adrs] = data; + break; #endif - case( VREG_C_COMMAND3 ): - vreg_ctr[ adrs ] = data; - switch( data ){ - case('r'): // マイコン再起動 - WDTE = 0xAA; - break; + case ( VREG_C_COMMAND3 ): + vreg_ctr[adrs] = data; + switch ( data ) + { + case ( 'r' ): // マイコン再起動 + WDTE = 0xAA; + break; + } + break; } - break; - } - return; + return; } @@ -219,26 +228,28 @@ void vreg_ctr_write( u8 adrs, u8 data ){ //　引数 adrs 外から見たときの、アドレス //　戻り xx データ // 　存在しないアドレスにアクセスした場合、戻り値は0x5A -u8 vreg_ctr_read( u8 adrs ){ - if(( VREG_C_RTC_SEC <= adrs ) - && ( adrs <= VREG_C_RTC_YEAR )){ - get_rtc(); - } - return( vreg_ctr[ adrs ] ); +u8 vreg_ctr_read( u8 adrs ) +{ + if( ( VREG_C_RTC_SEC <= adrs ) && ( adrs <= VREG_C_RTC_YEAR ) ) + { + get_rtc( ); + } + return ( vreg_ctr[adrs] ); } // ******************************************************** // I2C仮想レジスタから読まれて何かするレジスタ -void vreg_ctr_after_read( u8 adrs ){ +void vreg_ctr_after_read( u8 adrs ) +{ - // リードがトリガで何かをする↓ + // リードがトリガで何かをする↓ // 割り込みビットのクリア - if( adrs == VREG_C_IRQ3 ){ - vreg_ctr[ VREG_C_IRQ0 ] = vreg_ctr[ VREG_C_IRQ1 ] = - vreg_ctr[ VREG_C_IRQ2 ] = vreg_ctr[ VREG_C_IRQ3 ] = 0; + if( adrs == VREG_C_IRQ3 ) + { + vreg_ctr[VREG_C_IRQ0] = vreg_ctr[VREG_C_IRQ1] = + vreg_ctr[VREG_C_IRQ2] = vreg_ctr[VREG_C_IRQ3] = 0; } - return; + return; } - diff --git a/trunk/vreg_ctr.h b/trunk/vreg_ctr.h index 24f7668..f557244 100644 --- a/trunk/vreg_ctr.h +++ b/trunk/vreg_ctr.h @@ -78,7 +78,8 @@ // VREG_C_WIFI_LED -enum{ +enum +{ WIFI_LED_OFF = 0, WIFI_LED_ON, WIFI_LED_TXAUTO, @@ -88,7 +89,8 @@ enum{ // VREG_C_CAM_LED -enum{ +enum +{ CAM_LED_OFF = 0, CAM_LED_BLINK, CAM_LED_ON, @@ -108,7 +110,7 @@ enum{ #define REG_BIT_TWL_CMD_VOL_CHANGE 0x20 // ↑TWL側 -#define REG_BIT_TWL_IRQ_PWSW_DET 0x80 +#define REG_BIT_TWL_IRQ_PWSW_DET 0x08 #define REG_BIT_TWL_IRQ_RESET 0x01 #define REG_BIT_TWL_IRQ_OFF 0x02 #define REG_BIT_TWL_IRQ_BT_LOW 0x20 @@ -142,52 +144,54 @@ enum{ extern u8 vreg_ctr[]; /*============================================================================*/ -enum VREG_C{ // 未定義アドレスへ書き込んだ際の動作は不定 - VREG_C_MCU_VER_MAJOR = 0x00, +enum VREG_C +{ // 未定義アドレスへ書き込んだ際の動作は不定 + VREG_C_MCU_VER_MAJOR = 0x00, VREG_C_MCU_VER_MINOR, VREG_C_MCU_STATUS, - VREG_C_VCOM_T = 0x03, + VREG_C_VCOM_T = 0x03, VREG_C_VCOM_B, - VREG_C_DBG1 = 0x05, + VREG_C_DBG1 = 0x05, VREG_C_DBG2, VREG_C_DBG3, - VREG_C_TUNE = 0x08, + VREG_C_TUNE = 0x08, VREG_C_SND_VOL, VREG_C_BT_REMAIN, VREG_C_BT_TEMP, - VREG_C_STATUS = 0x0F, + VREG_C_STATUS_X = 0x0E, + VREG_C_STATUS = 0x0F, - VREG_C_IRQ0 = 0x10, + VREG_C_IRQ0 = 0x10, VREG_C_IRQ1, VREG_C_IRQ2, VREG_C_IRQ3, - VREG_C_IRQ_MASK0 = 0x18, + VREG_C_IRQ_MASK0 = 0x18, VREG_C_IRQ_MASK1, VREG_C_IRQ_MASK2, VREG_C_IRQ_MASK3, - VREG_C_COMMAND0 = 0x20, + VREG_C_COMMAND0 = 0x20, VREG_C_COMMAND1, VREG_C_COMMAND2, VREG_C_COMMAND3, - VREG_C_FREE0 = 0x24, + VREG_C_FREE0 = 0x24, VREG_C_FREE1, VREG_C_FREE2, VREG_C_FREE3, - VREG_C_LED_BRIGHT = 0x28, + VREG_C_LED_BRIGHT = 0x28, VREG_C_LED_POW, VREG_C_LED_WIFI, VREG_C_LED_CAM, VREG_C_LED_TUNE, - VREG_C_RTC_SEC = 0x30, + VREG_C_RTC_SEC = 0x30, VREG_C_RTC_MIN, VREG_C_RTC_HOUR, VREG_C_RTC_YOBI, @@ -197,29 +201,29 @@ enum VREG_C{ // VREG_C_RTC_COMP, - VREG_C_RTC_ALARM_MIN = 0x38, + VREG_C_RTC_ALARM_MIN = 0x38, VREG_C_RTC_ALARM_HOUR, VREG_C_RTC_ALARM_DAY, VREG_C_RTC_ALARM_MONTH, VREG_C_RTC_ALARM_YEAR, - VREG_C_ACC_CONFIG = 0x40, + VREG_C_ACC_CONFIG = 0x40, VREG_C_ACC_R_ADRS, - VREG_C_RESERVED5, + VREG_C_RESERVED5, VREG_C_ACC_W_ADRS, VREG_C_ACC_W_BUF, - VREG_C_ACC_XL = 0x45, + VREG_C_ACC_XL = 0x45, VREG_C_ACC_XH, VREG_C_ACC_YL, VREG_C_ACC_YH, VREG_C_ACC_ZL, VREG_C_ACC_ZH, - VREG_C_ACC_HOSU_L = 0x4B, + VREG_C_ACC_HOSU_L = 0x4B, VREG_C_ACC_HOSU_M, VREG_C_ACC_HOSU_H, - VREG_C_ACC_HOSU_HIST = 0x4E, + VREG_C_ACC_HOSU_HIST = 0x4E, VREG_C_ENDMARK_ }; @@ -230,14 +234,12 @@ enum VREG_C{ // #else -　"がらっと変えてしまったので、旧版のディレクトリを使用して下さい。" - +・@"がらっと変えてしまったので、旧版のディレクトリを使用して下さい。" #endif - /*============================================================================*/ -void vreg_ctr_init(); +void vreg_ctr_init( ); void vreg_ctr_write( u8 adrs, u8 data ); -u8 vreg_ctr_read( u8 phy_adrs ); +u8 vreg_ctr_read( u8 phy_adrs ); void vreg_ctr_after_read( u8 adrs ); diff --git a/trunk/vreg_twl.c b/trunk/vreg_twl.c index 723714a..6ced64a 100644 --- a/trunk/vreg_twl.c +++ b/trunk/vreg_twl.c @@ -9,70 +9,48 @@ TWL #include "vreg_twl.h" -u8 vreg_twl[ REG_TWL_INT_ADRS_TIME_PWSW_THRESHOLD +1 ]; + +#define TWL_REG_VER_INFO 0x35 + +u8 vreg_twl[_REG_TWL_INT_ADRS_EDNMARK]; /* ======================================================== 仮想レジスタの初期化 ======================================================== */ -void vreg_twl_init(){ - vreg_twl[ REG_TWL_INT_ADRS_VER_INFO ] = 0x35; - vreg_twl[ REG_TWL_INT_ADRS_POWER_INFO ] = 0x0F; - vreg_twl[ REG_TWL_INT_ADRS_POWER_SAVE ] = 0x07; - vreg_twl[ REG_TWL_INT_ADRS_BL ] = 0x03; - vreg_twl[ REG_TWL_INT_ADRS_CODEC_MIC_GAIN ] = 0x01; - vreg_twl[ REG_TWL_INT_ADRS_ADC_CALIB_STATUS ] = 0x01; - vreg_twl[ REG_TWL_INT_ADRS_ADC_CALIB_VALUE ] = 0x60; +void vreg_twl_init( ) +{ + vreg_twl[REG_TWL_INT_ADRS_BL] = 0x03; } // ======================================================== -// I2C仮想レジスタに書きます。 +// I2C仮想レジスタに書く・何かアクションする //　引数 adrs は内部アドレス // 　存在しないアドレスにアクセスした場合、何もしません。 -void vreg_twl_write( u8 adrs, u8 data ){ - switch( adrs ){ - case( REG_TWL_INT_ADRS_COMMAND ): - case( REG_TWL_INT_ADRS_MODE ): - case( REG_TWL_INT_ADRS_POWER_SAVE ): - case( REG_TWL_INT_ADRS_WIFI ): - case( REG_TWL_INT_ADRS_CAM ): - case( REG_TWL_INT_ADRS_VOL ): - case( REG_TWL_INT_ADRS_BL ): -/* - REG_TWL_INT_ADRS_CODEC_MIC_GAIN, // 0x50, - REG_TWL_INT_ADRS_CODEC_MIC_GAIN_RELOAD, - REG_TWL_INT_ADRS_ADC_CALIB, // 0x60, - REG_TWL_INT_ADRS_ADC_CALIB_VALUE, - REG_TWL_INT_ADRS_POWER_LED, -*/ - case( REG_TWL_INT_ADRS_TEMP0 ): - case( REG_TWL_INT_ADRS_TEMP1 ): - case( REG_TWL_INT_ADRS_TEMP2 ): - case( REG_TWL_INT_ADRS_TEMP3 ): - case( REG_TWL_INT_ADRS_TEMP4 ): - case( REG_TWL_INT_ADRS_TEMP5 ): - case( REG_TWL_INT_ADRS_TEMP6 ): - case( REG_TWL_INT_ADRS_TEMP7 ): -// REG_TWL_INT_ADRS_TIME_PWSW_DELAY, -// REG_TWL_INT_ADRS_TIME_PWSW_THRESHOLD +void vreg_twl_write( u8 adrs, u8 data ) +{ + switch ( adrs ) + { +// case ( REG_TWL_INT_ADRS_VOL ): - vreg_twl[ adrs ] = data; - break; - } - - // TWLレジスタに書かれて何かアクションする - switch( adrs ){ - case( REG_TWL_INT_ADRS_COMMAND ): - if( data != 0 ){ - set_irq( VREG_C_IRQ3, REG_BIT_TWL_RESET_REQ ); //リセットしかない。他のは、SPIから来ます。 - break; + case ( REG_TWL_INT_ADRS_MODE ): + case ( REG_TWL_INT_ADRS_CAM ): + vreg_twl[adrs] = ( data & 0x03 ); + break; + + case ( REG_TWL_INT_ADRS_BL ): + vreg_twl[adrs] = data; + break; + + case ( REG_TWL_INT_ADRS_COMMAND ): + if( ( data & 0x01 ) != 0 ) + { + set_irq( VREG_C_IRQ3, REG_BIT_TWL_RESET_REQ ); //リセットしかない。他のは、SPIから来ます。 + break; + } } - - default: - break; - } - return; + return; } @@ -82,13 +60,20 @@ void vreg_twl_write( u8 adrs, u8 data ){ //　引数 adrs 外から見たときの、アドレス //　戻り xx データ // 　存在しないアドレスにアクセスした場合、戻り値は0x5A -u8 vreg_twl_read( u8 phy_adrs ){ - u8 dat; +u8 vreg_twl_read( u8 phy_adrs ) +{ + u8 temp; - dat = vreg_twl[ phy_adrs ]; - - // リードがトリガで何かをするなら↓ - return( dat ); + switch( phy_adrs ){ + case( REG_TWL_INT_ADRS_VER_INFO ): return( TWL_REG_VER_INFO ); + case( REG_TWL_INT_ADRS_POWER_INFO ): return( 0x0F ); + case( REG_TWL_INT_ADRS_IRQ ): + temp = vreg_twl[ REG_TWL_INT_ADRS_IRQ ]; + vreg_twl[ REG_TWL_INT_ADRS_IRQ ]= 0; + return( temp ); + default: return( vreg_twl[ phy_adrs ] ); + case( 0xFF ): return( 0x00 ); + } } @@ -96,65 +81,16 @@ u8 vreg_twl_read( u8 phy_adrs ){ // ======================================================== // 外部から見える虫食いアドレスを、内部の連続アドレスに読み替える // 0xFFは存在しないアドレス。 -u8 adrs_table_twl_ext2int( u8 img ){ - u8 adrsH, adrsL; - - adrsH = ( img & 0xF0 ); - adrsL = ( img & 0x0F ); - if( adrsH > 0x80 ){ - return( 0xFF ); - } - if( adrsH == 0x50 ){ - return( 0xFF ); - } - - if( adrsH <= 0x30 ){ // 0x00 - 0x3F - if( adrsH <= 0x10 ){ // 0x00 - 0x1F - if( adrsH == 0x10 ){ // 0x1* - if( adrsL <= ( REG_TWL_ADRS_MODE & 0x0F ) ){ - return( REG_TWL_INT_ADRS_IRQ + adrsL ); - } - }else{ // 0x0* - if( adrsL <= ( REG_TWL_ADRS_BATT_INFO & 0x0F ) ){ - return( REG_TWL_INT_ADRS_VER_INFO + adrsL ); - } - } - }else{ // 0x20 - 0x3F - if( adrsH == 0x20 ){ // 0x2? - if( adrsL <= ( REG_TWL_ADRS_POWER_SAVE & 0x0F ) ){ - return( REG_TWL_INT_ADRS_POWER_INFO + adrsL ); - } - }else{ // 0x3* - if( adrsL <= ( REG_TWL_ADRS_CAM & 0x0F ) ){ - return( REG_TWL_INT_ADRS_WIFI + adrsL ); - } - } +u8 adrs_table_twl_ext2int( u8 img ) +{ + switch( img ){ + case( REG_TWL_ADRS_VER_INFO ): return( REG_TWL_INT_ADRS_VER_INFO ); + case( REG_TWL_ADRS_IRQ ): return( REG_TWL_INT_ADRS_IRQ ); + case( REG_TWL_ADRS_COMMAND ): return( REG_TWL_INT_ADRS_COMMAND ); + case( REG_TWL_ADRS_MODE ): return( REG_TWL_INT_ADRS_MODE ); + case( REG_TWL_ADRS_POWER_INFO ): return( REG_TWL_INT_ADRS_POWER_INFO ); + case( REG_TWL_ADRS_CAM ): return( REG_TWL_INT_ADRS_CAM ); + case( REG_TWL_ADRS_BL ): return( REG_TWL_INT_ADRS_BL ); + default: return( 0xFF ); } - }else{ - if( adrsH <= 0x60 ){ - if( adrsH == 0x60 ){ - if( adrsL <= ( REG_TWL_ADRS_POWER_LED & 0x0F ) ){ - return( REG_TWL_INT_ADRS_ADC_CALIB + adrsL ); - } - }else{ // 40台 - if( adrsL <= ( REG_TWL_ADRS_BL & 0x0F ) ){ - return( REG_TWL_INT_ADRS_VOL + adrsL ); - } - } - }else{ - if( adrsH == 0x70 ){ - if( adrsL <= ( REG_TWL_ADRS_TEMP7 & 0x0F ) ){ - return( REG_TWL_INT_ADRS_TEMP0 + adrsL ); - } - }else{ // 80台 - if( adrsL <= ( REG_TWL_ADRS_TIME_PWSW_THRESHOLD & 0x0F ) ){ - return( REG_TWL_INT_ADRS_TIME_PWSW_DELAY + adrsL ); - } - } - } - } - return( 0xFF ); } - - - diff --git a/trunk/vreg_twl.h b/trunk/vreg_twl.h index 5bc44d1..d02e61d 100644 --- a/trunk/vreg_twl.h +++ b/trunk/vreg_twl.h @@ -16,25 +16,26 @@ * 1:電源スイッチ OFF 時間押され検出 * LSB: リセット */ -enum REG_TWL_ADRS{ // 未定義アドレスへ書き込んだ際は無視 - REG_TWL_ADRS_VER_INFO = 0x00, +enum REG_TWL_ADRS +{ // 未定義アドレスへ書き込んだ際は無視 + REG_TWL_ADRS_VER_INFO = 0x00, REG_TWL_ADRS_PMIC_INFO, REG_TWL_ADRS_BATT_INFO, - REG_TWL_ADRS_IRQ = 0x10, + REG_TWL_ADRS_IRQ = 0x10, REG_TWL_ADRS_COMMAND, REG_TWL_ADRS_MODE, - REG_TWL_ADRS_POWER_INFO = 0x20, + REG_TWL_ADRS_POWER_INFO = 0x20, REG_TWL_ADRS_POWER_SAVE, - REG_TWL_ADRS_WIFI = 0x30, + REG_TWL_ADRS_WIFI = 0x30, REG_TWL_ADRS_CAM, - REG_TWL_ADRS_VOL = 0x40, + REG_TWL_ADRS_VOL = 0x40, REG_TWL_ADRS_BL, - REG_TWL_ADRS_CODEC_MIC_GAIN = 0x50, - REG_TWL_ADRS_ADC_CALIB = 0x60, + REG_TWL_ADRS_CODEC_MIC_GAIN = 0x50, + REG_TWL_ADRS_ADC_CALIB = 0x60, REG_TWL_ADRS_ADC_CALIB_STATUS, REG_TWL_ADRS_ADC_CALIB_VALUE, REG_TWL_ADRS_POWER_LED, - REG_TWL_ADRS_TEMP0 = 0x70, + REG_TWL_ADRS_TEMP0 = 0x70, REG_TWL_ADRS_TEMP1, REG_TWL_ADRS_TEMP2, REG_TWL_ADRS_TEMP3, @@ -42,7 +43,7 @@ enum REG_TWL_ADRS{ // REG_TWL_ADRS_TEMP5, REG_TWL_ADRS_TEMP6, REG_TWL_ADRS_TEMP7, - REG_TWL_ADRS_TIME_PWSW_DELAY = 0x80, + REG_TWL_ADRS_TIME_PWSW_DELAY = 0x80, REG_TWL_ADRS_TIME_PWSW_THRESHOLD }; @@ -51,42 +52,44 @@ enum REG_TWL_ADRS{ // * マイコン内部でのレジスタの実装 * もちろんつめてある */ -enum REG_TWL_ADRS_INT{ +enum REG_TWL_ADRS_INT +{ REG_TWL_INT_ADRS_VER_INFO = 0x00, - REG_TWL_INT_ADRS_PMIC_INFO, - REG_TWL_INT_ADRS_BATT_INFO, - REG_TWL_INT_ADRS_IRQ, // 0x10, +// REG_TWL_INT_ADRS_PMIC_INFO, +// REG_TWL_INT_ADRS_BATT_INFO, + REG_TWL_INT_ADRS_IRQ, // 0x10, REG_TWL_INT_ADRS_COMMAND, REG_TWL_INT_ADRS_MODE, - REG_TWL_INT_ADRS_POWER_INFO, // 0x20, - REG_TWL_INT_ADRS_POWER_SAVE, - REG_TWL_INT_ADRS_WIFI, // 0x30, + REG_TWL_INT_ADRS_POWER_INFO, // 0x20, +// REG_TWL_INT_ADRS_POWER_SAVE, +// REG_TWL_INT_ADRS_WIFI, // 0x30, REG_TWL_INT_ADRS_CAM, - REG_TWL_INT_ADRS_VOL, // 0x40, +/// REG_TWL_INT_ADRS_VOL, // 0x40, REG_TWL_INT_ADRS_BL, - REG_TWL_INT_ADRS_CODEC_MIC_GAIN, // 0x50, - REG_TWL_INT_ADRS_CODEC_MIC_GAIN_RELOAD, - REG_TWL_INT_ADRS_ADC_CALIB, // 0x60, - REG_TWL_INT_ADRS_ADC_CALIB_STATUS, - REG_TWL_INT_ADRS_ADC_CALIB_VALUE, - REG_TWL_INT_ADRS_POWER_LED, - REG_TWL_INT_ADRS_TEMP0, // 0x70 - 0x77 - REG_TWL_INT_ADRS_TEMP1, - REG_TWL_INT_ADRS_TEMP2, - REG_TWL_INT_ADRS_TEMP3, - REG_TWL_INT_ADRS_TEMP4, - REG_TWL_INT_ADRS_TEMP5, - REG_TWL_INT_ADRS_TEMP6, - REG_TWL_INT_ADRS_TEMP7, - REG_TWL_INT_ADRS_TIME_PWSW_DELAY, - REG_TWL_INT_ADRS_TIME_PWSW_THRESHOLD +// REG_TWL_INT_ADRS_CODEC_MIC_GAIN, // 0x50, +// REG_TWL_INT_ADRS_CODEC_MIC_GAIN_RELOAD, +// REG_TWL_INT_ADRS_ADC_CALIB, // 0x60, +// REG_TWL_INT_ADRS_ADC_CALIB_STATUS, +// REG_TWL_INT_ADRS_ADC_CALIB_VALUE, +// REG_TWL_INT_ADRS_POWER_LED, +// REG_TWL_INT_ADRS_TEMP0, // 0x70 - 0x77 +// REG_TWL_INT_ADRS_TEMP1, +// REG_TWL_INT_ADRS_TEMP2, +// REG_TWL_INT_ADRS_TEMP3, +// REG_TWL_INT_ADRS_TEMP4, +// REG_TWL_INT_ADRS_TEMP5, +// REG_TWL_INT_ADRS_TEMP6, +// REG_TWL_INT_ADRS_TEMP7, +// REG_TWL_INT_ADRS_TIME_PWSW_DELAY, +// REG_TWL_INT_ADRS_TIME_PWSW_THRESHOLD + _REG_TWL_INT_ADRS_EDNMARK, }; /* ========================================================================= */ -extern u8 vreg_twl[ REG_TWL_INT_ADRS_TIME_PWSW_THRESHOLD +1 ]; +extern u8 vreg_twl[]; @@ -101,11 +104,11 @@ extern u8 vreg_twl[ REG_TWL_INT_ADRS_TIME_PWSW_THRESHOLD +1 ]; /* ========================================================================= */ -void vreg_twl_init(); +void vreg_twl_init( ); void vreg_twl_write( u8 adrs, u8 data ); u8 adrs_table_twl_ext2int( u8 img ); u8 vreg_twl_read( u8 phy_adrs ); -task_status_immed command_from_twl(); +task_status_immed command_from_twl( ); #endif diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 670cdee..e4e06a5 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -2,12 +2,12 @@ Ver=200 Target=IDK0R32G [Configuration] -Chip=uPD78F1009_64 -Internal Rom=64KB -Internal Ram=3072B +Chip=uPD79F0104 +Internal Rom=32KB +Internal Ram=1536B Clock=Target Sub Clock=Target -Peripheral Break=0x2 +Peripheral Break=0x0 Firm Clock=System Flash Programming=Permit Low-voltage Flash Rewriting=On @@ -22,8 +22,8 @@ SubClock=None [Mapping] Count=0 [Main] -Geometry=242, 242, 1200, 882 -Window=Max +Geometry=211, 16, 1295, 1189 +Window=Normal MDI_MAX=OFF Button=ON Mode=Auto @@ -45,7 +45,7 @@ Erase=OFF HighSpeed=OFF Symbol Reset=ON CPU Reset=ON -File1=bsr_k0r.lmf +File1=bsr.lmf LoadFilter1=5 Offset1=0 Object1=ON @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=0, 0, 832, 980 -Window=Normal -DispStart=120 -CaretPos=121,0 +Geometry=246, 15, 1090, 974 +Window=Hide +DispStart=1 +CaretPos=0,0 Mode=Normal DispFile= Address1= @@ -139,14 +139,6 @@ SaveRange=Screen SaveStart= SaveEnd= Accumulative=ON -[Source1] -Geometry=75, 75, 832, 980 -Window=Normal -DispStart=170 -CaretPos=171,0 -Mode=Normal -DispFile=tasks_sys.c -Accumulative=ON [Assemble] Geometry=0, 0, 0, 0 Window=Hide @@ -187,8 +179,8 @@ Data16= Case=ON Scan=OFF Direction=Down -FindStart=0 -FindEnd=0 +FindStart= +FindEnd= SaveRange=Screen SaveStart= SaveEnd= @@ -246,6 +238,7 @@ SaveRange=Screen SaveStart= SaveEnd= Accumulative=ON +Idtag=OFF [Memory fill] Scope=0, 0 Code=0 @@ -284,11 +277,11 @@ Address16= Boundary=0, 0 Mode=Hex Attribute=Show -Sort=Unsort +Sort=Address Pickup=OFF SelectSort=Address Last Name= -Line=506 +Line=531 L1=P0 L2=P1 L3=P2 @@ -297,504 +290,529 @@ L5=P4 L6=P5 L7=P6 L8=P7 -L9=P8 -L10=P12 -L11=P14 -L12=P15 -L13=SDR00 -L14=SIO00 -L15=TXD0 -L16=SDR01 -L17=RXD0 -L18=SIO01 -L19=TDR00 -L20=TDR01 -L21=ADCR -L22=ADCRH -L23=PM0 -L24=PM1 -L25=PM2 -L26=PM3 -L27=PM4 -L28=PM5 -L29=PM6 -L30=PM7 -L31=PM8 -L32=PM12 -L33=PM14 -L34=PM15 -L35=ADM -L36=ADCE -L37=ADCS -L38=ADS -L39=KRM -L40=EGP0 -L41=EGN0 -L42=ISC -L43=TIS0 -L44=SDR02 -L45=SIO10 -L46=TXD1 -L47=SDR03 -L48=RXD1 -L49=IICA -L50=IICS -L51=SPD -L52=STD -L53=ACKD -L54=TRC -L55=COI -L56=EXC -L57=ALD -L58=MSTS -L59=IICF -L60=IICRSV -L61=STCEN -L62=IICBSY -L63=STCF -L64=TDR02 -L65=TDR03 -L66=TDR04 -L67=TDR05 -L68=TDR06 -L69=TDR07 -L70=RSUBC -L71=SEC -L72=MIN -L73=HOUR -L74=WEEK -L75=DAY -L76=MONTH -L77=YEAR -L78=SUBCUD -L79=ALARMWM -L80=ALARMWH -L81=ALARMWW -L82=RTCC0 -L83=RCLOE0 -L84=RCLOE1 -L85=RTCE -L86=RTCC1 -L87=RWAIT -L88=RWST -L89=RIFG -L90=WAFG -L91=WALIE -L92=WALE -L93=RTCC2 -L94=RCKDIV -L95=RCLOE2 -L96=RINTE -L97=CMC -L98=CSC -L99=HIOSTOP -L100=XTSTOP -L101=MSTOP -L102=OSTC -L103=OSTS -L104=CKC -L105=MCM0 -L106=MCS -L107=CSS -L108=CLS -L109=CKS0 -L110=PCLOE0 -L111=CKS1 -L112=PCLOE1 -L113=RESF -L114=LVIM -L115=LVIF -L116=LVIMD -L117=LVISEL -L118=LVION -L119=LVIS -L120=WDTE -L121=DSA0 -L122=DSA1 -L123=DRA0 -L124=DRA0L -L125=DRA0H -L126=DRA1 -L127=DRA1L -L128=DRA1H -L129=DBC0 -L130=DBC0L -L131=DBC0H -L132=DBC1 -L133=DBC1L -L134=DBC1H -L135=DMC0 -L136=DWAIT0 -L137=DS0 -L138=DRS0 -L139=STG0 -L140=DMC1 -L141=DWAIT1 -L142=DS1 -L143=DRS1 -L144=STG1 -L145=DRC0 -L146=DST0 -L147=DEN0 -L148=DRC1 -L149=DST1 -L150=DEN1 -L151=BECTL -L152=FLMDPUP -L153=PFCMD -L154=PFS -L155=FPRERR -L156=FLPMC -L157=BFAEN -L158=FWEPR -L159=BRAMEN -L160=IF2 -L161=IF2L -L162=TMIF05 -L163=TMIF06 -L164=TMIF07 -L165=PIF6 -L166=PIF7 -L167=MK2 -L168=MK2L -L169=TMMK05 -L170=TMMK06 -L171=TMMK07 -L172=PMK6 -L173=PMK7 -L174=PR02 -L175=PR02L -L176=TMPR005 -L177=TMPR006 -L178=TMPR007 -L179=PPR06 -L180=PPR07 -L181=PR12 -L182=PR12L -L183=TMPR105 -L184=TMPR106 -L185=TMPR107 -L186=PPR16 -L187=PPR17 -L188=IF0 -L189=IF0L -L190=WDTIIF -L191=LVIIF -L192=PIF0 -L193=PIF1 -L194=PIF2 -L195=PIF3 -L196=PIF4 -L197=PIF5 -L198=IF0H -L199=CMPIF0 -L200=CMPIF1 -L201=DMAIF0 -L202=DMAIF1 -L203=CSIIF00 -L204=STIF0 -L205=CSIIF01 -L206=SRIF0 -L207=SREIF0 -L208=IF1 -L209=IF1L -L210=CSIIF10 -L211=IICIF10 -L212=STIF1 -L213=SRIF1 -L214=SREIF1 -L215=IICAIF -L216=TMIF00 -L217=TMIF01 -L218=TMIF02 -L219=TMIF03 -L220=IF1H -L221=ADIF -L222=RTCIF -L223=RTCIIF -L224=KRIF -L225=MDIF -L226=TMIF04 -L227=MK0 -L228=MK0L -L229=WDTIMK -L230=LVIMK -L231=PMK0 -L232=PMK1 -L233=PMK2 -L234=PMK3 -L235=PMK4 -L236=PMK5 -L237=MK0H -L238=CMPMK0 -L239=CMPMK1 -L240=DMAMK0 -L241=DMAMK1 -L242=CSIMK00 -L243=STMK0 -L244=CSIMK01 -L245=SRMK0 -L246=SREMK0 -L247=MK1 -L248=MK1L -L249=CSIMK10 -L250=IICMK10 -L251=STMK1 -L252=SRMK1 -L253=SREMK1 -L254=IICAMK -L255=TMMK00 -L256=TMMK01 -L257=TMMK02 -L258=TMMK03 -L259=MK1H -L260=ADMK -L261=RTCMK -L262=RTCIMK -L263=KRMK -L264=MDMK -L265=TMMK04 -L266=PR00 -L267=PR00L -L268=WDTIPR0 -L269=LVIPR0 -L270=PPR00 -L271=PPR01 -L272=PPR02 -L273=PPR03 -L274=PPR04 -L275=PPR05 -L276=PR00H -L277=CMPPR00 -L278=CMPPR01 -L279=DMAPR00 -L280=DMAPR01 -L281=CSIPR000 -L282=STPR00 -L283=CSIPR001 -L284=SRPR00 -L285=SREPR00 -L286=PR01 -L287=PR01L -L288=CSIPR010 -L289=IICPR010 -L290=STPR01 -L291=SRPR01 -L292=SREPR01 -L293=IICAPR0 -L294=TMPR000 -L295=TMPR001 -L296=TMPR002 -L297=TMPR003 -L298=PR01H -L299=ADPR0 -L300=RTCPR0 -L301=RTCIPR0 -L302=KRPR0 -L303=MDPR0 -L304=TMPR004 -L305=PR10 -L306=PR10L -L307=WDTIPR1 -L308=LVIPR1 -L309=PPR10 -L310=PPR11 -L311=PPR12 -L312=PPR13 -L313=PPR14 -L314=PPR15 -L315=PR10H -L316=CMPPR10 -L317=CMPPR11 -L318=DMAPR10 -L319=DMAPR11 -L320=CSIPR100 -L321=STPR10 -L322=CSIPR101 -L323=SRPR10 -L324=SREPR10 -L325=PR11 -L326=PR11L -L327=CSIPR110 -L328=IICPR110 -L329=STPR11 -L330=SRPR11 -L331=SREPR11 -L332=IICAPR1 -L333=TMPR100 -L334=TMPR101 -L335=TMPR102 -L336=TMPR103 -L337=PR11H -L338=ADPR1 -L339=RTCPR1 -L340=RTCIPR1 -L341=KRPR1 -L342=MDPR1 -L343=TMPR104 -L344=MDAL -L345=MULA -L346=MDAH -L347=MULB -L348=MDBH -L349=MULOH -L350=MDBL -L351=MULOL -L352=PMC -L353=MAA -L354=ADPC -L355=PU0 -L356=PU1 -L357=PU3 -L358=PU4 -L359=PU5 -L360=PU7 -L361=PU12 -L362=PU14 -L363=PIM3 -L364=PIM7 -L365=PIM8 -L366=POM3 -L367=POM7 -L368=NFEN0 -L369=NFEN1 -L370=NFEN2 -L371=MDCL -L372=MDCH -L373=MDUC -L374=DIVST -L375=DIVMODE -L376=PER0 -L377=SAU0EN -L378=IICAEN -L379=ADCEN -L380=RTCEN -L381=PER1 -L382=OACMPEN -L383=PER2 -L384=TAU0EN -L385=OSMC -L386=RMC -L387=DSCCTL -L388=DSCON -L389=SELDSC -L390=DSCS -L391=BCDADJ -L392=SSR00 -L393=SSR00L -L394=SSR01 -L395=SSR01L -L396=SSR02 -L397=SSR02L -L398=SSR03 -L399=SSR03L -L400=SIR00 -L401=SIR00L -L402=SIR01 -L403=SIR01L -L404=SIR02 -L405=SIR02L -L406=SIR03 -L407=SIR03L -L408=SMR00 -L409=SMR01 -L410=SMR02 -L411=SMR03 -L412=SCR00 -L413=SCR01 -L414=SCR02 -L415=SCR03 -L416=SE0 -L417=SE0L -L418=SS0 -L419=SS0L -L420=ST0 -L421=ST0L -L422=SPS0 -L423=SPS0L -L424=SO0 -L425=SOE0 -L426=SOE0L -L427=SOL0 -L428=SOL0L -L429=TCR00 -L430=TCR01 -L431=TCR02 -L432=TCR03 -L433=TCR04 -L434=TCR05 -L435=TCR06 -L436=TCR07 -L437=TMR00 -L438=TMR01 -L439=TMR02 -L440=TMR03 -L441=TMR04 -L442=TMR05 -L443=TMR06 -L444=TMR07 -L445=TSR00 -L446=TSR00L -L447=TSR01 -L448=TSR01L -L449=TSR02 -L450=TSR02L -L451=TSR03 -L452=TSR03L -L453=TSR04 -L454=TSR04L -L455=TSR05 -L456=TSR05L -L457=TSR06 -L458=TSR06L -L459=TSR07 -L460=TSR07L -L461=TE0 -L462=TE0L -L463=TS0 -L464=TS0L -L465=TT0 -L466=TT0L -L467=TPS0 -L468=TPS0L -L469=TO0 -L470=TO0L -L471=TOE0 -L472=TOE0L -L473=TOL0 -L474=TOL0L -L475=TOM0 -L476=TOM0L -L477=IICCTL0 -L478=SPT -L479=STT -L480=ACKE -L481=WTIM -L482=SPIE -L483=WREL -L484=LREL -L485=IICE -L486=IICCTL1 -L487=DFC -L488=SMC -L489=DAD -L490=CLD -L491=WUP -L492=IICWL -L493=IICWH -L494=SVA -L495=OAM -L496=OAEN -L497=C0CTL -L498=C0OE -L499=C0EN -L500=C0RVM -L501=C0VRE -L502=C1CTL -L503=C1OE -L504=C1EN -L505=C1RVM -L506=C1VRE +L9=P12 +L10=P14 +L11=P15 +L12=SDR00 +L13=SIO00 +L14=TXD0 +L15=SDR01 +L16=RXD0 +L17=SIO01 +L18=TDR00 +L19=TDR01 +L20=ADCRH +L21=PM0 +L22=PM1 +L23=PM2 +L24=PM3 +L25=PM4 +L26=PM5 +L27=PM6 +L28=PM7 +L29=PM12 +L30=PM14 +L31=PM15 +L32=ADM +L33=ADCE +L34=ADCS +L35=ADS +L36=KRM +L37=EGP0 +L38=EGN0 +L39=ISC +L40=TIS0 +L41=SDR02 +L42=SIO10 +L43=TXD1 +L44=SDR03 +L45=RXD1 +L46=IICA0 +L47=IICS0 +L48=SPD0 +L49=STD0 +L50=ACKD0 +L51=TRC0 +L52=COI0 +L53=EXC0 +L54=ALD0 +L55=MSTS0 +L56=IICF0 +L57=IICRSV0 +L58=STCEN0 +L59=IICBSY0 +L60=STCF0 +L61=TDR02 +L62=TDR03 +L63=TDR04 +L64=TDR05 +L65=TDR06 +L66=TDR07 +L67=RSUBC +L68=SEC +L69=MIN +L70=HOUR +L71=WEEK +L72=DAY +L73=MONTH +L74=YEAR +L75=SUBCUD +L76=ALARMWM +L77=ALARMWH +L78=ALARMWW +L79=RTCC0 +L80=RCLOE0 +L81=RCLOE1 +L82=RTCE +L83=RTCC1 +L84=RWAIT +L85=RWST +L86=RIFG +L87=WAFG +L88=WALIE +L89=WALE +L90=RTCC2 +L91=RCKDIV +L92=RCLOE2 +L93=RINTE +L94=CMC +L95=CSC +L96=HIOSTOP +L97=XTSTOP +L98=MSTOP +L99=OSTC +L100=OSTS +L101=CKC +L102=MCM0 +L103=MCS +L104=CSS +L105=CLS +L106=CKS0 +L107=PCLOE0 +L108=CKS1 +L109=PCLOE1 +L110=RESF +L111=LVIM +L112=LVIF +L113=LVIMD +L114=LVISEL +L115=LVION +L116=LVIS +L117=WDTE +L118=DSA0 +L119=DSA1 +L120=DRA0 +L121=DRA0L +L122=DRA0H +L123=DRA1 +L124=DRA1L +L125=DRA1H +L126=DBC0 +L127=DBC0L +L128=DBC0H +L129=DBC1 +L130=DBC1L +L131=DBC1H +L132=DMC0 +L133=DWAIT0 +L134=DS0 +L135=DRS0 +L136=STG0 +L137=DMC1 +L138=DWAIT1 +L139=DS1 +L140=DRS1 +L141=STG1 +L142=DRC0 +L143=DST0 +L144=DEN0 +L145=DRC1 +L146=DST1 +L147=DEN1 +L148=BECTL +L149=FLMDPUP +L150=PFCMD +L151=PFS +L152=FPRERR +L153=FLPMC +L154=BFAEN +L155=FWEPR +L156=BRAMEN +L157=IF2 +L158=IF2L +L159=TMIF05 +L160=TMIF06 +L161=TMIF07 +L162=PIF6 +L163=IF2H +L164=IICAIF1 +L165=PIF20 +L166=PIF21 +L167=PIF22 +L168=PIF23 +L169=MK2 +L170=MK2L +L171=TMMK05 +L172=TMMK06 +L173=TMMK07 +L174=PMK6 +L175=MK2H +L176=IICAMK1 +L177=PMK20 +L178=PMK21 +L179=PMK22 +L180=PMK23 +L181=PR02 +L182=PR02L +L183=TMPR005 +L184=TMPR006 +L185=TMPR007 +L186=PPR06 +L187=PR02H +L188=IICAPR01 +L189=PPR020 +L190=PPR021 +L191=PPR022 +L192=PPR023 +L193=PR12 +L194=PR12L +L195=TMPR105 +L196=TMPR106 +L197=TMPR107 +L198=PPR16 +L199=PR12H +L200=IICAPR11 +L201=PPR120 +L202=PPR121 +L203=PPR122 +L204=PPR123 +L205=IF0 +L206=IF0L +L207=WDTIIF +L208=LVIIF +L209=PIF0 +L210=PIF1 +L211=PIF2 +L212=PIF4 +L213=PIF5 +L214=IF0H +L215=DMAIF0 +L216=DMAIF1 +L217=CSIIF00 +L218=STIF0 +L219=CSIIF01 +L220=SRIF0 +L221=SREIF0 +L222=IF1 +L223=IF1L +L224=CSIIF10 +L225=IICIF10 +L226=STIF1 +L227=SRIF1 +L228=SREIF1 +L229=IICAIF0 +L230=TMIF00 +L231=TMIF01 +L232=TMIF02 +L233=TMIF03 +L234=IF1H +L235=ADIF +L236=RTCIF +L237=RTCIIF +L238=KRIF +L239=MDIF +L240=TMIF04 +L241=MK0 +L242=MK0L +L243=WDTIMK +L244=LVIMK +L245=PMK0 +L246=PMK1 +L247=PMK2 +L248=PMK4 +L249=PMK5 +L250=MK0H +L251=DMAMK0 +L252=DMAMK1 +L253=CSIMK00 +L254=STMK0 +L255=CSIMK01 +L256=SRMK0 +L257=SREMK0 +L258=MK1 +L259=MK1L +L260=CSIMK10 +L261=IICMK10 +L262=STMK1 +L263=SRMK1 +L264=SREMK1 +L265=IICAMK0 +L266=TMMK00 +L267=TMMK01 +L268=TMMK02 +L269=TMMK03 +L270=MK1H +L271=ADMK +L272=RTCMK +L273=RTCIMK +L274=KRMK +L275=MDMK +L276=TMMK04 +L277=PR00 +L278=PR00L +L279=WDTIPR0 +L280=LVIPR0 +L281=PPR00 +L282=PPR01 +L283=PPR02 +L284=PPR04 +L285=PPR05 +L286=PR00H +L287=DMAPR00 +L288=DMAPR01 +L289=CSIPR000 +L290=STPR00 +L291=CSIPR001 +L292=SRPR00 +L293=SREPR00 +L294=PR01 +L295=PR01L +L296=CSIPR010 +L297=IICPR010 +L298=STPR01 +L299=SRPR01 +L300=SREPR01 +L301=IICAPR00 +L302=TMPR000 +L303=TMPR001 +L304=TMPR002 +L305=TMPR003 +L306=PR01H +L307=ADPR0 +L308=RTCPR0 +L309=RTCIPR0 +L310=KRPR0 +L311=MDPR0 +L312=TMPR004 +L313=PR10 +L314=PR10L +L315=WDTIPR1 +L316=LVIPR1 +L317=PPR10 +L318=PPR11 +L319=PPR12 +L320=PPR14 +L321=PPR15 +L322=PR10H +L323=DMAPR10 +L324=DMAPR11 +L325=CSIPR100 +L326=STPR10 +L327=CSIPR101 +L328=SRPR10 +L329=SREPR10 +L330=PR11 +L331=PR11L +L332=CSIPR110 +L333=IICPR110 +L334=STPR11 +L335=SRPR11 +L336=SREPR11 +L337=IICAPR10 +L338=TMPR100 +L339=TMPR101 +L340=TMPR102 +L341=TMPR103 +L342=PR11H +L343=ADPR1 +L344=RTCPR1 +L345=RTCIPR1 +L346=KRPR1 +L347=MDPR1 +L348=TMPR104 +L349=MDAL +L350=MULA +L351=MDAH +L352=MULB +L353=MDBH +L354=MULOH +L355=MDBL +L356=MULOL +L357=PMC +L358=MAA +L359=ADPC +L360=PU0 +L361=PU1 +L362=PU3 +L363=PU4 +L364=PU5 +L365=PU7 +L366=PU12 +L367=PU14 +L368=PIM3 +L369=PIM7 +L370=POM3 +L371=POM7 +L372=NFEN0 +L373=NFEN1 +L374=NFEN2 +L375=MDCL +L376=MDCH +L377=MDUC +L378=DIVST +L379=DIVMODE +L380=PER0 +L381=SAU0EN +L382=IICA0EN +L383=ADCEN +L384=RTCEN +L385=PER2 +L386=TAU0EN +L387=OSMC +L388=BCDADJ +L389=SSR00 +L390=SSR00L +L391=SSR01 +L392=SSR01L +L393=SSR02 +L394=SSR02L +L395=SSR03 +L396=SSR03L +L397=SIR00 +L398=SIR00L +L399=SIR01 +L400=SIR01L +L401=SIR02 +L402=SIR02L +L403=SIR03 +L404=SIR03L +L405=SMR00 +L406=SMR01 +L407=SMR02 +L408=SMR03 +L409=SCR00 +L410=SCR01 +L411=SCR02 +L412=SCR03 +L413=SE0 +L414=SE0L +L415=SS0 +L416=SS0L +L417=ST0 +L418=ST0L +L419=SPS0 +L420=SPS0L +L421=SO0 +L422=SOE0 +L423=SOE0L +L424=SOL0 +L425=SOL0L +L426=TCR00 +L427=TCR01 +L428=TCR02 +L429=TCR03 +L430=TCR04 +L431=TCR05 +L432=TCR06 +L433=TCR07 +L434=TMR00 +L435=TMR01 +L436=TMR02 +L437=TMR03 +L438=TMR04 +L439=TMR05 +L440=TMR06 +L441=TMR07 +L442=TSR00 +L443=TSR00L +L444=TSR01 +L445=TSR01L +L446=TSR02 +L447=TSR02L +L448=TSR03 +L449=TSR03L +L450=TSR04 +L451=TSR04L +L452=TSR05 +L453=TSR05L +L454=TSR06 +L455=TSR06L +L456=TSR07 +L457=TSR07L +L458=TE0 +L459=TE0L +L460=TS0 +L461=TS0L +L462=TT0 +L463=TT0L +L464=TPS0 +L465=TPS0L +L466=TO0 +L467=TO0L +L468=TOE0 +L469=TOE0L +L470=TOL0 +L471=TOL0L +L472=TOM0 +L473=TOM0L +L474=IICCTL00 +L475=SPT0 +L476=STT0 +L477=ACKE0 +L478=WTIM0 +L479=SPIE0 +L480=WREL0 +L481=LREL0 +L482=IICE0 +L483=IICCTL10 +L484=DFC0 +L485=SMC0 +L486=DAD0 +L487=CLD0 +L488=WUP0 +L489=IICWL0 +L490=IICWH0 +L491=SVA0 +L492=PER3 +L493=IICA1EN +L494=P20 +L495=PM20 +L496=PU20 +L497=EGP2 +L498=EGN2 +L499=IICA1 +L500=IICS1 +L501=SPD1 +L502=STD1 +L503=ACKD1 +L504=TRC1 +L505=COI1 +L506=EXC1 +L507=ALD1 +L508=MSTS1 +L509=IICF1 +L510=IICRSV1 +L511=STCEN1 +L512=IICBSY1 +L513=STCF1 +L514=IICCTL01 +L515=SPT1 +L516=STT1 +L517=ACKE1 +L518=WTIM1 +L519=SPIE1 +L520=WREL1 +L521=LREL1 +L522=IICE1 +L523=IICCTL11 +L524=DFC1 +L525=SMC1 +L526=DAD1 +L527=CLD1 +L528=WUP1 +L529=IICWL1 +L530=IICWH1 +L531=SVA1 [Local Variable] Geometry=0, 0, 0, 0 Window=Hide @@ -851,7 +869,7 @@ SaveEnd= Geometry=0, 0, 0, 0 Window=Hide Mode=Hex -Boundary=62 +Boundary=0 Pickup=OFF Name=Functional Register Bank=0 @@ -864,6 +882,48 @@ SP=3 PSW=3 ES=3 CS=3 +[Quick Watch] +0= +1= +2= +3= +4= +5= +6= +7= +8= +9= +10= +11= +12= +13= +14= +15= +[Software Break] +Geometry=0, 0, 0, 0 +Window=Hide +Width=150 30 200 100 +Name0=Swb00006 +Address0=vreg_ctr.c#_vreg_ctr_write+0x18b +Window0=ASM +Status0=ON +Count=0 +[Reset] +Debugger=ON +Symbol=OFF +Target CPU=OFF +[Extended Option] +OnClick Software Break=ON +TraceTimetag=x1 +Redraw=500 +Break When Access Function=OFF +Break When Access Whole=Select +Verify=ON +Break Sound=ON +TraceAutoClear=OFF +RRM Clock=Internal +CKC Register Value=0x09 +RRM Internal Clock Frequency=8.000 [Event Manager] Geometry=0, 0, 0, 0 Window=Hide @@ -876,17 +936,7 @@ Manager=ON Sort by=Unsort Detail=OFF Last Name= -Name0=syste001 -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 @@ -902,10 +952,7 @@ Manager=ON Sort by=Unsort Detail=OFF Last Name= -Name0=syste002 -Element0=syste001 -Set0=ON -Count=1 +Count=0 [Trace] Geometry=0, 0, 0, 0 Window=Hide @@ -952,59 +999,17 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=1148, 7, 440, 686 -Window=Normal -Boundary=16777386 -0=.system_status.pwr_state,P,N,A,+,1 -1=.SMC,P,S,A,+,1 -Line=2 -[Quick Watch] -0=SMC,P,A,1 -1=system_status.pwr_state,P,A,1 -2= -3= -4= -5= -6= -7= -8= -9= -10= -11= -12= -13= -14= -15= -[Software Break] Geometry=0, 0, 0, 0 Window=Hide -Width=150 30 200 100 -Name0=Swb00002 -Address0=tasks_sys.c#_tsk_sys+0xce -Window0=ASM -Status0=ON -Count=1 -[Reset] -Debugger=ON -Symbol=OFF -Target CPU=OFF -[Extended Option] -OnClick Software Break=ON -TraceTimetag=x1 -Redraw=500 -Break When Access Function=ON -Break When Access Whole=Select -Verify=ON -Break Sound=ON -TraceAutoClear=OFF -RRM Clock=Internal -CKC Register Value=0x09 -RRM Internal Clock Frequency=8 +Boundary=0 +Line=0 [About] Version=Program [Pseudo Emulation] Geometry=0, 0, 0, 0 Window=Hide +[Data Flash Option] +Data Flash Emulation=OFF [List] Geometry=0, 0, 0, 0 Window=Hide diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 673760a..57d7102 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -243,6 +243,325 @@ 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 +[IncFile] +Include1=incs_loader.h +Include2=jhl_defs.h +Include3=user_define.h +Include4=config.h +Include5=bsr_system.h +Include6=renge\renge.h +Include7=renge\renge_defs.h +Include8=renge\renge_task_immediate.h +Include9=vreg_ctr.h +Include10=loader.h +Include11=i2c_mcu.h +Include12=WDT.h +Include13=fsl.h +Include14=fsl_user.h +Include15=i2c_ctr.h +Include16=pm.h +Include17=rtc.h +Include18=adc.h +Include19=led.h +Include20=incs.h +Include21=vreg_twl.h +Include22=accero.h +Include23=i2c_twl_defs.h +Include24=renge\renge_task_intval.h +Include25=i2c_twl.h +Include26=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h +Include27=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [Options.CC78K0R 0] Version=210 Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r @@ -709,324 +1028,6 @@ VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 VF78K0Rvs= -[IncFile] -Include1=incs_loader.h -Include2=jhl_defs.h -Include3=user_define.h -Include4=config.h -Include5=bsr_system.h -Include6=renge\renge.h -Include7=renge\renge_defs.h -Include8=renge\renge_task_immediate.h -Include9=vreg_ctr.h -Include10=loader.h -Include11=i2c_mcu.h -Include12=WDT.h -Include13=fsl.h -Include14=fsl_user.h -Include15=i2c_ctr.h -Include16=pm.h -Include17=rtc.h -Include18=adc.h -Include19=led.h -Include20=incs.h -Include21=vreg_twl.h -Include22=accero.h -Include23=i2c_twl_defs.h -Include24=renge\renge_task_intval.h -Include25=i2c_twl.h -Include26=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h -[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 [ToolSet] ToolSetName=(変更)78K0R Software Package V1.10 Tool1=CC78K0R|W2.10 diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 92c796d..3abd39a 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,15 +1,25 @@ [ProjectManager] -FrameMax=1 -FrameX=102 -FrameY=62 -FrameCX=1503 -FrameCY=631 +FrameMax=0 +FrameX=110 +FrameY=74 +FrameCX=1376 +FrameCY=1066 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=ProjectWindow +OpenFile3=user_define.h,0,176,176,1420,933,0,33,20,0 +OpenFile4=vreg_ctr.c,0,345,273,1060,932,0,47,0,0 +OpenFile5=i2c_ctr.c,0,242,242,1425,868,0,116,0,0 +OpenFile6=led.c,0,286,286,1469,912,0,454,21,0 +OpenFile7=rtc.c,0,308,308,1491,934,0,31,17,0 +OpenFile8=tasks_sys.c,0,220,220,1403,846,16,392,17,0 +OpenFile9=loader.c,0,264,264,1447,890,0,139,0,0 +OpenFile10=magic.c,0,242,242,1486,999,3,8,0,0 +OpenFile11=adc.c,0,166,66,1349,692,0,210,0,0 +OpenFile12=accero.c,0,154,154,1398,911,25,119,0,0 +OpenFile13=pm.c,0,88,88,1144,747,50,218,32,0 +OpenFile14=ProjectWindow PrjPos=0,2,754,3,253 -OpenFile4=config.h,0,168,78,1412,835,0,14,21,0 -OpenFile5=OutputWindow +OpenFile15=OutputWindow OutputPos=0,67,1023,707,1568 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index c664a17..7d66dbc 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4ac169a4 +T=4adbffdf 1=incs_loader.h 2=fsl.h 3=fsl_user.h @@ -10,47 +10,47 @@ T=4ac169a4 6=pm.h 7=rtc.h [pm.c] -T=4ac09552 -1=incs_loader.h +T=4adc1fa6 +1=incs.h 2=adc.h 3=led.h 4=pm.h [i2c_ctr.c] -T=4ac07479 +T=4aca8ef0 1=incs.h [main.c] -T=4ac0af62 +T=4aca8ef0 1=incs.h 2=WDT.h 3=rtc.h 4=pm.h 5=accero.h [magic.c] -T=4ac01920 +T=4ad3e9ff 1=config.h [WDT.c] -T=4a9e6e71 +T=4aca8ef0 1=incs_loader.h [i2c_mcu.c] -T=4ac0b193 +T=4ad70c7e 1=incs.h 2=i2c_mcu.h [i2c_twl.c] -T=4ac07a54 +T=4aca8ef0 1=incs.h 2=i2c_twl_defs.h [ini_VECT.c] -T=4ac169a4 +T=4adc1fec 1=config.h [led.c] -T=4ac15aa7 +T=4adc1fee 1=incs.h 2=led.h [rtc.c] -T=4ac1c178 +T=4ad42ad0 1=incs.h [vreg_ctr.c] -T=4ac1a405 +T=4adbcc88 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -58,30 +58,30 @@ T=4ac1a405 5=accero.h 6=pm.h [vreg_twl.c] -T=4ab332c7 +T=4ad6dc31 1=incs.h 2=jhl_defs.h 3=vreg_twl.h [tasks.c] -T=4ac169a4 +T=4adc2aa4 1=incs.h 2=renge\renge.h 3=pm.h [adc.c] -T=4ac15aa7 +T=4aca9609 1=incs.h 2=adc.h 3=pm.h 4=led.h [renge\renge.c] -T=4ac0a6c5 +T=4ac96eb4 1=renge\renge_defs.h 2=renge\renge_task_intval.h 3=renge\renge_task_immediate.h 4=WDT.h 5=bsr_system.h [tasks_sys.c] -T=4ac1a252 +T=4ad42ad0 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -90,16 +90,17 @@ T=4ac1a252 6=pm.h 7=rtc.h [accero.c] -T=4ac1a5fc +T=4adc2c13 1=incs.h +2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] -T=4ac07a54 +T=4aca8ef0 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 [incs_loader.h] -T=4a9e6e71 +T=4aca8c17 1=jhl_defs.h 2=user_define.h 3=bsr_system.h @@ -109,50 +110,50 @@ T=4a9e6e71 7=i2c_mcu.h 8=WDT.h [jhl_defs.h] -T=4ab3330b +T=4aca8c17 [user_define.h] -T=4ac1a76f +T=4adc252d 1=config.h [config.h] -T=4ac1d2cd +T=4adc2bf0 [bsr_system.h] -T=4ac09552 +T=4aca8c17 [renge\renge.h] T=4abc82ef 1=renge\renge_defs.h 2=renge\renge_task_immediate.h [renge\renge_defs.h] -T=4aa79102 +T=4ac96e5c [renge\renge_task_immediate.h] -T=4a8a7575 +T=4ad68780 1=renge\renge_defs.h [vreg_ctr.h] -T=4ac14c41 +T=4ad68b93 1=config.h [loader.h] -T=4a7a31d0 +T=4aca8c17 1=jhl_defs.h [i2c_mcu.h] -T=4a9e6e71 +T=4aca8c17 [WDT.h] -T=4a9e6e71 +T=4aca8c17 [fsl.h] -T=47ec5c12 +T=4aca8c17 [fsl_user.h] -T=4a7bf458 +T=4aca8c17 [i2c_ctr.h] -T=4a7c0777 +T=4aca8c17 [pm.h] -T=4ab47f83 +T=4ad7efd5 [rtc.h] -T=4ab48e99 +T=4aca8c17 [adc.h] -T=4aa74fb6 +T=4aca8c17 1=jhl_defs.h [led.h] -T=4ac15aa7 +T=4aca8c17 [incs.h] -T=4ac0857f +T=4aca8c17 1=jhl_defs.h 2=user_define.h 3=bsr_system.h @@ -162,16 +163,18 @@ T=4ac0857f 7=i2c_mcu.h 8=rtc.h [vreg_twl.h] -T=4aa79c31 +T=4ad6dc31 [accero.h] -T=4aa7853b +T=4aca8c17 1=jhl_defs.h [i2c_twl_defs.h] -T=4a7c074e +T=4aca8c17 [renge\renge_task_intval.h] -T=4ab226cf +T=4ac9ab84 1=renge\renge_defs.h [i2c_twl.h] -T=4a7c0786 +T=4aca8c17 [..\..\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