From 668c688a28f84a5d4f582adcc8edb3e87e5c883b Mon Sep 17 00:00:00 2001 From: n2232 Date: Thu, 12 Dec 2013 08:52:44 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=82=A1=E3=83=BC=E3=83=A0=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=99=82=E3=80=81amo=5Fhv=20=E3=81=AE=E7=8A=B6?= =?UTF-8?q?=E6=85=8B=E3=82=92=E5=BE=A9=E5=B8=B0=E3=81=99=E3=82=8B=20?= =?UTF-8?q?=E2=80=A6=E3=81=91=E3=81=A9=E3=80=81=E5=B8=82=E5=A0=B4=E3=81=A7?= =?UTF-8?q?=E3=82=AF=E3=83=AC=E3=83=BC=E3=83=A0=E3=81=8C=E5=87=BA=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=AA=E3=81=84=E3=81=A8=E3=81=84=E3=81=86=E3=81=93?= =?UTF-8?q?=E3=81=A8=E3=81=AF=EF=BC=88=E5=B9=B8=E3=81=84=EF=BC=89=E6=9C=AC?= =?UTF-8?q?=E4=BD=93=E6=9B=B4=E6=96=B0=E6=99=82=E3=81=AF=E3=83=90=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=83=A9=E3=82=A4=E3=83=88=E5=88=87=E3=81=A3=E3=81=A6?= =?UTF-8?q?=E3=82=8B=EF=BC=9F=20=E3=80=80=E3=80=80=EF=BC=88Horizon=20?= =?UTF-8?q?=E5=86=8D=E8=B5=B7=E5=8B=95=E3=81=A0=E3=81=97=E3=80=81=20reset?= =?UTF-8?q?=20=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=82=92=E3=81=A1?= =?UTF-8?q?=E3=82=83=E3=82=93=E3=81=A8=E5=87=BA=E3=81=97=E3=81=A6=E3=82=8B?= =?UTF-8?q?=E6=B0=97=E3=82=82=E3=81=99=E3=82=8B=EF=BC=89?= 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@579 013db118-44a6-b54f-8bf7-843cb86687b1 --- snake_trunk/VCProj/bsr_trunk.sdf | Bin 1200128 -> 1200128 bytes snake_trunk/VCProj/bsr_trunk.suo | Bin 72192 -> 77824 bytes snake_trunk/jhl_defs.h | 2 +- snake_trunk/pm.c | 4 ++-- snake_trunk/task_status.c | 2 +- snake_trunk/task_sys.c | 22 +++++++++++++++++++--- 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/snake_trunk/VCProj/bsr_trunk.sdf b/snake_trunk/VCProj/bsr_trunk.sdf index 902398dd0791b01a12bb2bb51f61409d440ceb73..1ee23e81953e3f915458787e22def9d992164ba4 100644 GIT binary patch delta 4895 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 delta 4878 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 diff --git a/snake_trunk/VCProj/bsr_trunk.suo b/snake_trunk/VCProj/bsr_trunk.suo index c750838ab65debfbee9cb3b07f0b27bec4c7d47f..cadc3975be185e3bc125adbaa12054b59b4bb115 100644 GIT binary patch delta 2628 zcmcImeNa@_6@TaL+jVzYV1Z>r0>ZM&7*KRqcYqQ_R)Hjq<-?8{+aUtt2Uuhf);Ltu zwMK1}z`{XZN@yxu#k5sKt_6~&x*%jsO~pi;Od-RN%Gjnj1Tq^%5~b(uF4W|&&UA8j zesk`-=bYa?@7#0GTl+=9J|eVhWv~f@WQni=pO-~JDi+I@!A|^@>}EiI@S)@@Tf;K^#Wk9|Hw`SJZ4vJef!|Gtt-V_2{0r~A&etC_qOsel z+4x-(ceh54lhX+-q2?|yqiY!I8=i(OXjLZS#K|zM>e9nr+;#j}R??6Hk0}Bgf>njY zwvVtG3u?XQHN#3=m!V++jbB3jn^(VOuS5H!5l=ZHSjyF2shFxTy6;(x>I7~QBkkb51k`07ogd##U;Q-+^LJgso z;2_iy>Iq1Y{3J9=a~9Nm20A{n16r#Su%=akWdj0p-L!+>Hm;nrawS|bSAg?xhs!yR zCxQ?4q1sYzJGYg*X9xBSnxF{b-s(m*7?|PX5gDf53rFp$fFQ%Q?DL=J#_#;fHPs#e z#704=%L&1pucNS}R0o@>loNb8)@j>zXa1J$d-D0KTlXhLie;bRXUjuzy)p@2BJ$y_d1z;-p z(!zdmhKDTn<#0Z9{KEo%g&zMzE{XdYuD;#F){nFSj_3_&7+vnXBk)`vzS^=V$oTnP z$GNmh%aOmI?&{z8S(jXTk%HJ2qJ19Z1#Nq#(W!sm_#m#irs5`CI;EDhbxT*lPd%|u z_h~S2K@8+eNpjxhCDMb#p|~zl9aP%?)t#9By9r+xjubR??|DC7a<%_698Y!{JPw)Y zEh#mIhG{)X;a^UW@1O%Om&jS|7q=8aQ@75w=cO;Ut!XW7bniU#!#IiM=)DJX$y0jH-mH%`-eL z%J%3M!0%?8(Fq%5DL~S;&MmotnxkMAZ2;Nw)8zlwtV(r_`iE5f9LxIV0-))59F{#) z;1J!Z$z(OH{edYXBV+A~eN`)eR9sP*QCzaMBBiQO zyb%NjO-1p}+=^}G){^3a3em2FxRv;Saz3TqTwYLGShTewS0dk0R3Zij!ZLV6tW!V& zI+kX4IeFMb*<2DSMry%=Ib&vVbpR*?TY+six`r0hyA{c19WiFG!Rx#oC;ldM>Hv5w ze_+D52Vcjrp-@~l_G58M0ZZ|zu`)4T1+hxe_X@3HWZE;BFRoI75|53&jBgHwWBB-x zlspJT-PGjwkiyiQ0I6hr!{n1`-%nn1)FHHil91*}@b+(KQcMYiI7oXup*iX&XG8LO zP*$}#em_RCHL6vljFjjarSsa3(L*MWLOiN~2iX2^E9EiPyYhh&+&D65rHn2SOI4s3 zW&UtE^iwKz?}&C~(MN|`IVVNX1?|Pi!jro$1yq%0xb0mKziv!XgXgC;& zF0~+UBmIRr{bkZ0_QeqG@Wfz|_ezVNosCVjv)UrRPAhw{axxa3Rnbz1(cGYwSBXj* F{{hv`rQQGl delta 1713 zcmZYA4Nz276ae6N-o9N~WMSFG6@_5gR!!7px70Fc42&96M^+88$-qtdGZjYG6fxK& z)JZMjK-bco*ikTb6uIP*m9EG*mJawsR{k)EN@iw}n+!ot~#kktALj=RPih<##a>4kc!!gIEcqj6la5tqd(Jy-E9JeAP6oOUnvEPQWXdS z-=KOfK)IWGgRpXj9-mN$qc8Yta&&9JG;j7@rP~#H*IQFlr=ns&h?2{zg){Z8Y}>B zv6-=ugw3~fysgm(?#+@C=xRTQt@i<2jvYsHRU%qjb$ssk+X1H+Td<}&9Gh=wF{SBx zty`2ZzS)ay#agbtXaV<52?{uT7$Ne=y(2`qP`I;Zg92Aynu@NvK-3iKct-iBin8}i zXsUMy>HoL!^+8J3F2W=}XaTZuZL=H0D!w1m`ejL?%J~z zc;xY`;I0$hCq?%Gam-q}tGsx{bSxq3$r`eb$o;Y`is{f@w14J4D9tt3o^b(MQH!o} z8$WWk2ykk7ltvJ&l-IYWc-k;X9Vna+76i4hg@GP2wafC-m!>U9&&XbqZpm7;s=$3t zVhK7J_OTwynau#3S%wa>SZ**p&Av0hAl&ppEYG^MO60G$?Sa~>d!e>{EYLWDkR~h; z9D-9=hzWUiJb7s-?!JHl_4zTgHPa;O>yv>0vONy=ejqOB)Q8EI<$Q z*u0@o=)Nhk%X)}l_lClSAzL8vc`JPiCM*#$g>-qC-o`pbh*RVUOEKZX4F1s{EvnGT zvo;2=dnfambqBYtxLq|deProOJ+8fTkLBthm7OudI2g!sBB2v{f4kiEno@qrXqhDj zmh<>7FQ6jD*i#}Qcf&n?fEpkhTP=0 z408h5gQ_0u9e9E^Lf%ViSh>f>S`}czO%}Vyu7y;naDkbbC5To*HDwI!A4>T%T~<($ z52M(235@b&m`?(`@(apRKg#N$tm57*B}C)V5F7I;VLG!7hl!rH7*JBZ4FE55#J~i3 zrEQ+1C&2(7uNu4}D>XubyyTt;9{I!<1jo)+VsO>sD@jD|(MwIFAOrpSfW zm#~mxljq&xkVR!UI*OePg|QSEaFHj-V~T}Yz(5CPjNYiy&d*trk)7F7Z;95IYzgez z2-$};dO*DZ diff --git a/snake_trunk/jhl_defs.h b/snake_trunk/jhl_defs.h index 9a21ab3..2750983 100644 --- a/snake_trunk/jhl_defs.h +++ b/snake_trunk/jhl_defs.h @@ -13,7 +13,7 @@ typedef signed short sx16; #define false 0 -#define set_bit( cond, reg, pos ) \ +#define set_bit_if( cond, reg, pos ) \ { \ if( cond ){ \ reg |= pos; \ diff --git a/snake_trunk/pm.c b/snake_trunk/pm.c index 0541254..c86612f 100644 --- a/snake_trunk/pm.c +++ b/snake_trunk/pm.c @@ -185,7 +185,7 @@ static void update_chg_led() LED_CHARGE = temp_led_chg; // レジスタの充電中ビットはLEDに同期する - set_bit( LED_CHARGE, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); // set_bitのみ。 + set_bit_if( LED_CHARGE, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); // set_bit_ifのみ。 /// 割り込みはtask_status()で行う } @@ -282,7 +282,7 @@ void bt_get_charge_status() ***********************************************/ void pm_chk_adapter() { - set_bit( !PM_EXTDC_n, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY ); + set_bit_if( !PM_EXTDC_n, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY ); if( pm_extdc_old != PM_EXTDC_n ) // HAL を通すため、 PM_EXTDC_n の volatile にする心配なし { diff --git a/snake_trunk/task_status.c b/snake_trunk/task_status.c index 361497b..0de3bf4 100644 --- a/snake_trunk/task_status.c +++ b/snake_trunk/task_status.c @@ -37,7 +37,7 @@ void tsk_status( ) u8 diff; // 蓋開けチェック - set_bit( SHELL_OPEN, vreg_ctr[VREG_C_STATUS], REG_BIT_ST_SHELL_OPEN ); + set_bit_if( SHELL_OPEN, vreg_ctr[VREG_C_STATUS], REG_BIT_ST_SHELL_OPEN ); // ステータスレジスタ関係 → 割り込み // // pm.c で、その場で行います。 diff --git a/snake_trunk/task_sys.c b/snake_trunk/task_sys.c index 7c222c9..ba035b5 100644 --- a/snake_trunk/task_sys.c +++ b/snake_trunk/task_sys.c @@ -201,6 +201,13 @@ void tsk_sys( ) LED_CAM = 0; i2c_mcu_time_out_error = false; #endif + + /// ここでやるべきでは? + // プルアップon + PU_BT_IN_CHG_n = 1; + PU7 = bits8(0,0,0,1, 1,1,0,1); // 4:SW_WIFI 3:SW_PWSW 2:PM_IRQ 0:PM_EXTDC_n + PU_SW_HOME_n_JIKKI = 1; // SW_HOME + IIC_ctr_Init( ); IIC_twl_Init( ); @@ -222,15 +229,24 @@ void tsk_sys( ) // PMK21 = 0; // wifi 使わない PMK6 = 0; // pm_irq - // リブート時、ステータスを何となく更新 + // リブート時、ステータスを何となく更新、辻褄合わせ if( system_status.reboot ) { u8 bl_status_temp; + // LCD 電源ステータス + /// ファーム更新時、必ず液晶offかも? + if( read_pmic( PM_REG_ADRS_VDD_LCD ) != 0 ) + { + vreg_ctr[ VREG_C_STATUS ] |= REG_BIT_LCD_POW; + LCD_AMOL_HV_CTRL = 1; + } + + // バックライトが点いていたなら点ける bl_status_temp = read_pmic( PM_REG_ADRS_BL ); vreg_ctr[ VREG_C_STATUS ] |= (( bl_status_temp & 0x03 ) << 5 ); - set_bit( ( read_pmic( PM_REG_ADRS_VDD_LCD ) != 0 ), - vreg_ctr[ VREG_C_STATUS ], REG_BIT_LCD_POW ); + + // バッテリ&本体識別 BT_chk(); }