diff --git a/snake_trunk/VCProj/bsr_trunk.sdf b/snake_trunk/VCProj/bsr_trunk.sdf index 8a05a3d..e4d6080 100644 Binary files a/snake_trunk/VCProj/bsr_trunk.sdf and b/snake_trunk/VCProj/bsr_trunk.sdf differ diff --git a/snake_trunk/VCProj/bsr_trunk.vcxproj b/snake_trunk/VCProj/bsr_trunk.vcxproj index 3fe99ad..a4fc5a6 100644 --- a/snake_trunk/VCProj/bsr_trunk.vcxproj +++ b/snake_trunk/VCProj/bsr_trunk.vcxproj @@ -13,6 +13,7 @@ {9DF31AC3-BD19-4158-BD6F-9CFE64AEE5D2} bsr_trunk + arr_trunk diff --git a/snake_trunk/loader.c b/snake_trunk/loader.c index 42a8aeb..89e4638 100644 --- a/snake_trunk/loader.c +++ b/snake_trunk/loader.c @@ -200,11 +200,16 @@ void chk_platform_type() // ●CTRファミリ // system_status.family = (enum family_)( DEV_DET >> 1 ); /// あぁ... -#ifdef _DBG_FORCE_FLOWER +#ifdef _DBG_FORCE_xxx // 強制的に機種設定をしてデバッグしたいとき // system_status.family = FAMILY_FLOWER; #endif + if( system_status.family == FAMILY_SPFL ) + { + system_status.family == FAMILY_CLOSER; + } + if( system_status.family == FAMILY_CTR ) { system_status.LCD_is_CGS = true; diff --git a/snake_trunk/pm.c b/snake_trunk/pm.c index 9140818..014c1de 100644 --- a/snake_trunk/pm.c +++ b/snake_trunk/pm.c @@ -1036,7 +1036,7 @@ 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; @@ -1355,8 +1355,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; }