From 39fc5fa529e5d33e616f3151c4221bef8a3ca9b5 Mon Sep 17 00:00:00 2001 From: n2232 Date: Wed, 12 Sep 2012 07:30:11 +0000 Subject: [PATCH] =?UTF-8?q?=C3=97=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=81=AE=E3=81=BF?= 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@470 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/VCProj/bsr_trunk.sdf | Bin 2248704 -> 2248704 bytes trunk/VCProj/bsr_trunk.suo | Bin 72192 -> 73216 bytes trunk/main.c | 21 +++++++++++---------- trunk/pm.c | 1 - 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/trunk/VCProj/bsr_trunk.sdf b/trunk/VCProj/bsr_trunk.sdf index 985783594e74fbc5ea9a336959a33ad304c99b00..41ed26dfbd73992a73308425b0380f2617fe8e87 100644 GIT binary patch delta 4396 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 diff --git a/trunk/VCProj/bsr_trunk.suo b/trunk/VCProj/bsr_trunk.suo index baeb123694c96b1c7e7932f0bf6bb457c95b9e55..80e93867240b77bce9a0d30531489ca179357a79 100644 GIT binary patch delta 1615 zcmZux4@{L+6o2RY^WF!1@ZJ*y1T}av#gKZU=GvTzGD|dgG)zcy1ByXODZEvhv*(|* zA>xChTy>iI*_=7&h)ctzlMkY1ndWHOa=6TuTh<)e%fIOB+)v*_x9;}a_q*r(?m6e) zd+rzLR01cIc9#rG(JfDhg*Z=s0%l>Y{4~_zPI-~*emEQ!*kH5S0)$p&0qn<2H6wmX zdFp$OXFwK?clj!%5cC@2q_qaRwJaV|eX1&^4%}aqh-0)=?vE>#L61x^lyJ@x3yK9_~4BfWCy> zk7xTymoRUA9>0Dh0q_OQi{8#)$G{%@gO>X2avup;-%=dgbs5VJ z&cOE01U%QQVA08XW6+M*o2O#Yvo2J+haO&NwT$K+6EC->;*PIsj3Gsfwe3uyBe1bw z9Z-q8Zck%tWOyB27bZd*_S~${8*1y8G*s8;FRQI+z~xt;WPeDo9dqwh;_g3ldE3x< zU{9&=Ca$}V>*XC8RK^GJx-;QbqyPdQVamoeJ+bVQBqy7vto4C$gPAFpNt&!5ri^PJX26OcQ>|vPj!?WMYh=7{ u9wU;-_G)n0Ej_f_$Xq~tCO&_|1Zz(?aBDHHySs)pj(}At>m}$_T>k;I123m71E`u82)V3rnN%Q56>olqy1DBGGDG zQ#ENd6uj!SO)a{ywy~|n9RwAWL6K7H10VHO@!3Zj+p5W$8tbEHW_JMnt4UAt?LB+% z@64Pz_uLt8Gv}@6>MRC$l~@g9poB~^41l?$*f0WI==$Dy%8t7`qr~BO}?AB zk+=Hi7+quUUTr^_yp)?*yE1!jO->?dbj+}{C4Er*+q}J{Q07jX(|=PGM#hsVr_99l zOe<;4NhkfOnN$g8dHSGglXlq$DSxJ-6H6Y>oD4I%Z!67O90o@Dulz0n*qWRe`O1O< zk+gA6Sz7#3`0{Ts@14lENFA~Z@gp))kL*SokVa$=vKQHhG$GB%e&hhsf+$EUau7L$ zv>}I)cH}#x1Nj~~g8YCS1!gXD44vc138WJ_iJU@CBWI8wk+aA->Q)+33u zuT$io7D`QS)~GgDmaYq*fSL*fja=I}j?}G>B%KF1IqNe&tgCj&4kZb*T7}CW>M=xW zT}$$4f;{W*LId%B;q`xQXNkRIFb`8vXXw#&xW#Oo>D|t9phLt*+8#~Hb_;Ss{jcCV z%K92ut1i;VHP}C4Z-=5E$?)lE@SpOsf|(hOr$Jz-*8q96nT1pu#X%7(Rg#*ArF4V| ztp2lYU{piX^;G1*Ig#BEfEQsKU10!ELV3Z$qJr7lZ?5F2n4eo*Qd00%u}3PPo_H8W z+l^32-FD#UK^}(E-&wp@Y6J}TU)s!TC%}I_%hV_c-~_XQ+5Az;g|q7=S5Ho0rWeED zS<9%=X->_SrSFG~u}(5RB~ecN;}@V75t{y6HZChZO1G(f)0f_|LSgix@`9pVsdB+{ z`Ae6+m*Jc^ay;?g#x1*j*+@Mm7)V0ImD-Y1OYucVls~5DXTN<=zr84AY)C8|mB7lj8hhYU#>Y%lD5a_OG$XAOu*)~NF z#4#qs6Onf!z-6D`ts1O!pdX9q6(%kBTj}R^@cJHbG`SxvF{Mp-AvJx}Y|(bqtl|{dDWY*Z86U0u@#lHm4{)G zz~FmZzh!ms$(nfF>j-UE8$?Kj@H~$s<(7HMJtY-X&D*NJf^|zkXE-fQfE_k{N*&`7 zGm;T3I+W3Q@$kxaGq6~W-Ks(}LD{R0^o|Yco`_e!1L~>HAi<=5vcM$UIDGpA&91o7 zk5dJ`vew$b`jswXuC~akulCSR+s*Fado2RXFavQV6wK$BE-WlAQV)ddi7eC&>Gc$9 z+0+6=NH`xfQCUN8THzf*YtekEToc%aci&7@UPE8~IEG50^`HHgI-^;%5{3O2j=sJR zbekRiF?yWKF!i*4P{M{HL%WuY-yw)kC!aLf=*(DHsh(1zRPc@WVnG1f83~F1Kf$<{ zu|z>jQl_JyihnZHV?SeKADF;bAK-hW9M?4K9k;u@WnS H7iInh0?2^4 diff --git a/trunk/main.c b/trunk/main.c index e1125a0..93736de 100644 --- a/trunk/main.c +++ b/trunk/main.c @@ -2,7 +2,7 @@ MCU CTR BSR 2008- nintendo 開発技術部 藤田 - $Id$ + $Id: asdf$ ======================================================== */ @@ -44,22 +44,23 @@ extern bit pm_extdc_old; ***********************************************/ void main_loop( void ) { - renge_init( ); + renge_init(); #ifdef i2c_timeout_test i2c_mcu_time_out_error = false; #endif - iic_mcu_start( ); + iic_mcu_start(); - EI( ); + EI(); BT_chk(); system_status.pwr_state = OFF_TRIG; - // リブート判定 + + // リブート判定 if( system_status.reboot ) { - // 本体電源onなら、onを継続させる + // 本体電源onなら、onを継続させる…MCU WDTリセット、自己アップデートなど if( PM_chk_LDSW() ) { system_status.pwr_state = ON_TRIG; @@ -72,9 +73,9 @@ void main_loop( void ) pm_extdc_old = ~PM_EXTDC_n_RAW; // アダプタでPOR時に点けるため。 } - vreg_ctr_init( ); + vreg_ctr_init(); - clear_hosu_hist(); // 履歴クリア + clear_hosu_hist(); // 歩数計履歴クリア renge_task_interval_run_force = true; @@ -83,7 +84,7 @@ void main_loop( void ) // メインループ // while( 1 ) { // システムtick、または割り込みで廻ります。 - renge_task_interval_run( ); // 内部で、システムtickまたは強制起動します + renge_task_interval_run(); // 内部で、システムtickまたは強制起動します renge_task_immed_run(); #ifdef i2c_timeout_test if( i2c_mcu_time_out_error ) @@ -91,7 +92,7 @@ void main_loop( void ) i2c_mcu_error_monitor(); } #endif - HALT( ); + HALT(); } } diff --git a/trunk/pm.c b/trunk/pm.c index 0d2d009..3a4bc64 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -345,7 +345,6 @@ void BT_chk() BT_model_detect(); bt_param_select(); // バッテリ残量補正パラメータなどセット 非実機でも、とりあえずの値(パナ)指定にしておく。 - // 無駄にrcomp計算させるが、未初期化ポインタを参照するのいやだし、非実機なら計算しないとか面倒 if( system_status.model != MODEL_JIKKI ) {