diff --git a/trunk/_branch/0.13(sdk0.9_plus_E3)/accero.c b/trunk/_branch/0.13(sdk0.9_plus_E3)/accero.c index fe850b5..9835851 100644 --- a/trunk/_branch/0.13(sdk0.9_plus_E3)/accero.c +++ b/trunk/_branch/0.13(sdk0.9_plus_E3)/accero.c @@ -173,14 +173,9 @@ task_status_immed acc_hosu_set( ) str_send_buf[1] = 0x00; // ctrl2 HPF:normal, filterd, HPF for IRQ : dis/dis, HPF coeff:norm #ifdef _MODEL_WM0_ -# ifdef _MODEL_WM0_TEG2_CTRC_ - str_send_buf[2] = 0x02; // 回路が一部違う -# else - str_send_buf[2] = 0x10; // 3 IRQ pol :Active HI, Drive:Pushpull, /// IRQ2flg latch: auto clear after read, IRQ2 conf: IRQ( fall,shock,...) /// 1 : auto clear after read, conf: data ready -# endif #else # ifdef _MODEL_CTR_JIKKI_ str_send_buf[2] = 0x10; @@ -190,6 +185,7 @@ task_status_immed acc_hosu_set( ) /// 1 : auto clear after read, conf: data ready # endif #endif + str_send_buf[3] = 0x80; // ctrl3 block update:enable, MSB first, scale: +-2G(default), selftest: dis if( ( vreg_ctr[VREG_C_ACC_CONFIG] & diff --git a/trunk/_branch/0.13(sdk0.9_plus_E3)/config.h b/trunk/_branch/0.13(sdk0.9_plus_E3)/config.h index e5f9707..ab56aca 100644 --- a/trunk/_branch/0.13(sdk0.9_plus_E3)/config.h +++ b/trunk/_branch/0.13(sdk0.9_plus_E3)/config.h @@ -6,7 +6,7 @@ #define MCU_VER_MAJOR 0x00 -#define MCU_VER_MINOR 0x10 +#define MCU_VER_MINOR 0x13 #define _OVERCLOCK_ @@ -18,13 +18,13 @@ //#define _PARRADIUM_ //#define _MODEL_TEG2_ // ↑TEG2 CPU + Type-T -#define _MODEL_WM0_ -#define _MODEL_WM0_TEG2_CTRC_ +//#define _MODEL_WM0_ +//#define _MODEL_WM0_TEG2_CTRC_ //#define _MODEL_TS0_ // ↑TEG2 CPU + Type-C //#define _MODEL_CTR_TS_ // ↑FINAL SoC + Type-C -//#define _MODEL_CTR_JIKKI_ +#define _MODEL_CTR_JIKKI_ //#define _SW_HOME_ENABLE_ diff --git a/trunk/_branch/0.13(sdk0.9_plus_E3)/loader.c b/trunk/_branch/0.13(sdk0.9_plus_E3)/loader.c index 7ec6e79..44079d7 100644 --- a/trunk/_branch/0.13(sdk0.9_plus_E3)/loader.c +++ b/trunk/_branch/0.13(sdk0.9_plus_E3)/loader.c @@ -253,11 +253,7 @@ void hdwinit2( ) PM5 = 0b11110011; PM6 = 0b11111100; // I2CのラインがL出力になってしまうが、システムがOFFなのでかまわない -#ifdef _MODEL_CTR_ - PM7 = 0b01011111; -#else PM7 = 0b00011111; -#endif PM12 = 0b11111111; // 32kHzクロックのピン設定はどっちでもよい PM15 = 0b11111111; diff --git a/trunk/_branch/0.13(sdk0.9_plus_E3)/sw.c b/trunk/_branch/0.13(sdk0.9_plus_E3)/sw.c index ea60fdf..4532612 100644 --- a/trunk/_branch/0.13(sdk0.9_plus_E3)/sw.c +++ b/trunk/_branch/0.13(sdk0.9_plus_E3)/sw.c @@ -110,7 +110,7 @@ void tsk_sw( ) set_irq( VREG_C_IRQ0, REG_BIT_SW_HOME_HOLD ); #endif } - else if( SW_pow_count == ( HOLD_THREASHOLD * 4 ) ) + else if( SW_pow_count == (u8)( 1000 / INTERVAL_TSK_SW )) { // todo vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ILM_ONLY_RED; system_status.pwr_state = OFF_TRIG; diff --git a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9.ncb b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9.ncb index c61c6fd..1e6af6e 100644 Binary files a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9.ncb and b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9.ncb differ diff --git a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9.suo b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9.suo index ecd76ad..4dfeb37 100644 Binary files a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9.suo and b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9.suo differ diff --git a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9/Debug/BuildLog.htm b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9/Debug/BuildLog.htm index eace222..553061d 100644 Binary files a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9/Debug/BuildLog.htm and b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9/Debug/BuildLog.htm differ diff --git a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9/Debug/vc90.idb b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9/Debug/vc90.idb index 403cad4..6cd9c66 100644 Binary files a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9/Debug/vc90.idb and b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9/Debug/vc90.idb differ diff --git a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9/Debug/vc90.pdb b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9/Debug/vc90.pdb index c63cd37..4acad68 100644 Binary files a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9/Debug/vc90.pdb and b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav-mcu-basara_sdk0.9/yav-mcu-basara_sdk0.9/Debug/vc90.pdb differ diff --git a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.pri b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.pri index 135b403..6b08b7d 100644 --- a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.pri +++ b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.pri @@ -80,8 +80,8 @@ Kanji=SJIS [Source] Geometry=376, 104, 707, 899 Window=Normal -DispStart=68 -CaretPos=69,0 +DispStart=41 +CaretPos=88,0 Mode=Normal DispFile= Address1= @@ -141,9 +141,9 @@ SaveEnd= Accumulative=ON [Assemble] Geometry=674, 20, 600, 400 -Window=Hide -DispStart=864495616 -CaretPos=0,0 +Window=Normal +DispStart=689 +CaretPos=689,27 Address1= Address2= Address3= diff --git a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.prj b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.prj index e0d9e36..1cc5030 100644 --- a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.prj +++ b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.prj @@ -1,12 +1,12 @@ [ProjectManager] Version=6.00 -Path=C:\78k_data\yav-mcu-basara_sdk0.9\ +Path=C:\78k_data\yav-mcu-basara_0.13(0.10_plus_E3)\ Title=yav-mcu Series=78K0R.PM Device=uPD79F0104 DeviceVer=E1.00b DebugMode=1 -Target=C:\78k_data\yav-mcu-basara_sdk0.9\bsr.lmf +Target=bsr.lmf [BuildMode0] BuildModeName=Debug Build TargetFile=0 @@ -754,7 +754,7 @@ ZB= Etcetera0= Etcetera1=boot.lmf CommandFile=0 -OFILE=C:\78k_data\yav-mcu-basara_sdk0.9\bsr.lmf +OFILE=C:\78k_data\yav-mcu-basara_0.13(0.10_plus_E3)\bsr.lmf [Options.LK78K0R 3] Version=100 O0=bsr_bsr.lmf diff --git a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.prk b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.prk index 51a06f4..5da778c 100644 --- a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.prk +++ b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.prk @@ -10,10 +10,9 @@ OpenFile3=ProjectWindow PrjPos=0,2,754,3,253 OpenFile4=accero.c,0,44,44,1045,672,0,250,0,0 OpenFile5=led.c,0,66,66,1067,694,0,1,0,0 -OpenFile6=config.h,0,88,88,1089,716,0,25,21,0 -OpenFile7=task_misc.c,0,110,110,1111,738,0,1,0,0 -OpenFile8=task_sys.c,0,132,132,1133,760,0,1,0,0 -OpenFile9=OutputWindow +OpenFile6=config.h,0,88,88,1089,716,0,27,0,0 +OpenFile7=sw.h,0,264,264,1265,892,9,4,9,0 +OpenFile8=OutputWindow OutputPos=0,572,1038,46,1104 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] diff --git a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.sdb b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.sdb index 5201bb6..5c24449 100644 --- a/trunk/_branch/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.sdb +++ b/trunk/_branch/0.13(sdk0.9_plus_E3)/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4be25db4 +T=4bebac1d 1=incs_loader.h 2=fsl.h 3=fsl_user.h @@ -11,7 +11,7 @@ T=4be25db4 7=rtc.h 8=reboot.h [pm.c] -T=4be287db +T=4beb9bf9 1=incs.h 2=adc.h 3=led.h @@ -21,11 +21,11 @@ T=4be287db 7=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 8=fsl_user.h [i2c_ctr.c] -T=4bb92f33 +T=4beb9bf9 1=incs.h 2=accero.h [main.c] -T=4bb92f33 +T=4beb9bf9 1=incs_loader.h 2=WDT.h 3=rtc.h @@ -34,31 +34,31 @@ T=4bb92f33 6=led.h 7=adc.h [magic.c] -T=4bea6042 +T=4bebafab 1=config.h [WDT.c] -T=4bb92f33 +T=4beb9bf9 1=incs_loader.h [i2c_mcu.c] -T=4bb92f33 +T=4beb9bf9 1=incs.h 2=i2c_mcu.h [i2c_twl.c] -T=4bb92f33 +T=4beb9bf9 1=incs.h 2=i2c_twl_defs.h [ini_VECT.c] -T=4bb92f33 +T=4beb9bf9 1=config.h [led.c] -T=4bb92f33 +T=4beb9bf9 1=incs.h 2=led.h [rtc.c] -T=4bb92f33 +T=4beb9bf9 1=incs.h [vreg_ctr.c] -T=4be92df5 +T=4beb9bf9 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -68,20 +68,20 @@ T=4be92df5 7=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 8=fsl_user.h [vreg_twl.c] -T=4bb92f33 +T=4beb9bf9 1=incs.h 2=jhl_defs.h 3=vreg_twl.h 4=vreg_ctr.h 5=renge\renge_task_intval.h [adc.c] -T=4be26c82 +T=4beb9bf9 1=incs.h 2=adc.h 3=pm.h 4=led.h [renge\renge.c] -T=4bb92f32 +T=4beb9bf7 1=renge\renge.h 2=renge\renge_task_intval.h 3=renge\renge_task_immediate.h @@ -90,20 +90,20 @@ T=4bb92f32 6=user_define.h 7=bsr_system.h [accero.c] -T=4beb51c7 +T=4beb9bf9 1=incs.h 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] -T=4bb92f33 +T=4beb9bf9 1=incs_loader.h 2=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 3=fsl_user.h 4=i2c_ctr.h [reboot.c] -T=4bb92f33 +T=4beb9bf9 1=incs_loader.h [sw.c] -T=4bb92f33 +T=4bebafa0 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -112,13 +112,13 @@ T=4bb92f33 6=pm.h 7=rtc.h [task_debug.c] -T=4bb92f33 +T=4bebaa50 1=incs.h 2=renge\renge.h 3=pm.h 4=accero.h [task_misc.c] -T=4bb92f33 +T=4beb9bf9 1=incs.h 2=renge\renge.h 3=pm.h @@ -126,7 +126,7 @@ T=4bb92f33 5=adc.h 6=i2c_mcu.h [task_sys.c] -T=4bd17417 +T=4beb9bf9 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -137,13 +137,13 @@ T=4bd17417 8=sw.h 9=adc.h [pedo_alg_thre_det2.c] -T=4bb92f33 +T=4beb9bf9 1=incs.h 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h 3=accero.h 4=pedometer.h [incs_loader.h] -T=4bb92f33 +T=4beb9bf9 1=jhl_defs.h 2=user_define.h 3=bsr_system.h @@ -154,49 +154,49 @@ T=4bb92f33 8=i2c_mcu.h 9=WDT.h [jhl_defs.h] -T=4bb92f33 +T=4beb9bf9 1=config.h [config.h] -T=4be92e32 +T=4bebac3c [user_define.h] -T=4bb92f33 +T=4beb9bf9 [bsr_system.h] -T=4bb92f33 +T=4beb9bf9 [renge\renge.h] -T=4bb92f32 +T=4beb9bf7 1=renge\renge_defs.h 2=renge\renge_task_immediate.h [renge\renge_defs.h] -T=4bb92f32 +T=4beb9bf7 [renge\renge_task_immediate.h] -T=4bb92f32 +T=4beb9bf7 1=renge\renge_defs.h [vreg_ctr.h] -T=4bb92f33 +T=4beb9bf9 1=config.h [vreg_twl.h] -T=4bb92f33 +T=4beb9bf9 [loader.h] -T=4bb92f33 +T=4beb9bf9 1=jhl_defs.h [i2c_mcu.h] -T=4bb92f33 +T=4beb9bf9 [WDT.h] -T=4bb92f33 +T=4beb9bf9 [fsl.h] -T=4bb92f33 +T=4beb9bf9 [fsl_user.h] -T=4bb92f33 +T=4beb9bf9 [i2c_ctr.h] -T=4bb92f33 +T=4beb9bf9 [pm.h] -T=4bcfe880 +T=4beb9bf9 [rtc.h] -T=4bb92f33 +T=4beb9bf9 [reboot.h] -T=4bb92f33 +T=4beb9bf9 [incs.h] -T=4bb92f33 +T=4beb9bf9 1=jhl_defs.h 2=user_define.h 3=bsr_system.h @@ -207,28 +207,28 @@ T=4bb92f33 8=rtc.h 9=accero.h [accero.h] -T=4bb92f33 +T=4beb9bf9 1=jhl_defs.h 2=pedometer.h [pedometer.h] -T=4bb92f33 +T=4beb9bf9 [adc.h] -T=4bb92f33 +T=4beb9bf9 1=jhl_defs.h [led.h] -T=4bb92f33 +T=4beb9bf9 [batt_params.h] -T=4bb92f33 +T=4beb9bf9 [..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h] T=49a3bd4e [i2c_twl_defs.h] -T=4bb92f33 +T=4beb9bf9 [renge\renge_task_intval.h] -T=4bb92f32 +T=4beb9bf7 1=renge\renge_defs.h [..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h] T=45f12258 [i2c_twl.h] -T=4bb92f33 +T=4beb9bf9 [sw.h] -T=4bb92f33 +T=4bebafb5