From 870002ab79de3616d66862de09a292c6004a5eb8 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Mon, 25 Jan 2016 18:58:44 +0100
Subject: [PATCH] [Horus] Calibration bitmaps

---
 radio/src/bitmaps/horus/CMakeLists.txt            |   3 ++-
 .../bitmaps/horus/calibration/stick_pointer.png   | Bin 902 -> 0 bytes
 .../horus/calibration/stickmask_center.png        | Bin 394 -> 0 bytes
 .../bitmaps/horus/calibration/stickmask_out.png   | Bin 491 -> 0 bytes
 .../horus/calibration/stickmask_shadow.png        | Bin 687 -> 0 bytes
 radio/src/gui/horus/bitmaps.cpp                   |   4 ++++
 6 files changed, 6 insertions(+), 1 deletion(-)
 delete mode 100644 radio/src/bitmaps/horus/calibration/stick_pointer.png
 delete mode 100644 radio/src/bitmaps/horus/calibration/stickmask_center.png
 delete mode 100644 radio/src/bitmaps/horus/calibration/stickmask_out.png
 delete mode 100644 radio/src/bitmaps/horus/calibration/stickmask_shadow.png

diff --git a/radio/src/bitmaps/horus/CMakeLists.txt b/radio/src/bitmaps/horus/CMakeLists.txt
index 540f6d091..8843603c2 100644
--- a/radio/src/bitmaps/horus/CMakeLists.txt
+++ b/radio/src/bitmaps/horus/CMakeLists.txt
@@ -9,7 +9,8 @@ add_custom_target(ttf_horus_fonts DEPENDS ttf_horus_tinsize ttf_horus_smlsize tt
 add_bitmaps_target(horus_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/bmp_*.png" 480 5/6/5)
 add_bitmaps_target(horus_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/calibration/bmp_*.png" 480 5/6/5)
 add_bitmaps_target(horus_alpha_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/alpha_*.png" 480 5/6/5/8)
+add_bitmaps_target(horus_alpha_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/calibration/alpha_*.png" 480 5/6/5/8)
 add_bitmaps_target(horus_masks ${RADIO_SRC_DIRECTORY}/bitmaps/horus/mask_*.png 480 8bits)
 add_bitmaps_target(horus_slider_masks "${RADIO_SRC_DIRECTORY}/bitmaps/horus/slider/*.png" 480 8bits)
 add_bitmaps_target(horus_fonts ${RADIO_SRC_DIRECTORY}/fonts/horus/*.png 480 8bits)
-add_dependencies(horus_bitmaps horus_calibration_bitmaps horus_alpha_bitmaps horus_masks horus_slider_masks horus_fonts)
+add_dependencies(horus_bitmaps horus_calibration_bitmaps horus_alpha_bitmaps horus_alpha_calibration_bitmaps horus_masks horus_slider_masks horus_fonts)
diff --git a/radio/src/bitmaps/horus/calibration/stick_pointer.png b/radio/src/bitmaps/horus/calibration/stick_pointer.png
deleted file mode 100644
index 0d75765f9e2fa4ce3bd7278ffe4fb1b3c45e74c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 902
zcmV;119|+3P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10|QA!K~y-6g_O^0TvZguKj*$TGl`a1o5+Z9exxm=O;cMFL_|;!
zp;Z@E5b__m>ryPZ(7nN*6ba%+#D$<c6||+TR8VS_B-2XO7#s3qnjh_?GZT}!@7?3#
z&3kRq7xG=b!~LEQ_ndp)5mhBk^ZR=X5_-dm96@AFL;cMfbGbY{T}w@9OSS?RN~K{n
zd;&b4;#a49RTp#e;PiAg4QTG5MdtfTZ>jL}HZTA&!mGQ~U7aXCIwB%wtHDo7EEit~
z-bUJ)xg6P{Au@x5XmgF$<Ro@-0sv2Vu-o&#_$;4a7m@D(t8uBSN_AghaIRcjpDP!2
zu3XfmmrtnuXG*tf{rowtKKX>kzVSlua?$sn2C}M(sz$)Ma`9|zT72=iI&1HN#R_I-
zbbjDq0)4+{&jnyV;HfI+-@d*MlxL!j8g{??9^(6KC$CVT>y1-Md^DTu2VMepiHI1V
z;0O}+(l3|E^dHz37OUgfvE;jy@w+`Z01N=WG3pJ*hnayxJHi0Gd>+%&13*^9Ka|aO
z1A76_AZ|G}x|QW^5SyjeqN}S(Tn)nj=mmVEzPlVB*h&S$U`L?6QbDZ+U?~jiixF@S
zAg1@P*;$|p;Oceir%&&2J*7T6nuLGaU<GhM9Z&-hzz4CR@zIB@pFNWfbB^1i@38UH
z#V7>*xVCx~2!VMZ6jkMdh+irdf5{3%aqfL1BXpj4h3w(OxV1Ix#5j$yF<QS~O88$l
znpaLPulx=)fiHoJ$#OVX$Uj!{azA#6Jh16jB9O9?rmS6hVd2J^rgJS|3K#>HlArsz
z*~Q7R#;vC+8?DOLp53ib)qUP*j6c6{<A<hm0Z;?J0dA?PZdzX=;sgD!b#=Y@Y-etG
zUncX=Bc8uIfbhDtH?LW{^6BmR-<LKvR@;560pA1Xf&cCS-UWRaI1U`m89J@QI1oUi
zx1a^g0^b7HVi=?>*f!Jv_Y+P3UZSDxZa04cm;wF(YO1<va8rS8r~n?(&NSRv#zDK>
cKvR<c2U3iTrD)tkvH$=807*qoM6N<$f~+W;?EnA(

diff --git a/radio/src/bitmaps/horus/calibration/stickmask_center.png b/radio/src/bitmaps/horus/calibration/stickmask_center.png
deleted file mode 100644
index 5fd107e57f493a90e2d69de242f94f3e9b842a65..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 394
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VOR<w@2nP_<aHMnq`J4qFk;Opu
z*Fl)kNn>^eP*AeOHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IX1_nlUPZ!4!
zi{7VK7OrY>5Mg^@yhu$@r^&4Q?3SjRX&1#m%J$f`<|mnC1U=r@(3G3l&G9M!Q&Fn>
z+}6D>{}o(Hv`c$-Ad$f#zUPbY8-ItND-6#YUoG{`y*+7JX36fmC%*s97Mx?^%Y41m
z(PeknB96lbANu}0;eE4<uWQks#AwUD=I5U^+19=0I{%q(<JwCmqRj8V|5kN#*^v8N
z;EwOk_tgtM`yP8-HYu#OzF^|37!Vq2#M6BLPwm~~j~OGU>Ccy8X}lrN<S;FDxkNHg
zYGhaQ=}iiK$$Dy@LZ58xkL-9bZIOmRn_@|9dupV|B$m+7xk(HM8b0STH%KHq9aa*G
i;G3V|^kDhV_6OX{)bFM!M6LjZF@vY8pUXO@geCxLeVsf2

diff --git a/radio/src/bitmaps/horus/calibration/stickmask_out.png b/radio/src/bitmaps/horus/calibration/stickmask_out.png
deleted file mode 100644
index f9e93f42d872ccda3120000b9196c03400dcd5d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 491
zcmV<H0Tlj;P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10cc4?K~y-6t<=BDf=~bj@N>OVPz^ys1a2*DQb7?o^$zs_y+Ko}
zGz7g(OV40~4N(M54NkR(5Z3u7Ez|y3-+?n+(I40Ay$X^<LR{Cya=FB6wL&hJL!;3^
zv)M$kSWLS87Cyvr9M<b~0*F-z!G6Eb!{PAwSeOvJUazz)i>j(7V)xZFjkDS8H8`D4
z-$M75Qqs2VWN^J+Gn>t(0s*jAtI_kkIN0rWQ)59VlSvfxJny4*dsfplqu^q(_!<Mi
zd_K?1<r0F*X0v&{uioTzI$^)xhhs(4w4Xo#D3waLf$O?Iy>hi$jjW-f>pCix%Ga}N
zwOY{&-)!ojQc60G6W@ov@3Y-*rv^u((etCX+wE8`mp{fjolfkOL_m@}9*^wxdM}|&
zCd2V~%=7si!(w2N`Fzg7U_iq#sH!Rpg#t~}<Zw9TcDqf4f(SDC2OGrqeMl)Gg!t&I
hzXj7q`A-Z0{s3S5ND5kp(V+kU002ovPDHLkV1gI(*n$86

diff --git a/radio/src/bitmaps/horus/calibration/stickmask_shadow.png b/radio/src/bitmaps/horus/calibration/stickmask_shadow.png
deleted file mode 100644
index 145fee9911d94c8ddd9195b62ceb13885e0aab60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 687
zcmV;g0#N;lP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10xU^HK~y-6t&~kmGEo?YuQO+6%u+BHi6++01jAi_Ac)9C{?Ldv
zK}%QBGKdN{vk<2ONomT($oXg?e!ZISYrOaN;aptj=HU_6TFZZoyJ~2yMQe@L8e<GX
z2&9xqDRCU<-+|UzhQlHKexFXKLl}nidObEbHz^bf6pKZ6c6LZ6lMCPlpfQFhinzVK
zrP*u}MbUy`B9Y+m@Q~BfQ*yZ+p64Ni06@%kXpG_I<%P@3OP-&f84Lz2t5^tu=XvDw
zdCt$zsnu%uz7N2}*IG*yMO<B7@$m5QBW$*kPN&1g#Rctl8?E&`a5x-tcX!9*<0Ek#
z{|K9n)|zg&%k}j&UteEXYezt9EuWvCG@H$pX3L_KqSb2g^z?*MY6LXK@cR17$H&K7
zu(3=W#{@xu)_MfgS`&sLN~yJA<IKLF820;pj4{6g8e{17deaVt5TsJ6AGiN+aU6$q
zI*kxw1e8)zC=`%V{t7tzeh!#SCMO%ePCU<JZ*Ol36he^6WH>rHB9Ta}ZMVC-OSM|X
z^StR|Z)|LEe0<FQ{ywg|@(4{b7OB_kY;SK*I~)(Q*({AlgHox4@B1siFQp`#&2n;b
z!ok78L_+*|V3kt5y}faBbHn}pJ#iePl)_p&GH@Jx-=|nCa&~q`xm=#>egO!hy&4P#
z1VKO$1cYJ8`};dvTU+Gwc}k@cl}d$7CbLk_QXovPwNeUW%w*|Z*F{Q+>$*!T`36fh
VCn<nkx_<xw002ovPDHLkV1nNiFzWyS

diff --git a/radio/src/gui/horus/bitmaps.cpp b/radio/src/gui/horus/bitmaps.cpp
index e84ac5cd7..c785e21ac 100644
--- a/radio/src/gui/horus/bitmaps.cpp
+++ b/radio/src/gui/horus/bitmaps.cpp
@@ -240,6 +240,10 @@ const uint8_t LBM_STICK_BACKGROUND[] __DMA = {
 #include "bmp_stick_background.lbm"
 };
 
+const uint8_t LBM_STICK_POINTER[] __DMA = {
+#include "alpha_stick_pointer.lbm"
+};
+
 /*
  * Other
  */