From 5cbc6c31caa0bde49c52b0dcfee454bc3ac57fe1 Mon Sep 17 00:00:00 2001 From: fujita_ryohei Date: Wed, 6 Jan 2010 07:43:04 +0000 Subject: [PATCH] =?UTF-8?q?=E6=AD=A9=E6=95=B0=E8=A8=88=E3=81=AE=E9=96=BE?= =?UTF-8?q?=E5=80=A4=E3=82=92=E3=81=A1=E3=82=87=E3=81=A3=E3=81=A8=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=80=82=E6=9C=AA=E6=A4=9C=E8=A8=BC=20NOTIFY=20LED?= =?UTF-8?q?=E3=81=AE=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=20=E3=83=9B=E3=82=BF=E3=83=AB=E3=82=92=E3=81=A8=E3=82=8A?= =?UTF-8?q?=E3=81=82=E3=81=88=E3=81=9A=E3=82=86=E3=81=A3=E3=81=8F=E3=82=8A?= =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82=E8=A6=81=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@75 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/accero.c | 4 +- trunk/i2c_twl.c | 4 +- trunk/led.c | 175 ++++++++++++++++++----------- trunk/led.h | 38 ++++++- trunk/pm.c | 2 +- trunk/renge/renge.c | 10 +- trunk/renge/renge_task_config.rb | 8 +- trunk/renge/renge_task_immediate.h | 1 - trunk/renge/renge_task_intval.h | 76 +++++++------ trunk/renge/renge_tasks.txt | 1 + trunk/rtc.c | 2 +- trunk/user_define.h | 6 +- trunk/vreg_ctr.c | 1 + trunk/vreg_ctr.h | 25 +---- trunk/yav_mcu_bsr.plg | 104 ++++++++++++++++- trunk/yav_mcu_bsr.pri | 62 +++++----- 16 files changed, 341 insertions(+), 178 deletions(-) diff --git a/trunk/accero.c b/trunk/accero.c index 985dfc4..e5badaf 100644 --- a/trunk/accero.c +++ b/trunk/accero.c @@ -104,7 +104,7 @@ task_status_immed tsk_cbk_accero( ) // offでなければ、電源off中でも計測 // if( ( vreg_ctr[VREG_C_ACC_CONFIG] & VREG_BITMASK_ACC_CONF_HOSU ) != 0x00 ) { - static s16 th_H = 0x3500; // 閾値。暫定。動的変更とかしたい…ので変数 + static s16 th_H = 0x3300; // 閾値。暫定。動的変更とかしたい…ので変数 static s16 th_L = 0x2A00; static u16 acc_norm[3]; // 加速度の大きさのヒストリ。数字が大きい方が古い static u16 interval_hh; // 山-山間の時間。短過ぎたらはじく。 @@ -126,7 +126,7 @@ task_status_immed tsk_cbk_accero( ) && acc_norm[0] > th_H ) // 極大で、閾値を超えていた { - if(( 25 < interval_hh ) && ( interval_hh < 200 )) + if(( 20 < interval_hh ) && ( interval_hh < 200 )) // 前回の極大からの間隔がほどよい { if( time_l < interval_hh ) diff --git a/trunk/i2c_twl.c b/trunk/i2c_twl.c index c39b73c..44593a8 100644 --- a/trunk/i2c_twl.c +++ b/trunk/i2c_twl.c @@ -64,7 +64,8 @@ u16 tot; // 注！　↓はマクロなので、returnはメインループに戻ります。 #define wait_next { \ - tot = 0; \ + DBG_LED_WIFI_2_on; \ + tot = 0; \ while( IICAIF != 1 ){ \ if( SPD ){ \ LREL = 1; \ @@ -76,6 +77,7 @@ u16 tot; return; \ } \ } \ + DBG_LED_WIFI_2_off; \ } diff --git a/trunk/led.c b/trunk/led.c index baa3102..2fc55d0 100644 --- a/trunk/led.c +++ b/trunk/led.c @@ -33,6 +33,7 @@ static void led_pow_hotaru( ); // ======================================================== static const char MSG_MAIL[] = { 0b11110110, 0b11011010, 0b01101110, 0b10010100 }; #define MSG_SPD 60 +// ↑255/3以下であること！ // ======================================================== void LED_init( ) @@ -232,7 +233,7 @@ static void led_pow_hotaru( ) } else { - delay = 3; + delay = 10; } if( LED_duty_pow_L != red_to ) @@ -303,8 +304,6 @@ static void led_pow_hotaru( ) /* ======================================================== * 割り込みそのものは使いません * LED_Wifi 3 - 2 P24 （未） - todo 直書きの点滅間隔など ======================================================== */ void tsk_led_wifi( ) @@ -337,33 +336,31 @@ void tsk_led_wifi( ) switch ( vreg_ctr[VREG_C_LED_WIFI] ) { - case ( WIFI_LED_OFF ): + case ( WIFI_LED_OFF ): + default: LED_duty_WiFi = 0; state_wifi_tx = 0; remain_wifi_tx = 0; break; - case ( WIFI_LED_ON ): - default: + case ( WIFI_LED_ON ): LED_duty_WiFi = vreg_ctr[VREG_C_LED_BRIGHT]; state_wifi_tx = 0; remain_wifi_tx = 0; break; - case ( WIFI_LED_TXAUTO ): - // 短いパルスを捕まえるために、割り込みフラグを見る - - // 送信パターン - if( flag_wifi_TX != 0 ) - { // TX active + case ( WIFI_LED_TXAUTO ): + if( flag_wifi_TX != 0 ) // 短いパルスを捕まえるために、割り込みフラグを見る + { + // 送信パターン switch ( state_wifi_tx ) { - case ( 1 ): - case ( 3 ): - case ( 5 ): + case ( 1 ): + case ( 3 ): + case ( 5 ): LED_duty_WiFi = 0; break; - default: + default: LED_duty_WiFi = vreg_ctr[VREG_C_LED_BRIGHT]; } state_wifi_tx++; @@ -374,82 +371,134 @@ void tsk_led_wifi( ) } task_interval = 22; return; - } else { + // 送信フラグ待ち LED_duty_WiFi = vreg_ctr[VREG_C_LED_BRIGHT]; task_interval = 200; return; } break; - case ( WIFI_LED_PTN0 ): + } +} + + + + +/* ======================================================== + * 割り込みそのものは使いません * + LED_Wifi2 P24 （未） + ======================================================== */ +void tsk_led_notify( ) +{ + static u8 task_interval; + static u8 flg_char_space; + static u8 state_notify_led; // 点灯パターンの進行具合 + static u8 flag_wifi_TX; + + + if( task_interval-- != 0 ) + { + return; + } + + switch ( vreg_ctr[VREG_C_LED_NOTIFY] ) + { + case ( NOTIFY_LED_OFF ): + default: + LED_duty_NOTIFY = 0; + state_notify_led = 0; + flg_char_space = 0; + break; + + case ( NOTIFY_LED_ON ): + LED_duty_NOTIFY = vreg_ctr[VREG_C_LED_BRIGHT]; + state_notify_led = 0; + flg_char_space = 0; + break; + + case ( NOTIFY_LED_PTN0 ): // ゆっくりバースト - switch ( state_wifi_tx ) + switch ( state_notify_led ) { - case ( 1 ): - case ( 3 ): - case ( 5 ): - LED_duty_WiFi = vreg_ctr[VREG_C_LED_BRIGHT]; + case ( 1 ): + case ( 3 ): + case ( 5 ): + LED_duty_NOTIFY = vreg_ctr[VREG_C_LED_BRIGHT]; break; - default: - LED_duty_WiFi = 0; + default: + LED_duty_NOTIFY = 0; } - state_wifi_tx++; - if( state_wifi_tx == 16 ) + state_notify_led++; + if( state_notify_led == 16 ) { - state_wifi_tx = 0; + state_notify_led = 0; } task_interval = 50; return; - case ( WIFI_LED_PTN1 ): + case ( NOTIFY_LED_PTN1 ): // データテーブルに従って点滅 { u8 dat; - if( remain_wifi_tx != 0 ) + task_interval = MSG_SPD; // 共通のため。場合によって上書き + + if( flg_char_space != 0 ) { - LED_duty_WiFi = 0; - remain_wifi_tx = 0; - task_interval = MSG_SPD; + LED_duty_NOTIFY = 0; + flg_char_space = 0; 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 ) + // データバッファの見る位置の更新 + dat = ( MSG_MAIL[state_notify_led / 4] << ( ( state_notify_led % 4 ) * 2 ) ) & 0xC0; + if( dat == 0 ) { - 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; + state_notify_led = 0; + } + else + { + state_notify_led += 1; } - return; - } + flg_char_space = 1; + if(( dat & 0b10000000 ) != 0 ) + { + // 点灯はさせる + LED_duty_NOTIFY = vreg_ctr[VREG_C_LED_BRIGHT]; + if(( dat & 0b01000000 ) == 0 ) + { + // 短 + // nothing to do + } + else + { + // 長 + task_interval = ( MSG_SPD * 3 ); + } + // 次は単語間休み、とかの判定をさせたかったが + /// １バイトに２ビットずつデータが並んでおり、次のバイトに + /// またがるようなときが面倒なのでやめる + return; + } + else + { + if(( dat & 0b01000000 ) == 0 ) + { + // 一文終了 + task_interval = ( MSG_SPD * 3 ); + } + else + { + // 単語間 + // nothing to do + } + return; + } + } } } diff --git a/trunk/led.h b/trunk/led.h index 5ba2505..db22719 100644 --- a/trunk/led.h +++ b/trunk/led.h @@ -7,8 +7,8 @@ // LED_DUTY #define LED_duty_pow_L TDR07 #define LED_duty_pow_H TDR06 -#define LED_duty_CHARGE TDR05 #define LED_duty_WiFi TDR03 +#define LED_duty_NOTIFY TDR05 #define LED_duty_CAM TDR02 #define LED_duty_TUNE TDR01 // wifi2はPWMできません。 @@ -45,6 +45,42 @@ enum LED_MODE_TUNE LED_TUNE_ILM_SVR }; + +// VREG_C_WIFI_LED +enum +{ + WIFI_LED_OFF = 0, + WIFI_LED_ON, + WIFI_LED_TXAUTO, + WIFI_LED_PTN0, + WIFI_LED_PTN1 +}; + + +// VREG_C_WIFI_NOTIFY +enum +{ + NOTIFY_LED_OFF = 0, + NOTIFY_LED_ON, + NOTIFY_LED_PTN0, + NOTIFY_LED_PTN1, + NOTIFY_LED_PTN2 +}; + + +// VREG_C_CAM_LED +enum +{ + CAM_LED_OFF = 0, + CAM_LED_BLINK, + CAM_LED_ON, + CAM_LED_BY_TWL, + CAM_LED_ON_PLUSE, + CAM_LED_OFF_PLUSE +}; + + + // ==================================== void LED_init( ); void LED_stop( ); diff --git a/trunk/pm.c b/trunk/pm.c index e7a3f0f..b84407a 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -691,7 +691,7 @@ void tsk_batt( ) // 充電 // // →割り込み。miscの中でよろしくやってくれている。 set_bit( !BT_CHG_n, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); - LED_duty_CHARGE = !BT_CHG_n ? vreg_ctr[VREG_C_LED_BRIGHT] : 0; + LED_CHARGE = !BT_CHG_n ? 1 : 0; // 電池残量 // diff --git a/trunk/renge/renge.c b/trunk/renge/renge.c index 64b03f6..09332ba 100644 --- a/trunk/renge/renge.c +++ b/trunk/renge/renge.c @@ -238,7 +238,7 @@ err renge_task_immed_run(){ for( ; j < TASK_IMMED_RUN_LIST_MAX; j++ ) { DI(); - DBG_LED_WIFI_2_on; +// DBG_LED_WIFI_2_on; if( tasks_immed[ i ] == TSK_IMM_DELETED_ ) { if( tasks_immed[ j ] == TSK_IMM_EMPTY_ ) @@ -259,7 +259,7 @@ err renge_task_immed_run(){ } } #endif - DBG_LED_WIFI_2_off; +// DBG_LED_WIFI_2_off; EI(); break; } @@ -283,7 +283,7 @@ err renge_task_immed_run(){ #endif i += 1; } - DBG_LED_WIFI_2_off; +// DBG_LED_WIFI_2_off; EI(); if( tasks_immed[ i ] == TSK_IMM_EMPTY_ ) { @@ -295,7 +295,7 @@ err renge_task_immed_run(){ } } DI(); - DBG_LED_WIFI_2_on; +// DBG_LED_WIFI_2_on; // ここまでで完全に前詰めされている for( j = 0; j < TASK_IMMED_RUN_LIST_MAX; j++ ) @@ -321,7 +321,7 @@ err renge_task_immed_run(){ tasks_immed[ j ] = TSK_IMM_EMPTY_; } } - DBG_LED_WIFI_2_off; +// DBG_LED_WIFI_2_off; EI(); } } diff --git a/trunk/renge/renge_task_config.rb b/trunk/renge/renge_task_config.rb index 4d3eaf9..4da03da 100644 --- a/trunk/renge/renge_task_config.rb +++ b/trunk/renge/renge_task_config.rb @@ -46,15 +46,15 @@ conf << "TSK_LAST \n };\n\n" tasklist.each{|dat| - conf << "extern task_interval tsk_" << dat << "();\n" + conf << "extern void tsk_" << dat << "();\n" } conf << "\n" -conf << "task_info tasks[ TSK_LAST ] = {\n " +conf << "static const task_status ( *tasks[ TSK_LAST ] )() = {\n" tasklist.each{|dat| - conf << "{ tsk_" << dat << ", \t0 },\n " + conf << " tsk_" << dat << ",\n" } -conf << " \n};\n" +conf << " };\n" conf << "\n\n#endif\n" diff --git a/trunk/renge/renge_task_immediate.h b/trunk/renge/renge_task_immediate.h index e46e1a9..ff076e4 100644 --- a/trunk/renge/renge_task_immediate.h +++ b/trunk/renge/renge_task_immediate.h @@ -8,7 +8,6 @@ extern task_status_immed do_command0( ); -extern task_status_immed do_command2( ); extern task_status_immed ntr_pmic_comm(); 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 393d1a5..b5588db 100644 --- a/trunk/renge/renge_task_intval.h +++ b/trunk/renge/renge_task_intval.h @@ -1,37 +1,39 @@ -/*スクリプトによる自動生成です。手動で書き換えない方がよいです*/ - -#ifndef __renge_task__ -#define __renge_task__ - -#include "renge_defs.h" - -enum { - 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 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(); - -static const task_status ( *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, -}; - - -#endif +/*スクリプトによる自動生成です。手動で書き換えない方がよいです*/ + +#ifndef __renge_task__ +#define __renge_task__ + +#include "renge_defs.h" + +enum { + TSK_SW, TSK_ADC, TSK_BATT, TSK_LED_POW, TSK_LED_WIFI, TSK_LED_NOTIFY, TSK_LED_CAM, TSK_MISC_STAT, TSK_DEBUG, TSK_DEBUG2, TSK_SYS, TSK_LAST + }; + +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_notify(); +extern void tsk_led_cam(); +extern void tsk_misc_stat(); +extern void tsk_debug(); +extern void tsk_debug2(); +extern void tsk_sys(); + +static const task_status ( *tasks[ TSK_LAST ] )() = { + tsk_sw, + tsk_adc, + tsk_batt, + tsk_led_pow, + tsk_led_wifi, + tsk_led_notify, + tsk_led_cam, + tsk_misc_stat, + tsk_debug, + tsk_debug2, + tsk_sys, + }; + + +#endif diff --git a/trunk/renge/renge_tasks.txt b/trunk/renge/renge_tasks.txt index f9bf36f..79ad5bd 100644 --- a/trunk/renge/renge_tasks.txt +++ b/trunk/renge/renge_tasks.txt @@ -3,6 +3,7 @@ adc batt led_pow led_wifi +led_notify led_cam misc_stat debug diff --git a/trunk/rtc.c b/trunk/rtc.c index 7d3a4a0..fe98b04 100644 --- a/trunk/rtc.c +++ b/trunk/rtc.c @@ -127,7 +127,7 @@ void set_rtc( u8 adrs, u8 data ) { rtc_dirty = 1; memcpy( rtc_work, &SEC, 7 ); -// renge_task_immed_add( tski_rtc_close ); +// renge_task_immed_add( tski_rtc_close ); // I2C終了時に行う } rtc_work[adrs] = data; } diff --git a/trunk/user_define.h b/trunk/user_define.h index 4177827..30b862b 100644 --- a/trunk/user_define.h +++ b/trunk/user_define.h @@ -22,8 +22,6 @@ #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_2_on ( P2.4 = 1 ) #define DBG_LED_WIFI_2_off ( P2.4 = 0 ) #define DBG_LED_WIFI_2_toggle ( P2.4 ^= 1 ) @@ -144,10 +142,12 @@ //#define LED_CAM P1.0 // TO02 //#define LED_WIFI P1.1 // TO03 +//#define LED_NOTIFY P1.3 // TO05 //#define LED_TUNE P5.2 // SLTO ← TO01 -//#define LED_CHARGE P1.3 // TO05 //#define LED_POW2 P1.4 // TO06 ( 青 ) //#define LED_POW1 P1.5 // TO07 ( 赤 ) +#define LED_CHARGE P2.4 + #define I2C_PU P5.3 //#define I2C_M_SDA P3.1 // SDA10 diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index 072f1ab..1389964 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -162,6 +162,7 @@ void vreg_ctr_write( u8 adrs, u8 data ) case ( VREG_C_LED_WIFI ): case ( VREG_C_LED_CAM ): case ( VREG_C_LED_TUNE ): + case ( VREG_C_LED_NOTIFY ): vreg_ctr[adrs] = data & 0x0F; break; diff --git a/trunk/vreg_ctr.h b/trunk/vreg_ctr.h index 5354c41..fd4833f 100644 --- a/trunk/vreg_ctr.h +++ b/trunk/vreg_ctr.h @@ -120,30 +120,6 @@ #define REG_BIT_TWL_REQ_RESET ( 1 << 0 ) -// VREG_C_WIFI_LED -enum -{ - WIFI_LED_OFF = 0, - WIFI_LED_ON, - WIFI_LED_TXAUTO, - WIFI_LED_PTN0, - WIFI_LED_PTN1 -}; - - -// VREG_C_CAM_LED -enum -{ - CAM_LED_OFF = 0, - CAM_LED_BLINK, - CAM_LED_ON, - CAM_LED_BY_TWL, - CAM_LED_ON_PLUSE, - CAM_LED_OFF_PLUSE -}; - - - /* テンプレ #define REG_BIT_ ( 1 << 7 ) @@ -212,6 +188,7 @@ enum VREG_C VREG_C_LED_WIFI, VREG_C_LED_CAM, VREG_C_LED_TUNE, + VREG_C_LED_NOTIFY, VREG_C_RTC_SEC = 0x30, VREG_C_RTC_MIN, diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index 063aa8e..6b7ed3d 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,4 +1,11 @@ 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 +loader.c(110) : CC78K0R warning W0401: Conversion may lose significant digits +loader.c(113) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 3 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\loader.asm +Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -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 @@ -11,10 +18,105 @@ pm.c(844) : 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 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 +Compilation complete, 0 error(s) and 9 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 accero.c +accero.c(114) : CC78K0R warning W0745: Expected function prototype +accero.c(123) : 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(188) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 1 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\self_flash.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -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 @@ -25,4 +127,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 8 +Build Total error(s) : 0 Total warning(s) : 38 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index b016d23..29e82d4 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -80,8 +80,8 @@ Kanji=SJIS [Source] Geometry=202, 65, 1025, 1014 Window=Normal -DispStart=274 -CaretPos=275,0 +DispStart=69 +CaretPos=70,0 Mode=Normal DispFile= Address1= @@ -142,8 +142,8 @@ Accumulative=ON [Assemble] Geometry=605, 2, 600, 400 Window=Normal -DispStart=16372 -CaretPos=16372,27 +DispStart=1210 +CaretPos=1210,27 Address1= Address2= Address3= @@ -858,26 +858,28 @@ Count=0 Geometry=1225, 6, 354, 910 Window=Normal Boundary=13762700 -0=.P7,B,S,A,+,1 -1=.p5,B,S,A,+,1 -Line=2 +0=.vreg_ctr,P,N,A,+,1 +1=.cmd_BL,P,N,A,+,1 +2=.P7,B,S,A,+,1 +3=.p5,B,S,A,+,1 +Line=4 [Quick Watch] -0=rtcen,P,A,1 -1=renge_flg_interval,P,A,1 -2=rtccmk,P,A,1 -3=rtciimk,P,A,1 -4=wdte,P,A,1 -5=SEC,P,A,1 -6=rtcif,P,A,1 -7=vreg_ctr,P,A,1 -8=vreg_twl,P,A,1 -9=pm0,P,A,1 -10=data,P,A,1 -11=P5.3,P,A,1 -12=p4.3,P,A,1 -13=pu0,P,A,1 -14=p5,B,A,1 -15=P7,B,A,1 +0=renge_flg_interval,P,A,1 +1=rtccmk,P,A,1 +2=rtciimk,P,A,1 +3=wdte,P,A,1 +4=SEC,P,A,1 +5=rtcif,P,A,1 +6=vreg_twl,P,A,1 +7=pm0,P,A,1 +8=data,P,A,1 +9=P5.3,P,A,1 +10=p4.3,P,A,1 +11=pu0,P,A,1 +12=p5,B,A,1 +13=P7,B,A,1 +14=cmd_BL,P,A,1 +15=vreg_ctr,P,A,1 [Software Break] Geometry=1204, 674, 500, 428 Window=Normal @@ -890,19 +892,11 @@ Name1=Swb00004 Address1=renge.c#_renge_task_immed_add+0x34 Window1=ASM Status1=ON -Name2=Swb00001 -Address2=task_misc.c#_do_command0+0x15 +Name2=Swb00002 +Address2=task_sys.c#_chk_emergencyExit+0x4 Window2=ASM Status2=ON -Name3=Swb00005 -Address3=task_misc.c#_do_command0+0x0 -Window3=ASM -Status3=ON -Name4=Swb00002 -Address4=task_sys.c#_chk_emergencyExit+0x4 -Window4=ASM -Status4=ON -Count=5 +Count=3 [Reset] Debugger=ON Symbol=OFF