diff --git a/trunk/config.h b/trunk/config.h index 52dc387..0cbad46 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -9,6 +9,7 @@ #define MCU_VER_MINOR 6; + //#define _MODEL_TEG2_ //#define _MODEL_WM0_ #define _MODEL_TS0_ diff --git a/trunk/ini_VECT.c b/trunk/ini_VECT.c index bf5dc60..7da7766 100644 --- a/trunk/ini_VECT.c +++ b/trunk/ini_VECT.c @@ -6,7 +6,7 @@ //#pragma interrupt INTWDTI fn_intwdti // 未使用 //#pragma interrupt INTLVI fn_intlvi // 未使用 -#pragma interrupt INTP0 intp0_slp // SLP (CPUより、要求) ポーリング +//#pragma interrupt INTP0 intp0_slp // SLP (CPUより、要求) ポーリング //#pragma interrupt INTP1 fn_intp1 // (I2C) //#pragma interrupt INTP2 fn_intp2 // (I2C) //#pragma interrupt INTP3 fn_intp3 // 未搭載 @@ -86,10 +86,12 @@ __interrupt void fn_intlvi( ) } } -/* __interrupt void fn_intp0(){ -} // tasks.c -*/ + while( 1 ) + { + NOP(); + } +} __interrupt void fn_intp1( ) { diff --git a/trunk/loader.c b/trunk/loader.c index 2074f99..5937527 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -231,11 +231,13 @@ void hdwinit2( ) P7 = 0b01000000; P12 = 0b00000000; P14 = 0b00000000; -#ifdef _MCU_KE3_ - P8 = 0b00000000; -#else + +#ifdef _MCU_BSR_ P20 = 0b00000000; +#else + P8 = 0b00000000; #endif + P15 = 0b00000000; // プルアップ @@ -247,34 +249,52 @@ void hdwinit2( ) PU7 = 0b00011001; PU12 = 0b00000000; PU14 = 0b00000000; -#ifndef _MCU_KE3_ + +#ifdef _MCU_BSR_ +#ifdef _MODEL_CTR_ + PU20 = 0b00000001; +#else PU20 = 0b00000000; #endif - -#ifdef _MCU_KE3_ - PM0 = 0b00000000; // 0で出力 -#else - PM0 = 0b00000001; // BSRマイコンでは、reset1は監視のみになる。 #endif + +#ifdef _MCU_BSR_ + PM0 = 0b00000001; // BSRマイコンでは、reset1は監視のみになる。 +#else + PM0 = 0b00000000; // 0で出力 +#endif + PM1 = 0b00000000; +#ifdef _MODEL_CTR_ + PM2 = 0b11101000; +#else PM2 = 0b11101001; +#endif PM3 = 0b00000001; // P31,32は簡易I2C + #ifdef _PMIC_CTR_ PM4 = 0b00000111; #else PM4 = 0b00001011; #endif + PM5 = 0b00000011; PM6 = 0b00000000; // I2CのラインがL出力になってしまうが、システムがOFFなのでかまわない PM7 = 0b00011111; PM12 = 0b00011111; // 32kHzクロックのピン設定はどっちでもよい PM14 = 0b00000001; // debugger[1] とりあえず出力 PM15 = 0b00000111; -#ifdef _MCU_KE3_ - PM8 = 0b11111111; + +#ifdef _MCU_BSR_ +#ifdef _MODEL_CTR_ + PM20 = 0b00111101; #else PM20 = 0b00111100; #endif +#else + PM8 = 0b11111111; +#endif + // ポート入力モード・レジスタ設定 // [0:通常入力バッファ 1:TTL入力バッファ] @@ -297,6 +317,7 @@ void hdwinit2( ) MK0 = 0xFFFF; /* 割り込み禁止 */ MK1 = 0xFFFF; + #ifdef _MCU_BSR_ MK2 = 0xFFFF; #else @@ -336,7 +357,7 @@ void hdwinit2( ) // RTCC0 = 0b00000000; /* カウンタ動作停止 */ // 別途初期化関数 -#ifdef _MCU_KE3_ +#ifndef _MCU_BSR_ /*--- コンパレータ/プログラマブル・ゲイン・アップの動作停止 ---*/ OACMPEN = 0; /* クロック供給停止 */ OAM = 0x00; /* プログラマブル・ゲイン・アップの動作停止 */ @@ -359,21 +380,20 @@ void hdwinit2( ) SCR02 = 0x0087; SCR03 = 0x0087; -#ifdef _MCU_KE3_ - /*--- IICAの動作停止 ---*/ - IICAEN = 0; /* IICAへのクロック供給停止 */ - IICCTL0 = 0x00; /* IICA動作停止 */ - -#else +#ifdef _MCU_BSR_ // IICの動作停止 IICA0EN = 0; /* IICA0(CTR)へのクロック供給停止 */ IICCTL00 = 0x00; /* IICA1動作停止 */ IICA1EN = 0; // IICA1(TWL)へのクロック供給停止 IICCTL01 = 0x00; // IICA1動作停止 + +#else + /*--- IICAの動作停止 ---*/ + IICAEN = 0; /* IICAへのクロック供給停止 */ + IICCTL0 = 0x00; /* IICA動作停止 */ #endif /*--- DMAの動作停止 ---*/ DRC0 = 0b00000000; /* DMAチャネル0の動作禁止 */ DRC1 = 0b00000000; /* DMAチャネル1の動作禁止 */ - } diff --git a/trunk/pm.h b/trunk/pm.h index 5daec58..015aa90 100644 --- a/trunk/pm.h +++ b/trunk/pm.h @@ -99,6 +99,14 @@ task_status_immed tski_PM_LCD_off( ); #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_ +#define PM_VDD_ecoMode() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_SAVE, 0x47 )) +#define PM_VDD_normMode() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_SAVE, 0x00 )) +#else +#define PM_VDD_ecoMode() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_SAVE, 0x00 | 0x40 )) +#define PM_VDD_normMode() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_POW_SAVE, 0x00 | 0x03 )) +#endif +// ↑本番チップ待ち+PMICバグ // ほか // #ifdef _PMIC_TWL_ diff --git a/trunk/tasks.c b/trunk/tasks.c index 90e9cb8..173e54f 100644 --- a/trunk/tasks.c +++ b/trunk/tasks.c @@ -16,7 +16,7 @@ extern u8 boot_ura; /* ======================================================== - 他のところでケアされていない部分 + ステータスレジスタなど ======================================================== */ void tsk_misc_stat( ) { @@ -336,10 +336,11 @@ task_status_immed do_command0( ) /* ======================================================== CPUからのスリープ要求 +  ポーリングにしました。 ======================================================== */ + /* __interrupt void intp0_slp( ) { // SLP - /* if( SLP_REQ ){ system_status.pwr_state = SLEEP_TRIG; }else{ @@ -351,5 +352,5 @@ __interrupt void intp0_slp( ) } } renge_task_interval_run_force = 1; - */ } + */ diff --git a/trunk/tasks_sys.c b/trunk/tasks_sys.c index ff904b0..58665d3 100644 --- a/trunk/tasks_sys.c +++ b/trunk/tasks_sys.c @@ -12,8 +12,8 @@ #include "pm.h" #include "rtc.h" -u8 SW_pow_count, SW_home_count, SW_tune_count, SW_wifi_count; -bit SW_pow_mask, SW_home_mask, SW_tune_mask, SW_wifi_mask; +u8 SW_pow_count, SW_home_count, SW_wifi_count; +bit SW_pow_mask, SW_home_mask, SW_wifi_mask; /* ======================================================== @@ -70,7 +70,7 @@ void tsk_sys( ) // 電源投入 SW_pow_mask = 1; - SW_tune_mask = 1; + SW_home_mask = 1; SW_wifi_mask = 1; // 電源投入 // @@ -105,7 +105,6 @@ void tsk_sys( ) PM_TEG_LCD_dis( 0 ); #endif - if( system_status.poweron_reason == PWSW ) { // 電源ボタンでのonの時は、LEDを点灯させる @@ -120,8 +119,6 @@ void tsk_sys( ) // ここまで来ると、電源投入確定 system_status.pwr_state = ON_TRIG; renge_task_interval_run_force = 1; - - return; break; case ON_TRIG: //------------------------------------------------------- @@ -164,7 +161,9 @@ void tsk_sys( ) case ON: //--------------------------------------------- { + // PMICによる強制電源断チェック static u8 count; + if( !RESET1_n ) { count += 1; @@ -175,35 +174,55 @@ void tsk_sys( ) } if( count > 50 ){ - // 電源異常チェック /// コマンドで、正規にリセットをかけたときには、 /// このチェックに引っかからないので大丈夫 system_status.pwr_state = OFF_TRIG; renge_task_interval_run_force = 1; } } + + + // SLP監視 + if( SLP_REQ ){ + system_status.pwr_state = SLEEP_TRIG; + renge_task_interval_run_force = 1; + } break; case SLEEP_TRIG: //------------------------------------- +#ifdef _MODEL_CTR_ + PM_VDD_ecoMode(); +#endif system_status.pwr_state = SLEEP; - // todo PMICのモード切替 - // SoCとのハンドシェイク - PM_BL_off( ); - return; break; case SLEEP: //------------------------------------------ - system_status.pwr_state = ON_TRIG; if( !RESET1_n ) { - NOP( ); -/* - // ステータス類の設定、電源のフラグなどの整理 - system_status.pwr_state = OFF_TRIG; - renge_task_interval_run_force = 1; -*/ + system_status.pwr_state = OFF_TRIG; + renge_task_interval_run_force = 1; } - return; + + // スリープから復帰 + if( !SLP_REQ ){ +#ifdef _MODEL_CTR_ + PM_VDD_normMode(); +#endif + wait_ms( 5 ); // tdly_sw + +#ifdef _MODEL_CTR_ + SLP_ACK = 1; + NOP(); // 適当ウェイト + NOP(); + NOP(); + NOP(); + SLP_ACK = 0; +#endif + + system_status.pwr_state = ON_TRIG; + renge_task_interval_run_force = 1; + } + break; case OFF_TRIG: //--------------------------------------- @@ -243,7 +262,6 @@ void tsk_sys( ) KRM = ( KR_SW_POW ); // Mask ではなく、Modeなのだそうだ。紛らわしい // intp20系は後ほど MK0 = 0b1111111110111111; // INT(EXTDC) -// MK0 = 0b1111111100111111; // INT(SHELL), INT(EXTDC) MK1 = 0b1111010111111111; // KR(SW_PW,SW_WiFi,...), RTC(Alarm) MK2L = 0b11111111; @@ -269,7 +287,6 @@ void tsk_sys( ) EI( ); renge_task_interval_run_force = 1; - return; break; default: @@ -280,13 +297,12 @@ void tsk_sys( ) } } - return; } #define INTERVAL_TSK_SW 16 #define CLICK_THRESHOLD 3 -#define LONG_PUSH_THREASHOLD ( 800 / INTERVAL_TSK_SW ) +#define HOLD_THREASHOLD ( 800 / INTERVAL_TSK_SW ) /* ======================================================== スイッチの監視  チャタリングをはねたり、長押しや、押したトリガなどの検出など @@ -312,7 +328,6 @@ void tsk_sys( ) void tsk_sw( ) { static u8 cnt_force_off = 0; - static u8 sw_pow_old = 0; static u8 task_interval = 0; if( task_interval != 0 ) @@ -325,44 +340,36 @@ void tsk_sw( ) task_interval = ( INTERVAL_TSK_SW / SYS_INTERVAL_TICK ); } - if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == OFF ) ) - { - count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask ); - count_sw_n( SW_WIFI_n, SW_wifi_count, SW_wifi_mask ); - count_sw_n( SW_TUNE_n, SW_tune_count, SW_tune_mask ); -// count_sw_n( SW_HOME_n, SW_home_count, SW_home_mask ); - } switch ( system_status.pwr_state ) { case ( OFF_TRIG ): SW_pow_count = 0; SW_wifi_count = 0; - SW_tune_count = 0; + SW_home_count = 0; cnt_force_off = 0; break; case ( ON ): case ( SLEEP ): // 電源スイッチの監視 // - if( SW_pow_count == 0 ) + if( SW_POW_n ) { - if( ( CLICK_THRESHOLD < sw_pow_old ) && ( sw_pow_old < LONG_PUSH_THREASHOLD ) ) + if( ( CLICK_THRESHOLD < SW_pow_count ) && ( SW_pow_count < HOLD_THREASHOLD ) ) { set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); } } - else if( SW_pow_count == LONG_PUSH_THREASHOLD ) + else if( SW_pow_count == HOLD_THREASHOLD ) { set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_HOLD ); } - else if( SW_pow_count == ( LONG_PUSH_THREASHOLD * 4 ) ) + else if( SW_pow_count == ( HOLD_THREASHOLD * 4 ) ) { // todo // vreg_ctr[ VREG_C_LED_POW ] = LED_POW_ONLY_RED; system_status.pwr_state = OFF_TRIG; renge_task_interval_run_force = 1; } - sw_pow_old = SW_pow_count; // 電源OFF割り込みを入れたが… if( ( vreg_ctr[VREG_C_IRQ0] & REG_BIT_SW_POW_HOLD ) != 0 ) @@ -383,45 +390,33 @@ void tsk_sw( ) cnt_force_off = 0; } - /* todo - // HOME スイッチ…だと? // - if( SW_home_count == 6 ){ - vreg_ctr[ VREG_C_IRQ0 ] |= REG_BIT_SW_HOME_CLICK; - if( ( vreg_ctr[ VREG_C_IRQ_MASK0 ] & REG_BIT_SW_HOME_CLICK ) == 0 ){ - IRQ0_ast; - } - }else if( SW_pow_count == 66 ){ - vreg_ctr[ VREG_C_IRQ0 ] |= REG_BIT_SW_HOME_HOLD; - if( ( vreg_ctr[ VREG_C_IRQ_MASK0 ] & REG_BIT_SW_HOME_HOLD ) == 0 ){ - IRQ0_ast; - } - } - */ + // HOME スイッチ // + if( SW_HOME_n ) + { + if( ( CLICK_THRESHOLD < SW_home_count ) && ( SW_home_count < HOLD_THREASHOLD ) ) + { + set_irq( VREG_C_IRQ0, REG_BIT_SW_HOME_CLICK ); + } + } + else if( SW_home_count == HOLD_THREASHOLD ) + { + set_irq( VREG_C_IRQ0, REG_BIT_SW_HOME_HOLD ); + } - // wifi sw + // wifi sw // if( SW_wifi_count == 10 ) { set_irq( VREG_C_IRQ0, REG_BIT_SW_WIFI_CLICK ); } - // tune sw - if( SW_tune_count == 10 ) - { - set_irq( VREG_C_IRQ0, REG_BIT_SW_TUNE_CLICK ); - } break; } - -/* -マスクのせいでできなくなった -// まとめて割り込みを立てる - if(( vreg_ctr[ VREG_C_IRQ0 ] - & ( REG_BIT_SW_POW_CLICK | REG_BIT_SW_POW_HOLD - | REG_BIT_SW_HOME_CLICK | REG_BIT_SW_HOME_HOLD - | REG_BIT_SW_WIFI_CLICK | REG_BIT_SW_TUNE_CLICK ) ) != 0 ){ - IRQ0_ast; - } -*/ + if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == OFF ) ) + { + count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask ); + count_sw_n( SW_HOME_n, SW_home_count, SW_home_mask ); + count_sw_n( SW_WIFI_n, SW_wifi_count, SW_wifi_mask ); + } return; } diff --git a/trunk/user_define.h b/trunk/user_define.h index 2c550c9..439aa64 100644 --- a/trunk/user_define.h +++ b/trunk/user_define.h @@ -99,14 +99,18 @@ extern unsigned char temp_teg; // CODEC -#define PM_IRQ_n P7.2 // INTP6 +#define PM_IRQ_n P7.2 +// INTP6 #define SND_DEPOP P7.7 // PM -#define PM_EXTDC P7.0 // INTP7 -//#define BT_TEMP P15.0 // ANI8 -//#define BT_DET P15.1 // ANI9 +#define PM_EXTDC P7.0 +// INTP7 +//#define BT_TEMP P15.0 +// ANI8 +//#define BT_DET P15.1 +// ANI9 #define BT_DET_P P1.6 #define BT_TEMP_P P1.7 #ifndef _PMIC_CTR_ @@ -123,12 +127,20 @@ extern unsigned char temp_teg; #define PM_BT_AUTH P4.2 #endif -#define SW_TUNE_n P2.0 -#define SW_WIFI_n P7.4 // KR4 -#define SW_POW_n P7.3 // KR3 -#define SW_HOME_n P20.4 // INTP22 +#define SW_WIFI_n P7.4 +// KR4 +#define SW_POW_n P7.3 +// KR3 #define SW_SEL_n P2.3 -//#define VOL P2.7 // ANI7 +//#define VOL P2.7 +// ANI7 + +#ifdef _MODEL_CTR_ +#define SW_HOME_n P20.4 +// INTP22 +#else +#define SW_HOME_n P2.0 +#endif // WiFi #ifndef _TEG_ @@ -167,7 +179,8 @@ extern unsigned char temp_teg; #define SHELL_CLOSE P7.1 // INTP5 ふた開閉 (閉じると?) #define SHELL_CLOSE_P P3.3 -//#define DBG_VR P2.6 // ANI6 +//#define DBG_VR P2.6 +// ANI6 #define DBG P14.1 @@ -201,8 +214,9 @@ extern unsigned char temp_teg; #define INT_MSK0_IIC_M_DMA ( 0b0001000000000000 ) #define INT_MSK0_SHELL ( 0b0000000010000000 ) #define INT_MSK0_EXTDC ( 0b0000000001000000 ) -#define INT_MSK0_SLP ( 0b0000000000000100 ) -#define INT_MSK0_RSV ( 0b1110111100111011 ) +//#define INT_MSK0_SLP ( 0b0000000000000100 ) +//#define INT_MSK0_RSV ( 0b1110111100111011 ) +#define INT_MSK0_RSV ( 0b1110111100111111 ) #define INT_MSK1_KR ( 0b0000100000000000 ) #define INT_MSK1_RTCINTVAL ( 0b0000010000000000 ) diff --git a/trunk/vreg_ctr.h b/trunk/vreg_ctr.h index f557244..e2e5032 100644 --- a/trunk/vreg_ctr.h +++ b/trunk/vreg_ctr.h @@ -14,7 +14,6 @@ // VREG_C_IRQ0 #define REG_BIT_VR_TUNE_CHANGE ( 1 << 7 ) #define REG_BIT_VR_SNDVOL_CHANGE ( 1 << 6 ) -#define REG_BIT_SW_TUNE_CLICK ( 1 << 5 ) #define REG_BIT_SW_WIFI_CLICK ( 1 << 4 ) #define REG_BIT_SW_POW_HOLD ( 1 << 3 ) #define REG_BIT_SW_POW_CLICK ( 1 << 2 ) diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index 0a4f6c6..e351f03 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,14 +1,90 @@ C:\WINDOWS\system32\cmd.exe /c echo touch magic.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 -qcvjl1wt -sainter_asm -zp -no loader.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\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 -qcvjl1wt -sainter_asm -zp -no pm.c +pm.c(222) : CC78K0R warning W0745: Expected function prototype +pm.c(226) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(230) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(243) : CC78K0R warning W0510: Pointer mismatch in function 'iic_mcu_write' +pm.c(606) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 5 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 -qcvjl1wt -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 -qcvjl1wt -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 -qcvjl1wt -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 -qcvjl1wt -sainter_asm -zp -no i2c_mcu.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_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 -qcvjl1wt -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 -qcvjl1wt -sainter_asm -zp -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 -qcvjl1wt -sainter_asm -zp -no led.c +led.c(414) : 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 -qcvjl1wt -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 -qcvjl1wt -sainter_asm -zp -no vreg_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\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 -qcvjl1wt -sainter_asm -zp -no vreg_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\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 -qcvjl1wt -sainter_asm -zp -no tasks.c tasks.c(34) : 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\tasks.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 -qcvjl1wt -sainter_asm -zp -no adc.c +adc.c(78) : CC78K0R warning W0745: Expected function prototype +adc.c(49) : 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\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 -qcvjl1wt -sainter_asm -zp -no tasks_sys.c +tasks_sys.c(340) : 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\tasks_sys.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 -qcvjl1wt -sainter_asm -zp -no accero.c +accero.c(91) : CC78K0R warning W0745: Expected function prototype +accero.c(93) : 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 -qcvjl1wt -sainter_asm -zp -no self_flash.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\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 -qcvjl1wt -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\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 -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 tasks.rel adc.rel renge.rel tasks_sys.rel accero.rel self_flash.rel reboot.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 @@ -16,4 +92,4 @@ Object Conversion Complete, 0 error(s) and 0 warning(s) found. C:\WINDOWS\system32\cmd.exe /c ruby C:\Cygwin\home\fujita_ryohei\ctr\nec_s_2_bsrbin.rb bsr.hex C:/Cygwin/home/fujita_ryohei/ctr/nec_s_2_bsrbin.rb:2: warning: variable $KCODE is no longer effective; ignored -Build Total error(s) : 0 Total warning(s) : 1 +Build Total error(s) : 0 Total warning(s) : 13 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 2c31966..f56fe63 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -80,8 +80,8 @@ Kanji=SJIS [Source] Geometry=304, 189, 1090, 857 Window=Normal -DispStart=70 -CaretPos=71,0 +DispStart=167 +CaretPos=168,0 Mode=Normal DispFile= Address1= @@ -139,35 +139,11 @@ SaveRange=Screen SaveStart= SaveEnd= Accumulative=ON -[Source1] -Geometry=189, 181, 1090, 857 -Window=Normal -DispStart=69 -CaretPos=70,0 -Mode=Normal -DispFile=adc.c -Accumulative=ON -[Source2] -Geometry=330, 40, 1090, 857 -Window=Normal -DispStart=9 -CaretPos=10,0 -Mode=Normal -DispFile=tasks_sys.c -Accumulative=ON -[Source3] -Geometry=100, 100, 1090, 857 -Window=Normal -DispStart=78 -CaretPos=79,0 -Mode=Normal -DispFile=loader.c -Accumulative=ON [Assemble] Geometry=118, 76, 600, 937 Window=Normal -DispStart=1375 -CaretPos=1443,27 +DispStart=356 +CaretPos=356,27 Address1= Address2= Address3= @@ -984,15 +960,16 @@ Count=0 Geometry=1138, 6, 440, 300 Window=Normal Boundary=13762700 -0=.system_status,.,N,A,+,1 -1=.RTCEN,P,S,A,+,1 -2=.P2,B,S,A,+,1 -3=.PM2,B,S,A,+,1 -4=.PM20,B,S,A,+,1 -5=.P20,B,S,A,+,1 -6=.wifi_TX,P,N,A,+,1 -7=.temp,P,N,A,+,1 -Line=8 +0=.P12.0,P,S,A,+,1 +1=.system_status,.,N,A,+,1 +2=.RTCEN,P,S,A,+,1 +3=.P2,B,S,A,+,1 +4=.PM2,B,S,A,+,1 +5=.PM20,B,S,A,+,1 +6=.P20,B,S,A,+,1 +7=.wifi_TX,P,N,A,+,1 +8=.temp,P,N,A,+,1 +Line=9 [Quick Watch] 0=temp,P,A,1 1=wifi_TX,P,A,1 @@ -1002,7 +979,7 @@ Line=8 5=PM20,B,A,1 6=RTCEN,P,A,1 7=system_status,P,A,1 -8= +8=P12.0,P,A,1 9= 10= 11= @@ -1026,11 +1003,7 @@ Name2=Swb00003 Address2=tasks_sys.c#_tsk_sys+0x4 Window2=ASM Status2=ON -Name3=Swb00004 -Address3=loader.c#_main+0x82 -Window3=ASM -Status3=ON -Count=4 +Count=3 [Reset] Debugger=ON Symbol=OFF diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 3cbb845..51a0356 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,5 +1,5 @@ [ProjectManager] -FrameMax=1 +FrameMax=0 FrameX=111 FrameY=10 FrameCX=1376 @@ -7,23 +7,24 @@ FrameCY=1066 OpenFile1=i2c_mcu.c,0,330,330,1204,1087,48,321,48,0 OpenFile2=renge\\renge_defs.h,0,330,330,1574,1087,0,47,0,0 OpenFile3=user_define.h,0,176,176,1420,933,0,33,20,0 -OpenFile4=vreg_ctr.c,0,345,273,1060,932,0,47,0,0 -OpenFile5=i2c_ctr.c,0,242,242,1425,868,0,116,0,0 -OpenFile6=rtc.c,0,308,308,1491,934,0,31,17,0 -OpenFile7=magic.c,0,242,242,1486,999,3,8,0,0 -OpenFile8=vreg_twl.c,0,314,110,1558,867,21,72,21,0 -OpenFile9=adc.c,0,166,66,1349,692,0,210,0,0 -OpenFile10=accero.c,0,154,154,1398,911,25,237,25,0 -OpenFile11=tasks.c,0,44,41,1288,801,0,161,0,0 -OpenFile12=inter_asm\self_flash.asm,0,118,281,1362,1038,0,933,0,0 -OpenFile13=loader.c,0,255,224,1438,850,14,85,0,0 -OpenFile14=main.c,0,124,87,1368,844,0,45,0,0 -OpenFile15=reboot.c,0,110,110,1354,867,20,18,16,0 -OpenFile16=led.c,0,286,286,1469,912,6,81,6,0 -OpenFile17=ProjectWindow +OpenFile4=rtc.c,0,308,308,1491,934,0,31,17,0 +OpenFile5=magic.c,0,242,242,1486,999,3,8,0,0 +OpenFile6=vreg_twl.c,0,314,110,1558,867,21,72,21,0 +OpenFile7=accero.c,0,154,154,1398,911,25,237,25,0 +OpenFile8=inter_asm\self_flash.asm,0,118,281,1362,1038,0,933,0,0 +OpenFile9=loader.c,0,255,224,1438,850,14,85,0,0 +OpenFile10=main.c,0,124,87,1368,844,0,45,0,0 +OpenFile11=vreg_ctr.c,0,345,273,1060,932,14,23,0,0 +OpenFile12=i2c_ctr.c,0,242,242,1425,868,14,108,0,0 +OpenFile13=reboot.c,0,110,110,1354,867,5,14,14,0 +OpenFile14=adc.c,0,166,66,1349,692,0,49,0,0 +OpenFile15=led.c,0,286,286,1469,912,0,420,6,0 +OpenFile16=pm.c,0,88,88,1332,845,13,352,9,0 +OpenFile17=config.h,0,259,332,1503,1089,0,1,0,0 +OpenFile18=ProjectWindow PrjPos=0,2,754,3,253 -OpenFile18=config.h,0,259,332,1503,1089,19,14,19,0 -OpenFile19=OutputWindow +OpenFile19=tasks.c,0,44,41,1288,801,14,34,0,0 +OpenFile20=OutputWindow OutputPos=0,134,1090,377,1505 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 4511850..a24b097 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4ae01ded +T=4ae69c33 1=incs_loader.h 2=fsl.h 3=fsl_user.h @@ -11,13 +11,13 @@ T=4ae01ded 7=rtc.h 8=reboot.h [pm.c] -T=4ade715b +T=4ae66ba6 1=incs.h 2=adc.h 3=led.h 4=pm.h [i2c_ctr.c] -T=4add1541 +T=4ae66d1d 1=incs.h [main.c] T=4adee91e @@ -34,7 +34,7 @@ T=4ad3e9ff T=4aca8ef0 1=incs_loader.h [i2c_mcu.c] -T=4ad70c7e +T=4ae66d1d 1=incs.h 2=i2c_mcu.h [i2c_twl.c] @@ -42,17 +42,17 @@ T=4add157f 1=incs.h 2=i2c_twl_defs.h [ini_VECT.c] -T=4addae30 +T=4ae6b094 1=config.h [led.c] -T=4ae5247d +T=4ae65639 1=incs.h 2=led.h [rtc.c] T=4adee281 1=incs.h [vreg_ctr.c] -T=4adbcc88 +T=4ae6477f 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -65,13 +65,13 @@ T=4ade5fd9 2=jhl_defs.h 3=vreg_twl.h [tasks.c] -T=4adee905 +T=4ae6b094 1=incs.h 2=renge\renge.h 3=pm.h 4=accero.h [adc.c] -T=4addae7b +T=4ae6462f 1=incs.h 2=adc.h 3=pm.h @@ -84,7 +84,7 @@ T=4ac96eb4 4=WDT.h 5=bsr_system.h [tasks_sys.c] -T=4adeeabd +T=4ae6b094 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -93,11 +93,11 @@ T=4adeeabd 6=pm.h 7=rtc.h [accero.c] -T=4adebaab +T=4ae66d1d 1=incs.h 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] -T=4ae01cd5 +T=4ae67264 1=incs_loader.h 2=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h 3=fsl_user.h @@ -116,12 +116,12 @@ T=4aca8c17 7=i2c_mcu.h 8=WDT.h [jhl_defs.h] -T=4aca8c17 +T=4ae647cd [user_define.h] -T=4adebcdf +T=4ae6b094 1=config.h [config.h] -T=4ae54846 +T=4ae69c33 [bsr_system.h] T=4aca8c17 [renge\renge.h] @@ -134,7 +134,7 @@ T=4ac96e5c T=4ad68780 1=renge\renge_defs.h [vreg_ctr.h] -T=4adc45cd +T=4ae69c33 1=config.h [loader.h] T=4aca8c17 @@ -150,11 +150,11 @@ T=4aca8c17 [i2c_ctr.h] T=4aca8c17 [pm.h] -T=4ad7efd5 +T=4ae6a7ef [rtc.h] T=4aca8c17 [adc.h] -T=4aca8c17 +T=4ae64633 1=jhl_defs.h [led.h] T=4aca8c17