From 98b1029becb7444cb8139f31be080a68181799a6 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Thu, 16 Jun 2016 10:14:53 +0200
Subject: [PATCH] 3djc/chan mon improve (#3604)

* Prepare for more flexibility (and a much better look)

* [Horus] Preparation for a new Channels menu

* monitor bar icons added

* Add ICONS structure and populate for MONITOR pages

* Restore old widget (had used it for temp work), will likely update to the newer look later

Functionnal output monitor 1,2, still need extended and overrides

* extended limits

* Overrides are now managed

* Back to Red ;)
Add outL outR to hightlight out of limits values

* Rewrite of posOnBar, as it was getting overly complex
subtrin now fulland more logicaly managed

* Fix overrides

* Center bar drawn last to be always visible

* Limits need to go through extend limits display calculation as well

* remove debug printf

* Add inverted output icon

* Tidy up and cosmetics
---
 .../horus/THEMES/Default/mask_monitor.png     | Bin 0 -> 1200 bytes
 .../THEMES/Default/mask_monitor_gvars.png     | Bin 0 -> 698 bytes
 .../THEMES/Default/mask_monitor_inver.png     | Bin 0 -> 543 bytes
 .../THEMES/Default/mask_monitor_lockch.png    | Bin 0 -> 530 bytes
 .../THEMES/Default/mask_monitor_logsw.png     | Bin 0 -> 1078 bytes
 .../THEMES/Default/mask_monitor_mixes1.png    | Bin 0 -> 1090 bytes
 .../THEMES/Default/mask_monitor_mixes2.png    | Bin 0 -> 1091 bytes
 .../THEMES/Default/mask_monitor_outL.png      | Bin 0 -> 295 bytes
 .../THEMES/Default/mask_monitor_outR.png      | Bin 0 -> 299 bytes
 .../THEMES/Default/mask_monitor_outputs1.png  | Bin 0 -> 1083 bytes
 .../THEMES/Default/mask_monitor_outputs2.png  | Bin 0 -> 1076 bytes
 radio/src/gui/horus/menu_general.cpp          |   9 +
 radio/src/gui/horus/menu_model.cpp            |  21 ++
 radio/src/gui/horus/menus.h                   |  54 ++--
 radio/src/gui/horus/navigation.cpp            |   7 +-
 radio/src/gui/horus/themes/darkblue.cpp       |   3 +
 radio/src/gui/horus/themes/default.cpp        |   5 +-
 radio/src/gui/horus/view_channels.cpp         | 231 ++++++++++--------
 radio/src/gui/horus/view_statistics.cpp       |   1 -
 19 files changed, 197 insertions(+), 134 deletions(-)
 create mode 100644 radio/sdcard/horus/THEMES/Default/mask_monitor.png
 create mode 100644 radio/sdcard/horus/THEMES/Default/mask_monitor_gvars.png
 create mode 100644 radio/sdcard/horus/THEMES/Default/mask_monitor_inver.png
 create mode 100644 radio/sdcard/horus/THEMES/Default/mask_monitor_lockch.png
 create mode 100644 radio/sdcard/horus/THEMES/Default/mask_monitor_logsw.png
 create mode 100644 radio/sdcard/horus/THEMES/Default/mask_monitor_mixes1.png
 create mode 100644 radio/sdcard/horus/THEMES/Default/mask_monitor_mixes2.png
 create mode 100644 radio/sdcard/horus/THEMES/Default/mask_monitor_outL.png
 create mode 100644 radio/sdcard/horus/THEMES/Default/mask_monitor_outR.png
 create mode 100644 radio/sdcard/horus/THEMES/Default/mask_monitor_outputs1.png
 create mode 100644 radio/sdcard/horus/THEMES/Default/mask_monitor_outputs2.png

diff --git a/radio/sdcard/horus/THEMES/Default/mask_monitor.png b/radio/sdcard/horus/THEMES/Default/mask_monitor.png
new file mode 100644
index 0000000000000000000000000000000000000000..68ddd4516cbe5049f0f87997cfca728b1d41f8ed
GIT binary patch
literal 1200
zcmV;h1W)^kP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11T9HKK~zYI#h1%Va$OY0pQOkNkI37o8+0+uIMAqx6io^oSfrDp
z{(u^05sqpU6-0xe1`RD5B+(!YqG*_xq6QMtFzAMmBpoBPe7-@rKh1O0_vL%}795c6
zTKjkQ+Us`8ND?JVB9TBO62ar+BOV?e008y%^{A_>gDlIasi`S-D}Y5Ll}gd;_0r*R
zP_Ne$fa;^y>*;Vf==FM;N~MZz%YtB^&&T%m_8frGXrwI5wA<~p+wGKPnMR{AN2k5L
zoj#xM_rZ#y(B*Q8jZ7vJJsuB(!64J=be?`Xon|l?q{ri-$z&3CE|-gnqLc={zrSZ!
zR~G?Lr_<5xb~6@>sTwDfNxr_m=B&kHF}mGu>U25+U{_Zc@9*ymgB3*)P)U;L_xn|W
zFE1|~9UWz5WhDX7VzKb_^fX7u@Ap%ZBmw_<@*Hr+y^<s`5{alnKR-Wdv)S^3tGv9N
z=jZ1+x{*jkz+EnvI@ss)3HNH9lq3%i4>couaBwhB-|zPew`T_&$nTWNM6cWJ)`XJe
z%F2o+xUH>C)yD01i)hcJ8c5RX^@`}#3Z#te?d@rT`}_M<ZDO&Qh<2~n`!Cqxa1a1z
zW@ZXPNiva0<mGneIXF1bwDWj81VD$w@eNiKMN}k<#lpM0yQ1);qoW*Pb#*m2H#ZB~
z1cO0Q;S@z70)c=qmL!R_wY7Pv@%;Quzu(X8?QLFPUvq41jMdfE3<LrUg+fdu5=CD&
zolc7i7YGE1%$>=y%$u7VS}YcpmzQ&Ob(PU*G^c`PKTfB!DD0=mvP=Nqak93yMgX+i
z?Ig)~JkFt^A>kISKq@OM<Hp9uZ-MQ0I{|QQZH>C0-Aa-q?C<ZxY&PTL;{yONJUon}
zqa$2gTwr;583uy^Br!cbjoaH>VH=G`vADR1(a}+yoScA#I&QYBGZG4g#L33T$MfF&
z?CeYwg~`cDaffYfZ8=`q+S<}~btbrsMx*FF>+9>n`1<-<)ondJJp{n2sw!HoRyH;^
z=3R%)W)u29gG(pNGW2>q;_*1b;V=M*=>h<nnwnHS)zHuY03eCZ&Q4gZ);yhGzkZ3|
z;cyu7cpQ4Y9<nSWr+|1o9+KqF&W?ENpQ%NDH;UHQRs!I_z<^lq>+8#D8pp@S;=jBC
zLgtsuySqD9R8$ZEJ32b}^z@YDvbniA0a#dA5dVFBeev+{kV{KTe0+Qq>zXA~tx3$!
z&x_4#Yil_%F~Ql{S$21Ki*>Wv%=h<q)fmVY%_c$Sx5Z>K$&rx}%{*>yZsz6XWl?Cs
zwwMvML11@xm%Y8cqL{R_v~X%_if?akMWH1P0%YOQCzJ12S64-WnUj`0`jFbg-v0i6
zN#H*k_Oeg@bG&srodlqIum8z-n=NVsy}@Akdjoy8{H;%zGV=fVX!{3_r~%$d-kw1K
O0000<MNUMnLSTX)8Auuc

literal 0
HcmV?d00001

diff --git a/radio/sdcard/horus/THEMES/Default/mask_monitor_gvars.png b/radio/sdcard/horus/THEMES/Default/mask_monitor_gvars.png
new file mode 100644
index 0000000000000000000000000000000000000000..55b488d1e93bc3778770a1fe7a2822ebab22f870
GIT binary patch
literal 698
zcmV;r0!96aP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10yjxSK~zYI?U%oc;!qIBC$a=wu&|Iw8VO<wI~&1TECd_D-cktI
zSc#2@U}t5cVCO%fR@Q>nVj)`iGm?M^0mXc`*xTGa<KB5*)@|+!ulX{}C-cY*^Ed#Y
zZ_vxNVVWkLPA5kpJkOKM<zh|zkfv!Um&*`E5k%zZ5k(Q@av7SYec)h$i^Zbj!0S^i
z7A-Ib0H$e@D2lY*ZmCwQQ7)IWU(JIuO_N%!7L`gR5(I%(tJQmM05A;0`l?^A!zpQ+
zX5}{w0{~zvi{m&)D*aPVXYTU>{Rclyw#oH7Z8jU4OeTyM2n0xyBwOrav7q^UPO(_*
zcCzbs(sljQwy0DpwxJLXhjF=Fn7HY53ZKts4Gdk^ZSC||;QfA&;cy6^=NWjX)3IXK
z>op`vLN=SVynhCNNKq6991I3=KA&+o91w{_kW40VKA)WjFPBTW-EIcnXfzOy#}SQ2
zaXcQGc*np1P$(1_FvoF_Wf`if+F~6A?{+)9zP>W>Znt|g_7?czKJN8;WEckHwOXzF
z6FgFJzuyPX^T_A(w)PqhhhKBm<M9|Cj|bIi6#$S*r5JD`k#HV7o6X?&`=Ka`<&8!o
za2&_L2ZMogU{zHi%Q7;VjBQe-(`g1A3Wbo(W-*)1J_X-BtLybTMWaz_x7)V0s8Xqr
zrfG~fpU=tb_1^z;J!|!OA$s3?1wo+gc1z7>^GlXJA|gQ$i0ApA6$8&-Z@+D!=K%KY
g^sFb04g4&<0sb;)cxw)i(*OVf07*qoM6N<$f`H90A^-pY

literal 0
HcmV?d00001

diff --git a/radio/sdcard/horus/THEMES/Default/mask_monitor_inver.png b/radio/sdcard/horus/THEMES/Default/mask_monitor_inver.png
new file mode 100644
index 0000000000000000000000000000000000000000..64f251238afafc4d6e9b4d328bd635b935d2c0fb
GIT binary patch
literal 543
zcmV+)0^t3LP)<h;3K|Lk000e1NJLTq000XB000mO1^@s6z`ccj00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10h~!hK~yM_eUh!q>HrkRpZB^i-Ntkihe0gX2_}=(X0wUis{REQ
zqsb&#Od=M$!6GbJ#8nxBh6yr33~G4ZAou+c?>%tBIsDGyIUgS+dAr>(nM^PmjSz+*
z9*+kej|U2c0ve45N~ID20JU0;wr#UqE^|7aa<y7<y<XGvJofv2rqgM5yIqnbL{X&Y
zdHk2{b~|RXSuU4Le#o-S^Z5)#QE)gMu;1^INF<O<CSjT;0AM&AVm6xrvMkeeUDoS$
zT9(CPvB+F5M@`dMtJN3;0XLfs<MBBE06?``h2uEbZntn<7mLLLK@cF5$-r?OEEWq~
zuUB9^9`k;`e`)l6pZR?LEADhU6h)DeBoRM{@qM4EREm-$@p8FvFc?tRbqaz&MNz)t
zzhER1Apk0hLS5GhfB+ba#h&mh_|7#=Bf>DGZQK6^0njjvXXkdiO;uIjLb5E=G)>Ou
z^KZ?s1%_czQ504x6`oF~=ed7wqt$9L8jVsA1dc`{9*@Ugr~d_$WV6|%s;Y1QM8J#n
hdOcW{^_m6%d;*MCblAkqugd@c002ovPDHLkV1gj`-nRe%

literal 0
HcmV?d00001

diff --git a/radio/sdcard/horus/THEMES/Default/mask_monitor_lockch.png b/radio/sdcard/horus/THEMES/Default/mask_monitor_lockch.png
new file mode 100644
index 0000000000000000000000000000000000000000..360923a093714e84a218ab12295eb959b077a9d4
GIT binary patch
literal 530
zcmV+t0`2{YP)<h;3K|Lk000e1NJLTq000XB000mO1^@s6z`ccj00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10gp*UK~yM_Wl|xl!eA6V6Lkw)P*95w*DPw97|hB*lVDgGR`Dko
zEc*c>Gn#C}AlStJpjj476Prz$?7Z-vd+*~N_{zEG-gD381Ap**KIytHo6ROwRi$Z~
zoX_Wcy<Q&)L6T7v(KJm0`1e|^79Wqtuh?~60$@I$=Vr5E7=~Q0*DMx`1i;yB_A9Q}
z>jXg0^Y|C5)rtVvXf#NYDFArC->_{Py<QK0(d~9&+cu&o0sy1{!1sL^h5^TMpzAsm
zMS-sCa2yAQVZitO@9xQDA_OWF3LK3_%;j<dKb=mAa=Dxknx-Ym!!Tqvn@wt!N`;VR
zIU(BZwh*vZt0gsAmI+l=1-t!z&p3|hd7i*)n#NSW-xn@$y<Q<n63*wdzz+rk;BYu3
z-RX3i_xqhBc{-hh$;ac7h~t>mYLx(JS(dPKr_&(-8iv6*j+vGu3CraY!{HE@%LSHY
zCDymw4Vg>^i^T$xBmti(yWNh8q6pTCqHw$2iofoIAPDF<4ojsH$Kx@BAQ0C20)>oI
Up<r>oSO5S307*qoM6N<$g7bCY@c;k-

literal 0
HcmV?d00001

diff --git a/radio/sdcard/horus/THEMES/Default/mask_monitor_logsw.png b/radio/sdcard/horus/THEMES/Default/mask_monitor_logsw.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc63551434eeaa96992ac1b060ff5f5a6a7b9e3a
GIT binary patch
literal 1078
zcmV-61j+k}P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11G7m)K~zYI#g{!ua%~vLFHL+3ZLlL4hf1f2B7(AphG?iMbBO2z
zTB@Nis77%Sih{;!$v&i|noKZku!uz3%7!SK1Svwr)F4yzc>d4On@{G)o4vg~f4Jd%
zT=(_6@BiUCT(<xK=r2h0@d3~Clt?7L6(SakNhlO%KEyu?g+eeIjbK?8MD(qLWmy=F
zMubA4HyqMny<Y$Az>h<(*Qdb(0N{C^Se7Nf-%pE+i!?DYk!{Tv#q&IwOeQiI45Uyf
z=;7hvH8%jnVzKn9-rMm}kw^q5Cns>ZT;Mn^Z`?<PLZNj2SS<F(>i6JqIGi;x8jV7y
z(?K8*q~jQd!N|x60)fE4g2Ul(@!(`KiPqLu$Ye6Cudn0o?hYQ02P-QpsHv$zdwV<L
z@i-!pNM0Ad1fHLtM`>v(uCK4N5?)<hp}f2tEXzV55I`!GVsLN}!C>&egPWR~Fg-n;
z*G9YD4xLU1tJR8)jSVQ3N+^{|JUu;q9h^)iArgtOyStkg{85jOkEpDy#LUc0L2$vE
z2?m3dN~MY_pNfhK(&=<$v)Ky96$DRBO_55aBCS?iFiA3*B&X9!x3{-MM5I!w$m{hI
z$8q^5<+Iviv4Dthbaa%{(wmzbEH5vkr>6%}sT8%fwXj$$0D#%qSu{2_e(f8p)oKh6
z52q&w0s-vp?O}9u6jfDKkjv#58XCgZ))u^8Z^oipT3XQ8*Y`EBTrS7z>M8&r9*;vN
zlcB4t3rkB&aJ${u-`|JN=gaBF_VzXe0s)*(XK~=?=VuTRY&KguSu&YSU%$M(pt`ym
z<KyEw!2qDuYSGr#Rvg&l@qmbMc6OFC>D=5LhzLTV5SN#iIb+ObGo(^!abS+)AdyI5
zGMTax-rwItB9WxyJ3Bjbf{%}nK}7KRe4nr5l9CcqtJUOiII`Xu3<iouqv`w8(^Ilq
ztyyvB=jX&Q3^5E-Tsa*a9Ds=6a5&PtaJ$_oD=WjVU%xU&Lqh`+iA2VZo12?4Ha1qA
z)o&UY7y!dCu-ol9?aU{a%LO9B;o)Ika8|STUYnbnG&wm*8jXfD8Vz-HbWnYLJprIp
zDn%T}Q7V<n7#9~8WHy_rzrUZlySwuzFSO$~?d<HJx3?E^xjbhtB@_xF5{V!di&0ls
zhlPcOjPm=G)rDFg;Pq#cNF=~<9C)7pl=Zn<9}&@O->Xn4$nW>l+S=Ox((DltDHIA4
wi^YGe27bQ1{c8=q0LVN${nQaA3;a|14Km00!+}?S)Bpeg07*qoM6N<$f+4Buq5uE@

literal 0
HcmV?d00001

diff --git a/radio/sdcard/horus/THEMES/Default/mask_monitor_mixes1.png b/radio/sdcard/horus/THEMES/Default/mask_monitor_mixes1.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b0c71f609acc5917933db281df10d0a429043ec
GIT binary patch
literal 1090
zcmV-I1ikx-P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru;06vAGbjFof^h%<1J6lB
zK~zY`#h1@ZDqR@Ik8+z<(b6CNK$D0lvEPfJ2&@)Cgp%zF(x`<*P)a7$><W^CNCLO*
z`UkQ_xF`zS6trqAM2LQvG-_%?rt^Il?``g#v|hb8-X1tG^PDr^&z$odp7R_D0FZC6
zAMYJJ&y#dI{iP6!qKH%~6+7|MSe6A%(@-jvAcTBrQ!169X&NlczTqH%9S+Br1K&4?
z!y$kr0KoG+Q7V-r91fG^<z+H8HI=(Ge`q|<6OYG3oK7c^$z<gA_V!<G0N^-I_^Zv$
zO*}k2;7^R_dHDT)%+JqbZf*|0hw)9H<G5c-{X3Wt0;yDr@$qrQVzGju`}_M)tJQ+W
z(9n?37mY>>1HZM(%1Z3*?R^SNrBbk3t&m70qHl`^*VfjG1S%>jz_Ki|*(_F8R!~=0
zhlz;^ghC+zfXCwzji)FI!^6WkI5;Q{9F0cd@pw>HRtAMa0fu3a&1Nw+HU^W)1cqU-
zwY3G6N`;Gy3jn~<(h>+E=;`S}Fc{2Pm4d+l5DJCBFbsH}huLh#$jAsXnT#Oj^?IRJ
ztHCgg5M!R_^M<1+@Y^n(oScNwXvFL5YmT7T>qSjX4FZ9{r~9C2u+?hC;NT$Q@i-P2
z7jb@mo)@msXmELX`8D8$g#`=@4B+ME1pu(Uy$wPLy1Tovv$KPAI-LW*zrX)Ga3Ya_
zTrNi{l@bZ)^?G5PLZJXn)3~|00RYf64X4vtFgR~sjKyMvq9{U9l*q5uYK7;!yF0SG
zyGxFbj|m}!=yW;~2n6z`O_pVIogXc=*=)wl%#85Y!C(*+ML{Z+!eB7q@bFORi$o&O
zYPIlsy*aaee0)S>V`Jel<~R=h{r#Aoodp0`EEY^pPvh$9Do41fsR?ekI|s_LESj5}
zMG2;$UCnVE`uh4{v)S_IZI)%x($a#Bjg7o<ZEbDMNy7!r*zI;B9*?89w-<K1J+JWk
z`Z`WdPT=$TguYlThPJl0y!roA@Y&fJ8X6iv2!X+1z|+$c^m;w)b~`ee45HB}+S}XV
za=GC5`%zwA4v9npo6UwuB!Z5Pjt`5055Y#G5hW!hqQR@Ht9X8X#^~rMR4NtZayi!4
z){si2P*qhW8e3XgDtiA}Ocr-6QWOQ3%O%Re*VorbCX=Gw-r3pt;S7rg*VotM^z^i#
zA|Muvp}M;I@4yy|1wNlobP|1L$z&2;U0p@b_{Uq_E0f7cI2<M#jfUuSI+92v{<Dzd
zIF6W1CUSIiR8Zk3lgWN%!|y6@zpbE`yuUmBUso8(cU{{40mx%gG41lX0000007*qo
IM6N<$f;uS!?*IS*

literal 0
HcmV?d00001

diff --git a/radio/sdcard/horus/THEMES/Default/mask_monitor_mixes2.png b/radio/sdcard/horus/THEMES/Default/mask_monitor_mixes2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8c04780e22722ac769c3d3eadb02fa46bf3e8ad
GIT binary patch
literal 1091
zcmV-J1ibr+P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv00000
z008+zyMF)x010qNS#tmY4c7nw4c7reD4Tcy000McNliru;06vAG%C+?XbS)U1JFrC
zK~zY`#h1-XDqk4Kk8+#4ik80gLM9PWV(*Kf2&@)Cgp%zF(x`<*P)a7$><W^CNCLO*
z`UkQ_xF`zS6trqAM2KEY8pqUzOy~Ps{BCpar1i6I{CeOphx79N%sJ2DInR*+0Qm;{
z@w!0}1d>jtzZ61I6p_p2(nkC;mSsWHG}LM}2q9lu)M_<ong+|VFF1%`r_=f6z}Lm;
zbc$dZ00@FW)M_<}L?UEyagj_+Oyq9OCruCp;`Mro%jF^pg@RmPU;nEO06fo&f3?28
zj=Q@%e8vPpKp+sn?CdONW@hlG8(;K!p8vhoe}V}ikjv#59UTS7aRozncXy%DXhe;H
zfdR2E7K;@Ieko;TW!Tx-c^8;UrC_t!Ad|@?b3Y8OuCA5{l$Mr)Wm#miSu8Crp{Aw=
zV`F0ohr<8>uh%OXPf-*G2M4jYxA!q{EEa>;>qT*KF;prQ7=}SMo5je;2+U?P7>2>d
z#s(@YD{*#q1^`%CSO6geU0q!Wg+e*IQZN_*!r?F&hJhdmuvjb@8X7_-lM%&yJ|8q1
z4H$+IeJlt<UUz&5{Blai$H!qZnehDloFnM-`A}6=g<vrF?m74{*k-e#zrP>xcpUTd
z^Ef>{%?sCRwKzXN{~GYz+#LG)`tbDh1OV9F+yo&6ot>T7+S)=ooz8*Z-roKlIFU#|
zsZ=7BN=XC^27@?GrBZ>WX<S`h0RU*4hRfwD7@RjQavVn}iXs$6N!oQfomjuQxgp!z
z+vM=@kPt$MUau#?U@&jkWLY-1@vW`4SS*;DniBsy6bgZ&D9Gh<7>!2k@9&F!(P$Jp
zoen;qFK4y)_xGr;uP@xkJkO)Iw-?jX(*OXg)r!f<NnBi9<Onx3G{EEW<Um=LMPp;5
zB)}AOs(GGAPfri*c6;8q&9W?-nwqe-wwBkg&CSg@VYr|bdpsV*<8gF%cf;Xu<P~0B
zUB%JS5&V9?*vD}kT3TB2#{YN0CnqPUtE&Sc1V*C~4-XG87z}VY9LQuch{a-PZEc0y
z?M5IFKuJjnWHK4-b~~ccDB9ZE-b@DG1e;7I6crUo1}`r!<MHtk!^6X<tgM7msl>|4
z3R0;Q%FD|oV}JhqDb{}_lH#}EYmuTTxZQ3^48FX)L^7F_oc8wi_Pp~y1+J~F#qsfR
zK}i6|aj2-M_&c!GYK7nLm)u0}Su&YKM@PqpSN!88?^P%iBoc`btyW9)dOb-b691XV
z@jOq=W-~cBI4CIbQz#U_qv3a@x8Ih~%U-{o{;wyD?7JRq{{WV&UL`9gV;ukh002ov
JPDHLkV1f)D?KJ=Z

literal 0
HcmV?d00001

diff --git a/radio/sdcard/horus/THEMES/Default/mask_monitor_outL.png b/radio/sdcard/horus/THEMES/Default/mask_monitor_outL.png
new file mode 100644
index 0000000000000000000000000000000000000000..78b54ffe92740659a4e0bacf1f4a57367ffd905e
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VEX7WqAsj$Z!;#Vfk}U9uEC#B-
z4#JF18nY{af|4b!5hcO-X(i=}MX3zs<>h*rdD+Fui3O>8`9<lo-`Pk36)o{}aSV}|
z+S_l))ndTF!knd=@iMt->DnXLE~Q7X*EFm6-b;APz2@?*AI)1BpK}HFJ?7eeJ2j$=
zHU3i6;we>sY|eXV3YI^Z<IK^xRjeU3(qj_K+OMo@UwchU?Rm^`U|a5!%5w%h3>@!m
zQzI{Zw|!o@>AiJm=tUD=!(-f&f`UX?6<HW=ZBz9P?t5IZZEtqf)|cPs8b15KJNmN8
j#nQWvdkwFYo@IZ0_tl*f&TkBW?q%?F^>bP0l+XkKl~HhV

literal 0
HcmV?d00001

diff --git a/radio/sdcard/horus/THEMES/Default/mask_monitor_outR.png b/radio/sdcard/horus/THEMES/Default/mask_monitor_outR.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec8a743c50f611f02ee2b60ca70d9046422282f9
GIT binary patch
literal 299
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VEX7WqAsj$Z!;#Vfk}U9uEC#B-
z4#JF18nY{af|4b!5hcO-X(i=}MX3zs<>h*rdD+Fui3O>8`9<lo-`Pk36|L}eaSV}|
zI(33JUyA{Q%WQ`x1qq-0Ce;WQu9DFHz^ex&J$}S69hJ<oV4TJMVAdYd*|Fc0&8&+)
z8O@Xo6k$DV@FC!`NlEPS)h@TUu{a*sq{GnjxI>_+a-KeiL$<HXaf{~+2FC>26kqR(
zoA7<!CY^~vo8DV9cxg^jNxZ$ynx#O7Jy0YtRFvU)<)merk<<Q8{IdD-^Ie&<_FaEk
m>39FT|KfGoYqsXw-(^@>^4h*Cxy=jcW(H4JKbLh*2~7Zv`DyL|

literal 0
HcmV?d00001

diff --git a/radio/sdcard/horus/THEMES/Default/mask_monitor_outputs1.png b/radio/sdcard/horus/THEMES/Default/mask_monitor_outputs1.png
new file mode 100644
index 0000000000000000000000000000000000000000..b886fc1bc18e86a43c473fcea0f1d9d914c9c098
GIT binary patch
literal 1083
zcmV-B1jPG^P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru;06vAH8ETbkfs0t1IS54
zK~zY`#aCY_yKNZ0HftNPMQmD1$^i$Oe}!mCq9iTS+H&M%IdNn)PUK`cbKqoh!hv$8
zB?qL`Oo|<>9Ec@K5o;UM{utitckq4Q@AsPd#^?LF>OOd%`?>F{=eh6q>V9M-i64OC
z?Sdc(NT<`^N}^OMA(zXgi~JjrNQBeV(=-?i1n{k9Fc>&JJ<UiY@=8aM*y(hBJK<Y%
zI-Mf1j3fm?fWctE&CLy5E*I=}d*;=AfJ7pJr>7?r6%}Q~34(xyg#}DaO+l~M<Lc@P
za=9Ebl1!yi$j{FQ05ml<L7|YAUZ>N+VzIzxvq2`4We}UqW_Uav93LN}rluytAB{#)
zQc?l{NG6j|tJQziIGIf5bX7*9k-=b)Z{ct_*x1;}^Ye4QhiEh^=13-!|J3+*VvR;a
ztyU|sf`S6kKQJ)B&mt${Xf&D;m`Ehp($XUC@p`=y|MvDaS5{USi^aZ|m?S+OkGRL-
za7cW;y}bnRZW*!>E3$R!<>e*ZZZ|G2E?_hoF*Y^^lgR|H*NZ?PAlW-IGJ@9DR+N^O
z=B_I5oj4Q<vAn!o(pZ(1mE7Fi<lNjGtE#I0pBfJh4G{o`hllC)dTF!SME~gMC<B22
z)9JLB*yVE3VzKb{_V(+<p-_k_m5Mr@j`4V03|?PfXGKMYD1jc2NAz`dbrHaS`<?dp
z_X&W#y}cO;?(gqux7#U`$q0Z}tCgWph^MEgJUBSu<KyGkiLbA(Sy)&|jYdPS*GoYV
zG7|0V?6A7JngCc<R>sxU)emcYc6OFqjb~<N#P8zbV)pm<b9Q!?KA(@NR7(7}CnhGC
zmzPHX92^{EB9X`-4Tr<5tE<cXKVDp1WOsKr3kwS+-K|oo*wN9!$;nA>Y;16AYm2qD
zwFJPWr6mbzBobj`W1}QKX90PBe&*rfA?N1iI5adwy<RU#B$vyn)oKZV%gf7R+}+(B
zo12?6^ggSAjE|2)p-?~&1iZYwKoA6k!(kj99l>NWVSaud_4W1e`F!yCeAwOHMKBnI
z*=&ZzVgUfeVlnje^uX`;=Pn>0nL?r9+S*!19aE{4*o3iIjBRagS#xB)>TK4~&_KW6
z|6%t&JUp<yy`2E4R;&3sS><%qCnqP+Xf%>Fl}d%;;^GgbHy)3pudfe#dwXBk>dzt`
zkF&G0Q*yF@J8=f_?~`CINF)-XWPXNN@jCbF^?Kag+`#R2=RE8^K0d-~wPI&y2k*`2
zZ=u)gp;RiRbM>DdZ+~o{m%V*E{i!F6?57@WzW`#<gP)E8o}B;y002ovPDHLkV1j*o
B2o3-M

literal 0
HcmV?d00001

diff --git a/radio/sdcard/horus/THEMES/Default/mask_monitor_outputs2.png b/radio/sdcard/horus/THEMES/Default/mask_monitor_outputs2.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d0354e25c7da4fe41dd2188006392f5bee89983
GIT binary patch
literal 1076
zcmV-41k3x0P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00006VoOIv00000
z008+zyMF)x010qNS#tmY4c7nw4c7reD4Tcy000McNliru;06vAHYgKIYo!1H1Hnl|
zK~zY`#aB&8vRe>-G|386iqeoEf)=$1%YuqRDk32wBne4cwUIWh3aX8?k#;WH6m4n|
zv<rzAMG%+~lnbFnlte+$pQvT{(~s|S7x%mG{mk@Qw|g5HUfwfj=HblDd6*+1N&JAw
z-Y*D(fR~q-Zw1NE&xcehO<m+K357zm+wIh9wFL03s?};~x7!&Ch5mx02s|}4_3eP~
zb!uu#1eTDbAPCTEwYa;xgTvu~&1OqaO%{p8Vt9RhMR9R)nx7yDSX^Ah%*+fl8V#<m
zuOXF6AtA{`B7wrfLI6NhQxjye)Y7ZfYFI25Sglq_B$6~>lgR{^%Y~DZ6V%q$rrE>c
zFiJ~H0RZuM90dghf7Uo2kLQ#solZx;-_Q3lIXOwaUeAk*3w|Wwa9E5HkH`P6@$bM&
zrIIR@Dn*NmibVUszyLohIRS^m;WWosEXJ0W7IBZ;?M|`p?CfxLb(N7w<a>ch(&ciA
zdnP9*Q*1_~kpMm{LndHZrcS-Oy28T30xmBvq0{LwHZ}%>!2q}04WG}KvUg-;1g)*D
zC@U+=omD<MaUc+2MMXtQV^vjEacgUfPN$RA)z$w^jm>5=0dQz&h;Fx=R;yLCkB*Mg
z=kxL9<wXqaa5!kOSa^Sb|8?L%AV9fXPPJOiXf!H1Z)|L^va(X7K$puU+Pb^D3E<yd
zr-Oq70-(`oObhV%_(+@0Mu|j103043W*`vY+1VKn4-fhL{QPy`o0}Ud6bdSpO1j-{
z3WAUpXm@v)H8nK^!1D5PuC1+Qt?~K!d2ThHot+i`OG--E-`~%<xjA|~9wrhA@orB{
zOfWAmj{rD0ILKHmmIfLO23cQUpZh&tT3TXHPY)FeMM`(e<#Kj(bZ~llnwy)O+}_@1
zU0odkaCvz-1vC^2QLoph_~%R@Z*OlrIy$1$>7?0grbeSl2_%(DsZyy3fGaC2qTj>A
z1Dl(h)A&9kfsBujLnf0!5CkNXNeF^~U@(Z|<6{^M2F%aTqoJVz9*+kej|Y2ud+_`H
zFqurSSS$d5NF;*Z-d=dU-rNZ!o62M|uCK4B)iIGsh)o!YMA+8WmN7=gRA<u0#zuO*
z-mKmG^z_8`_IA<d*B~i=v!?p=^b|^^GG$FJm!qVlBrEksqfzwr^<jU1|La`+S&2rY
z?Ck7J%Tl%zrvd*y3FacPSWKkMPXi~DN%5LE91aG9L59QOf7ILCTXuDIW$cUhz#5H)
u$z<|p$J-wp=q2ypPXE^vM)FgSwm$&rtj-9S(?Mwf0000<MNUMnLSTYOx95QX

literal 0
HcmV?d00001

diff --git a/radio/src/gui/horus/menu_general.cpp b/radio/src/gui/horus/menu_general.cpp
index dd2196596..23c4012dc 100644
--- a/radio/src/gui/horus/menu_general.cpp
+++ b/radio/src/gui/horus/menu_general.cpp
@@ -20,6 +20,15 @@
 
 #include "opentx.h"
 
+const MenuHandlerFunc menuTabGeneral[] = {
+  menuGeneralSetup,
+  menuGeneralSdManager,
+  menuGeneralCustomFunctions,
+  menuGeneralTrainer,
+  menuGeneralHardware,
+  menuGeneralVersion,
+};
+
 bool menuGeneralCustomFunctions(evt_t event)
 {
   MENU(STR_MENUGLOBALFUNCS, RADIO_ICONS, menuTabGeneral, e_GeneralCustomFunctions, NUM_CFN, { NAVIGATION_LINE_BY_LINE|4/*repeated*/ });
diff --git a/radio/src/gui/horus/menu_model.cpp b/radio/src/gui/horus/menu_model.cpp
index 3f6ed94dc..34ef4a0a8 100644
--- a/radio/src/gui/horus/menu_model.cpp
+++ b/radio/src/gui/horus/menu_model.cpp
@@ -20,6 +20,27 @@
 
 #include "opentx.h"
 
+const MenuHandlerFunc menuTabModel[] = {
+  menuModelSetup,
+  CASE_HELI(menuModelHeli)
+  CASE_FLIGHT_MODES(menuModelFlightModesAll)
+  menuModelExposAll,
+  menuModelMixAll,
+  menuModelLimits,
+  CASE_CURVES(menuModelCurvesAll)
+#if defined(GVARS) && defined(FLIGHT_MODES)
+  CASE_GVARS(menuModelGVars)
+#endif
+  menuModelLogicalSwitches,
+  menuModelCustomFunctions,
+#if defined(LUA_MODEL_SCRIPTS)
+  menuModelCustomScripts,
+#endif
+  CASE_FRSKY(menuModelTelemetry)
+  CASE_MAVLINK(menuTelemetryMavlinkSetup)
+  CASE_TEMPLATES(menuModelTemplates)
+};
+
 extern uint8_t s_curveChan;
 
 void editCurveRef(coord_t x, coord_t y, CurveRef & curve, evt_t event, uint8_t attr);
diff --git a/radio/src/gui/horus/menus.h b/radio/src/gui/horus/menus.h
index 01a9dd0a8..e097284dc 100644
--- a/radio/src/gui/horus/menus.h
+++ b/radio/src/gui/horus/menus.h
@@ -95,6 +95,9 @@ enum MenuIcons {
   ICON_STATS_TIMERS,
   ICON_STATS_ANALOGS,
   ICON_STATS_DEBUG,
+  ICON_MONITOR,
+  ICON_MONITOR_OUTPUTS1,
+  ICON_MONITOR_OUTPUTS2,
   MENUS_ICONS_COUNT
 };
 
@@ -113,6 +116,7 @@ enum EnumTabModel {
   e_CustomScripts,
 #endif
   CASE_FRSKY(e_Telemetry)
+  e_TabModelPagesCount
 };
 
 const uint8_t RADIO_ICONS[] = {
@@ -153,6 +157,12 @@ const uint8_t STATS_ICONS[] = {
 #endif
 };
 
+const uint8_t MONITOR_ICONS[] = {
+  ICON_MONITOR,
+  ICON_MONITOR_OUTPUTS1,
+  ICON_MONITOR_OUTPUTS2
+};
+
 bool menuModelSetup(evt_t event);
 bool menuModelHeli(evt_t event);
 bool menuModelFlightModesAll(evt_t event);
@@ -168,27 +178,7 @@ bool menuModelCustomScripts(evt_t event);
 bool menuModelTelemetry(evt_t event);
 bool menuModelExpoOne(evt_t event);
 
-const MenuHandlerFunc menuTabModel[] = {
-//   menuModelSelect,
-  menuModelSetup,
-  CASE_HELI(menuModelHeli)
-  CASE_FLIGHT_MODES(menuModelFlightModesAll)
-  menuModelExposAll,
-  menuModelMixAll,
-  menuModelLimits,
-  CASE_CURVES(menuModelCurvesAll)
-#if defined(GVARS) && defined(FLIGHT_MODES)
-  CASE_GVARS(menuModelGVars)
-#endif
-  menuModelLogicalSwitches,
-  menuModelCustomFunctions,
-#if defined(LUA_MODEL_SCRIPTS)
-  menuModelCustomScripts,
-#endif
-  CASE_FRSKY(menuModelTelemetry)
-  CASE_MAVLINK(menuTelemetryMavlinkSetup)
-  CASE_TEMPLATES(menuModelTemplates)
-};
+extern const MenuHandlerFunc menuTabModel[e_TabModelPagesCount];
 
 enum EnumTabRadio {
   e_Setup,
@@ -197,6 +187,7 @@ enum EnumTabRadio {
   e_Trainer,
   e_Hardware,
   e_Vers,
+  e_TabRadioPagesCount
 };
 
 bool menuGeneralSetup(evt_t event);
@@ -207,14 +198,7 @@ bool menuGeneralVersion(evt_t event);
 bool menuGeneralHardware(evt_t event);
 bool menuGeneralCalib(evt_t event);
 
-static const MenuHandlerFunc menuTabGeneral[] PROGMEM = {
-  menuGeneralSetup,
-  menuGeneralSdManager,
-  menuGeneralCustomFunctions,
-  menuGeneralTrainer,
-  menuGeneralHardware,
-  menuGeneralVersion,
-};
+extern const MenuHandlerFunc menuTabGeneral[e_TabRadioPagesCount];
 
 enum EnumTabDiag
 {
@@ -240,6 +224,16 @@ static const MenuHandlerFunc menuTabStats[] PROGMEM = {
 #endif
 };
 
+enum EnumTabChannels
+{
+  e_Channels1,
+  e_Channels2,
+  e_TabChannelsPagesCount
+};
+
+extern const MenuHandlerFunc menuTabChannels[e_TabChannelsPagesCount];
+extern uint8_t lastChannelsPage;
+
 extern const MenuHandlerFunc menuTabScreensSetup[1+MAX_CUSTOM_SCREENS] PROGMEM;
 
 bool menuFirstCalib(evt_t event);
@@ -248,8 +242,6 @@ bool menuCustomFunctions(evt_t event, CustomFunctionData * functions, CustomFunc
 bool menuModelSelect(evt_t event);
 bool menuAboutView(evt_t event);
 bool menuMainViewChannelsMonitor(evt_t event);
-bool menuChannelsView(evt_t event);
-bool menuChannelsView(evt_t event);
 bool menuTextView(evt_t event);
 bool menuScreensTheme(evt_t event);
 
diff --git a/radio/src/gui/horus/navigation.cpp b/radio/src/gui/horus/navigation.cpp
index 24dfbacac..b20b5fb86 100644
--- a/radio/src/gui/horus/navigation.cpp
+++ b/radio/src/gui/horus/navigation.cpp
@@ -375,6 +375,12 @@ bool check(check_event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, u
 {
   uint8_t maxcol = MAXCOL(menuVerticalPosition);
 
+  if (menuTab == menuTabModel && event == EVT_KEY_FIRST(KEY_MODEL)) {
+    killEvents(event);
+    pushMenu(menuTabChannels[lastChannelsPage]);
+    return false;
+  }
+
   if (menuTab && !calibrationState) {
     int cc = curr;
     switch (event) {
@@ -383,7 +389,6 @@ bool check(check_event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, u
           cc = 0;
         break;
 
-
       case EVT_KEY_FIRST(KEY_PGUP):
         if (cc-- == 0)
           cc = menuTabSize-1;
diff --git a/radio/src/gui/horus/themes/darkblue.cpp b/radio/src/gui/horus/themes/darkblue.cpp
index 3fd056861..064cba75a 100644
--- a/radio/src/gui/horus/themes/darkblue.cpp
+++ b/radio/src/gui/horus/themes/darkblue.cpp
@@ -106,6 +106,9 @@ class DarkblueTheme: public Theme
       loadMenuIcon(ICON_THEME_VIEW4, "mask_theme_view4.png");
       loadMenuIcon(ICON_THEME_VIEW5, "mask_theme_view5.png");
       loadMenuIcon(ICON_THEME_ADD_VIEW, "mask_theme_add_view.png");
+      loadMenuIcon(ICON_MONITOR, "mask_monitor.png");
+      loadMenuIcon(ICON_MONITOR_OUTPUTS1, "mask_monitor_outputs1.png");
+      loadMenuIcon(ICON_MONITOR_OUTPUTS2, "mask_monitor_outputs2.png");
     }
 
     virtual void load() const
diff --git a/radio/src/gui/horus/themes/default.cpp b/radio/src/gui/horus/themes/default.cpp
index fb88423b3..49d2e457f 100644
--- a/radio/src/gui/horus/themes/default.cpp
+++ b/radio/src/gui/horus/themes/default.cpp
@@ -122,7 +122,10 @@ class DefaultTheme: public Theme
       loadMenuIcon(ICON_THEME_VIEW5, "mask_theme_view5.png");
       loadMenuIcon(ICON_THEME_ADD_VIEW, "mask_theme_add_view.png");
       loadMenuIcon(ICON_LIBRARY, "mask_library.png");
-
+      loadMenuIcon(ICON_MONITOR, "mask_monitor.png");
+      loadMenuIcon(ICON_MONITOR_OUTPUTS1, "mask_monitor_outputs1.png");
+      loadMenuIcon(ICON_MONITOR_OUTPUTS2, "mask_monitor_outputs2.png");
+      
       BitmapBuffer * background = BitmapBuffer::loadMask(getThemePath("mask_currentmenu_bg.png"));
       BitmapBuffer * shadow = BitmapBuffer::loadMask(getThemePath("mask_currentmenu_shadow.png"));
       BitmapBuffer * dot = BitmapBuffer::loadMask(getThemePath("mask_currentmenu_dot.png"));
diff --git a/radio/src/gui/horus/view_channels.cpp b/radio/src/gui/horus/view_channels.cpp
index 563caedb5..2d7fbb620 100644
--- a/radio/src/gui/horus/view_channels.cpp
+++ b/radio/src/gui/horus/view_channels.cpp
@@ -1,108 +1,139 @@
-/*
- * Copyright (C) OpenTX
- *
- * Based on code named
- *   th9x - http://code.google.com/p/th9x 
- *   er9x - http://code.google.com/p/er9x
- *   gruvin9x - http://code.google.com/p/gruvin9x
- *
- * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "../../opentx.h"
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 
-bool isChannelUsed(int channel);
-int getChannelsUsed();
+#include "opentx.h"
 
-bool menuChannelsView(evt_t event)
+#define RECT_OFFSET                    80
+#define ROW_HEIGHT                     21
+#define BAR_HEIGHT                     10
+#define COLLUMN_SIZE                   180
+#define X_OFFSET                       30
+#define Y_OFFSET                       75
+
+bool menuChannels1(evt_t event);
+bool menuChannels2(evt_t event);
+const BitmapBuffer *locked_bmp = NULL;
+const BitmapBuffer *inver_bmp = NULL;
+const BitmapBuffer *outL_bmp = NULL;
+const BitmapBuffer *outR_bmp = NULL;
+
+const MenuHandlerFunc menuTabChannels[] PROGMEM = {
+  menuChannels1,
+  menuChannels2,
+};
+
+uint8_t lastChannelsPage = 0;
+
+uint16_t posOnBar(int16_t value_to100){
+  return divRoundClosest((value_to100 + (g_model.extendedLimits ? 150 : 100)) * COLLUMN_SIZE, (g_model.extendedLimits ? 150 : 100)*2);
+}
+
+void drawSingleOutputBar(uint16_t x, uint16_t y, uint8_t Chan)
 {
-  const int CHANNEL_MARGIN = 16;
-  const int CHANNEL_HEIGHT = 25;
-  const int CHANNEL_WIDTH = (LCD_W - 3*CHANNEL_MARGIN) / 2;
-  const int CHANNEL_PADDING_HORZ = 4;
-  const int CHANNEL_PADDING_VERT = 2;
-  const int BAR_WIDTH = CHANNEL_WIDTH-2*CHANNEL_PADDING_HORZ;
-
-  static int view = 0;
-  int x=CHANNEL_MARGIN, y=CHANNEL_MARGIN;
-
-  int viewMax = (getChannelsUsed() - 1) / 8;
-  if (viewMax <= 0 || view > viewMax) {
-    view = 0;
-  }
-  else {
-    switch (event) {
-      case EVT_KEY_FIRST(KEY_RIGHT):
-        if (++view > viewMax)
-          view = 0;
-        break;
-      case EVT_KEY_FIRST(KEY_LEFT):
-        if (--view < 0)
-          view = viewMax;
-        break;
-    }
-  }
-
-  int skipCount = view*8;
-  for (int ch=0, index=0; index<skipCount+8 && ch<NUM_CHNOUT; ++ch) {
-    if (isChannelUsed(ch)) {
-      if (++index > skipCount) {
-        // The black background
-        lcdDrawSolidFilledRect(x, y, CHANNEL_WIDTH, CHANNEL_HEIGHT, TEXT_BGCOLOR);
-
-        // The label
-        unsigned int lenLabel = ZLEN(g_model.limitData[ch].name);
-        if (lenLabel > 0)
-          lcdDrawSizedText(x+CHANNEL_PADDING_HORZ, y+CHANNEL_PADDING_VERT, g_model.limitData[ch].name, sizeof(g_model.limitData[ch].name), ZCHAR);
-        else
-          putsChn(x+CHANNEL_PADDING_HORZ, y+CHANNEL_PADDING_VERT, ch+1, 0);
-
-        int32_t val = channelOutputs[ch];
-
-        // The bar
-        lcdDrawSolidFilledRect(x+CHANNEL_PADDING_HORZ, y+15, BAR_WIDTH, 6, TEXT_INVERTED_BGCOLOR);
-        unsigned int lim = g_model.extendedLimits ? 640*2 : 512*2;
-        unsigned int len = limit<unsigned int>(1, (abs(val) * BAR_WIDTH/2 + lim/2) / lim, BAR_WIDTH/2);
-        unsigned int x0 = (val>0) ? x+CHANNEL_PADDING_HORZ-1+BAR_WIDTH/2 : x+CHANNEL_PADDING_HORZ+BAR_WIDTH/2+1-len;
-        lcdDrawSolidFilledRect(x0, y+16, len, 4, TEXT_BGCOLOR);
-
-        y += CHANNEL_HEIGHT + CHANNEL_MARGIN;
-        if (y >= 4*(CHANNEL_HEIGHT + CHANNEL_MARGIN)) {
-          x += CHANNEL_WIDTH + CHANNEL_MARGIN;
-          y = CHANNEL_MARGIN;
-        }
-      }
-    }
-  }
-
-#if 0
+  char chanString[] = "CH 32";
+  uint16_t limits = (g_model.extendedLimits ? 300 : 200);
+  int16_t chanVal = calcRESXto100(channelOutputs[Chan]);
+  LimitData *ld = limitAddress(Chan);
   
-#if defined(CHANNELS_MONITOR_INV_HIDE)
-      //if channel output is inverted, show it with oposite sign
-      if (g_model.limitData[ch].revert) val = -val;
-#endif
+  if (!locked_bmp) locked_bmp =  BitmapBuffer::load(getThemePath("mask_monitor_lockch.png"));
+  if (!inver_bmp) inver_bmp =  BitmapBuffer::load(getThemePath("mask_monitor_inver.png"));
+  if (!outL_bmp) outL_bmp =  BitmapBuffer::load(getThemePath("mask_monitor_outL.png"));
+  if (!outR_bmp) outR_bmp =  BitmapBuffer::load(getThemePath("mask_monitor_outR.png"));
+      
+  strAppend(chanString, "Ch ");
+  strAppendSigned(&chanString[3], Chan + 1, 2);
+  lcdDrawText(x + X_OFFSET, y + 1, chanString, TINSIZE | TEXT_COLOR | LEFT);
+    
+  lcdDrawSizedText(x + X_OFFSET + 50, y + 1, g_model.limitData[Chan].name, sizeof(g_model.limitData[Chan].name), TINSIZE | TEXT_COLOR | LEFT | ZCHAR);
 
-      // Value
-#if defined(PPM_UNIT_US)
-      uint8_t wbar = (longNames ? 54 : 64);
-      lcdDrawNumber(x+LCD_W/2-3-wbar-ofs, y+1, PPM_CH_CENTER(ch)+val/2, TINSIZE);
-#elif defined(PPM_UNIT_PERCENT_PREC1)
-      uint8_t wbar = (longNames ? 48 : 58);
-      lcdDrawNumber(x+LCD_W/2-3-wbar-ofs, y+1, calcRESXto1000(val), PREC1|TINSIZE);
-#else
-      uint8_t wbar = (longNames ? 54 : 64);
-      lcdDrawNumber(x+LCD_W/2-3-wbar-ofs, y+1, calcRESXto1000(val)/10, TINSIZE); // G: Don't like the decimal part*
-#endif
-#endif
+  lcdColorTable[CUSTOM_COLOR_INDEX]= RGB(222, 222, 222);
+  lcdDrawSolidFilledRect(x + X_OFFSET, y + 11, COLLUMN_SIZE, BAR_HEIGHT, CUSTOM_COLOR);
+  
+  lcdColorTable[CUSTOM_COLOR_INDEX]= RGB(180, 180, 180);
+  lcdDrawText(x + X_OFFSET + posOnBar(-100 + ld->min/10)+2, y + 10, "]",TINSIZE| TEXT_COLOR | RIGHT);
+  lcdDrawText(x + X_OFFSET + posOnBar(100 + ld->max/10), y + 10, "[",TINSIZE| TEXT_COLOR);
 
+  lcd->drawSolidVerticalLine(x + X_OFFSET + posOnBar(calcRESXto100(ld->offset)), y + 11, BAR_HEIGHT , MAINVIEW_GRAPHICS_COLOR);
+  lcd->drawSolidVerticalLine(x + X_OFFSET + posOnBar(chanVal), y + 11, BAR_HEIGHT , HEADER_BGCOLOR);
+
+  strAppendSigned(chanString, chanVal);
+  if (chanVal < -limits / 2) {
+    lcd->drawBitmap(x + X_OFFSET + COLLUMN_SIZE / 2 - 55, y + 8, outL_bmp);
+    chanVal = - limits / 2;
+    lcdDrawText(x + X_OFFSET + COLLUMN_SIZE - 2, y + 1, chanString, TINSIZE | TEXT_COLOR | RIGHT | INVERS);
+  } else if (chanVal > limits / 2){
+    lcd->drawBitmap(x + X_OFFSET + COLLUMN_SIZE / 2 + 55, y + 8, outR_bmp);
+    chanVal = limits / 2;
+    lcdDrawText(x + X_OFFSET + COLLUMN_SIZE - 2, y + 1, chanString, TINSIZE | TEXT_COLOR | RIGHT | INVERS);
+  } else {
+    lcdDrawText(x + X_OFFSET + COLLUMN_SIZE - 2, y + 1, chanString, TINSIZE | TEXT_COLOR | RIGHT);
+  }
+    
+  if(posOnBar(chanVal) > posOnBar(calcRESXto100(ld->offset))){
+    lcdDrawSolidFilledRect(x + X_OFFSET + posOnBar(calcRESXto100(ld->offset)),  y + 11, posOnBar(chanVal) - posOnBar(calcRESXto100(ld->offset)), BAR_HEIGHT, MAINVIEW_GRAPHICS_COLOR);
+  }
+  else if (posOnBar(chanVal) < posOnBar(calcRESXto100(ld->offset))) {
+    uint16_t endpoint = x + X_OFFSET + posOnBar(calcRESXto100(ld->offset));
+    uint16_t size = posOnBar(calcRESXto100(ld->offset)) - posOnBar(chanVal);
+    lcdDrawSolidFilledRect(endpoint - size,  y + 11, size, BAR_HEIGHT, MAINVIEW_GRAPHICS_COLOR);
+  }
+  
+  if (safetyCh[Chan] != OVERRIDE_CHANNEL_UNDEFINED) lcd->drawBitmap(x + 3, y + 5, locked_bmp);
+  if (ld->revert) lcd->drawBitmap(x + 16, y + 5, inver_bmp);
+  lcd->drawSolidVerticalLine(x + X_OFFSET + COLLUMN_SIZE / 2, y + 11, BAR_HEIGHT , TEXT_COLOR);
+}
+
+bool menuChannelsMonitor(evt_t event, uint8_t page)
+{
   return true;
 }
+
+bool menuChannels1(evt_t event)
+{
+  MENU("Channels monitor 1-16", MONITOR_ICONS, menuTabChannels, e_Channels1, 0, { 0 });
+  lastChannelsPage = e_Channels1;
+  
+  int8_t Chan;
+  uint16_t x=0,y=0;
+  for(Chan=0, x=1, y=Y_OFFSET;Chan < 8; Chan++, y+=ROW_HEIGHT){
+    drawSingleOutputBar(x, y, Chan);
+  }
+  for(Chan=8, x=1 + LCD_W/2, y=Y_OFFSET; Chan < 16;Chan++, y+=ROW_HEIGHT){
+    drawSingleOutputBar(x, y, Chan);
+  }
+  return menuChannelsMonitor(event, 0);
+}
+
+bool menuChannels2(evt_t event)
+{
+  MENU("Channels monitor 17-32", MONITOR_ICONS, menuTabChannels, e_Channels2, 0, { 0 });
+  lastChannelsPage = e_Channels2;
+
+  int8_t Chan;
+  uint16_t x,y;
+  for(Chan=16, x=1, y=Y_OFFSET; Chan < 24; Chan++, y+=ROW_HEIGHT){
+    drawSingleOutputBar(x, y, Chan);
+  }
+  for(Chan=24, x=1 + LCD_W/2, y=Y_OFFSET; Chan < 32; Chan++, y+=ROW_HEIGHT){
+    drawSingleOutputBar(x, y, Chan);
+  }  
+  
+  return menuChannelsMonitor(event, 1);
+}
diff --git a/radio/src/gui/horus/view_statistics.cpp b/radio/src/gui/horus/view_statistics.cpp
index 330b56b01..8fa12a2a0 100644
--- a/radio/src/gui/horus/view_statistics.cpp
+++ b/radio/src/gui/horus/view_statistics.cpp
@@ -25,7 +25,6 @@
 #define MENU_STATS_COLUMN2    (LCD_W/2)
 #define MENU_STATS_COLUMN3    (LCD_W/2 + 120)
 
-
 bool menuStatsGraph(evt_t event)
 {
   switch(event) {