From bad11a89d5bd96547554f8f44d404946b8fd5b3a Mon Sep 17 00:00:00 2001 From: n2232 Date: Mon, 25 Feb 2013 05:13:33 +0000 Subject: [PATCH] =?UTF-8?q?ARR=202.2E=20=E6=94=B9=EF=BC=88=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=AF=E3=81=9D=E3=81=AE?= =?UTF-8?q?=E3=81=BE=E3=81=BE=E3=81=8C=E3=82=88=E3=81=84=E3=81=A8=E3=81=AE?= =?UTF-8?q?=E3=81=93=E3=81=A8=EF=BC=89=20LDO=202.8=20=E3=82=92=20on=20?= =?UTF-8?q?=E3=81=AB=E3=80=82?= 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@518 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/VCProj/bsr_trunk.sdf | Bin 2248704 -> 2248704 bytes trunk/VCProj/bsr_trunk.suo | Bin 72704 -> 73216 bytes trunk/batt_params.c | 2 +- trunk/config.h | 4 ++++ trunk/loader.c | 7 +++++++ trunk/pm.c | 17 ++++++++++------- trunk/pm.h | 7 ++----- trunk/sw.c | 6 +++++- trunk/yav_mcu_bsr.prk | 12 ++++++------ trunk/yav_mcu_bsr.sdb | 10 +++++----- 10 files changed, 40 insertions(+), 25 deletions(-) diff --git a/trunk/VCProj/bsr_trunk.sdf b/trunk/VCProj/bsr_trunk.sdf index 8a05a3dc9e2f3846faf568d6002982b21ec1a542..3c9acaa6b83f97ac0ab10ccbe520b00de557dd65 100644 GIT binary patch delta 19626 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 wC~!P1PVFQ&;M1& delta 876 zcmZWmZAep57{2e>-EE(3b861{v8`ED3Z`L1gsU_XLNf-Mie^!mNU80Q)sJiRFEi~d zZ~f6+krGa1$DG=Si~6AuGz9$-X3Nx|LaqED)9hS7GU~u{dG5n=pZ9ss<)5&8C)=i# z$nzP7IZTm;4U!C zI+>MBhwPRBSDUFP$%diqlrZa$CA<8u zpth9t^z#zTJ9*4Mq+1Wtt#2XE&|9VMvT@un`zA1!*IndsdU7IxOneMNIH4{KYd-{& zmQQxNR6Xzcf)I8zMG;d&fC_^&WNKJS_*ol^ZEha>=6%@bwqeWY0fH8ONwICf=4tnV zT)`}98Ai#}2=7@a6yE8mXtk|@u7St+e0JY#&!B;V%TJVQLsBlpWT`Kp=eJww|$vW7MLjF<; yS9!`mZ8R$h&6_|ams3w9MT#JH@Y3jLcn}Ooc&>$bZ*(~LVYycr?bS4C1oRua96(S2 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]