rvtr/ctr_mcu
1
Fork 0
mirror of https://github.com/rvtr/ctr_mcu.git synced 2025-10-31 13:51:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

■1.0

Browse Source 
電源投入時にvol_optionを初期化するように
アダプタを差したら電池が無くても点滅しないよう仕様変更
歩数計　境界min,secが正しく動作していなかった


git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@204 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
N2232 2010-07-14 13:14:42 +00:00
parent 5df850ac96
commit 17f77befae
16 changed files with 889 additions and 945 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
trunk/adc.c
View File

@ -179,6 +179,7 @@ task_status_immed tski_vol_update()
{ {
// 最優先 スライダに上書き // 最優先 スライダに上書き
sent_index = vol_data_ctr; sent_index = vol_data_ctr;
vreg_ctr[ VREG_C_VOL_OPTION ] &= ~REG_BIT_VOL_UPDATE_TO_SLIDER;
} }
else if( vol_changed_by_ctr ) else if( vol_changed_by_ctr )
{ {

1411
trunk/bsr.hex
View File

File diff suppressed because it is too large Load Diff

BIN
trunk/bsr.lmf
View File

Binary file not shown.

88
trunk/bsr_k0r.map
View File

@ -24,8 +24,8 @@ Direc-file:bsr_mcu.dr
*** Link information *** *** Link information ***
66 output segment(s) 66 output segment(s)
3D2DH byte(s) real data 3D86H byte(s) real data
5403 symbol(s) defined 5405 symbol(s) defined
*** Memory map *** *** Memory map ***
@ -366,57 +366,57 @@ Direc-file:bsr_mcu.dr
@@CNST ini_VECT 023C4H 00000H @@CNST ini_VECT 023C4H 00000H
@@CNST task_status @@CNST task_status
023C4H 00000H 023C4H 00000H
ROM_CODE 023C4H 02694H CSEG ROM_CODE 023C4H 026EDH CSEG
ROM_CODE pm 023C4H 009AAH ROM_CODE pm 023C4H 009B0H
ROM_CODE i2c_ctr 02D6EH 00060H ROM_CODE i2c_ctr 02D74H 00060H
ROM_CODE i2c_twl 02DCEH 0005EH ROM_CODE i2c_twl 02DD4H 0005EH
ROM_CODE led 02E2CH 004F3H ROM_CODE led 02E32H 004F7H
ROM_CODE rtc 0331FH 000E0H ROM_CODE rtc 03329H 000F5H
ROM_CODE vreg_ctr 033FFH 00444H ROM_CODE vreg_ctr 0341EH 00446H
ROM_CODE vreg_twl 03843H 00163H ROM_CODE vreg_twl 03864H 00163H
ROM_CODE adc 039A6H 0029FH ROM_CODE adc 039C7H 002A3H
ROM_CODE renge 03C45H 001C3H ROM_CODE renge 03C6AH 001C3H
ROM_CODE accero 03E08H 0013DH ROM_CODE accero 03E2DH 0013DH
ROM_CODE sw 03F45H 000F3H ROM_CODE sw 03F6AH 000F3H
ROM_CODE task_debug ROM_CODE task_debug
04038H 00001H 0405DH 00001H
ROM_CODE task_misc ROM_CODE task_misc
04039H 001BAH 0405EH 001BAH
ROM_CODE task_sys 041F3H 0030BH ROM_CODE task_sys 04218H 0030BH
ROM_CODE pedo_alg_thre_det2 ROM_CODE pedo_alg_thre_det2
044FEH 004D5H 04523H 00509H
ROM_CODE task_status ROM_CODE task_status
049D3H 00085H 04A2CH 00085H
@@BASE 04A58H 004E7H CSEG BASE @@BASE 04AB1H 004E7H CSEG BASE
@@BASE loader 04A58H 00000H @@BASE loader 04AB1H 00000H
@@BASE pm 04A58H 00043H @@BASE pm 04AB1H 00043H
@@BASE i2c_ctr 04A9BH 00183H @@BASE i2c_ctr 04AF4H 00183H
@@BASE main 04C1EH 00000H @@BASE main 04C77H 00000H
@@BASE magic 04C1EH 00000H @@BASE magic 04C77H 00000H
@@BASE WDT 04C1EH 00000H @@BASE WDT 04C77H 00000H
@@BASE i2c_mcu 04C1EH 000D9H @@BASE i2c_mcu 04C77H 000D9H
@@BASE i2c_twl 04CF7H 000CDH @@BASE i2c_twl 04D50H 000CDH
@@BASE led 04DC4H 00000H @@BASE led 04E1DH 00000H
@@BASE rtc 04DC4H 00043H @@BASE rtc 04E1DH 00043H
@@BASE vreg_ctr 04E07H 00000H @@BASE vreg_ctr 04E60H 00000H
@@BASE vreg_twl 04E07H 00000H @@BASE vreg_twl 04E60H 00000H
@@BASE adc 04E07H 000B3H @@BASE adc 04E60H 000B3H
@@BASE renge 04EBAH 00000H @@BASE renge 04F13H 00000H
@@BASE accero 04EBAH 0004AH @@BASE accero 04F13H 0004AH
@@BASE self_flash @@BASE self_flash
04F04H 00000H 04F5DH 00000H
@@BASE sw 04F04H 00000H @@BASE sw 04F5DH 00000H
@@BASE task_debug @@BASE task_debug
04F04H 00000H 04F5DH 00000H
@@BASE task_misc @@BASE task_misc
04F04H 00000H 04F5DH 00000H
@@BASE task_sys 04F04H 00000H @@BASE task_sys 04F5DH 00000H
@@BASE pedo_alg_thre_det2 @@BASE pedo_alg_thre_det2
04F04H 00000H 04F5DH 00000H
@@BASE ini_VECT 04F04H 0003BH @@BASE ini_VECT 04F5DH 0003BH
@@BASE task_status @@BASE task_status
04F3FH 00000H 04F98H 00000H
* gap * 04F3FH 000B7H * gap * 04F98H 0005EH
MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL 04FF6H 0000AH CSEG AT
MGC_TAIL magic 04FF6H 0000AH MGC_TAIL magic 04FF6H 0000AH

6
trunk/config.h
View File

@ -3,7 +3,7 @@
//#define _debug_led_ //#define _debug_led_
//#define _ALLOW_NOBATT_ //#define _ALLOW_NOBATT_
//#define _DEBUG_BT_IRQ_ //#define _DEBUG_BT_FUEL_
//#define _DEBUG_BT_TEMP_ //#define _DEBUG_BT_TEMP_
//#define _DBG_PEDO_AUTO_ENABLE_ //#define _DBG_PEDO_AUTO_ENABLE_
//#define _DBG_LED_PRINT_ //#define _DBG_LED_PRINT_
@ -12,8 +12,8 @@
#define MCU_VER_MAJOR 0x00 #define MCU_VER_MAJOR 0x01
#define MCU_VER_MINOR 0x29 #define MCU_VER_MINOR 0x00
//#define PM_CCIC_TIM //#define PM_CCIC_TIM

BIN
trunk/hoge.bin
View File

Binary file not shown.

2
trunk/led.c
View File

@ -355,7 +355,7 @@ static u8 led_pow_batt_low()
// おしまい // おしまい
} }
if( vreg_ctr[VREG_C_BT_REMAIN] > BATT_TH_EMPTY ) if(( vreg_ctr[VREG_C_BT_REMAIN] > BATT_TH_EMPTY ) || !BT_IN_CHG_n )
{ {
// 赤点灯 // 赤点灯
led_fade_to( LED_duty_pow_blu, 0 ); led_fade_to( LED_duty_pow_blu, 0 );

BIN
trunk/mcufirm_1_0.bin Normal file
View File

Binary file not shown.

135
trunk/pedo_alg_thre_det2.c
View File

@ -214,11 +214,10 @@ static void hosu_increment()
{ {
// 毎時履歴の更新 ///////////////////////////// // 毎時履歴の更新 /////////////////////////////
// 空白の時間を考慮する。１時間以上放置されたなど。 // 空白の時間を考慮する。１時間以上放置されたなど。
u16 now_hour; u16 now_longhour;
u8 now_year; u8 now_year;
u8 now_min; u8 now_min;
u8 now_sec; u8 now_sec;
u8 after_boundary;
// 時計を止める必要が有るので↓は一気に行って下さい // 時計を止める必要が有るので↓は一気に行って下さい
DI(); DI();
@ -230,35 +229,34 @@ static void hosu_increment()
last_month = MONTH; last_month = MONTH;
now_min = MIN; now_min = MIN;
now_sec = SEC; now_sec = SEC;
now_hour = get_long_hour(); now_longhour = get_long_hour();
// RWAIT = 0; ↑で行っています // RWAIT = 0; ↑で行っています
// EI(); 〃 // EI(); 〃
if( ( now_min > vreg_ctr[ VREG_C_ACC_HOSU_HOUR_BOUNDARY ] ) // 元旦零時台で昨日扱いになった場合の帳尻合わせ
|| ( ( now_min == vreg_ctr[ VREG_C_ACC_HOSU_HOUR_BOUNDARY ] ) if( now_longhour == 65535 )
&& ( now_sec >= vreg_ctr[ VREG_C_ACC_HOSU_HOUR_BOUNDARY_SEC ] ))
)
{ {
after_boundary = 1; now_longhour = ( ( 365 + (( now_year & 0x03 ) == 1 ? 1: 0 )) * 24 ) -1;
} now_year -= 1;
else last_hour = 0x23;
{ last_month = 0x12;
after_boundary = 0; last_day = 0x31;
now_min = 0x59;
now_sec = 0x59;
} }
// 歩数計が止まっていた時間を考慮して必要なら進める // // 歩数計が止まっていた時間を考慮して必要なら進める //
if( last_year == now_year ) if( last_year == now_year )
{ {
if( ( now_hour + after_boundary ) > last_hour_fny ) // 右辺に足してるのは負の数が困るので if( now_longhour > last_hour_fny )
{ {
fill_hosu_hist_hours( now_hour + after_boundary - last_hour_fny ); fill_hosu_hist_hours( now_longhour - last_hour_fny );
} }
} }
else if( last_year == ( now_year -1 ) ) else if( last_year == ( now_year -1 ) )
{ {
// 年をまたいでいるとき // 年をまたいでいるとき
u16 temp_hours = ( ( 365 + (( now_year & 0x03 ) == 1 ? 1: 0 )) * 24 ) - last_hour_fny + now_hour + after_boundary; fill_hosu_hist_hours( ( ( 365 + (( now_year & 0x03 ) == 1 ? 1: 0 )) * 24 ) - last_hour_fny + now_longhour );
fill_hosu_hist_hours( temp_hours );
} }
else if( last_year < now_year ) else if( last_year < now_year )
{ {
@ -271,7 +269,7 @@ static void hosu_increment()
// ノーケアでよい // ノーケアでよい
} }
last_year = now_year; last_year = now_year;
last_hour_fny = now_hour + after_boundary; last_hour_fny = now_longhour;
// 実際にインクリメント // 実際にインクリメント
{ {
@ -431,15 +429,25 @@ u16 get_long_hour()
u8 day_hex; u8 day_hex;
u8 hour_hex; u8 hour_hex;
u8 min;
u8 sec;
// RWAIT = 1 を確認してから↓に進んで下さい // RWAIT = 1 を確認してから↓に進んで下さい
year_hex = bcdtob( YEAR ); year_hex = YEAR;
month_hex = bcdtob( MONTH ); month_hex = MONTH;
day_hex = bcdtob( DAY ); day_hex = DAY;
hour_hex = bcdtob( HOUR ); hour_hex = HOUR;
min = MIN;
sec = SEC;
RWAIT = 0; RWAIT = 0;
EI(); EI();
year_hex = bcdtob( year_hex );
month_hex = bcdtob( month_hex );
day_hex = bcdtob( day_hex );
hour_hex = bcdtob( hour_hex );
// まず日数の部分 // まず日数の部分
long_hour = DAYS_FROM_HNY[ month_hex ]; long_hour = DAYS_FROM_HNY[ month_hex ];
if(( ( year_hex & 0x03 ) == 0 ) && ( ( 3 <= month_hex ) if(( ( year_hex & 0x03 ) == 0 ) && ( ( 3 <= month_hex )
@ -453,83 +461,20 @@ u16 get_long_hour()
long_hour += hour_hex; long_hour += hour_hex;
return( long_hour ); if( ( min > vreg_ctr[ VREG_C_ACC_HOSU_HOUR_BOUNDARY ] )
} || ( ( min >= vreg_ctr[ VREG_C_ACC_HOSU_HOUR_BOUNDARY ] )
&& ( sec >= vreg_ctr[ VREG_C_ACC_HOSU_HOUR_BOUNDARY_SEC ] ))
)
# ifdef _use_my_sqrt_ {
// ======================================================== return( long_hour );
// 高速？平方根アルゴリズム }
// ======================================================== else
#if 0 {
// 拝借もと return( long_hour -1 ); // 1時間前に含める 注意：元旦の0時
// ttp://www.finetune.co.jp/~lyuka/technote/fract/sqrt_hypot.html
/* NAME
* sqrtl - square root function
* SYNOPSYS
* long
* sqrtl(long x)
* DISCRIPTIONS
* The sqrtl() function compute the non-negative square root of x.
* ERROR
* Below 1/2 LSB.
* SEE ALSO
* sqrt(3), http://www.finetune.co.jp/~lyuka/fract/sqrt_hypot.html
* COPYRIGHT
* Copyright 2002, Takayuki HOSODA. All rights reserved.
*/
unsigned long my_sqrt( unsigned long a )
{
unsigned long x;
unsigned long t;
unsigned long s;
unsigned char scale;
x = a;
if (x > 0) {
scale = 0;
if (x < 0x8000) {
x <<= 16;
scale = 8;
a = x;
}
x >>= 8;
s = 8;
for (t = 0x400000L; x < t; t >>= 2)
s--;
t = 88;
t <<= s;
x *= 22;
s += 5;
x >>= s; // -3.1e-2 < err < +2.9e-2
/* 打ち切り
s = a;
t += x;
x = s;
s /= t;
s += t;
s >>= 1; // -4.8e-4 < err <= 0
t = x;
x /= s;
x += s;
x >>= 1; // -1.2e-7 < err <= 0
s = x;
s++;
s *= x;
if (t > s) // adjust LSB
x++;
*/
if (scale) {
x += 127;
x >>= 8;
}
} }
return x;
} }
#endif
#if 1
// 拝借もと // 拝借もと
// ttp://www001.upp.so-net.ne.jp/y_yutaka/labo/math_algo/math_algo.html // ttp://www001.upp.so-net.ne.jp/y_yutaka/labo/math_algo/math_algo.html
unsigned long my_sqrt(unsigned long x) unsigned long my_sqrt(unsigned long x)
@ -553,5 +498,3 @@ unsigned long my_sqrt(unsigned long x)
return t; return t;
} }
#endif
#endif

11
trunk/pm.c
View File

@ -148,7 +148,7 @@ void tsk_batt( )
// 充電 // // 充電 //
// →割り込み。miscの中でよろしくやってくれている。 // →割り込み。miscの中でよろしくやってくれている。
if( !BT_CHG_n ) if( !BT_IN_CHG_n )
{ {
set_bit( 1, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); set_bit( 1, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE );
LED_CHARGE = 1; LED_CHARGE = 1;
@ -213,8 +213,9 @@ void BT_chk()
{ {
bt_force_update = 0; bt_force_update = 0;
iic_mcu_start( ); // 中で初期化フラグをもってるので呼びまくって良い　こんなところに…orz iic_mcu_start( ); // 中で初期化フラグをもってるので呼びまくって良い　こんなところに…orz
if(( battery_manufacturer_old == BT_VENDER_OPEN ) || if( (( battery_manufacturer_old == BT_VENDER_OPEN ) ||
( battery_manufacturer_old == BT_VENDER_NOT_CHECKED )) ( battery_manufacturer_old == BT_VENDER_NOT_CHECKED )) &&
!system_status.reboot )
{ {
BT_mgic_quick_start(); BT_mgic_quick_start();
} }
@ -483,7 +484,7 @@ void BT_get_left(){
u8 temp_fuel[2]; u8 temp_fuel[2];
static u16 hysteresis; static u16 hysteresis;
#ifdef _DEBUG_BT_IRQ_ #ifdef _DEBUG_BT_FUEL_
if( vreg_ctr[ VREG_C_COMMAND3 ] == 'd' ) if( vreg_ctr[ VREG_C_COMMAND3 ] == 'd' )
{ {
vreg_ctr[ VREG_C_BT_REMAIN ] = vreg_ctr[ VREG_C_DBG01 ]; vreg_ctr[ VREG_C_BT_REMAIN ] = vreg_ctr[ VREG_C_DBG01 ];
@ -572,7 +573,7 @@ void BT_get_left(){
} }
// 充電許可（＝アダプタも刺さってる）のに充電してない = 充電完了 // 充電許可（＝アダプタも刺さってる）のに充電してない = 充電完了
if( BT_CHG_Ena && !BT_CHG_n ){ if( BT_CHG_Ena && !BT_IN_CHG_n ){
vreg_ctr[ VREG_C_BT_REMAIN ] = 100; vreg_ctr[ VREG_C_BT_REMAIN ] = 100;
vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = 0; vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = 0;
} }

2
trunk/pm.h
View File

@ -149,7 +149,7 @@ task_status_immed tski_PM_LCD_off();
task_status_immed tski_PM_BL_set(); task_status_immed tski_PM_BL_set();
#define PM_Chg_Stop() { BT_TEMP_P = 0; BT_CHG_DISABLE(); while( !BT_CHG_n ){;}; LED_CHARGE = 0; bt_chg_ready = 0; } #define PM_Chg_Stop() { BT_TEMP_P = 0; BT_CHG_DISABLE(); while( !BT_IN_CHG_n ){;}; LED_CHARGE = 0; bt_chg_ready = 0; }
// 　これを呼ぶ前に、現在温度を教えておく必要があります。 // 　これを呼ぶ前に、現在温度を教えておく必要があります。

2
trunk/task_sys.c
View File

@ -83,7 +83,7 @@ void tsk_sys( )
timeout = 0; timeout = 0;
// todo debug // todo debug
#ifdef _DEBUG_BT_IRQ_ #ifdef _DEBUG_BT_FUEL_
vreg_ctr[ VREG_C_DBG01 ] = 99; vreg_ctr[ VREG_C_DBG01 ] = 99;
#endif #endif
#ifdef _DEBUG_BT_TEMP_ #ifdef _DEBUG_BT_TEMP_

2
trunk/user_define.h
View File

@ -135,7 +135,7 @@
#endif #endif
// <20>[“d’†(in) // <20>[“d’†(in)
#define BT_CHG_n P5.1 #define BT_IN_CHG_n P5.1
#define SW_WIFI_n P7.4 #define SW_WIFI_n P7.4
// KR4 // KR4

1
trunk/vreg_ctr.c
View File

@ -77,6 +77,7 @@ void vreg_ctr_reset( )
vreg_ctr[ VREG_C_LED_CAM ] = 0; vreg_ctr[ VREG_C_LED_CAM ] = 0;
vreg_ctr[ VREG_C_LED_TUNE ] = 0; vreg_ctr[ VREG_C_LED_TUNE ] = 0;
vreg_ctr[ VREG_C_VOL_DIGITAL ] = 0x20; vreg_ctr[ VREG_C_VOL_DIGITAL ] = 0x20;
vreg_ctr[ VREG_C_VOL_OPTION ] = 0;
{ {
u8 i; u8 i;
for( i = 0; i < sizeof( uni_info_LED ); i++ ) for( i = 0; i < sizeof( uni_info_LED ); i++ )

58
trunk/yav_mcu_bsr.plg
View File

@ -6,11 +6,11 @@ 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\loader.asm "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. 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 -qvjl2w -sainter_asm -zpb -no pm.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 -qvjl2w -sainter_asm -zpb -no pm.c
pm.c(224) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' pm.c(225) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
pm.c(436) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(437) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(536) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(537) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(537) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(624) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(538) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(625) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(663) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(663) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(701) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(701) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(785) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(785) : CC78K0R warning W0401: Conversion may lose significant digits
@ -72,23 +72,23 @@ 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 "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. 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 -qvjl2w -sainter_asm -zpb -no vreg_ctr.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 -qvjl2w -sainter_asm -zpb -no vreg_ctr.c
vreg_ctr.c(109) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' vreg_ctr.c(110) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(118) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' vreg_ctr.c(119) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(127) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' vreg_ctr.c(128) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(137) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' vreg_ctr.c(138) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(141) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' vreg_ctr.c(142) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(148) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' vreg_ctr.c(149) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(158) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(159) : CC78K0R warning W0401: Conversion may lose significant digits vreg_ctr.c(159) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(161) : CC78K0R warning W0401: Conversion may lose significant digits vreg_ctr.c(160) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(163) : CC78K0R warning W0401: Conversion may lose significant digits vreg_ctr.c(162) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(248) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' vreg_ctr.c(165) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(253) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' vreg_ctr.c(249) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(258) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' vreg_ctr.c(254) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(287) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' vreg_ctr.c(259) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(301) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' vreg_ctr.c(288) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(410) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' vreg_ctr.c(302) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(411) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
Compilation complete, 0 error(s) and 17 warning(s) found. Compilation complete, 0 error(s) and 17 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 "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. Assembly complete, 0 error(s) and 0 warning(s) found.
@ -102,14 +102,14 @@ 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 -qvjl2w -sainter_asm -zpb -no adc.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 -qvjl2w -sainter_asm -zpb -no adc.c
adc.c(124) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(124) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(130) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' adc.c(130) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
adc.c(210) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(211) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(237) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(238) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(329) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(330) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(353) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add' adc.c(354) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
adc.c(372) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(373) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(451) : CC78K0R warning W0745: Expected function prototype adc.c(452) : CC78K0R warning W0745: Expected function prototype
adc.c(475) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(476) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(480) : CC78K0R warning W0401: Conversion may lose significant digits adc.c(481) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 10 warning(s) found. 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\adc.asm "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. Assembly complete, 0 error(s) and 0 warning(s) found.
@ -162,6 +162,10 @@ pedo_alg_thre_det2.c(153) : CC78K0R warning W0401: Conversion may lose significa
Compilation complete, 0 error(s) and 4 warning(s) found. Compilation complete, 0 error(s) and 4 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\pedo_alg_thre_det2.asm "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pedo_alg_thre_det2.asm
Assembly complete, 0 error(s) and 0 warning(s) found. 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 -qvjl2w -sainter_asm -zpb -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 -qvjl2w -sainter_asm -zpb -no task_status.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 -qvjl2w -sainter_asm -zpb -no task_status.c
Compilation complete, 0 error(s) and 0 warning(s) found. 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_status.asm "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_status.asm

115
trunk/yav_mcu_bsr.pri
View File

@ -78,10 +78,10 @@ Symbol Type=OFF
Language=C Language=C
Kanji=SJIS Kanji=SJIS
[Source] [Source]
Geometry=25, 96, 754, 790 Geometry=25, 111, 803, 775
Window=Normal Window=Normal
DispStart=247 DispStart=62
CaretPos=283,0 CaretPos=63,0
Mode=Normal Mode=Normal
DispFile= DispFile=
Address1= Address1=
@ -139,18 +139,10 @@ SaveRange=Screen
SaveStart= SaveStart=
SaveEnd= SaveEnd=
Accumulative=ON Accumulative=ON
[Source1]
Geometry=0, 0, 754, 790
Window=Normal
DispStart=292
CaretPos=1,0
Mode=Normal
DispFile=led.c
Accumulative=ON
[Assemble] [Assemble]
Geometry=282, 92, 968, 626 Geometry=282, 92, 968, 626
Window=Hide Window=Hide
DispStart=864505856 DispStart=864338944
CaretPos=0,0 CaretPos=0,0
Address1= Address1=
Address2= Address2=
@ -968,48 +960,49 @@ Count=0
Geometry=835, -4, 441, 425 Geometry=835, -4, 441, 425
Window=Normal Window=Normal
Boundary=18088086 Boundary=18088086
0=.TDR06,P,S,A,+,1 0=.now_longhour,P,N,A,+,1
1=+LED_dim_status_sleep,.,N,A,-,1 1=.TDR06,P,S,A,+,1
2=.frame_sleep,P,N,A,+,1 2=.LED_dim_status_sleep,.,N,A,+,1
3=.PM20,B,S,A,+,1 3=.frame_sleep,P,N,A,+,1
4=.P20,P,S,A,+,1 4=.PM20,B,S,A,+,1
5=.pu20,B,S,A,+,1 5=.P20,P,S,A,+,1
6=.work_vr_vol,.,N,A,+,1 6=.pu20,B,S,A,+,1
7=.vol_data_ctr_tmp,P,N,A,+,1 7=.work_vr_vol,.,N,A,+,1
8=.vol_data_ctr,P,N,A,+,1 8=.vol_data_ctr_tmp,P,N,A,+,1
9=.last_modifyer,P,N,A,+,1 9=.vol_data_ctr,P,N,A,+,1
10=.sent_index,P,N,A,+,1 10=.last_modifyer,P,N,A,+,1
11=.vreg_ctr,P,N,A,+,1 11=.sent_index,P,N,A,+,1
12=.system_status,.,N,A,+,1 12=.vreg_ctr,P,N,A,+,1
13=.battery_manufacturer,P,N,A,+,1 13=.system_status,.,N,A,+,1
14=.bt_comp,.,N,A,+,1 14=.battery_manufacturer,P,N,A,+,1
15=.ADM,H,S,A,+,1 15=.bt_comp,.,N,A,+,1
16=.ADCRH,P,S,A,+,1 16=.ADM,H,S,A,+,1
17=.adc_data,P,N,A,+,1 17=.ADCRH,P,S,A,+,1
18=.adc_raw_vol,P,N,A,+,1 18=.adc_data,P,N,A,+,1
19=.new_val,P,N,A,+,1 19=.adc_raw_vol,P,N,A,+,1
20=.work_vr_vol,.,N,A,+,1 20=.new_val,P,N,A,+,1
21=.ADS,P,S,A,+,1 21=.work_vr_vol,.,N,A,+,1
Line=22 22=.ADS,P,S,A,+,1
Line=23
[Quick Watch] [Quick Watch]
0=ADS,P,A,1 0=adc_data,P,A,1
1=adc_data,P,A,1 1=work_vr_vol,P,A,1
2=work_vr_vol,P,A,1 2=vol_data_ctr_tmp,P,A,1
3=vol_data_ctr_tmp,P,A,1 3=vol_data_ctr,P,A,1
4=vol_data_ctr,P,A,1 4=adc_raw_vol,P,A,1
5=adc_raw_vol,P,A,1 5=ADCRH,P,A,1
6=ADCRH,P,A,1 6=ADM0,P,A,1
7=ADM0,P,A,1 7=ADM,P,A,1
8=ADM,P,A,1 8=pu20,B,A,1
9=pu20,B,A,1 9=P20,P,A,1
10=P20,P,A,1 10=PM20,P,A,1
11=PM20,P,A,1 11=pu6,P,A,1
12=pu6,P,A,1 12=frame_sleep,P,A,1
13=frame_sleep,P,A,1 13=LED_dim_status_sleep,P,A,1
14=LED_dim_status_sleep,P,A,1 14=TDR06,P,A,1
15=TDR06,P,A,1 15=now_longhour,P,A,1
[Software Break] [Software Break]
Geometry=799, 616, 445, 260 Geometry=869, 649, 445, 260
Window=Normal Window=Normal
Width=150 30 200 100 Width=150 30 200 100
Name0=Swb00002 Name0=Swb00002
@ -1020,19 +1013,15 @@ Name1=Swb00003
Address1=adc.c#_adc_filter+0x89 Address1=adc.c#_adc_filter+0x89
Window1=ASM Window1=ASM
Status1=ON Status1=ON
Name2=Swb00006 Name2=Swb00001
Address2=adc.c#_adc_filter+0x1f Address2=led.c#_led_pow_sleep+0x15
Window2=ASM Window2=ASM
Status2=ON Status2=OFF
Name3=Swb00001 Name3=Swb00004
Address3=led.c#_led_pow_sleep+0x15 Address3=pedo_alg_thre_det2.c#_hosu_increment+0x68
Window3=ASM Window3=ASM
Status3=OFF Status3=ON
Name4=Swb00004 Count=4
Address4=led.c#_led_pow_normal+0x7
Window4=ASM
Status4=ON
Count=5
[Reset] [Reset]
Debugger=ON Debugger=ON
Symbol=OFF Symbol=OFF