From cc1c121c1ff7400af47faaf02ca20712954d1554 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Mon, 5 Jan 2015 19:19:05 +0100
Subject: [PATCH] Avoid building of all lbms for all targets after a make clean

---
 radio/src/Makefile                 |  61 +++++++++++++++++++++--------
 radio/src/bitmaps/9X/asterisk.png  | Bin 0 -> 196 bytes
 radio/src/bitmaps/9X/splash.png    | Bin 0 -> 353 bytes
 radio/src/bitmaps/Taranis/logo.png | Bin 0 -> 1238 bytes
 4 files changed, 45 insertions(+), 16 deletions(-)
 create mode 100644 radio/src/bitmaps/9X/asterisk.png
 create mode 100644 radio/src/bitmaps/9X/splash.png
 create mode 100644 radio/src/bitmaps/Taranis/logo.png

diff --git a/radio/src/Makefile b/radio/src/Makefile
index 98286a8fc..4fc1c398e 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -373,6 +373,10 @@ endif
 
 GUIGENERALSRC = gui/menu_general.cpp gui/menu_general_setup.cpp gui/menu_general_trainer.cpp gui/menu_general_version.cpp gui/menu_general_diagkeys.cpp gui/menu_general_diaganas.cpp gui/menu_general_calib.cpp
 
+BITMAPS = bitmaps/sticks.lbm
+
+FONTS = $(patsubst %.png,%.lbm,$(wildcard fonts/std/*.png)) 
+
 ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR))
   # 9x/9xr radio
   ARCH = AVR
@@ -390,7 +394,8 @@ ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR))
   LCDSRC = lcd_common.cpp lcd_default.cpp
   PULSESSRC = pulses/pulses_avr.cpp
   CPPSRC += debug.cpp
-
+  BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm
+  
   ifeq ($(PCB), 9XR)
     FLAVOUR = 9xr
     CPPDEFS += -DPCB9XR
@@ -458,6 +463,7 @@ ifeq ($(PCB), $(filter $(PCB), STD128 9X128 9XR128))
   LCDSRC = lcd_common.cpp lcd_default.cpp
   PULSESSRC = pulses/pulses_avr.cpp
   CPPSRC += debug.cpp
+  BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm
   
   ifeq ($(PCB), 9XR128)
     FLAVOUR = 9xr128
@@ -522,6 +528,7 @@ ifeq ($(PCB), $(filter $(PCB), 9X2561))
   LCDSRC = lcd_common.cpp lcd_default.cpp
   PULSESSRC = pulses/pulses_avr.cpp
   CPPSRC += debug.cpp
+  BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm
 
   ifeq ($(PCB), 9XR2561)
     FLAVOUR = 9xr2561
@@ -588,6 +595,7 @@ ifeq ($(PCB), GRUVIN9X)
   LCDSRC = lcd_common.cpp lcd_default.cpp
   PULSESSRC = pulses/pulses_avr.cpp  
   CPPSRC += audio_avr.cpp haptic.cpp debug.cpp
+  BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm
   
   ifeq ($(SDCARD), YES)
     CPPDEFS += -DRTCLOCK
@@ -630,6 +638,7 @@ ifeq ($(PCB), MEGA2560)
   LCDSRC = lcd_common.cpp lcd_default.cpp
   PULSESSRC = pulses/pulses_avr.cpp  
   CPPSRC += audio_avr.cpp debug.cpp
+  BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm
 
   ifeq ($(PCBREV), ST7565P)
     EXTRABOARDSRC = targets/stock/lcd_driver.cpp targets/common_avr/telemetry_driver.cpp
@@ -715,6 +724,7 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO))
   CPPSRC += tasks_arm.cpp audio_arm.cpp haptic.cpp gui/view_about.cpp gui/view_text.cpp telemetry/telemetry.cpp
   CPPSRC += targets/sky9x/telemetry_driver.cpp targets/sky9x/second_serial_driver.cpp targets/sky9x/pwr_driver.cpp targets/sky9x/adc_driver.cpp targets/sky9x/eeprom_driver.cpp targets/sky9x/pulses_driver.cpp targets/sky9x/keys_driver.cpp targets/sky9x/audio_driver.cpp targets/sky9x/buzzer_driver.cpp targets/sky9x/haptic_driver.cpp targets/sky9x/sdcard_driver.cpp targets/sky9x/massstorage.cpp
   CPPSRC += loadboot.cpp debug.cpp
+  BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm
   ifeq ($(SDCARD), YES)
     CPPDEFS += -DVOICE
     INCDIRS += FatFs FatFs/option
@@ -792,6 +802,7 @@ ifeq ($(PCB), TARANIS)
   MCU  = cortex-m3
   OPT = s
   CPPDEFS += -DHSE_VALUE=12000000
+  BITMAPS += $(patsubst %.png,%.lbm,$(wildcard bitmaps/Taranis/*.png) $(wildcard bitmaps/Taranis/std/*.png))
   SDCARD = YES
   THR_TRACE = YES
   EXT = FRSKY_SPORT
@@ -1030,8 +1041,11 @@ ifneq ($(PCB), $(filter $(PCB), TARANIS))
 endif
 
 ifneq ($(FONT), STD)
-  INCDIRS += fonts/$(shell sh -c "echo $(FONT) | tr '[:upper:]' '[:lower:]'")
+  FONTDIR = $(shell sh -c "echo $(FONT) | tr '[:upper:]' '[:lower:]'")
+  FONTS += $(patsubst %.png,%.lbm,$(wildcard fonts/$(FONTDIR)/*.png)) 
+  INCDIRS += fonts/$(FONTDIR)
 endif
+
 INCDIRS += fonts/std
   
 ifeq ($(THR_TRACE), YES)
@@ -1336,7 +1350,7 @@ bootloader.lbm:
 endif
 
 tra: translations/en.h translations/cz.h translations/de.h translations/es.h translations/fi.h translations/fr.h translations/it.h translations/pl.h translations/pt.h translations/se.h
-lbm: fonts bitmaps/sticks.lbm
+lbm: fonts bitmaps
   
 elf: $(TARGET).elf
 bin: $(TARGET).bin
@@ -1408,24 +1422,37 @@ translations/se.h: translations/se.h.txt
 	@echo "Create Swedish language specific header files"
 	$(TRANSLATE) translations/se.h.txt translations/se.h se
 
+FONTNAME = Roboto
+
 .PHONY: fonts
-fonts: $(patsubst %.png,%.lbm,$(wildcard fonts/*/*.png))
+fonts: $(FONTS)
 
 fonts/%.lbm: fonts/%.png
 	$(IMG2LBM) $^ $@ $(LCDSIZE)
+	
+fonts/font_stdsize.lbm:
+	$(FONT2PNG) $(FONTNAME) 8 fonts/font_stdsize.png
+	$(IMG2LBM) fonts/font_stdsize.png $@ $(LCDSIZE) 4bits
 
-bitmaps/sticks.lbm: bitmaps/sticks.xbm bitmaps/9X/splash.xbm bitmaps/Taranis/splash.png bitmaps/Taranis/logo.bmp bitmaps/Taranis/icons.png bitmaps/9X/asterisk.xbm bitmaps/9X/about.png bitmaps/Taranis/about.png bitmaps/Taranis/asterisk.png
-	@echo
-	@echo "Convert bitmaps from xbm to lbm:"
-	$(IMG2LBM) bitmaps/sticks.xbm bitmaps/sticks.lbm $(LCDSIZE) 1bit 4
-	$(IMG2LBM) bitmaps/9X/asterisk.xbm bitmaps/9X/asterisk.lbm $(LCDSIZE) 1bit
-	$(IMG2LBM) bitmaps/9X/splash.xbm bitmaps/9X/splash.lbm $(LCDSIZE) 1bit
-	$(IMG2LBM) bitmaps/9X/about.png bitmaps/9X/about.lbm $(LCDSIZE) 1bit
-	$(IMG2LBM) bitmaps/Taranis/splash.png bitmaps/Taranis/splash.lbm $(LCDSIZE) 4bits
-	$(IMG2LBM) bitmaps/Taranis/logo.bmp bitmaps/Taranis/logo.lbm $(LCDSIZE) 4bits
-	$(IMG2LBM) bitmaps/Taranis/icons.png bitmaps/Taranis/icons.lbm $(LCDSIZE) 4bits
-	$(IMG2LBM) bitmaps/Taranis/about.png bitmaps/Taranis/about.lbm $(LCDSIZE) 4bits
-	$(IMG2LBM) bitmaps/Taranis/asterisk.png bitmaps/Taranis/asterisk.lbm $(LCDSIZE) 4bits
+fonts/font_midsize.lbm:
+	$(FONT2PNG) $(FONTNAME) 10 fonts/font_midsize.png
+	$(IMG2LBM) fonts/font_midsize.png $@ $(LCDSIZE) 4bits
+
+fonts/font_dblsize.lbm:
+	$(FONT2PNG) $(FONTNAME) 14 fonts/font_dblsize.png
+	$(IMG2LBM) fonts/font_dblsize.png $@ $(LCDSIZE) 4bits
+
+.PHONY: bitmaps
+bitmaps: $(BITMAPS) 
+
+bitmaps/sticks.lbm: bitmaps/sticks.xbm
+	$(IMG2LBM) $^ $@ $(LCDSIZE) 1bit 4
+	
+bitmaps/9X/%.lbm: bitmaps/9X/%.png
+	$(IMG2LBM) $^ $@ $(LCDSIZE) 1bit
+
+bitmaps/Taranis/%.lbm: bitmaps/Taranis/%.png
+	$(IMG2LBM) $^ $@ $(LCDSIZE) 4bits
 
 ifeq ($(OS),Windows_NT)
   PARSER = avr-cpp 
@@ -1583,6 +1610,8 @@ clean_list :
 	$(REMOVE) stamp-opentx.h
 	$(REMOVE) *.lbm 
 	$(REMOVE) bitmaps/*.lbm 
+	$(REMOVE) bitmaps/*/*.lbm 
+	$(REMOVE) fonts/*.lbm
 	$(REMOVE) fonts/*/*.lbm
 	$(REMOVE) lua_exports.txt lua_exports.cpp lua_fields.txt
 	$(MAKE) -C bootloader clean
diff --git a/radio/src/bitmaps/9X/asterisk.png b/radio/src/bitmaps/9X/asterisk.png
new file mode 100644
index 0000000000000000000000000000000000000000..506ee247b798bfceba5d5ea6b7a3286ba596c8bf
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^(m<@h$P6TJE}vKdq}T#{LR^9L|NsA&-kg6I$l@&U
zh%9Dc;1&j9Muu5)B!GhKC7!;n?DrX2`DAzw#6DaC6bkfoaSY+Op8Nx-m6^?ek?rgM
z|MCed{_`oxHFu=^X67mNGFZgrBJxm0LWj>l#6aQzr>nq04y73nS*+(gus;yMs3!8H
l@fbG)FGDmRTR}J@!|65FFLa)9asv%#@O1TaS?83{1OU}aIGq3h

literal 0
HcmV?d00001

diff --git a/radio/src/bitmaps/9X/splash.png b/radio/src/bitmaps/9X/splash.png
new file mode 100644
index 0000000000000000000000000000000000000000..64ebfb9d56561b8f7656ab17bf914d3b5ad4e47f
GIT binary patch
literal 353
zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`$P6T3NW8THQfvV}A+A9B|Ns9>Z_d99WN{XF
zL>4nJa0`PlBg3pY5<o%r5>H=O_WO*ie6lRp=SExy3cd4maSX9I{q~Y!-eChC)_|2#
zHlNtOx?cGZ!^#uk+TLgDwEoc?hwy~e+#6;yS)_R$b$ztvq=etGW}Q#MMehR3S1WvS
zwTL}9!|cP!$KR&&Pt#t}UFYC5=}o=JJ^sy1LYtm!f7I~jqJvi0$={PimRLQn>|;K>
z&&R<pqA{t5=YFe*TdRY0^Zi3?OAKs}Yy1pY)#RIJ;8CZ$*{PoC^`{^)Ye#K^1nZ0M
z7RU-Y-+%Wb|Fy(|QcGSli4wDR`)g)ZC6laYo2+@r)0E1YUBjH8X&ra&cV$q+SuW9E
wXD3M~Yzp0`#5%|1jB3xy<;T1C?)=A)DYNPRths3)fj(#OboFyt=akR{02Km@W&i*H

literal 0
HcmV?d00001

diff --git a/radio/src/bitmaps/Taranis/logo.png b/radio/src/bitmaps/Taranis/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae8b9e8e5f140644ce1298d1756df03025c7854f
GIT binary patch
literal 1238
zcmV;{1S$K8P)<h;3K|Lk000e1NJLTq002M$001Be0ssI2E&u7$00003b3#c}2nYz<
z;ZNWI00fRnL_t(oh3#0qOY>Y5Kdm2is2{g9f`dyy7soh>I0eDo=-?h*1u<)JF*<2G
zrHYGKBvJo?_!me<Cnd!}98^-J6r|FgcQ{Y)b4}W6-}=1IJNTP!nwxWezw?!w#t;!Y
z!OqT(<2Z~lMNt$*(KM~2$G;u1P6bR)Pcz0CW5r^zR4M_0VHmou{~3B;0CtWb2!bH+
zec$suP17hFK@j{4Q{AIu0j6m(#$;JmRn@lbAP79qqn!K|4IP(IsZ^rMDHe;XtE;6_
z$@hH#NTpJ;EYteGM7+}n7-RW-KA+Ds#(dwmEGv~t0YDH0#bR-1XXg))Y>Q4)76gH9
z+m>a~6hcJTb;%C3^0yaBdvxW`G)-BS5mA<9(=>x1007&zyQlTVb_#;vg8<L-lm?gp
zRaIM=P!z>=T`GOg^8kQvwk%6k)sQL17%B99pZnsE_`XjQ!gbvcA4O3-&*OgS{o}gs
z2LXm*@Y0eS002$XS_yDnmkJ30$UU(!O*3kWtdRiQw)qB5mo7Qc&`6+d*r-+0G%-{{
ze5++yA)=n=>AJ4#x?vcu>zbxXm*fT;N$08Ordm}LV~jRXbS%qi8mXuNiaj^`TYwm|
zXbGyS8XW+JVKgNto-b5Y)ih1hG*wkeFgE(0)8ek9rW8dH-BIj$Dn1Ahnep&&G2&fa
z*G<!GRaex?tw8CbT8bhXxae7nEQAG!6-li|KB&GazpZ?H>Qc0fk;)b!wkbh$9cBMp
zK*&dUQv+?r5r=Kt;>?Ni6RXj6UGX3oZ5UBNl>ILOVns$xh{<VcqCLcF35A1NNEASW
z<paOAk^Ln=3{sOF4Ny6KN|!zoc;mJSKRqIrT&S<a@QaQ6fu6XDPl=``K7GZuYG3i?
z6%9w|jUif#&XOoPK8^n12Y(%dgM*n&CR)vzOlE6qi`EMZ3q3tOo12?-xxBpGmCHmT
zvA@4hpTc{4dx=B>01&ZWuRlCItgNg6gwIrnD1O|CofePBTM6jx?Y+9XLPXE=hK7co
zpPv!2P$+c89sqK=oZ~o>B#n-aUR+%4@9z_*SS&U>JNx+f7@`OO^?Dr<4-O9E@i@Pm
z$z<s6z`y_(7J6`Ua<WpXAmZiaB_iJ6-;a-v$6~Rr1iZYwNRmYB(a}*Fmn2|jX6E(v
z6@(02Uta@2wOTznIYGp;v$OvGelCD(AWl&M0I;^UM!(nV_4)bvWHQ+mdlHaNr)e!o
z5`EN@k4mMov9SS>3?O16kvKm;N5tdf<7&0a1(1eT0+Pw(#Kgqg+Z!U@-QD%|^>xc0
z0J7Qa>FH@Yot7lYahzN(*OYPevZtr#@bHjg2_G{+%tQgPSZriu1OObzLBw*ojELLY
z+utA{kx1lnIr>8-o6Yhj4lxcjF~7CDyBq2OY7A(Wfu*G-L@bp`s;bs%wOXw<H#aA4
z_@1167eWFgNqTyELd5m;bpSXzI-)`v9v*IG;Y;1kBi9YMk-@>ia=A=vV$X++<2Z|p
zi?_G8Q&Us#@9$${V>dT9$z-xnDA2I}!T%5c0N69Sb<gMU^Z)<=07*qoM6N<$f=LoT
At^fc4

literal 0
HcmV?d00001