From a7462157c550a6a9baa3dbb724368612cb8994fe Mon Sep 17 00:00:00 2001 From: bsongis Date: Fri, 10 Jul 2015 23:35:28 +0200 Subject: [PATCH] [Taranis X9E] Bitmaps added on startup --- radio/src/bitmaps/Taranis/lock.png | Bin 0 -> 1573 bytes radio/src/bitmaps/Taranis/logo.bmp | Bin 3126 -> 0 bytes radio/src/bitmaps/Taranis/sleep.png | Bin 0 -> 1691 bytes radio/src/bitmaps/Taranis/startup.png | Bin 0 -> 5532 bytes radio/src/targets/taranis/board_taranis.cpp | 114 +++++++++----------- radio/src/targets/taranis/board_taranis.h | 1 + radio/src/targets/taranis/lcd_driver.cpp | 6 +- 7 files changed, 56 insertions(+), 65 deletions(-) create mode 100755 radio/src/bitmaps/Taranis/lock.png delete mode 100755 radio/src/bitmaps/Taranis/logo.bmp create mode 100755 radio/src/bitmaps/Taranis/sleep.png create mode 100644 radio/src/bitmaps/Taranis/startup.png diff --git a/radio/src/bitmaps/Taranis/lock.png b/radio/src/bitmaps/Taranis/lock.png new file mode 100755 index 0000000000000000000000000000000000000000..a3b103e94ee6c0789a345a4a2e00fb4929e61925 GIT binary patch literal 1573 zcmV+=2HN?FP)WZq0 z6<5@_qGH8WE3UDks`4u7am9)nm4{ey z#T8dvag7>lthmOCipoPCqUS!OGtFdXl9^tmh3fy-b@g%d;s`mHonk-!4L@QpSY*^V4FOy{FCzPr9bpy>*%oYwI;JM> zlRBm(eHPD)_XBYHWm>dGU^9T4mrcX0(Y$P;z-B<~Km9U&w}8_pw_xMXioln-#w|iF?Di z0ZLe3dMw-c+(6z(UUA@R)&9Vaa_@7hmbNX}#tvj-0T!ZhU^Afko$T8zvVCV83AVrb z9{Xhd2y5E6=9>-R!dXF_Wvu~wwoMuiTkw}bSDKNTC zUm*x7H}14MGMXujMHri*iU;4|d$i5vmhs+5B%-O0SFc_{Fc{R-w$*G&**eza%l$F9Vd;1%A;<7gVyn1RD7C*vqK$0YM zIvw2{yjHCN;Uz?=M>e?}2dAf}l4m%s4tOdS9&|U-PimHK)Ibpg0kvvP_TS;*q3qdC zct^FbPPbz`V286en+(eU86Z`yqg3W?^ROS?heRR)tE;P$iCbS^2b!j(;I?-p>vz?= zs#U0#1c>RAS$MVdI*5`C$B8$R@$!z6N~ykb!1!Uk&W`7<)M5$dJr{!TM{g+ z$9(_*QdCM7U1QOhtX(7$fy4N%E4w{zVCoFSVlmkkB?dN@k&Mky3k!)yzrd!YDkU4u zFHKd3q$gDzC-E37wbaCGt#X#5q=TuksPI|f))NpOPR04t^#Gs^9^7%XffaXMIEL~cphu=Fj6L!%epIGF3?3-Bem?=H% z7XXCyqs4{0*Ig9)C8P_ipluC{&Qliv1|^>Uz++#st8O3t3a6f`q^h*9+TwOK6N#sv zJ#!IHh>*f84-)l3u{`rSqZ_Q68hU3k?Vy_~1+l$nd#HKY zR2AliWoDzqz?lp2N=Ge%#Rr3q9veT61u6*iWo1KuHeM zPSW@1xKy;Tbqv5(3|0TC$|mw&9+&n9GT)j{dZM5aaN(?g5JHH(U=fw1B>B2;&1dL= zxZzhGXqtvtG$y(7FsuYaL2x)6P%4&W*CbM@l;Kw%=B9ODI-k!&KA+chsb$_a55Zti ztY5{Y7S(G@l?reT4tSmizQIGM+mT#yA&A*rTbeU(#G8Okz$Rc5unE`%Yyvg`PpSM5 XopQ=0&%gb(00000NkvXXu0mjfXC%xteR?uv z$Uw%78Of9>6PYt-Myu75B}*2vX3a{rY}v@3Jv%var$^?J?hu5PlE;xXxOkJjT$wgapT7L`T5bLNfVkjZA!Cd z&1l}dIW1bWpk>RJv})Cg)~#F9rcE2#wrxwhcI{~2zC9f}bf9C$j&$nOiO!unV=x%# z(xnSsyLP2pw{CRr-klyjdeF0HPkQz0Mep9d>C>kVef##MU%!6z@86#R0|qc~;6Mfq z8pPnigYozGXULEt3>`X@VZ(+oeE4uij2OYlks}#3Y80bKk0u}>fH7mnFm~)%#*G`t z`0?YJFku1{Cr)J2q)8Z!MkY_5%#|p24o$T7Ri`~0-vuDp9_U_$_$z)>RzJ2W9zn=pK z4sh_`K@J@{#Noq-IdbF(M~@!m*s)_AKYpAOCr)tkqVJr#W-x3}?@t#cVcn z?%X-fpFhuq3m3R}@gkQlUE=cP%Uro~g{xPua_!nRu3x{-jT<+(dGjW>Zr$Sc?c3bB zbBDWk?_#l7xOeX!_wV25!Gi}peE5(@j~?;(@nfDmdBW4DPkHw28PA_T=f#T`ynOkR zSFc|2`t@txym`ahw{Njptwcmb@b29^-oJm(hYuf!jEv;t$B#rsMe*s=Cq94v%$F}; z`1)Zq^3y~_=wo8aDR+-wV+5`B_6ZMm_^U;M z+aeK*e8ePJ<#$O&xQG;!e)Y8L@4Ue$LIR@(I)Zp^5G$jle}Md}w$)GKY+uBK|H$m{ z_W@rk!ll%Ei56Fh4i)R;$@*n}r$1eVh^^{)QT$RyaJY}}#z5&`=9N8vtXSwOCFw5T z9QOR#qr^V(B)#L!@pAyrK&y3@pH(3G{ovr~&7b3v@j4&s8BUbC(a}ld)hE5S)69)T`P^Yo%a_8DH?5dDQKJk zwY?5SO8Pjn5MlDWK$Yq!z@+@`nN$IBnN(VhMk{Mq=D5D>^-7BhuNbfmvn{>?{s^EH zJ0(go7;QaDoRdKXRc)wY53iW`5kT>3w=16H@OLz!V0y`++#kh~NdoOFIt4PsaVWJA z+k)9(@HZI^24N9a`BT(5cT^VWCmXcaChgMM&$;L?RrUSjEL@m$0*gj(-*L4PCKO91 zVOC_?*^nD(aBPQJe)uS^I_MYG*~oR8AZxE#iUXOj?a}S5L|x y45LP?53`yznxESIjX+kb#q6ii{i(Z7@2Ash?Z@divc^G;I=#R1%*7f1i|{WifsP*l diff --git a/radio/src/bitmaps/Taranis/sleep.png b/radio/src/bitmaps/Taranis/sleep.png new file mode 100755 index 0000000000000000000000000000000000000000..b35df3e5234065dba9eddb33c719863739151b6d GIT binary patch literal 1691 zcmV;M24wk(P)7mY^2CAis> zQcCIQ@6p1g^t42o2;)fUyVA`6=9Sp(8126Add|x%O|yFq*Y`;?J{g_(caE_r+O0N( ztgw8OHgv;rTpOhgH`pnAmQV1Wj?Nlbuq?|3R#B7-!G>zmtzTPo{mDAbKg!e5=?pV| zTJk-vexy_O4(rQ|Cna#eo&63?-%nE}!qDWsBpngXsmpB{8 z#>U1uA0T7}SOd$oXGKx;zu2p4c<09*=dI@-<>~Ol@Jit&{Z%>?%?4u9lVG>L-|~#J zmjN8ao((JxlMZprwqCEJuwHQf>mByMB{)>JD!#|%6Z}jwo+r+RV$%ANPGh%YQ#Biu z0}NWTS8`fXP68nWQeJ|hD1j#_lbQtpF(*RIiZdOZBuU7uX2Q{M>s^a75r(oWtP^&^ z((Jsl^V81UbND6zD$neFS=p)}9*+mASy2>Snq7K%*lxAa>)8&eyjc!(A%qYVOT|m| z^+O@~0^DfYNq>2>9C+E`7c3zJN>hO#2=nh>zl;aRa8h@+z_A=OO@pRs zXt&$5=T=o{2ljK5{pGxDQ^A@RJYchLn@uWtX3Bza<}AvaWneVL^b7;lT6Jol$&{e|}B-fAs0#ctBh4T25`vL>S86amW7V+a_fq3|)J? z7JTuLeUPP0ggIBK?7i8Wn_$y_*UydH|FiFUDPGe2rRnP1ec!cT&%Mi07s8Av(FF6cdG;*&g7RYkpC2O$L7fd*@6A(P2K%!(+Mic??ccrBhh^ko4%Wn15v zsfB8_dS&{ySe!or83P`#El@8#ev6-<11+=l^qy}G&kcAS4!q*!q8sVh2}dRqa%$P@ z^}J66{|~7p07!Ys$()wm#%ma_DHIL2TW!d)3@*XhS`kL%MM-Zr!2hIH0>;T{=@ULy!=RC?8!rCzvGzUWCazL zOcp7f{m%6}Y6(NLb2-bfk4wD{)2=GR4?~)Nln)GSVCTb~{f@Jz*%j7a*y$C?&&sL|xTq>ClFtb+>eK-`s$wcDsX ztDx8Gx$0dxFWcdVv%?QYcBW;TCJe(4Uz3~`pXBlC)hici7(@&0CZ3`wP!t92R@-&s z=Ax@dvMf6iMq9|$LqZ5NO@rD0H}UA3I2oOQ=Xoc;&a7rGcZK0P0=`b|i@Onj1Na8; l4d5HVH-K*d-vC}-`v)7EK%J;760QIM002ovPDHLkV1lb-EQSC8 literal 0 HcmV?d00001 diff --git a/radio/src/bitmaps/Taranis/startup.png b/radio/src/bitmaps/Taranis/startup.png new file mode 100644 index 0000000000000000000000000000000000000000..03fac5a86f8c3695477ddfb765d15215f80d27f4 GIT binary patch literal 5532 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 & (RCC_CSR_SFTRSTF | RCC_CSR_WDGRSTF))) { - tmr10ms_t start = get_tmr10ms(); - while (pwrPressed()); - tmr10ms_t duration = get_tmr10ms() - start; - if (duration < PWR_PRESS_DURATION_MIN || duration >= PWR_PRESS_DURATION_MAX) { - pwrOff(); - } - } -#endif - -#if 0 // second version - if (!(RCC->CSR & (RCC_CSR_SFTRSTF | RCC_CSR_WDGRSTF))) { - tmr10ms_t start = get_tmr10ms(); - tmr10ms_t duration = 0; - uint8_t pwr_on = 0; - while (pwrPressed()) { - duration = get_tmr10ms() - start; - if (duration >= PWR_PRESS_DURATION_MAX) { - turnBacklightOff(); - } - else if (duration > PWR_PRESS_DURATION_MIN && pwr_on != 1) { - backlightInit(); - pwr_on = 1; - } - } - if (duration < PWR_PRESS_DURATION_MIN || duration >= PWR_PRESS_DURATION_MAX) { - pwrOff(); - } - } -#endif - -#if defined(REV9E) // third version - if (!(RCC->CSR & (RCC_CSR_SFTRSTF | RCC_CSR_WDGRSTF))) { - tmr10ms_t start = get_tmr10ms(); - tmr10ms_t duration = 0; - uint8_t pwr_on = 0; - while (pwrPressed()) { - duration = get_tmr10ms() - start; - if (duration >= PWR_PRESS_DURATION_MAX) { - turnBacklightOff(); - } - else if (duration > PWR_PRESS_DURATION_MIN && pwr_on != 1) { - backlightInit(); - pwr_on = 1; - } - } - if (duration < PWR_PRESS_DURATION_MIN || duration >= PWR_PRESS_DURATION_MAX) { - pwrOff(); - } - } -#endif - keysInit(); adcInit(); delaysInit(); lcdInit(); // delaysInit() must be called before - -#if defined(REV9E) - topLcdInit(); -#endif - audioInit(); init2MhzTimer(); + init5msTimer(); + __enable_irq(); i2cInit(); usbInit(); @@ -207,7 +159,45 @@ void boardInit() DBGMCU_APB1PeriphConfig(DBGMCU_IWDG_STOP|DBGMCU_TIM1_STOP|DBGMCU_TIM2_STOP|DBGMCU_TIM3_STOP|DBGMCU_TIM6_STOP|DBGMCU_TIM8_STOP|DBGMCU_TIM10_STOP|DBGMCU_TIM13_STOP|DBGMCU_TIM14_STOP, ENABLE); #endif +#if defined(REV9E) + if (!(RCC->CSR & (RCC_CSR_SFTRSTF | RCC_CSR_WDGRSTF))) { + tmr10ms_t start = get_tmr10ms(); + tmr10ms_t duration = 0; + uint8_t pwr_on = 0; + while (pwrPressed()) { + duration = get_tmr10ms() - start; + lcd_clear(); + if (duration < PWR_PRESS_DURATION_MIN) { + lcd_bmp(76, 0, bmp_lock, 0, 60); + } + else if (duration >= PWR_PRESS_DURATION_MAX) { + lcd_bmp(76, 0, bmp_sleep, 0, 60); + turnBacklightOff(); + } + else { + unsigned index = (duration - PWR_PRESS_DURATION_MIN) / ((PWR_PRESS_DURATION_MAX-PWR_PRESS_DURATION_MIN) / 4); + lcd_bmp(76, 0, bmp_startup, index*60, 60); + if (pwr_on != 1) { + backlightInit(); + pwr_on = 1; + } + } + lcdRefresh(); + } + if (duration < PWR_PRESS_DURATION_MIN || duration >= PWR_PRESS_DURATION_MAX) { + pwrOff(); + } + else { + lcdRefreshWait(); + } + } + else { + backlightInit(); + } + topLcdInit(); +#else backlightInit(); +#endif } #endif diff --git a/radio/src/targets/taranis/board_taranis.h b/radio/src/targets/taranis/board_taranis.h index 5c3546a54..605332f20 100644 --- a/radio/src/targets/taranis/board_taranis.h +++ b/radio/src/targets/taranis/board_taranis.h @@ -342,6 +342,7 @@ void bluetoothWakeup(void); // LCD driver void lcdInit(void); +void lcdInitFinish(void); void lcdOff(void); // Top LCD driver diff --git a/radio/src/targets/taranis/lcd_driver.cpp b/radio/src/targets/taranis/lcd_driver.cpp index afc965bb8..4ad229b7e 100644 --- a/radio/src/targets/taranis/lcd_driver.cpp +++ b/radio/src/targets/taranis/lcd_driver.cpp @@ -268,8 +268,8 @@ void backlightInit() BACKLIGHT_TIMER->PSC = (PERI2_FREQUENCY * TIMER_MULT_APB2) / 50000 - 1; // 20us * 100 = 2ms => 500Hz BACKLIGHT_TIMER->CCMR1 = TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC2M_1 | TIM_CCMR1_OC2M_2 ; // PWM BACKLIGHT_TIMER->CCER = TIM_CCER_CC1E | TIM_CCER_CC2E ; - BACKLIGHT_TIMER->CCR1 = 0 ; - BACKLIGHT_TIMER->CCR2 = 80 ; + BACKLIGHT_TIMER->CCR2 = 0 ; + BACKLIGHT_TIMER->CCR1 = 100 ; BACKLIGHT_TIMER->EGR = 0 ; BACKLIGHT_TIMER->CR1 = TIM_CR1_CEN ; // Counter enable #elif defined(REVPLUS) @@ -287,7 +287,7 @@ void backlightInit() BACKLIGHT_TIMER->CCMR2 = TIM_CCMR2_OC4M_1 | TIM_CCMR2_OC4M_2 ; // PWM BACKLIGHT_TIMER->CCER = TIM_CCER_CC4E | TIM_CCER_CC2E ; BACKLIGHT_TIMER->CCR2 = 0 ; - BACKLIGHT_TIMER->CCR4 = 80 ; + BACKLIGHT_TIMER->CCR4 = 100 ; BACKLIGHT_TIMER->EGR = 0 ; BACKLIGHT_TIMER->CR1 = TIM_CR1_CEN ; // Counter enable #else