mirror of
https://github.com/rvtr/ctr_mcu.git
synced 2025-10-31 13:51:10 -04:00
ARR 2.2E 改（バージョンはそのままがよいとのこと）
LDO 2.8 を on に。 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
This commit is contained in:
n2232
parent
468f22534a
commit
bad11a89d5
Binary file not shown.
Binary file not shown.
@ -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
|
||||
|
||||
@ -10,6 +10,10 @@
|
||||
#define MCU_VER_MINOR 0x2E
|
||||
|
||||
|
||||
// ビルドスイッチ
|
||||
#define _MCU_ARR // snake 系
|
||||
|
||||
|
||||
// デバッグ向けスイッチ
|
||||
|
||||
//#define _debug_led_ // LED print デバッグをしたいとき
|
||||
|
||||
@ -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;
|
||||
|
||||
17
trunk/pm.c
17
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;
|
||||
}
|
||||
|
||||
|
||||
@ -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()
|
||||
|
||||
|
||||
@ -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()
|
||||
}
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user