diff --git a/trunk/accero.c b/trunk/accero.c index 995c6af..1356751 100644 --- a/trunk/accero.c +++ b/trunk/accero.c @@ -160,18 +160,14 @@ task_status_immed tsk_cbk_accero( )   累積をインクリメント  履歴を更新 ========================================================*/ -#define MAGIC_PEDO_NODATA 65535 -#define MAGIC_PEDO_MAX 65534 - u8 p_record; u8 last_hour; // 履歴の最新は何時? -/* - static u16 last_hour; - static u8 last_year; -*/ static void hosu_increment() { + static u16 last_hour_fny; + static u8 last_year; + // 累積の更新 // // いろいろ失敗した... if( ++vreg_ctr[ VREG_C_ACC_HOSU_L ] == 0 ) @@ -186,32 +182,9 @@ static void hosu_increment() } } - // 毎時履歴の更新 { - u8 now_hour; - - // 時計を止める必要が有るので↓は一気に行って下さい - DI(); - RWAIT = 1; - while( !RWST ){;} - now_hour = HOUR; - RWAIT = 0; - EI(); - - if( last_hour != now_hour ) - { - last_hour = now_hour; - p_record += 1; - } - // インクリメント - if( pool[ p_record ] != 0xFFFF ) - { - pool[ p_record ] += 1; - } - - -// 空白の時間を考慮するタイプ ///////////////////////////// -#if 0 + // 毎時履歴の更新 ///////////////////////////// + // 空白の時間を考慮する。1時間以上放置されたなど。 u16 now_hour; u8 now_year; @@ -220,68 +193,67 @@ static void hosu_increment() RWAIT = 1; while( !RWST ){;} now_year = bcdtob( YEAR ); + last_hour = HOUR; // 履歴読み出し時に使用。BCDのままでよい now_hour = get_long_hour(); // RWAIT = 0; ↑で行っています // EI(); 〃 - // 歩数計が止まったいた時間を考慮して必要なら進める // + // 歩数計が止まっていた時間を考慮して必要なら進める // if( last_year == now_year ) { - if( now_hour > last_hour ) + if( now_hour > last_hour_fny ) { - fill_hosu_hist_hours( now_hour - last_hour ); + fill_hosu_hist_hours( now_hour - last_hour_fny ); } } else if( last_year == ( now_year -1 ) ) { // 年をまたいでいるとき - u16 temp_hours = ( ( 365 + (( now_year & 0x03 ) == 1 )? 1: 0 ) * 24 ) - last_hour + now_hour; + u16 temp_hours = ( ( 365 + (( now_year & 0x03 ) == 1 )? 1: 0 ) * 24 ) - last_hour_fny + now_hour; fill_hosu_hist_hours( temp_hours ); } else if( last_year < now_year ) { // 数年放置 - fill_hosu_hist_hours( 255 ); + fill_hosu_hist_hours( 0 ); } else { - // 巻き戻るなど - // 知らない… + // カレンダーが巻き戻るなど + // ノーケアでよい } last_year = now_year; - last_hour = now_hour; + last_hour_fny = now_hour; // 実際にインクリメント - *( hyst_pedometer + p_record ) += 1; - if( *( hyst_pedometer + p_record ) > MAGIC_PEDO_MAX ) + if( pool[ p_record ] != 0xFFFF ) { - *( hyst_pedometer + p_record ) = MAGIC_PEDO_MAX; + pool[ p_record ] += 1; } -#endif } } -#if 0 + +/* ======================================================== +空白の時間を適切に0にして、 +今を含む1時間のデータを書く位置にポインタ?を進める +======================================================== */ void fill_hosu_hist_hours( u16 hours ) { if( hours > 255 ) { - hours = 255; + hours = 0; } - hours -= 1; - // 空白の数時間の設定 - while( hours != 0 ) + do { p_record += 1; - *( hyst_pedometer + p_record ) = MAGIC_PEDO_NODATA; + pool[ p_record ] = 0; hours -= 1; } - p_record += 1; - *( hyst_pedometer + p_record ) = 0; + while( hours != 0 ); } -#endif bit hosu_read_inited; @@ -297,6 +269,7 @@ void hosu_read_end( ) hosu_read_inited = 0; } + /* ======================================================== 歩数計のヒストリを返す。 1回呼ぶ度に、ヒストリの下位、上位、一時間遡って下位上位... @@ -311,7 +284,7 @@ u8 hosu_read( ) { p_record_buffer = p_record; hosu_read_inited = 1; - return( last_hour ); + return( last_hour ); // 最初は、最後に記録した時刻を送る } temp = pool[ p_record_buffer ]; @@ -329,25 +302,6 @@ u8 hosu_read( ) } -/* ======================================================== - 歩数計のヒストリを空っぽにする -======================================================== */ -void hosu_init() -{ - u8 i = 0; - - do - { - pool[ i ] = 0; - i += 1; - } - while( i != 0 ); - vreg_ctr[ VREG_C_ACC_HOSU_L ] = 0; - vreg_ctr[ VREG_C_ACC_HOSU_M ] = 0; - vreg_ctr[ VREG_C_ACC_HOSU_H ] = 0; -} - - /*=========================================================  加速度センサ透過アクセス リード diff --git a/trunk/accero.h b/trunk/accero.h index 5faa069..fe755cd 100644 --- a/trunk/accero.h +++ b/trunk/accero.h @@ -10,7 +10,6 @@ task_status_immed tsk_cbk_accero( ); task_status_immed acc_hosu_set( ); -void hosu_init(); void hosu_read_end( ); u8 hosu_read( ); void fill_hosu_hist_hours( u16 ); diff --git a/trunk/adc.c b/trunk/adc.c index 59c911f..bbb4273 100644 --- a/trunk/adc.c +++ b/trunk/adc.c @@ -27,6 +27,21 @@ bit adc_updated; ・8tics毎に呼ばれ、3チャンネル分取り込むとADCを停止します。  タスク起動時、レジスタには前回の取り込み値が入っています。 ======================================================== */ + +static const u8 slider_to_codec[64] = +{ + 127, 125, 124, 123, 121, 120, 119, 117, + 116, 115, 113, 112, 111, 109, 108, 107, + 105, 104, 103, 101, 100, 99, 98, 96, + 95, 94, 92, 91, 90, 88, 87, 86, + 84, 83, 82, 80, 79, 78, 76, 75, + 74, 72, 71, 70, 69, 67, 66, 65, + 63, 62, 61, 59, 58, 57, 55, 54, + 53, 51, 50, 49, 47, 46, 45, 44 +}; + + + void tsk_adc( ) { static u8 task_interval = 0; @@ -96,7 +111,9 @@ void tsk_adc( ) sndvol_codec / 2 + sndvol_codec / 4 ); // 簡易スケーリング todo // codecに伝える iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_VOL, - 127 - ( sndvol_codec / 2 + sndvol_codec / 4 )/2 ); + slider_to_codec[ sndvol_codec/4 ] ); + +// 127 - (u8)( (u16)sndvol_codec*3 / 4 )/2 ); } tokidoki += 1; } diff --git a/trunk/i2c_ctr.c b/trunk/i2c_ctr.c index 8c0c4f2..809311c 100644 --- a/trunk/i2c_ctr.c +++ b/trunk/i2c_ctr.c @@ -70,7 +70,7 @@ __interrupt void int_iic_ctr( ) EI(); // 読み出し終了 - if( !ACKD ) + if( !ACKD ) // 割り込み要因はNAK(データ送信の最後) { state = IIC_IDLE; SPIE = 0; @@ -98,7 +98,8 @@ __interrupt void int_iic_ctr( ) return; } - if( SPD ) + if( SPD ) // 割り込み要因はストップコンディション + // 通信の最後。↑の !ACKD に来たときは割り込み来ない (SPIE = 0 のため ) { state = IIC_IDLE; SPIE = 0; @@ -107,11 +108,12 @@ __interrupt void int_iic_ctr( ) return; } - if( STD ) + if( STD ) // 割り込み要因:スタートコンディション { if( ( state == IIC_TX ) || ( state == IIC_RX ) ) { state = IIC_IDLE; + // no break // } } @@ -125,7 +127,7 @@ __interrupt void int_iic_ctr( ) state = IIC_RCV_REG_ADRS; break; - case ( IIC_RCV_REG_ADRS ): + case ( IIC_RCV_REG_ADRS ): // 2バイト目(レジスタアドレス)受信後に来る // レジスタアドレス受信 reg_adrs = IICA; WREL = 1; @@ -133,7 +135,7 @@ __interrupt void int_iic_ctr( ) state = IIC_TX_OR_RX; break; - case ( IIC_TX_OR_RX ): + case ( IIC_TX_OR_RX ): // ↑の次に来る割り込み。STなら送信準備、データが来たら書き込まれ // if( TRC ){ // 送信方向フラグ で区別するのは、割り込み遅延時に不具合が起こりえる if( STD ) { // スタートコンディション検出フラグ @@ -158,15 +160,14 @@ __interrupt void int_iic_ctr( ) // no break, no return // } - default: + default: // バースト R/W でここが何回も呼ばれることになる 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; @@ -177,7 +178,7 @@ __interrupt void int_iic_ctr( ) } if( state == IIC_TX ) - { + { // さらにつぎに送るデータの準備だけシテオク。SPが来て使われないかもしれない trx_buf = vreg_ctr_read( reg_adrs ); } break; @@ -187,7 +188,6 @@ __interrupt void int_iic_ctr( ) - // ======================================================== void IIC_ctr_Init( void ) { diff --git a/trunk/i2c_twl.c b/trunk/i2c_twl.c index 44593a8..3286d41 100644 --- a/trunk/i2c_twl.c +++ b/trunk/i2c_twl.c @@ -64,7 +64,6 @@ u16 tot; // 注! ↓はマクロなので、returnはメインループに戻ります。 #define wait_next { \ - DBG_LED_WIFI_2_on; \ tot = 0; \ while( IICAIF != 1 ){ \ if( SPD ){ \ @@ -77,7 +76,6 @@ u16 tot; return; \ } \ } \ - DBG_LED_WIFI_2_off; \ } diff --git a/trunk/main.c b/trunk/main.c index 31a8066..5bb2c57 100644 --- a/trunk/main.c +++ b/trunk/main.c @@ -64,7 +64,10 @@ void main_loop( void ) read_dipsw( ); // 特定スイッチで何かするか? - hosu_init(); + fill_hosu_hist_hours( 0 ); // 履歴クリア + vreg_ctr[ VREG_C_ACC_HOSU_L ] = 0; + vreg_ctr[ VREG_C_ACC_HOSU_M ] = 0; + vreg_ctr[ VREG_C_ACC_HOSU_H ] = 0; renge_task_interval_run_force = 1; @@ -73,17 +76,16 @@ void main_loop( void ) RTCIMK = 0; /* 割り込み(アラーム&インターバル)許可 */ // メインループ // - while( 1 ) + while( 1 ) { // システムtick、または割り込みで廻ります。 WDT_Restart( ); renge_task_interval_run( ); // 内部で、システムtickまたは強制起動します while( renge_task_interval_run_force != 0 ) { renge_task_interval_run( ); - renge_task_immed_run( ); } WDT_Restart( ); - renge_task_immed_run( ); // ここのループが廻る度に実行されます + while( renge_task_immed_run( ) != ERR_SUCCESS ); // ここのループが廻る度に実行されます HALT( ); } } diff --git a/trunk/renge/renge.c b/trunk/renge/renge.c index 09332ba..4d3b5fa 100644 --- a/trunk/renge/renge.c +++ b/trunk/renge/renge.c @@ -10,10 +10,9 @@ →作りました ctr_mcu_config.rb 参照。 task_config.hが作成されます。 *****************************************************************************/ -#include "renge_defs.h" +#include "renge.h" #include "renge_task_intval.h" #include "renge_task_immediate.h" - #include "..\WDT.h" #include "..\config.h" #include "..\user_define.h" @@ -24,6 +23,7 @@ //****************************************************************************** bit renge_flg_interval; bit renge_task_interval_run_force; +bit renge_task_immediate_not_empty; u8 system_time; @@ -90,6 +90,8 @@ err renge_task_interval_run(){ for( i = 0; i != TSK_LAST; i += 1 ) { tasks[ i ](); + // 逐次起動タスクがあったら起動しておく + renge_task_immed_run(); } } return( ERR_SUCCESS ); @@ -130,13 +132,13 @@ err renge_task_immed_add( task_status* new_task ){ u8 i; // リストの空きの先頭に登録 - // 削除したばかりのタスクは、削除マークとなり、空きとは明示的に区別される + // 削除したばかりのタスクは、削除マーク(TSK_IMM_DELETED_)となり、空きとは明示的に区別される // 重複登録を避ける for( i = 0; i < TASK_IMMED_RUN_LIST_MAX; i += 1 ) { if( tasks_immed[ i ] != TSK_IMM_EMPTY_ ) { - // 空きではなかった + // 重複登録チェック if( tasks_immed[ i ] == new_task ) { // 重複登録はしない @@ -154,6 +156,8 @@ err renge_task_immed_add( task_status* new_task ){ if( tasks_immed[ i ] == TSK_IMM_EMPTY_ ) { tasks_immed[ i ] = new_task; + DBG_LED_WIFI_2_off; + DBG_LED_WIFI_2_on; return( ERR_SUCCESS ); } } @@ -168,11 +172,6 @@ err renge_task_immed_add( task_status* new_task ){ - - - - - /************************************** 逐次実行タスクの実行 **************************************/ @@ -182,7 +181,7 @@ err renge_task_immed_run(){ do{ last_task_id = 0xFF; - + DBG_LED_WIFI_2_off; for( list_id = 0; list_id < TASK_IMMED_RUN_LIST_MAX; list_id += 1 ){ if( tasks_immed[ list_id ] != TSK_IMM_EMPTY_ ){ #ifdef _renge_test_ @@ -326,7 +325,17 @@ err renge_task_immed_run(){ } } } - while( last_task_id != 0xFF ); // タスクが残っていたら再実行 +#if 0 + while( last_task_id != 0xFF ); // タスクが残っていたら延々再実行 +#else + while( 0 ); +#endif + + if( last_task_id != 0xFF ) + { + // まだタスクが残ってる(また呼んでね) + return( ERR_ERR ); + } return( ERR_SUCCESS ); } diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index 6c169ff..0499375 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -238,16 +238,12 @@ void vreg_ctr_write( u8 adrs, u8 data ) break; case ( VREG_C_ACC_HOSU_SETTING ): - hosu_init(); + fill_hosu_hist_hours( 0 ); // 履歴クリア + vreg_ctr[ VREG_C_ACC_HOSU_L ] = 0; + vreg_ctr[ VREG_C_ACC_HOSU_M ] = 0; + vreg_ctr[ VREG_C_ACC_HOSU_H ] = 0; break; -#ifdef _debug_ - case ( VREG_C_BT_REMAIN ): - case ( VREG_C_BT_TEMP ): - vreg_ctr[adrs] = data; - break; -#endif - case ( VREG_C_COMMAND3 ): switch ( data ) { diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index d90e427..5b9829c 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,131 +1,12 @@ C:\WINDOWS\system32\cmd.exe /c touch magic.c -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no loader.c -loader.c(106) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\loader.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no pm.c -pm.c(190) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(202) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(206) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(257) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(294) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(373) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(381) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(853) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 8 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pm.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no i2c_ctr.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no main.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\main.asm -Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no magic.c Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no WDT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\WDT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no i2c_mcu.c -i2c_mcu.c(119) : CC78K0R warning W0401: Conversion may lose significant digits -i2c_mcu.c(196) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_mcu.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no i2c_twl.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no ini_VECT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\ini_VECT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no led.c -led.c(457) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\led.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no rtc.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\rtc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no vreg_ctr.c -vreg_ctr.c(72) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(128) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(138) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(139) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(141) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(143) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(144) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(146) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(166) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(262) : CC78K0R warning W0510: Pointer mismatch in function 'FSL_Init' -Compilation complete, 0 error(s) and 10 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no vreg_twl.c -vreg_twl.c(46) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_twl.c(50) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no adc.c -adc.c(73) : CC78K0R warning W0745: Expected function prototype -adc.c(78) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(81) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(96) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(99) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(235) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 6 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\adc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no renge\renge.c Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\renge.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no accero.c -accero.c(110) : CC78K0R warning W0745: Expected function prototype -accero.c(119) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\accero.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no self_flash.c -self_flash.c(189) : CC78K0R warning W0401: Conversion may lose significant digits -self_flash.c(325) : CC78K0R warning W0411: Illegal pointer combination -self_flash.c(367) : CC78K0R warning W0510: Pointer mismatch in function 'FSL_Init' -Compilation complete, 0 error(s) and 3 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\self_flash.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no reboot.c -reboot.c(14) : CC78K0R warning W0915: Asm statement found. skip to jump optimize this function 'my_reboot' -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\reboot.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no sw.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\sw.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no task_debug.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_debug.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no task_misc.c -task_misc.c(48) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(34) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_misc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no task_sys.c -task_sys.c(322) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_sys.asm -Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lk78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r\s0rm.rel" -go85h,0FC00h,1024 -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map -nkd -kp -gb6EFBFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r" -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel ini_VECT.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel reboot.rel sw.rel task_debug.rel task_misc.rel task_sys.rel Link complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\oc78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf @@ -136,4 +17,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 39 +Build Total error(s) : 0 Total warning(s) : 0 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 94ef77e..2c2f4c7 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -4,7 +4,7 @@ Target=IDK0R32G [Configuration] Chip=uPD79F0104 Internal Rom=32KB -Internal Ram=1536B +Internal Ram=1536KB Clock=Target Sub Clock=Target Peripheral Break=0x2 diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index b447685..95532a0 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -6,7 +6,7 @@ Series=78K0R.PM Device=uPD79F0104 DeviceVer=E1.00b DebugMode=1 -Target=bsr.lmf +Target=C:\78k_data\yav-mcu-basara\bsr.lmf [BuildMode0] BuildModeName=Debug Build TargetFile=0 diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index d856b32..e5615c8 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,27 +1,27 @@ [ProjectManager] FrameMax=0 -FrameX=364 -FrameY=162 +FrameX=151 +FrameY=50 FrameCX=1299 FrameCY=1043 OpenFile1=task_sys.c,0,521,328,1765,1085,25,250,25,0 OpenFile2=bsr_mcu.dr,0,198,198,1177,834,0,53,0,0 OpenFile3=loader.c,0,266,31,1510,788,23,43,23,0 OpenFile4=sw.c,0,132,132,1376,889,0,165,17,0 -OpenFile5=config.h,0,282,262,1526,1019,0,19,0,0 -OpenFile6=vreg_ctr.c,0,159,252,1138,888,30,201,38,0 -OpenFile7=ProjectWindow +OpenFile5=vreg_ctr.c,0,159,252,1138,888,30,201,38,0 +OpenFile6=renge\renge_task_immediate.h,0,308,308,1276,933,0,23,0,0 +OpenFile7=renge\renge_defs.h,0,22,22,990,647,0,50,0,0 +OpenFile8=accero.c,0,272,165,1516,922,0,114,13,0 +OpenFile9=main.c,0,66,66,1034,691,0,70,0,0 +OpenFile10=renge\renge.c,0,285,287,1264,923,15,225,0,0 +OpenFile11=task_misc.c,0,88,88,1056,713,5,159,5,0 +OpenFile12=pm.c,0,421,154,1400,790,0,694,0,0 +OpenFile13=adc.c,0,220,220,1199,856,0,111,0,0 +OpenFile14=i2c_twl.c,0,44,44,1288,801,34,67,0,0 +OpenFile15=ProjectWindow PrjPos=0,2,754,3,253 -OpenFile8=renge\renge_task_immediate.h,0,308,308,1276,933,0,23,0,0 -OpenFile9=renge\renge_task_intval.h,0,0,0,968,625,37,23,37,0 -OpenFile10=renge\renge_defs.h,0,22,22,990,647,0,50,0,0 -OpenFile11=accero.c,0,272,165,1516,922,0,114,13,0 -OpenFile12=main.c,0,66,66,1034,691,0,70,0,0 -OpenFile13=renge\renge.c,0,285,287,1264,923,15,225,0,0 -OpenFile14=task_misc.c,0,88,88,1056,713,5,159,5,0 -OpenFile15=pm.c,0,421,154,1400,790,0,694,0,0 -OpenFile16=adc.c,0,220,220,1199,856,0,111,0,0 -OpenFile17=i2c_twl.c,0,44,44,1288,801,34,67,0,0 +OpenFile16=renge\renge_task_intval.h,0,155,11,1123,636,27,16,27,0 +OpenFile17=config.h,0,282,262,1526,1019,0,37,0,0 OpenFile18=OutputWindow OutputPos=0,421,829,388,1497 ActivePRJ=yav_mcu_bsr.prj diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index b503cd6..08b528c 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -11,7 +11,7 @@ T=4b445f00 7=rtc.h 8=reboot.h [pm.c] -T=4b444213 +T=4b4d808f 1=incs.h 2=adc.h 3=led.h @@ -22,7 +22,7 @@ T=4b346598 1=incs.h 2=accero.h [main.c] -T=4b3800f0 +T=4b4d743c 1=incs_loader.h 2=WDT.h 3=rtc.h @@ -31,7 +31,7 @@ T=4b3800f0 6=led.h 7=adc.h [magic.c] -T=4b445c1c +T=4b4fe6cf 1=config.h [WDT.c] T=4afd21ca @@ -55,7 +55,7 @@ T=4b4438bb T=4b4438a1 1=incs.h [vreg_ctr.c] -T=4b442c3c +T=4b4d747d 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -72,7 +72,7 @@ T=4b1c8d36 4=vreg_ctr.h 5=renge\renge_task_intval.h [adc.c] -T=4b308310 +T=4b502014 1=incs.h 2=adc.h 3=pm.h @@ -87,11 +87,11 @@ T=4b43f5e3 6=user_define.h 7=bsr_system.h [accero.c] -T=4b43f4cd +T=4b4d8094 1=incs.h 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] -T=4b444f8c +T=4b4d743c 1=incs_loader.h 2=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 3=fsl_user.h @@ -100,7 +100,7 @@ T=4b444f8c T=4afd21cb 1=incs_loader.h [sw.c] -T=4b383e14 +T=4b4d6c9b 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -147,7 +147,7 @@ T=4b023fdb [user_define.h] T=4b442a95 [config.h] -T=4b444960 +T=4b4fe6cf [bsr_system.h] T=4b3064de [renge\renge.h] @@ -160,7 +160,7 @@ T=4b32f836 T=4b42ee65 1=renge\renge_defs.h [vreg_ctr.h] -T=4b4438a1 +T=4b4d8094 1=config.h [loader.h] T=4afd21ca @@ -198,7 +198,7 @@ T=4b25e780 [vreg_twl.h] T=4afd21cb [accero.h] -T=4b25e782 +T=4b4d69bc 1=jhl_defs.h [i2c_twl_defs.h] T=4afd21ca