diff --git a/trunk/VCProj/bsr_trunk.sdf b/trunk/VCProj/bsr_trunk.sdf index 8a05a3d..3c9acaa 100644 Binary files a/trunk/VCProj/bsr_trunk.sdf and b/trunk/VCProj/bsr_trunk.sdf differ diff --git a/trunk/VCProj/bsr_trunk.suo b/trunk/VCProj/bsr_trunk.suo index 4de7601..198e938 100644 Binary files a/trunk/VCProj/bsr_trunk.suo and b/trunk/VCProj/bsr_trunk.suo differ diff --git a/trunk/batt_params.c b/trunk/batt_params.c index b03e75a..a863711 100644 --- a/trunk/batt_params.c +++ b/trunk/batt_params.c @@ -7,7 +7,7 @@ #include "batt_params.h" -const bt_param_ bt_param[ _BT_PARAM_NUM_ ] = +const bt_param_ bt_param[ /*_BT_PARAM_NUM_*/ ] = // 同じ電池を使い回すので モデル×電池≠パラメータ数 { // ctr //////////////////////////////////////////////// // BT_PARAM_CTR_MAXELL diff --git a/trunk/config.h b/trunk/config.h index fdb91aa..c8e1c8a 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -10,6 +10,10 @@ #define MCU_VER_MINOR 0x2E +// ビルドスイッチ +#define _MCU_ARR // snake 系 + + // デバッグ向けスイッチ //#define _debug_led_ // LED print デバッグをしたいとき diff --git a/trunk/loader.c b/trunk/loader.c index 42a8aeb..f965104 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -205,6 +205,13 @@ void chk_platform_type() // system_status.family = FAMILY_FLOWER; #endif +#ifdef _MCU_ARR + if( system_status.family == FAMILY_SPFL ) + { + system_status.family == FAMILY_CLOSER; + } +#endif + if( system_status.family == FAMILY_CTR ) { system_status.LCD_is_CGS = true; diff --git a/trunk/pm.c b/trunk/pm.c index 9140818..1ec093d 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -51,7 +51,6 @@ extern const bt_param_ bt_param[]; bit pm_extdc_old; // 前回アダプタチェックしたとき刺さっていたか？ u8 pmreg_v_core; // SoCのコア電圧設定。SNAKE(LAGER)で変更があるため。 -u8 pmreg_v_vdd; // SNAKEでは2.8Vを起動しないようにするため // 充電停止温度関係 static u8 raw_temp_lh; @@ -1036,17 +1035,15 @@ task_status_immed tski_vcom_set( ) void set_vdd_voltages( enum family_ family ) { - if( family == FAMILY_SNAKE ) + if(( family == FAMILY_SNAKE ) || ( family == FAMILY_CLOSER )) { // SNAKE pmreg_v_core = PM_REG_BIT_VDD1P_1R00; - pmreg_v_vdd = PM_REG_BIT_VDD_SNK; } else { // NORMAL pmreg_v_core = PM_REG_BIT_VDD1P_1R15; - pmreg_v_vdd = PM_REG_BIT_VDD_CTR; } } @@ -1089,6 +1086,13 @@ err PM_sys_pow_on( ) pmic_version = read_pmic( PM_REG_ADRS_VER ); read_mgic_2B( BT_GAUGE_REG_VERSION, mgic_version ); + return ( ERR_SUCCESS ); +} + + + +void reset_release() +{ // リセット解除など。システム起動！ PM_reset_neg(); FCRAM_RST_neg; @@ -1096,8 +1100,6 @@ err PM_sys_pow_on( ) codec_reg_init(); // CODEC 不定レジスタ初期化(reset2の後でないといけないので) ntr_pm_reg_shadow = 0; // 　〃　こんなところで... - - return ( ERR_SUCCESS ); } @@ -1355,8 +1357,9 @@ void bt_param_select() { case( FAMILY_SPFL ): bt_type_temp += BT_PARAM_SPFL_MAXELL; break; // オフセット 残念な実装で…。 case( FAMILY_SNAKE ): bt_type_temp += BT_PARAM_SNAKE_MAXELL; break; + case( FAMILY_CLOSER ): bt_type_temp += BT_PARAM_SPFL_MAXELL; break; case( FAMILY_CTR ): - case( FAMILY_FLOWER ): // CTR と同じ物を使う + case( FAMILY_FLOWER ): // CTR と同じ default: /* bt_type_temp そのまま */ break; } diff --git a/trunk/pm.h b/trunk/pm.h index 673c036..4d65543 100644 --- a/trunk/pm.h +++ b/trunk/pm.h @@ -96,14 +96,12 @@ enum NTR_PM_BT_STATUS{ - // 0x03 pw cnt3 #define PM_REG_BIT_LDSW ( 1 << 0 ) #define PM_REG_BIT_nRST1 ( 1 << 1 ) // 0x01 pw cnt1 #define PM_REG_BIT_VDD_CTR 0x0F -#define PM_REG_BIT_VDD_SNK 0x0B // 2.8V不要 #define PM_REG_BIT_VDD50A ( 1 << 4 ) // 0x02 pw cnt2 @@ -145,7 +143,6 @@ extern u8 mgic_version[]; extern u8 pm_reg_bit_vddlcd; // アモルファス対応(電源シーケンスが違う) extern u8 pmreg_v_core; // SoCのコア電圧設定。SNAKE(LAGER)で変更があるため。 -extern u8 pmreg_v_vdd; // SNAKEでは2.8V不要 //========================================================= err PM_sys_pow_on( ); @@ -191,8 +188,8 @@ u8 read_pmic( u8 reg ); // システム電源 // -#define PM_VDD_on() ( send_cmd_pmic( PM_REG_ADRS_VDD_SYS, pmreg_v_vdd )) -#define PM_VDD50A_on() ( send_cmd_pmic( PM_REG_ADRS_VDD_SYS, ( pmreg_v_vdd | PM_REG_BIT_VDD50A ))) +#define PM_VDD_on() ( send_cmd_pmic( PM_REG_ADRS_VDD_SYS, PM_REG_BIT_VDD_CTR )) +#define PM_VDD50A_on() ( send_cmd_pmic( PM_REG_ADRS_VDD_SYS, ( PM_REG_BIT_VDD_CTR | PM_REG_BIT_VDD50A ))) #define PM_VDD_off() ( send_cmd_pmic( PM_REG_ADRS_VDD_SYS, 0 )) #define PM_off() PM_VDD_off() diff --git a/trunk/sw.c b/trunk/sw.c index d0cd54f..be26b65 100644 --- a/trunk/sw.c +++ b/trunk/sw.c @@ -184,6 +184,7 @@ void tsk_sw( ) } } + // 実機・体験台共通 count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask ); // ボタン押し時間のカウント // HOME sw // @@ -204,6 +205,9 @@ void tsk_sw( ) sw_wifi_mukan_time = TIME_MUKAN; } } - } + break; + default: + break; + }// switch() } diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index bafc511..75c3342 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,15 +1,15 @@ [ProjectManager] FrameMax=0 -FrameX=18 -FrameY=131 -FrameCX=1576 -FrameCY=915 +FrameX=150 +FrameY=150 +FrameCX=1200 +FrameCY=850 OpenFile1=ProjectWindow PrjPos=0,0,706,0,291 OpenFile2=loader.c,0,215,59,1446,717,65,88,65,0 -OpenFile3=OutputWindow +OpenFile3=config.h,0,323,22,1500,759,20,40,0,0 +OpenFile4=OutputWindow OutputPos=0,106,756,74,1030 -OpenFile4=config.h,0,323,22,1500,759,20,40,20,0 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 80305bd..da63c7d 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=5105d5a0 +T=5114407c 1=incs_loader.h 2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 3=fsl_user.h @@ -13,7 +13,7 @@ T=5105d5a0 9=WDT.h 10=magic.h [pm.c] -T=510f63f9 +T=511c3b4b 1=incs.h 2=adc.h 3=led.h @@ -40,7 +40,7 @@ T=505039f7 7=i2c_mcu.h 8=pool.h [magic.c] -T=510f63df +T=511441ab 1=magic.h 2=config.h [WDT.c] @@ -141,7 +141,7 @@ T=50ad9127 3=pm.h 4=accero.h [task_misc.c] -T=5105d029 +T=5114443a 1=incs.h 2=renge\renge.h 3=pm.h @@ -244,7 +244,7 @@ T=4e559884 T=4fd7f6f9 1=config.h [config.h] -T=5105d4fd +T=511c3c3b [jhl_defs.h] T=4e647343 [user_define.h]