From 9d24f9337c6bbff62d492d0d595f8f3ef58f155a Mon Sep 17 00:00:00 2001 From: fujita_ryohei Date: Fri, 19 Mar 2010 09:36:25 +0000 Subject: [PATCH] =?UTF-8?q?TS=E5=AF=BE=E5=BF=9C=20=E3=83=BB=E5=AE=9F?= =?UTF-8?q?=E6=A9=9F=E5=AF=BE=E5=BF=9C=EF=BC=88TS=E3=81=A8=E5=BE=AE?= =?UTF-8?q?=E5=A6=99=E3=81=AB=E9=81=95=E3=81=86=E3=81=9F=E3=82=81=EF=BC=89?= =?UTF-8?q?=20=E3=83=BBifdef=E3=81=AE=E8=AA=A4=E3=82=8A=20=E3=80=80#ifdef?= =?UTF-8?q?=20A=20||=20B=20=E3=81=A8=E6=9B=B8=E3=81=91=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=81=AE=E3=81=AFC=E3=81=AE=E4=BB=95=E6=A7=98=E3=82=89?= =?UTF-8?q?=E3=81=97=E3=81=84=20=E3=80=80#if=20defined=20(=20A=20||=20B=20?= =?UTF-8?q?)=20=E3=81=AF=E9=96=8B=E7=99=BA=E7=92=B0=E5=A2=83=E3=81=8C?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C=E3=81=97=E3=81=A6=E3=81=AA=E3=81=84=20?= =?UTF-8?q?=E3=83=BB=E8=A3=BD=E5=93=81=E6=A4=9C=E6=9F=BB=E7=94=A8=E3=81=AB?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=95=E3=82=A9=E3=83=A1=E3=83=BC=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=8C=E8=AA=AD=E3=82=81=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB(0x7F=EF=BD=9E)=20=E3=83=BB=E3=83=95=E3=83=AA?= =?UTF-8?q?=E3=83=BC=E3=83=AC=E3=82=B8=E3=83=84=E3=82=BF=E3=81=AE=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=20=E3=83=BB?= 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@99 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/config.h | 21 ++++++- trunk/i2c_ctr.c | 8 ++- trunk/loader.c | 12 ++-- trunk/magic.c | 15 ++--- trunk/main.c | 3 - trunk/pedo_alg_thre_det2.c | 41 ++++++++----- trunk/pedometer.h | 5 +- trunk/pm.c | 2 +- trunk/pm.h | 3 +- trunk/task_misc.c | 39 +++++++++++++ trunk/user_define.h | 35 +++++++++-- trunk/vreg_ctr.c | 12 +++- trunk/vreg_ctr.h | 5 +- trunk/yav_mcu_bsr.plg | 7 +-- trunk/yav_mcu_bsr.pri | 117 ++++++++++++++++++++++++------------- trunk/yav_mcu_bsr.prk | 35 +++++------ trunk/yav_mcu_bsr.sdb | 20 +++---- 17 files changed, 255 insertions(+), 125 deletions(-) diff --git a/trunk/config.h b/trunk/config.h index f3b9d0a..23bffff 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -18,13 +18,30 @@ //#define _PARRADIUM_ //#define _MODEL_TEG2_ //#define _MODEL_WM0_ -#define _MODEL_TS0_ -//#define _MODEL_CTR_ +//#define _MODEL_TS0_ +#define _MODEL_CTR_TS_ +//#define _MODEL_CTR_JIKKI_ + //#define _SW_HOME_ENABLE_ // ---------------------------------- // +#ifdef _MODEL_CTR_TS_ +#ifdef _MODEL_CTR_JIKKI_ +どちらか一方だけセットして下さい。 +#endif +#endif +#ifdef _MODEL_CTR_TS_ +#define _MODEL_CTR_ +#endif + +#ifdef _MODEL_CTR_JIKKI_ +#define _MODEL_CTR_ +#endif + + +// ---------------------------------- // #ifdef _MODEL_TEG2_ #define _PMIC_TWL_ #define _MCU_KE3_ diff --git a/trunk/i2c_ctr.c b/trunk/i2c_ctr.c index 40ff5b1..dedbeda 100644 --- a/trunk/i2c_ctr.c +++ b/trunk/i2c_ctr.c @@ -46,6 +46,7 @@ // ============================================== extern bit irq_readed; // いずれかのIRQレジスタが読まれた +u8 iic_burst_state; /* ======================================================== @@ -97,6 +98,7 @@ __interrupt void int_iic_ctr( ) // 歩数計読み出し終了 hosu_read_end( ); rtc_unlock( ); + iic_burst_state = 0; return; } @@ -176,8 +178,10 @@ __interrupt void int_iic_ctr( ) vreg_ctr_write( reg_adrs, rx_buf ); WREL = 1; } - if( reg_adrs != VREG_C_ACC_HOSU_HIST ) - { + // + if( ( reg_adrs != VREG_C_ACC_HOSU_HIST ) + && ( reg_adrs != VREG_C_INFO ) ) + { // この二つのレジスタは特殊なアクセス方法をする。アクセスポインタを進めない。 reg_adrs += 1; } diff --git a/trunk/loader.c b/trunk/loader.c index dbb9873..a914abe 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -74,7 +74,7 @@ void main( ) { system_status.reboot = 1; } - else if( ( RESF & 0x10 ) != 0) // WDRF + else if( ( RESF & 0x10 ) != 0) // WDRF { system_status.reboot = 1; vreg_ctr[ VREG_C_MCU_STATUS ] |= REG_BIT_WDT_RESET; @@ -195,7 +195,7 @@ void hdwinit2( ) P3 = 0b00000110; // 簡易I2Cは出力ラッチを1にする P14 = 0b00000000; } - + PM3 = 0b11110000; // P31,32は簡易I2C PM14 = 0b11111100; // debugger[1] とりあえず出力 @@ -228,7 +228,11 @@ void hdwinit2( ) #ifdef _MCU_BSR_ #ifdef _MODEL_CTR_ +#ifdef _SW_HOME_ENABLE_ + PU20 = 0b00010001; +#else PU20 = 0b00000001; +#endif #else PU20 = 0b00000000; #endif @@ -241,8 +245,8 @@ void hdwinit2( ) #endif PM1 = 0b00000000; -#ifdef _MODEL_CTR_ - PM2 = 0b11101000; +#ifdef _MODEL_CTR_JIKKI_ + PM2 = 0b11101001; #else PM2 = 0b11101111; #endif diff --git a/trunk/magic.c b/trunk/magic.c index 0dc867d..c012cac 100644 --- a/trunk/magic.c +++ b/trunk/magic.c @@ -5,23 +5,20 @@ ****************************************************************************/ #include "config.h" -static const unsigned char hoge[] = __TIME__; - - - -#define SIG { 0x30, 0x38, 0x3A, 0x34, 0x35, 0x3A, 0x33, 0x39, 0x00, 0x00 } - // V0.5 (ニセ0.1改) #pragma section @@CNSTL MGC_LOAD AT 0x0FF6 -__far static const unsigned char MGC_LOAD[] = SIG; +__far static const unsigned char MGC_LOAD[] = __TIME__; #pragma section @@CNST MGC_MIMI AT 0x2100 -static const unsigned char MGC_HEAD[] = SIG; +static const unsigned char MGC_HEAD[] = __TIME__; #pragma section @@CNST MGC_TAIL AT 0x4FF6 -static const unsigned char MGC_TAIL[] = SIG; +static const unsigned char MGC_TAIL[] = __TIME__; +// 0Dまでこれを使用 +// #define SIG { 0x30, 0x38, 0x3A, 0x34, 0x35, 0x3A, 0x33, 0x39, 0x00, 0x00 } + // あーあ。 /* diff --git a/trunk/main.c b/trunk/main.c index e337add..84c2094 100644 --- a/trunk/main.c +++ b/trunk/main.c @@ -70,9 +70,6 @@ void main_loop( void ) read_dipsw( ); // 特定スイッチで何かするか？ clear_hosu_hist(); // 履歴クリア - 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; diff --git a/trunk/pedo_alg_thre_det2.c b/trunk/pedo_alg_thre_det2.c index 3253f31..2263f8c 100644 --- a/trunk/pedo_alg_thre_det2.c +++ b/trunk/pedo_alg_thre_det2.c @@ -28,8 +28,8 @@ extern u16 pool[]; ========================================================*/ void pedometer() { - static s16 th_H = 15500; // 閾値。暫定。動的変更とかしたい…ので変数 - static s16 th_L = 15000; + static s16 th_H = 15000; // 閾値。暫定。動的変更とかしたい…ので変数 + static s16 th_L = 11000; static u16 acc_norm[3]; // 加速度の大きさのヒストリ。数字が大きい方が古い static u16 acc_norm_temp; static u8 interval_hh; // 山-山間の時間。短過ぎたらはじく。 @@ -68,7 +68,8 @@ void pedometer() // ヒストリにフィルタを掛けて、今回の値を求める filterd = 0; - for( i = 0; i != 64; i++ ) // 係数が０ばかりのため +// for( i = 8; i != 55; i++ ) // 係数が０ばかりのため + for( i = 0; i != 46; i++ ) // 係数テーブルをいじりました。パラメータ調整時注意 { filterd += (signed long)norm_hist[ ( hist_indx + i ) & TAP-1 ] * lpf_coeff[ i ]; } @@ -113,11 +114,11 @@ void pedometer() } if( acc_norm[0] > 18000 ) { - th_L = acc_norm[0] - 6000; + th_L = acc_norm[0] - 10000; } else { - th_L = acc_norm[0] - 3500; + th_L = 11000; } } else @@ -173,6 +174,9 @@ u8 last_day = 0x30; u8 last_month = 0x12; u8 last_year = 0x99; +#define HOSU_NODATA 0xFFFF +#define HOSU_MAX 0xFFFE + static void hosu_increment() { static u16 last_hour_fny; @@ -237,7 +241,11 @@ static void hosu_increment() last_hour_fny = now_hour; // 実際にインクリメント - if( pool[ p_record ] != 0xFFFE ) + if( pool[ p_record ] == HOSU_NODATA ) + { + pool[ p_record ] = 1; + } + if( pool[ p_record ] != HOSU_MAX ) { pool[ p_record ] += 1; } @@ -283,11 +291,13 @@ void clear_hosu_hist() hours -= 1; } while( 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; } - -u8 hosu_read_state; +extern u8 iic_burst_state; bit record_read_msb_lsb; /* ======================================================== @@ -297,7 +307,6 @@ bit record_read_msb_lsb; void hosu_read_end( ) { record_read_msb_lsb = 0; - hosu_read_state = 0; } @@ -311,30 +320,30 @@ u8 hosu_read( ) u16 temp; static u8 p_record_buffer; - switch( hosu_read_state ){ + switch( iic_burst_state ){ case( 0 ): p_record_buffer = p_record; - hosu_read_state += 1; + iic_burst_state += 1; return( last_hour ); case( 1 ): - hosu_read_state += 1; + iic_burst_state += 1; return( last_day ); case( 2 ): - hosu_read_state += 1; + iic_burst_state += 1; return( last_month ); case( 3 ): - hosu_read_state += 1; + iic_burst_state += 1; return( btobcd(last_year) ); case( 4 ): - hosu_read_state += 1; + iic_burst_state += 1; return( 0x55 ); // reserved dummy case( 5 ): - hosu_read_state += 1; + iic_burst_state += 1; return( 0xAA ); // reserved. dummy default: diff --git a/trunk/pedometer.h b/trunk/pedometer.h index 5c25ec9..1dd1d03 100644 --- a/trunk/pedometer.h +++ b/trunk/pedometer.h @@ -20,7 +20,7 @@ Tap Count =64 Kaiser Constant = 7.000000 Quantized by 11 [bits] */ - 0,// [0] +/* 0,// [0] 0, 0, 0, @@ -28,6 +28,7 @@ Quantized by 11 [bits] 0, 0, 0, +*/ 1,// 8 2, 2, @@ -75,6 +76,7 @@ Quantized by 11 [bits] 2, 2, 1, +/* 0, 0,// 56 0, @@ -84,6 +86,7 @@ Quantized by 11 [bits] 0, 0, 0 +*/ }; // */ diff --git a/trunk/pm.c b/trunk/pm.c index 5220631..a781d91 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -81,7 +81,7 @@ void PM_init( ) // 電池メーカーの識別 BT_DET_P = 1; - temp = ( u8 ) ( get_adc( ADC_SEL_BATT_DET ) >> 6 ); + temp = ( u8 ) ( get_adc( ADC_SEL_BATT_DET ) >> 5 ); BT_DET_P = 0; iic_mcu_set_wo_dma( ); diff --git a/trunk/pm.h b/trunk/pm.h index f13fe17..2978f4d 100644 --- a/trunk/pm.h +++ b/trunk/pm.h @@ -69,6 +69,7 @@ enum BT_GAUGE_REG_ADRS // 0x05 pow save +#define PM_REG_BIT_VDD1P_1R15 0b00000000 #define PM_REG_BIT_VDD1P_1R05 0b00001000 #define PM_REG_BIT_VDD1P_0R90 0b00100000 #define PM_REG_BIT_VDD_AUTO 0b00000111 @@ -123,7 +124,7 @@ task_status_immed tski_PM_BL_set(); #define PM_VDD_off() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_SYS, 0 )) #define PM_off() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_SYS, 0 )) -#ifdef _model_CTR_ +#ifdef _MODEL_CTR_ #define PM_VDD_normMode() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_SAVE, PM_REG_BIT_VDD1P_1R15 | PM_REG_BIT_VDD_PWM )) #define PM_VDD_ecoMode() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_SAVE, PM_REG_BIT_VDD1P_0R90 | PM_REG_BIT_VDD_AUTO )) diff --git a/trunk/task_misc.c b/trunk/task_misc.c index 113f1d2..c9d06f2 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -8,7 +8,11 @@ #include "pm.h" #include "accero.h" +#include "adc.h" +#include "i2c_mcu.h" + +// ======================================================== #define INTERVAL_TSK_MISC_STAT 4 @@ -172,4 +176,39 @@ task_status_immed do_command0( ) // task_status_immed do_command1( ) +extern u8 iic_burst_state; +/* ======================================================== +　デバッグ用にいろいろ読んできます。 +　返値はデータそのもの + ======================================================== */ +u8 mcu_info_read() +{ + u8 temp; + + switch( iic_burst_state++ ){ + case( 0 ): + // IICがなにかエラーでも知らない。00かFFならエラーの可能性が高い + return( iic_mcu_read_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VER ) ); + + case( 1 ): + // 電池メーカーの識別 + BT_DET_P = 1; + temp = ( u8 ) ( get_adc( ADC_SEL_BATT_DET ) >> 5 ); + BT_DET_P = 0; + return( temp ); + + case( 2 ): + // ガスゲージバージョン + return( iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VERSION ) ); + + case( 3 ): + return( iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VERSION + 1 ) ); + + default: + return( 0xEE ); + } + + +} + diff --git a/trunk/user_define.h b/trunk/user_define.h index 3130bac..f69f77d 100644 --- a/trunk/user_define.h +++ b/trunk/user_define.h @@ -3,7 +3,7 @@ #define IIC_SLV_ADDR_MONITOR 0x6E #define IIC_T_SLAVEADDRESS 0x4A -#define IIC_C_SLAVEADDRESS 0x4A +#define IIC_C_SLAVEADDRESS 0x4A #define IIC_SLA_DCP 0x50 @@ -50,12 +50,23 @@ // PMxは0で出力モード // SoC -#ifndef _MODEL_TS0_ +#ifdef _MODEL_TEG2_ #define IRQ0_ast { P3.0 = 0; PM3.0 = 0; } #define IRQ0_neg { PM3.0 = 1; } #define IRQ0 ( P3.0 ) -#else +#endif +#ifdef _MODEL_WM0_ +#define IRQ0_ast { P3.0 = 0; PM3.0 = 0; } +#define IRQ0_neg { PM3.0 = 1; } +#define IRQ0 ( P3.0 ) +#endif +#ifdef _MODEL_TS0_ +#define IRQ0_ast { P7.6 = 0; PM7.6 = 0; } +#define IRQ0_neg { PM7.6 = 1; } +#define IRQ0 ( P7.6 ) +#endif +#ifdef _MODEL_CTR_ #define IRQ0_ast { P7.6 = 0; PM7.6 = 0; } #define IRQ0_neg { PM7.6 = 1; } #define IRQ0 ( P7.6 ) @@ -80,11 +91,23 @@ #endif // FCRAM -#ifndef _MODEL_TS0_ +#ifdef _MODEL_TEG2_ #define FCRAM_RST P14.0 #define FCRAM_RST_ast { P14.0 = 0; } #define FCRAM_RST_neg { P14.0 = 1; } -#else +#endif +#ifdef _MODEL_WM0_ +#define FCRAM_RST P14.0 +#define FCRAM_RST_ast { P14.0 = 0; } +#define FCRAM_RST_neg { P14.0 = 1; } +#endif + +#ifdef _MODEL_TS0_ +#define FCRAM_RST P3.0 +#define FCRAM_RST_ast { P3.0 = 0; } +#define FCRAM_RST_neg { P3.0 = 1; } +#endif +#ifdef _MODEL_CTR_ #define FCRAM_RST P3.0 #define FCRAM_RST_ast { P3.0 = 0; } #define FCRAM_RST_neg { P3.0 = 1; } @@ -136,7 +159,7 @@ //#define VOL P2.7 // ANI7 -#ifdef _MODEL_CTR_ +#ifdef _MODEL_CTR_JIKKI_ #define SW_HOME_n P20.4 // INTP22 #else diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index 4f11bb3..1f7ce0d 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -13,6 +13,9 @@ CTR MCU I2C #include #include "fsl_user.h" +extern u8 mcu_info_read(); // task_misc.c + + // ******************************************************** u8 vreg_ctr[VREG_C_ENDMARK_]; @@ -263,9 +266,6 @@ void vreg_ctr_write( u8 adrs, u8 data ) if( ( data & 0x01 ) != 0 ) { clear_hosu_hist(); // 履歴クリア - 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; @@ -327,10 +327,16 @@ u8 vreg_ctr_read( u8 adrs ) { return( (u8)( ( rsub_temp >> 8 ) & 0xFF ) ); } + else if( adrs == VREG_C_INFO ) + { + return( mcu_info_read() ); + } #if 1 if( adrs >= VREG_C_ENDMARK_ ) { + // VREG_C_INFO > VREG_C_ENDMARK_ なので + // いじるときは注意 return( 0xEE ); } #endif diff --git a/trunk/vreg_ctr.h b/trunk/vreg_ctr.h index 987b2a9..4ad7188 100644 --- a/trunk/vreg_ctr.h +++ b/trunk/vreg_ctr.h @@ -252,9 +252,10 @@ enum VREG_C VREG_C_FREE_E, VREG_C_FREE_F, - - VREG_C_ENDMARK_ + VREG_C_ENDMARK_ }; +#define VREG_C_INFO 0x7F + /* VREG_C_PM_INFO, // 未使用 VREG_C_BT_INFO, // 未使用 diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index dae25d1..5348c75 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -3,11 +3,6 @@ C:\WINDOWS\system32\cmd.exe /c touch 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 -qvjl3wt -sainter_asm -zp -no task_sys.c -task_sys.c(328) : 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 -gb7EFBFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r" -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel ini_VECT.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel reboot.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.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 @@ -18,4 +13,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 1 +Build Total error(s) : 0 Total warning(s) : 0 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 8bf559d..c70da55 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -14,7 +14,7 @@ Low-voltage Flash Rewriting=On Fail Safe Break=0x2000 Port=1 NMI=OFF -TRESET=OFF +TRESET=ON IRESET=OFF WAIT=OFF SysClock=None @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=389, 53, 673, 1042 +Geometry=438, 5, 673, 1042 Window=Normal -DispStart=37 -CaretPos=95,0 +DispStart=280 +CaretPos=281,0 Mode=Normal DispFile= Address1= @@ -139,11 +139,19 @@ SaveRange=Screen SaveStart= SaveEnd= Accumulative=ON +[Source1] +Geometry=0, 0, 673, 1042 +Window=Normal +DispStart=145 +CaretPos=166,14 +Mode=Normal +DispFile=task_sys.c +Accumulative=ON [Assemble] Geometry=24, 657, 600, 400 Window=Normal -DispStart=685 -CaretPos=685,27 +DispStart=17241 +CaretPos=17241,27 Address1= Address2= Address3= @@ -256,8 +264,8 @@ Window=Hide Boundary=0 Mode=Proper [Sfr] -Geometry=0, 0, 0, 0 -Window=Hide +Geometry=50, 50, 596, 915 +Window=Normal Address1= Address2= Address3= @@ -274,7 +282,7 @@ Address13= Address14= Address15= Address16= -Boundary=0, 0 +Boundary=202, 89 Mode=Hex Attribute=Show Sort=Unsort @@ -866,7 +874,7 @@ SaveRange=Screen SaveStart= SaveEnd= [Register] -Geometry=0, 0, 0, 0 +Geometry=25, 25, 250, 400 Window=Hide Mode=Hex Boundary=62 @@ -960,48 +968,73 @@ Count=0 Geometry=1146, 11, 440, 793 Window=Normal Boundary=13762700 -0=.adc_raw_vol,P,N,A,+,1 -1=.vol_old,P,N,A,+,1 -2=.acc_norm_temp,P,N,A,+,1 -3=.acc_norm,P,N,A,+,1 -4=.temp2,P,N,A,+,1 -5=.temp1,P,N,A,+,1 -6=.filterd,P,N,A,+,1 -Line=7 +0=.P3.3,P,S,A,+,1 +1=.PU3.3,P,S,A,+,1 +2=.PM3.3,P,S,A,+,1 +3=.SW_home_mask,P,N,A,+,1 +4=.SW_home_mask,P,N,A,+,1 +5=.SW_home_count,P,N,A,+,1 +6=.PU20,B,S,A,+,1 +7=.P2.0,P,S,A,+,1 +8=.PM2.0,P,S,A,+,1 +9=.P20.4,B,S,A,+,1 +10=.PM20.4,B,S,A,+,1 +11=.PM3,B,S,A,+,1 +12=.P3,B,S,A,+,1 +13=.adc_raw_vol,P,N,A,+,1 +14=.vol_old,P,N,A,+,1 +15=.acc_norm_temp,P,N,A,+,1 +16=.acc_norm,P,N,A,+,1 +17=.temp2,P,N,A,+,1 +18=.temp1,P,N,A,+,1 +19=.filterd,P,N,A,+,1 +Line=20 [Quick Watch] -0=temp1,P,A,1 -1=temp2,P,A,1 -2=filterd,P,A,1 -3=acc_norm,P,A,1 -4=acc_norm_temp,P,A,1 -5=vol_old,P,A,1 -6=adc_raw_vol,P,A,1 -7= -8= -9= -10= -11= -12= -13= -14= -15= +0=acc_norm_temp,P,A,1 +1=vol_old,P,A,1 +2=adc_raw_vol,P,A,1 +3=P3,B,A,1 +4=PM3,P,A,1 +5=PM20.4,B,A,1 +6=P20.4,B,A,1 +7=PU20,B,A,1 +8=SW_home_count,P,A,1 +9=PM3.3,P,A,1 +10=PU3.3,P,A,1 +11=P3.3,P,A,1 +12=PM2.0,P,A,1 +13=P2.0,P,A,1 +14=SW_HOME_n,P,A,1 +15=SW_home_mask,P,A,1 [Software Break] Geometry=1085, 899, 500, 200 Window=Normal Width=150 30 200 100 -Name0=Swb00002 -Address0=pedo_alg_thre_det2.c#es_S0096+0x104 +Name0=Swb00003 +Address0=adc.c#es_F0072+0xa7 Window0=ASM Status0=OFF -Name1=Swb00003 -Address1=adc.c#es_F0072+0xa7 +Name1=Swb00004 +Address1=adc.c#es_F0072+0xc4 Window1=ASM Status1=OFF -Name2=Swb00004 -Address2=adc.c#es_F0072+0xc4 +Name2=Swb00002 +Address2=task_sys.c#es_F0052+0xeb Window2=ASM -Status2=OFF -Count=3 +Status2=ON +Name3=Swb00001 +Address3=task_sys.c#es_F0052+0xdd +Window3=ASM +Status3=ON +Name4=Swb00005 +Address4=task_sys.c#es_F0052+0xcf +Window4=ASM +Status4=ON +Name5=Swb00006 +Address5=task_sys.c#es_F0052+0xc7 +Window5=ASM +Status5=ON +Count=6 [Reset] Debugger=ON Symbol=OFF diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 5d781af..5a90285 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,25 +1,26 @@ [ProjectManager] -FrameMax=0 -FrameX=41 -FrameY=39 +FrameMax=1 +FrameX=-1421 +FrameY=43 FrameCX=1299 FrameCY=1044 OpenFile1=renge\renge.h,0,502,637,1746,1394,29,16,29,0 -OpenFile2=user_define.h,0,330,330,1574,1056,0,172,0,0 -OpenFile3=jhl_defs.h,0,250,539,1494,1265,0,10,8,0 -OpenFile4=renge\\renge_defs.h,0,293,307,1537,1033,18,37,18,0 -OpenFile5=renge\renge_defs.h,0,667,22,1514,748,0,16,0,0 -OpenFile6=pedometer.h,0,586,125,1830,851,11,74,11,0 -OpenFile7=sw.c,0,264,264,1508,990,0,105,0,0 -OpenFile8=pedo_alg_thre_det2.c,0,347,41,1231,551,32,73,19,0 -OpenFile9=adc.c,0,286,286,1530,1012,24,134,50,0 -OpenFile10=config.h,0,257,193,1501,919,0,21,0,0 -OpenFile11=task_misc.c,0,308,308,1552,1034,0,1,0,0 -OpenFile12=ProjectWindow +OpenFile2=jhl_defs.h,0,250,539,1494,1265,0,10,8,0 +OpenFile3=renge\\renge_defs.h,0,293,307,1537,1033,18,37,18,0 +OpenFile4=renge\renge_defs.h,0,667,22,1514,748,0,16,0,0 +OpenFile5=pedometer.h,0,586,125,1830,851,11,74,11,0 +OpenFile6=sw.c,0,264,264,1508,990,0,105,0,0 +OpenFile7=pedo_alg_thre_det2.c,0,347,41,1231,551,26,76,19,0 +OpenFile8=adc.c,0,286,286,1530,1012,24,134,50,0 +OpenFile9=task_misc.c,0,308,308,1552,1034,16,137,29,0 +OpenFile10=ProjectWindow PrjPos=0,2,754,3,253 -OpenFile13=task_sys.c,0,330,330,1574,1056,22,136,37,0 -OpenFile14=OutputWindow -OutputPos=0,605,1071,70,1128 +OpenFile11=config.h,0,257,193,1501,919,19,22,8,0 +OpenFile12=task_sys.c,0,330,330,1574,1056,0,172,37,0 +OpenFile13=pm.h,0,44,44,1034,660,0,115,0,0 +OpenFile14=loader.c,0,66,66,1056,682,0,235,0,0 +OpenFile15=OutputWindow +OutputPos=0,390,856,19,1077 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 17e7db4..7d4ba41 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4b68f956 +T=4ba2fdb7 1=incs_loader.h 2=fsl.h 3=fsl_user.h @@ -23,7 +23,7 @@ T=4b7decbc 1=incs.h 2=accero.h [main.c] -T=4b68d913 +T=4b999c7e 1=incs_loader.h 2=WDT.h 3=rtc.h @@ -32,7 +32,7 @@ T=4b68d913 6=led.h 7=adc.h [magic.c] -T=4b962756 +T=4ba2fe88 1=config.h [WDT.c] T=4afd21ca @@ -56,7 +56,7 @@ T=4b4438bb T=4b6a6fa4 1=incs.h [vreg_ctr.c] -T=4b95fb8d +T=4b999c7e 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -122,7 +122,7 @@ T=4b6a6fb1 3=pm.h 4=accero.h [task_sys.c] -T=4b962889 +T=4b9dbbcc 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -133,7 +133,7 @@ T=4b962889 8=sw.h 9=adc.h [pedo_alg_thre_det2.c] -T=4b9603bf +T=4ba1d48a 1=incs.h 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h 3=accero.h @@ -153,9 +153,9 @@ T=4b25f1a9 T=4b90c1b8 1=config.h [user_define.h] -T=4b95fc65 +T=4ba2fe2d [config.h] -T=4b95fce7 +T=4ba2fec7 [bsr_system.h] T=4b3064de [renge\renge.h] @@ -184,7 +184,7 @@ T=4afd21cb [i2c_ctr.h] T=4afd21cb [pm.h] -T=4b8f1beb +T=4ba1e3ed [rtc.h] T=4b6a6fa4 [adc.h] @@ -227,4 +227,4 @@ T=45f12258 [batt_params.h] T=4b663897 [pedometer.h] -T=4b9601d1 +T=4ba1d482