From f5d3581e4afb17e363ee4eeb88076a90884c18da Mon Sep 17 00:00:00 2001 From: n2232 Date: Thu, 12 Dec 2013 08:27:17 +0000 Subject: [PATCH] =?UTF-8?q?2.33=20=E7=95=B0=E5=B8=B8=E7=B5=82=E4=BA=86?= =?UTF-8?q?=E6=99=82=E3=80=81=E3=82=A2=E3=83=A2=E3=83=AB=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=B9LCD=E9=9B=BB=E6=BA=90=E3=82=92=E5=88=87=E3=82=8A?= =?UTF-8?q?=E5=BF=98=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F=E3=80=82=20read?= =?UTF-8?q?=5Fpmic()=20=E3=81=8C=E3=80=81=E9=80=9A=E4=BF=A1=E7=95=B0?= =?UTF-8?q?=E5=B8=B8=E6=99=82=E3=81=AB=E4=B8=8D=E5=AE=9A=E5=80=A4=E3=82=92?= =?UTF-8?q?=E8=BF=94=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E3=80=82=E3=81=9D?= =?UTF-8?q?=E3=82=82=E3=81=9D=E3=82=82=E9=80=9A=E4=BF=A1=E7=95=B0=E5=B8=B8?= =?UTF-8?q?=E3=81=8C=E7=84=A1=E3=81=84=E5=89=8D=E6=8F=90=E3=81=AE=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=89=E3=81=A0=E3=81=8C=E3=80=810xff=20=E3=82=92?= =?UTF-8?q?=E8=BF=94=E3=81=99=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=81=8A=E3=81=8F=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@577 013db118-44a6-b54f-8bf7-843cb86687b1 --- snake_trunk/VCProj/bsr_trunk.sdf | Bin 1200128 -> 1200128 bytes snake_trunk/VCProj/bsr_trunk.suo | Bin 72192 -> 72192 bytes snake_trunk/config.h | 2 +- snake_trunk/i2c_mcu.c | 4 ++++ snake_trunk/pm.c | 26 +++++++++++--------------- snake_trunk/task_sys.c | 2 ++ 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/snake_trunk/VCProj/bsr_trunk.sdf b/snake_trunk/VCProj/bsr_trunk.sdf index e884dd49ff5642f4420001968f8b6487a685c8d6..902398dd0791b01a12bb2bb51f61409d440ceb73 100644 GIT binary patch delta 8122 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 a@bxPVzJ9F_>(_@3>%%GQ!$K%*to|F0hV{t+ delta 13762 zcmbW833L?2y2q=lXS%0mNxIXMb+XJPKu7{10YP>WAR#~k39E`gas`1Pn1HxkmLz~E zD3B1KKmilH2GENpB8&?lxI95+RRK|ucoju`N|XyOaCzTXlR&V2=biKBoc{MWzyDX& z)zw{9-4iIU8C+g7m>uvh9!B7!Rj~wVO+&|z;@As6f7c_Dv!WO10D}f5+L> zc!~Y=TG->cki68-^4U+0>S28&c6`ulH05lj9L|TK+%BRCEWCPN-|)3@!R|8K0*U6& zmuL^z;$d^Zc4?kOw*fx``&F?2FWA2X+dA0pE|F*!Y^kt?!&U*T7`BnH^@i>1hb4L# zwz*Kw5BnO}+5!)P?aEw>Ab@FqBZ)*}*)gZSz? z3$4A>k1m_#qq9qVbYXs7zO>KYKl%(G4(Iu1gx_AyB4j;eY}Uav=!;P3U(tm7q&=Yp{;#)(XOtln} zFu1C0nRUmk$_B;<#bs|!X@{gP*t|{- zJm8PAv-X@sqxV@T*(cGu3|V96;(l8(0+N^cSw`@cVD|Mp@rldfyXt4y_ZTN=qf% zvt-Y!tAS00`W?X1tQvc3?7i-1ffe{!3FhSkD<9G4>F0qRfjk?uYv0=w-rot|@AI>I z%qh2~vHRZLoQz|n0LI7#iJh@M)(!`TllM!fzUmhflXhgqx0l#m@22D;w~LN)W?7T` z`{dwYTVObiO5D>sQ4A-zC3d`&S|G7Y*Dr}aSrX`zx}$KcZvXlDA2`Go-ZI3rmLUcM ziw}zpZZ+6&obk_Q$l=wjdBEXK{#OGI2Mi84yz&1(0}cn(|2E+Az-u+&LM0oon8?DL z#~nX+zif$a8F)D0|2**OG^L!SUifkKSUC4HepZNmU!$b4ckUST{B&SRes+<5WR+I? z&-|PAk&Idx5fV8I$_U18Qp=la)fhhH3e6I3tl&{XA?8;PD=GZY6`JhE{6xXq2*sEm z`Ga=heSf81QMi*ZItqoDm;Ope3Zth$w+n@spZt}MF}@Rx`HyG}#?j=iqI`j6&n+6%X>P>A{A zKjch;FyT7gTz5|KvR7Vt{fn7!&n@RnlY6?Y6uUMQ zlo5ITU_amj}B0i<~@>gRz_R|5If?J|zT> zI$9)_iA0P;2&~slztd>$50MAB9~X9|urb!jvvX&hs?RltFj1E`hcHbyhk;4D&a0NN-<_EoDDjfnoTbSH)Jyo?X(9J^N|VW8 zLWYof3;BtVad^JN3CSlKB?++Lk$qM&fso6jB$)h4$TZ$m;u^)X(nBKn_;fiaNh21C zEG0EI@&qAIlA|`Vf{<>c+(J}|tRm$aSxv}j;(;lkqmfvS;i zys!*1JAP?Z*GjVDD48*9@|1}WPJD3Eq%~dTPHT?Keb;Q3)AXK@9Y;{zLSuP>B*$_| zlKb(Q2UU&lk>pgqK$1Hdy&)-{pfaHb>CN{^@?AV*x?+)1_)04G;CE1%@P4PVCWn*0 zXnS}@jMKt*Q@Jm{PX_5O%eNUBP)i%UI8YaAB*_RQ7yeLoe6;63KyB)8>&mFhYaS8SwUfI+bPzy z-#FUxMT#8HV^nzn|M6Q#D8Ht_5%Eg;2&zkHEE&qvRC%%|7f=jAbqS3UI){{yNxW&H z#o*_T+Z29Kg-*$bq)ssY32_SbkbJH`9u&qeZnatYz8q*^ADf&h@)AUbPbkE^$|jE# zMhAhCg+k0TGU2IU=)WA{JcU6!3!wHCg6b3+P6~KYs?)>k|K&*F8(LE0gc&0gVywOk zr}pLw+6&%JD8zwdEd9z6!HY3v1k|2DP@O`<$cVr(`j*)he&m89nxBR|H)eQ6MvPF5 zdF^>u6pxL9D?Y#>dwGTvE?6Q=hFBSD6d4()Y(;mtA+~8Wcr`mjr(U*$47eS=Er28FH|s?xSkD|Dw_rFqK~`pq2B|dXF_j)&qSA3=RNDBQN~b-l(kpFLx?r_R*(jCr1gHnLom8b+u$?-l z(CM&UJEyql%5w_!!G;S^T_sGz*(nE-*TFosfwM|SPfwjVhc`v*F^<9oh5W^>9Lv{K zI^rYW6FI1ipz1=4$b&p{i#3#2?q?Q$q0-UaH~^+39_kmUQ#XmgDS_J#wAffsD!!@zW7p!u4jcCY_NI#K>u|cAF z!zxEnL*0vneM;CE zyU8NnwAum943QPycC{nZ{W;){1eFQ(fO6k_7R5{4RtsOc#^K=4u6Fb?&OwSKp3hta z<2Z5->$;a8S>w+i#P-H(&o{PxZm{u|U|WJ8KXib1UeW0=7C+4ayz6WTewe9AgVnITfvfhq*! zU@{|+va+vL@xQUo;h@j~?>*%><4%BOQzChwR)Vn(%2Qo>6#wZfcu-_*ow5A#)6o3U zBC!}$As8E=fkZL+&TR_^FWvwLpCb|<0u3P;N0T{x;|52u8ZhQm7i2d-sAq44ba>Q) z1}qZk7)O(GOmE9KZFFR*0k`~SnfOi6mZhRhr6_}O3|VU7FNWFR9@yl_R|ED^QK;l; ztBwDAlOx%^Runo9Y7mUufCl>i%~kdk{_r!7$Ls1@M);3&4zJk=1J;fcJbduM!lzyK zhac76wDMsmG))TU6HjO{xNa-lenJ~)+zWZ_2`UpBLGI;6C$xKwX@KGhDiaz7kDy?{ zQZZFg_#Y=UpVY*Q{@W2}6hlr&g35$Ok>Xo3gVmA4hNeB7)}QMqwG?AIWVR=$OlTyT z9>~`WXjREcE!&t0W;=q)gvP)Woq0;@!mpmxIve*37nQ-}jh%Qux|59(_>ux^D;lU# zq~u0REd10dE!QX&DX5H~dPr#?MU25QpK5u=1AyBSR3mW$=xkX@mIT)7n7Z{&OvhkNphJZ7!sCC#Xzl44I3qkK;!^)9&QG z&uE$)1It4TGWbP{ZsDb$YyFM+q9`gOs2(!ERpY<@TpMdF5GkmPphl4effTrG7C!Tg zHirAp!XY9^1CELe`t=4Iy=%9P9(lt?2g3H+>oz(lS*4#OsdUV5u=0GX(!$48 z`Yo(jGqEVd?*Z$(@0h3L+J;wjT*V^Z*|G<2;I}MLm#g0D%BjEvj$bb)yg!p}zc(~Wu z!B`9+iJ&r}(PVMpbn=J8)9f6tv%m2un4JkK6B{p2G=?k-Jo$d=bLQ~EeKt#QJA7M%=>@edd4fv=gF^YRU#P-|$2;>Qp9JiI zw>g}MQKN*mUWnTApW~fg1K#!EenWK#4I?Xf!#viT7bSqZ5_lv*bqEb3E4g<*i{T9k z&P<~Ucr-zE2=$Pvz%Al!BGpk>PLYpeqtK~NQ;23Z$KX_>4u^ryg# zB&do|H-D)etTAGx{i!XSAwFn@h{r9fP!~MIG_-@qTv%u_jE&&B392GAm~2FMys=3b zs8)jNBAd7`(K$}VFFM&&RS?e8LX;5R=dhylJ&DlMwcrGa-@_E44)|3Jo?SfL(canD z*bJ^gP!*vX*&KKiCi-TZ2sMl2fV|!@tb0P&*A*cpvCMj?l~KMT(4Yp%4e& zNe;BQKEdOJLX7Vu>AXX#Gu~)`vf%{PBGgG5@D1WFVYmef5ehL@+JX0oleNP0GZp&C zS%n&~-#$a3y*jG&^=KRI-oZxw9vi*gVWSPjHag%tg&vxw(mMyM^y?gzJ`kZ&+X01c z30G*3Zxnh^fyeRl3OzqsrL(eBO4_P))mIATr#d;?*Lm$4I~&|?do9dW^=p{k(|83M zdJjQmLJjgt%l)8O*UZru8N0w6NKlzjjqC~x-*%Ed$=Cxtm!LACA!HBU+|m3sNx$FN z3%nmeWkLG_loxH^}Rro;A=h`j+^V!oqU2*-)(#*@=zH;HOObT=KVf3;R`F> zpQ_NL6^y>uQK6ldGkU0lLi;!wt((he@(1u(@xFs@VlMjS0SE1Khn?1(Wb|4$I~{bd zgFf2UNk3fepyS*sJn(+3%0xJo zmQVd)GR7ZS;%uUJ?dV|Qs|qR!>c*QkGq*qIS+>f;j~%iM@oQUIf3>R6S+=jLetG$_ z{H4;;h9wn?OBU^4Sh`TEXee(e%UIAfzjprqd8PAw^N!7J{Cm~kYac0iq~f9UhYIFY z%*rn*nptpPQE|aEX==md^m{6biY8W!uNap;uIMiPF6oZ6(Ul{-!?Ym{IgNwTvwc~O z1CI5t%JB6))~BLZMURTxYr7V8X-KQ($I6_Y*yyAF-y7hR&v2HZzv?;)=c14)pbjzx zf6VasFJ$Q9!F3sqG?utOcNzX6u@HaNEs!N`%eWm@3Hs&kSF8hZU%S&f(H_a>f4*xM z^v#?}Egciscko9R>Wx;vbgy1w<)@4F-qxB|(q3ugZ}-x=CYHY7d*Rsg70;(X-?*)6 zTjsW=t+iVVwn|$Ywq$HMT31+i@wxKn(w}SO-#ksTTu0XzuD`ghe4VzghNtm9PpXO1 zQ9ikYy@^TF8;XmH_2T`!ERXi%o0e;K|2s4E-jp3kBd_|Q^~rvAR5@*N;R~}Oer$x- zV{xi{(=PZeYeT&~f+u~V_}qVp*Xs<5&kPvHfb#w2mMA{F!eZwOKT-O*hk^@#q!Kw8 zd&p4AQ&&QccyRgmCrYM!oXD93st}CBKzWQ!7WF8+_=GaRm??5fK@Ea&JiHt2JE4@g z9}&hnP#3{C43r-}s`T_PIH@eO)zvsM*ohInm+Xd9yUbaQ^%d!me{YSomt^2yn^bV$AnmbavstqK$v!k;p7jH^xqq2X?))2cP_pW;+}Z zKJKAn%u^biUHM_K4MYjTh!G00UwY1Z-Odii&%3$@`e7W5U+Z(hVN!h_k>Te1HMjXr zgi|JjZ(nJRux>At=vv;m(i-;F*7X6!92iK9^$&- zjAW%jbrO7tR+vX_d=jop{eOh`d z^JM0UT0ZtoeOui*XPW);Que|TxZCJPzx|?qIk?X2((J?d3v-VFyuW6rJ>+t5*$=+0 zcN~YqSJk#Ud|Dn^-}3chF3Bnne348+s06l+nmDD%WfRwA>F33MJ@zmRpe{AB}U6Frc z;yK-rmz^>hw%fr_W!+?u?pPwu#6x=^Zyt!Pu4QOX8E+NaR16xHby;MH5dR zjr_M8{KohX9fQX2H;k5G=vd@`w0ymBuhKh^Up4W>JCR>A@#MRJtCl~n+;IIv$6<+n zrV^odBhN5#%Xs9OChnPlyuXPjO+-Gx#8V4_^FFV!XmJx{nG*8;h6S@t+^$1U`%B2jm^h)x?>2E&Mn3gV9BzV67Br^)$sh#&?J@90 zCf-Rw9+*R0PobSu^W%=t=WOQ9PV z)^KC#C=(9~MeZ?iPZ;uO6Hf|99%JHNA~ZO@E!Jf8io^n4OxzZQypM^8d61jOP---C z^X!ongB)j%z!G!gjA<+y=FuA(hul1RQ@zLsn;MklLq5dBX*}|wH+jqGwj`jDd($Y# z8wlS1+aS*~aZg+1!%RG<9rAJ$4@*Q|VdA-|?a^3hGLn*zo5vPSM!wjTZ%NVe{7=S) zJRl_;-O_pSNAR|}qc(63Et=rX6JZCq_fqOvbbLpss<|TNaZ`<3Sf=sq2x0M}ivUBoU*_z3=3`5&LpiRggM_r*yW8FGTS?~#5`C0HEWn3Z5 zpW4H|z*1Eh>VL71YXq$;cX=Z#e=nq`AZ5g&mfHgMC4=C{&&YiHHhwVQe%(Jk(LPr8 zw|iI5u~ij@NHyI0qiqm>eY`zezBs&`XZBTnJZ*s*#D@iG?fBg@)%*PKtk8N(OX^)q R>VuZl2QR7D>gx5H{{bk5{KWtO diff --git a/snake_trunk/VCProj/bsr_trunk.suo b/snake_trunk/VCProj/bsr_trunk.suo index b1f921936c3e764ce06679423b605b1d904ab8a8..bdf527e0a5e000085e16f7d3b777c2955748bcd9 100644 GIT binary patch delta 2215 zcmZ`)e^6A{6@KUK+s6Z!WmyoN4GN1}W2nJ}p^2de0XG9$1VVt4glK?ZQIROFKbmCh z28`(l5yFSOw&UoslaRy^V^}c$;edjntuo-WGyTJCP*dCK*d&sasG&rA-hGbWM zdH0=r?)mZE@7(L@lRSOW$vgvX!&*ab_$EOR8d$RMTf?8tS;G4xF}KIaz#8FK{uiWm z5yp3U7>TZe7%Wm2V#<8Uc#oeoL5+NZ1Yviie>!TdB-3#=o)?^gJGKzRQYxlm$7Q;o zr(%Lr{;B!nMr}?mW%bAk|MY!-d?ZrHQZcLE=Bry0mdFM!P>fkYB_kSuSLX{(+@GMwYb(ELs)GG*h3E+=S^>OVD_}2D z$8+K7upzz4g;j@_va5%DZ4xeZEJM{{FT6c6MmrZGv9lW|0rQ!SR2A)TUhayx6Fjlp^xz4yxc3AIA1$@x8whPNBwsuZy_mZkw1a;2f60)2;8~^2bor zEFq&i-f%=%1N)%_B#(K}_|`t7hTbYr;K%U1l;lr(d%{33;=P_yNIfnb?XjY+J{CnC zPUQ7isfCM4fVaJl0a>lbMV{9L%cB-@_`iOyK#Zg)_NUV@$VB(aVhQ{E>yWi?FFgH{ zVHFqf{=o$Nqc0J~r%Eu{Uj^yIcE-nr8>eizyksfb23CcY2y284p#t|jOOSNhXDa`p z=c&^sBhp4PQ8o}uZk-jaHyxbX^C&!3h`^wNp-B$MaB))z53GBO|gyP709lJx`GA};o8x`jo;eK5`>sSugsJe`03#a%v zjyEoDZ!BlFZQqgUdPRZu~TaOFyq?^6*~SDo~0ox9KOsbx@q$}Rc~hh7QG z^$Z49JLW7G6kIGeg$YbL?YN=F1-`#a$iAE(wmGeOLI7^eDLY&xH0b&i}wtO|;Uh8pt8s zvd9j*6eGHH_{ymabgRJMI=zV$&Q|ZZ_Oc~>R@iX%nvDD$t8oYGU(!px>zp! zL7kt6u3PZw6&F%w6g1aHaLJFc?JNujXKXxY>%E&NQg-m}=yy{K!FqE!oHKFS0ak&5 zZ@IhXE|QkjCYq0~nHuKRO0`I&bjs&#S#j7y4%H!%gG@nBs#_wy+Y(aMDTzub{5!po zM&lYPD|XgbZmrqqZrD}7wIYZ+jQdSq#3v1x&51=)pMyL9n0wt2V~#-^^D% zVe~xg#j&bEp-0sZ%=9x2SyhapoalE#D+J*pj~DZb6VX3mq-G!c*`M<`MlF(Qfp#O^ zT74>lJfiA1(^~bUOeJw;e8UB8x9~WLKV04r@$tot3~e`)utHMQHx;@wuX1N4*Qr(b z{|;IUz8a2GO(L1p{UUi7ZSBT8a^6fYFry36vRYBk7)ZZLo)ZN@eVrTY!^vo}DE|SQ Ce=q+4 delta 2151 zcmb7FZBSEZ7QQFBiI&*Vz zH*+TEec$t*kLP^c&`B|LQtW(8Pn9UpdlS|Pf>6h_2XE=Ww7MP|e{W^SAnExeR3H7l zxY1AQzd8i5KrTJb=lz&1h~&M*sdoDn_of zCeo;*YOLLGFM9Wj7;MPGk{!#?`fE2z_S=xr?}0V!K-GZ&94$V)(d3|=?8fp)vxteC zD_QSOEb8}S!y)I4u#wtqAFa9<|{_b{nEjH?Pk|rUi=*L-rR`tpN$v{ zC$r)*ezObv!XBI$v~~SaXSD1QUJ%@Zs$~biIJ17YVFB}7v3xuYqd&RP{f>i*G(4)p zR+PUZ!PC7OnJ1l=oq}Jent5BO`Ig$_Kx&)BHdZ6{ZZe*@o`h>{Mua<5d&!2Ktl5r< zwj927Yhlj)hZ$Y(K8n~r^9=eDnl9K9eJokdUS$iV!YW}kNArAis+~j>He}>9PuDFAfl|= zirSy;Xb!Hx#*fVG;5Phl(23seS~PY@(SLVr(xFdW9u0ODia2p94_T+`xfgP!Rch$4 z{Vj=&mLa!$J7TAbw1m|6IH?h7?Jpv=$BDvEcO7{p9qAuO%!%x%R?o8~{ju3#-!4>Y z$g7ytFim6JdD5z(^aw0{&mq>MqP-QD&q#2c39u=jcDoEUeQ902DLM_e@Yw*$K67Z5 z@Fd#L)=-I-uj+FSr1VRu>nnn-FMxgh``OVluJ}ThchY7}s&zn0P_zFmllpEIIzPJ~ z!M=@}rTetJR-bbs^L#67^1yZ8Mx_kI!(E@db=*@WT-4LBWZ?0jgJIdi-g(hFu&Ql^XpgWIQBlwBaK+npT_{n2ASvqVIc1^RWGXfA&8tiYnAE+tq6;r=H_Z8q zNf3;}+gLQb!xr!dgU{Fc>->9Oa97mVzciiiZ?5Pu@#A7@QDqSO+ScMA7rn*1DrJRC zZk!$t!!?}5J^pgIKxzu=(K^(Q2H_ejNAQ3LrZHI&?R=Aq?yWkqPap&wE^};%4g6*n=%<(4HySHUM zE?rF~HTtEI?{%mCkqgUz5t| z`e%si>c?NG(wpQ2hC9CIGn2#Qxf{kj)1sMs&n%uEc?pli=_U7OGwSUS8C(4hxIT{HAb*4Fjuz_!;tM=k;r;2d^>(-Xge66jI-jbD8 z9hrERW_R6rOh;w zMp~*&nJLwNVpdA-y}-Of@!dm}O5z;y%748pe$q_~dJbwP^!{xXXdYgsAtC3@DiQco PF(as%^7q8-WRv~_0hj}+ diff --git a/snake_trunk/config.h b/snake_trunk/config.h index 6c65253..ef24663 100644 --- a/snake_trunk/config.h +++ b/snake_trunk/config.h @@ -7,7 +7,7 @@ */ #define MCU_VER_MAJOR 0x02 -#define MCU_VER_MINOR 0x32 +#define MCU_VER_MINOR 0x33 // ビルドスイッチ diff --git a/snake_trunk/i2c_mcu.c b/snake_trunk/i2c_mcu.c index db007b3..fabaece 100644 --- a/snake_trunk/i2c_mcu.c +++ b/snake_trunk/i2c_mcu.c @@ -143,6 +143,10 @@ u8 iic_mcu_read_a_byte( u8 SLA, u8 adrs ) u8 dat; iic_mcu_result = iic_mcu_read( SLA, adrs, 1, &dat ); + if( iic_mcu_result != I2C_ERR_OK ) + { + dat = 0xff; + } return ( dat ); } diff --git a/snake_trunk/pm.c b/snake_trunk/pm.c index 1599397..b278d26 100644 --- a/snake_trunk/pm.c +++ b/snake_trunk/pm.c @@ -875,7 +875,8 @@ err PM_LCD_on( ) void PM_LCD_off() { - // BLついてたら消す。// チェックするのは割り込みの関係 + // BLついてたら消す。 + // チェックするのは割り込みの関係 if( ( read_pmic( PM_REG_ADRS_BL ) & 0x03 ) != 0 ) { u8 tot; @@ -895,8 +896,8 @@ void PM_LCD_off() } - - // 50msとか待つし、確認しましょうかね… + // LCD 電源落とす + // 50ms も wait あるので点いてるか確認する if( read_pmic( PM_REG_ADRS_VDD_LCD ) != 0 ) { PM_TCOM_off(); @@ -907,7 +908,7 @@ void PM_LCD_off() if( system_status.LCD_is_CGS == false ) { // アモルファスならポート操作 - SPFL_LCD_AMOL_HV_CONT = 0; // 他のファミリでもL縛りなので弊害なし + SPFL_LCD_AMOL_HV_CONT = 0; // 他のファミリでもL縛りなので弊害なしだが。 wait_ms( 10 ); // アモルファス15Vを切ったときのウェイト。 } @@ -915,7 +916,7 @@ void PM_LCD_off() vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW; } - set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF ); // 無条件に発生。マスク無ければ。 + set_irq( VREG_C_IRQ3, REG_BIT_LCD_OFF ); // 無条件に発生。(マスクは有効) } @@ -1110,16 +1111,12 @@ void reset_release() ***********************************************/ void PM_sys_pow_off( ) { -// if( RESET1_n ) - if( PM_chk_LDSW() ) - { - // 異常終了でないとき - PM_BL_set( REG_BIT_CMD_BL_U_OFF | REG_BIT_CMD_BL_L_OFF ); - PM_LCD_off(); // TCOM,VCS OFF も消してきます。 - wait_ms( 20 ); + // 一応 LCD 関係消すのを試みる。 + PM_BL_set( REG_BIT_CMD_BL_U_OFF | REG_BIT_CMD_BL_L_OFF ); + PM_LCD_off(); // 消えてれば何もしない + wait_ms( 20 ); - PM_reset_ast(); - } + PM_reset_ast(); RESET2_ast; FCRAM_RST_ast; @@ -1128,7 +1125,6 @@ void PM_sys_pow_off( ) PM_off( ); PM_LDSW_off( ); - } diff --git a/snake_trunk/task_sys.c b/snake_trunk/task_sys.c index 457ab56..98fc8e2 100644 --- a/snake_trunk/task_sys.c +++ b/snake_trunk/task_sys.c @@ -406,6 +406,8 @@ void tsk_sys( ) system_status.poweron_reason = NONE; pwsw_timeout = 0; + SPFL_LCD_AMOL_HV_CONT = 0; // 異常終了時、アモルファスLCD用電源を切り忘れてしまう + if( !PM_EXTDC_n || chg_led_override != 0 ) // これがゼロになるまで待つ