diff --git a/branches/sim/VCProj/Debug/bsr_trunk.log b/branches/sim/VCProj/Debug/bsr_trunk.log index 58c1bd7..e8f4cb4 100644 --- a/branches/sim/VCProj/Debug/bsr_trunk.log +++ b/branches/sim/VCProj/Debug/bsr_trunk.log @@ -1,13 +1,17 @@ -2011/08/02 14:10:42 にビルドを開始しました。 +2011/08/02 17:36:43 にビルドを開始しました。 1>ノード 2 上のプロジェクト "C:\78k_data\yav-mcu-basara\branches\sim\VCProj\bsr_trunk.vcxproj" (build ターゲット)。 1>InitializeBuildStatus: - "Debug\sim.unsuccessfulbuild" のタッチ タスクを実行しています。 + "AlwaysCreate" が指定されたため "Debug\sim.unsuccessfulbuild" を作成しています。 ClCompile: - C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /Z7 /nologo /W1 /WX- /Od /Oy- /D _MBCS /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc100.pdb" /Gd /TC /analyze- /errorReport:prompt ..\accero.c ..\adc.c ..\i2c_ctr.c ..\i2c_twl.c ..\led.c ..\led_cam.c ..\led_pow.c ..\loader.c ..\magic.c ..\main.c ..\pedo_alg_thre_det2.c ..\pm.c ..\rtc.c ..\self_flash.c ..\sw.c ..\task_debug.c ..\task_misc.c ..\task_status.c ..\task_sys.c ..\vreg_ctr.c ..\vreg_twl.c + C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /Z7 /nologo /W1 /WX- /Od /Oy- /D _MBCS /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc100.pdb" /Gd /TC /analyze- /errorReport:prompt ..\WDT.c ..\accero.c ..\adc.c ..\hal.c ..\i2c_ctr.c ..\i2c_mcu.c ..\i2c_twl.c ..\ini_VECT.c ..\led.c ..\led_cam.c ..\led_pow.c ..\loader.c ..\magic.c ..\main.c ..\pedo_alg_thre_det2.c ..\pm.c ..\renge\renge.c ..\rtc.c ..\self_flash.c ..\sw.c ..\task_debug.c ..\task_misc.c ..\task_status.c ..\task_sys.c ..\vreg_ctr.c ..\vreg_twl.c + WDT.c accero.c adc.c + hal.c i2c_ctr.c + i2c_mcu.c i2c_twl.c + ini_VECT.c led.c led_cam.c led_pow.c @@ -16,17 +20,18 @@ main.c pedo_alg_thre_det2.c pm.c - 1>..\pm.c(1279): warning C4090: '=' : 異なる 'const' 修飾子です。 + 1>..\pm.c(1274): warning C4090: '=' : 異なる 'const' 修飾子です。 + renge.c rtc.c self_flash.c sw.c + コードを生成中... + コンパイル中... task_debug.c task_misc.c task_status.c task_sys.c vreg_ctr.c - コードを生成中... - コンパイル中... vreg_twl.c コードを生成中... Link: @@ -68,4 +73,4 @@ ビルドに成功しました。 -経過時間 00:00:03.96 +経過時間 00:00:04.00 diff --git a/branches/sim/VCProj/bsr_trunk.sdf b/branches/sim/VCProj/bsr_trunk.sdf index c3d9657..7e11756 100644 Binary files a/branches/sim/VCProj/bsr_trunk.sdf and b/branches/sim/VCProj/bsr_trunk.sdf differ diff --git a/branches/sim/VCProj/bsr_trunk.suo b/branches/sim/VCProj/bsr_trunk.suo index 3b84754..ccd7641 100644 Binary files a/branches/sim/VCProj/bsr_trunk.suo and b/branches/sim/VCProj/bsr_trunk.suo differ diff --git a/branches/sim/bsr.hex b/branches/sim/bsr.hex index 2ff6e9f..8ce4a7e 100644 --- a/branches/sim/bsr.hex +++ b/branches/sim/bsr.hex @@ -252,8 +252,8 @@ :100FB6009DDAADDC5BD9085BD808BDD8D7C3C7F3CB :100FC600728EFDC162314C410036344E1161A07201 :070FD600C09EFD62C6C2D7F8 -:0A0FF60031343A32343A3238000048 -:0A20000031343A32343A323800002D +:0A0FF60031373A33363A313100004A +:0A20000031373A33363A313100002F :10200A00AEF0B430B740BA30BB50BBB0BC50BD1014 :10201A00BD60BDB0BFE0C2B0C420C7B0CAE0CE1038 :10202A0001F0141014200630639049006E00777096 @@ -751,7 +751,7 @@ :103EDC002361F8ED55402361F8ED3541ED83404009 :103EEC0013F901DF29F64646DD05F516FDEF03A0B3 :103EFC0016FD4016FD65DC0CF6BD46F512F9710297 -:103F0C0061EDC541AD4644060061D8EDC541713245 +:103F0C0061EDC541AD4644020061D8EDC541713249 :103F1C0061FDCE0471535EFDB1234015F903DF0939 :103F2C00710261F512F9EDC541FD182640C7FB9BE6 :103F3C00DE09710261F512F9EDC541714A27714034 @@ -786,7 +786,7 @@ :10410C005302715B227158100571581105CF12F9C9 :10411C0005713261F6BD46F50CFCF50EFCCF14FCB6 :10412C00FFCF10FCFFCF11FCFFF513F9F516FD3195 -:10413C0012622EFDB123AD4644070061C8E512F9A9 +:10413C0012622EFDB123AD4644030061C8E512F9AD :10414C00D515F961E8FD2B058F14F9312511F50E04 :10415C00FCF50CFC502EFD4002E513F9E512F9EFCD :10416C0058D42ADF54FD2B05FD4A2371730171329B @@ -1003,6 +1003,6 @@ :104E8400C5AC0416F643DD078B99A7A5B3EFF5C2AD :024E9400C6D77F :024FF4000200B9 -:0A4FF60031343A32343A3238000008 +:0A4FF60031373A33363A313100000A :00000001FF  \ No newline at end of file diff --git a/branches/sim/bsr.lmf b/branches/sim/bsr.lmf index b7a297f..47e7b7f 100644 Binary files a/branches/sim/bsr.lmf and b/branches/sim/bsr.lmf differ diff --git a/branches/sim/bsr_k0r.map b/branches/sim/bsr_k0r.map index 35ee013..582d06f 100644 --- a/branches/sim/bsr_k0r.map +++ b/branches/sim/bsr_k0r.map @@ -25,7 +25,7 @@ Direc-file:bsr_mcu.dr 67 output segment(s) 3DE2H byte(s) real data - 6164 symbol(s) defined + 6162 symbol(s) defined *** Memory map *** diff --git a/branches/sim/hoge.bin b/branches/sim/hoge.bin index 9673de6..8af9301 100644 Binary files a/branches/sim/hoge.bin and b/branches/sim/hoge.bin differ diff --git a/branches/sim/i2c_twl.c b/branches/sim/i2c_twl.c index 5971b37..532a06e 100644 --- a/branches/sim/i2c_twl.c +++ b/branches/sim/i2c_twl.c @@ -52,7 +52,7 @@ extern u8 vreg_twl[]; #define SMC SMC0 #define TRC TRC0 -#endif +#endif // _MCU_BSR_ #ifndef _MCU_BSR_ @@ -63,7 +63,7 @@ void IIC_twl_Stop( void ) void IIC_twl_Init( void ) { } -#else +#else // _MCU_BSR_ diff --git a/branches/sim/sim/sfrAlias.h b/branches/sim/sim/sfrAlias.h index 1e77313..83bec0e 100644 --- a/branches/sim/sim/sfrAlias.h +++ b/branches/sim/sim/sfrAlias.h @@ -130,8 +130,8 @@ #ifdef _MODEL_CTR_ // mcuRegP[ _P5_3 ] ɉAmcuRegP[ _P5_5 ], P140 P141 // P140o͐pȂ̂... -#define I2C_PU_on() { P14 |= 0x03; mcuRegPM[ _P5_3 ] = 0; mcuRegPM[ _P3_3 ] = 0; } -#define I2C_PU_off() { mcuRegPM[ _P5_3 ] = 1; mcuRegPM[ _P3_3 ] = 1; P14 &= ~0x03; } +# define I2C_PU_on() { P14 |= 0x03; mcuRegPM[ _P5_3 ] = 0; mcuRegPM[ _P3_3 ] = 0; } +# define I2C_PU_off() { mcuRegPM[ _P5_3 ] = 1; mcuRegPM[ _P3_3 ] = 1; P14 &= ~0x03; } #endif #define GYRO_ENABLE() mcuRegP[ _P5_0 ] = 0 @@ -168,33 +168,4 @@ #define ACCEL_INT1 mcuRegP[ _P2_5 ] // todo P2.5ʖړIŎgȂȎ(AIN5)ꂢɂ #define PM_ACCEL_INT1 mcuRegPM[ _P2_5 ] -#define KR_SW_POW ( 1 << 3 ) -#define KR_SW_WIFI ( 1 << 4 ) - - -/////////////////////////////////////////////////////////// - -#define INT_MSK0_IIC_M_DMA 1<<12 -#define INT_MSK0_SHELL 1<<7 -#define INT_MSK0_EXTDC 1<<6 -//#define INT_MSK0_SLP 1<<2 -#define INT_MSK0_RSV ~( INT_MSK0_IIC_M_DMA | INT_MSK0_SHELL | INT_MSK0_EXTDC ) - -#define INT_MSK1_KR 1<<11 -#define INT_MSK1_RTCINTVAL 1<<10 -#define INT_MSK1_RTCALARM 1<<9 -#define INT_MSK1_ADC 1<<8 -#define INT_MSK1_IIC_CTR 1<<3 -#define INT_MSK1_IIC_MCU 1<<0 -#define INT_MSK1_RSV ~( INT_MSK1_KR | INT_MSK1_RTCINTVAL | INT_MSK1_RTCALARM | INT_MSK1_ADC \ - | INT_MSK1_IIC_CTR | INT_MSK1_IIC_MCU ) - -#define INT_MSK2_WIFI_TX_KE3 1<<4 -#define INT_MSK2L_RSV ~( INT_MSK2_WIFI_TX_KE3 ) - -#define INT_MSK2_IIC_TWL 1<<8 -#define INT_MSK2_WIFI_TX_BSR 1<<10 -#define INT_MSK2_CODEC_PMIRQ 1<<3 -#define INT_MSK2_RSV ~( INT_MSK2_IIC_TWL | INT_MSK2_WIFI_TX_BSR | INT_MSK2_CODEC_PMIRQ ) - #endif // dupe include guard diff --git a/branches/sim/task_sys.c b/branches/sim/task_sys.c index e970137..6ee6b32 100644 --- a/branches/sim/task_sys.c +++ b/branches/sim/task_sys.c @@ -47,7 +47,7 @@ extern bit i2c_mcu_time_out_error; //========================================================= -#define PWSW_POWON_TIME (u8)( 50 / INTERVAL_TSK_SW ) // [ms] +#define PWSW_POWON_TIME (u8)( 20 / INTERVAL_TSK_SW ) // [ms] /* ======================================================== }CRŕKvȂ @@ -410,7 +410,7 @@ void tsk_sys( ) else { // A_v^Ȃ /////////////////////////////// - u8 irq_mask_original_1; // RTCA[ŋNȂ悤ɁB@Å荞݂ł͋NȂ +// u8 irq_mask_original_1; // RTCA[ŋNȂ悤ɁB@Å荞݂ł͋NȂ if( chg_led_override != 0 ) // ꂪ[ɂȂ܂ő҂ todo { diff --git a/branches/sim/user_define.h b/branches/sim/user_define.h index 8f11573..701ee3a 100644 --- a/branches/sim/user_define.h +++ b/branches/sim/user_define.h @@ -29,7 +29,7 @@ # define DBG_LED2_on ; # define DBG_LED2_off ; # define DBG_LED2_toggle ; -#endif +#endif // _debug_led_ #define IIC_SLA_CODEC 0xA4 #define IIC_SLA_ACCEL 0x30 // ST LIS331DLH @@ -52,8 +52,8 @@ #define RESET1_n ( P0.0 ) #if 0 // PM_RESET1`g -#define RESET1_ast { P0.0 = 0; PM0.0 = 0; } -#define RESET1_neg { PM0.0 = 1; } +# define RESET1_ast { P0.0 = 0; PM0.0 = 0; } +# define RESET1_neg { PM0.0 = 1; } #endif #define RESET2_ast { P0.1 = 0; PM0.1 = 0; } @@ -174,12 +174,39 @@ #define PM_ACCEL_INT1 PM2.5 +#endif // _WIN32 + +// win32 sim‹Ƌ + #define KR_SW_POW ( 1 << 3 ) #define KR_SW_WIFI ( 1 << 4 ) - /////////////////////////////////////////////////////////// +#define INT_MSK0_IIC_M_DMA 1<<12 +#define INT_MSK0_SHELL 1<<7 +#define INT_MSK0_EXTDC 1<<6 +//#define INT_MSK0_SLP 1<<2 +#define INT_MSK0_RSV ~( INT_MSK0_IIC_M_DMA | INT_MSK0_SHELL | INT_MSK0_EXTDC ) + +#define INT_MSK1_KR 1<<11 +#define INT_MSK1_RTCINTVAL 1<<10 +#define INT_MSK1_RTCALARM 1<<9 +#define INT_MSK1_ADC 1<<8 +#define INT_MSK1_IIC_CTR 1<<3 +#define INT_MSK1_IIC_MCU 1<<0 +#define INT_MSK1_RSV ~( INT_MSK1_KR | INT_MSK1_RTCINTVAL | INT_MSK1_RTCALARM | INT_MSK1_ADC \ + | INT_MSK1_IIC_CTR | INT_MSK1_IIC_MCU ) + +#define INT_MSK2_WIFI_TX_KE3 1<<4 +#define INT_MSK2L_RSV ~( INT_MSK2_WIFI_TX_KE3 ) + +#define INT_MSK2_IIC_TWL 1<<8 +#define INT_MSK2_WIFI_TX_BSR 1<<10 +#define INT_MSK2_CODEC_PMIRQ 1<<3 +#define INT_MSK2_RSV ~( INT_MSK2_IIC_TWL | INT_MSK2_WIFI_TX_BSR | INT_MSK2_CODEC_PMIRQ ) + +#if 0 #define INT_MSK0_IIC_M_DMA 0b0001000000000000 #define INT_MSK0_SHELL 0b0000000010000000 #define INT_MSK0_EXTDC 0b0000000001000000 @@ -202,13 +229,6 @@ #define INT_MSK2_WIFI_TX_BSR ( 0b0000010000000000 ) #define INT_MSK2_CODEC_PMIRQ ( 0b0000000000001000 ) #define INT_MSK2_RSV 0b1111101111110111 +#endif // 0 -#endif - - - -#else -// win32V~[V‹ - - -#endif +#endif // dupe include guard diff --git a/branches/sim/yav_mcu_bsr.plg b/branches/sim/yav_mcu_bsr.plg index 8f5ffe3..b7f4bea 100644 --- a/branches/sim/yav_mcu_bsr.plg +++ b/branches/sim/yav_mcu_bsr.plg @@ -137,10 +137,6 @@ pedo_alg_thre_det2.c(113) : CC78K0R warning W0401: Conversion may lose significa Compilation complete, 0 error(s) and 2 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\pedo_alg_thre_det2.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no ini_VECT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\ini_VECT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no task_status.c Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\task_status.asm