From 303c07b4ef91e4fd7b2f3630cf2cd83275e01c46 Mon Sep 17 00:00:00 2001 From: Nic Limper Date: Wed, 27 Mar 2024 11:13:30 +0100 Subject: [PATCH] updated tiny font for better readability --- ESP32_AP-Flasher/data/fonts/BellCent10.vlw | Bin 10909 -> 0 bytes ESP32_AP-Flasher/data/fonts/tahoma9.vlw | Bin 0 -> 34013 bytes ESP32_AP-Flasher/data/update_actions.json | 3 ++- ESP32_AP-Flasher/src/contentmanager.cpp | 6 +++--- resources/tagtypes/01.json | 8 ++++---- resources/tagtypes/02.json | 4 ++-- resources/tagtypes/05.json | 4 ++-- resources/tagtypes/2F.json | 6 +++--- resources/tagtypes/33.json | 4 ++-- resources/tagtypes/34.json | 2 +- resources/tagtypes/35.json | 6 +++--- resources/tagtypes/36.json | 4 ++-- resources/tagtypes/55.json | 6 +++--- resources/tagtypes/60.json | 4 ++-- resources/tagtypes/BD.json | 4 ++-- 15 files changed, 31 insertions(+), 30 deletions(-) delete mode 100644 ESP32_AP-Flasher/data/fonts/BellCent10.vlw create mode 100644 ESP32_AP-Flasher/data/fonts/tahoma9.vlw diff --git a/ESP32_AP-Flasher/data/fonts/BellCent10.vlw b/ESP32_AP-Flasher/data/fonts/BellCent10.vlw deleted file mode 100644 index b1d32e74e3ad837c034791272a447e275b5b070a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10909 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 W=N>zJ^2q6D9yxOU(Gw?T(Ek9f#9^fX diff --git a/ESP32_AP-Flasher/data/fonts/tahoma9.vlw b/ESP32_AP-Flasher/data/fonts/tahoma9.vlw new file mode 100644 index 0000000000000000000000000000000000000000..b1074a0615b7f1b4a4fd39cd0d0d4e941f6873ba GIT binary patch literal 34013 zcmbuG1DGw#l7-LinTMHYd!B9Ewr$(y*tTb$ZQHhO+t!`@42H+2x%za`aMt_Fm2wd9uZmo&6RA-Yo;;Z*u+q@h)oIDuT7Yb+-;|jdz>C`robe1&lWvn#2-@OClOlXns=ev*hrP;Cj4zT+L zws!XW53mPVv+lF|J+NWbPoy*+6f?hHbuYv<9vlHW#p#+4F-8tf#~$ka(!D&)7=4y* zgc=Wz8P1aCBb;C2Ju)zUj|%JW=uyUafB1nBGaen!8t*ZIaVMOu-baKQkBu1(9z0JN zzk@%CmGQWEs0Z8q4n96|d;(htg@MsO58CuX%y>~e_$=Ma zizC1Gj$RTN8u-`URWC0!R(`Ra&hWB`*Us>AW8ggfK3~zWx}WlUrE57C{lY8kRRiqR z1MD@%mU?+@V0^FZcaylr>mpdgUO&LzFu>jz80RWK;u>#?U=4e7VB7`I?)UR8J3MM? zyfp&Oz&+#H&-bo)_ZxsG3vR`j(uQ&eQA>iX-!bss=VxNi9T!Gi$tMh>!qiKHESiM{7YJ4w(wX=VJfc;>A{cwQ&Xn_4Vu(dnmzqfd2 z^?v#8*YDp?%>yIPQ{!h5tex-Y1MC+A?3aP9_4%v7_?@d>@UHRe2*Bz+bnJ-8^Lt#p z_KtMSmEZRb;7TtWz6bbmAJhW*U823_s{XLxCSo!s{pJ9jBu`>on-^J_i z;Y`NLub=PCf$`lg9pRi?&K4MFs^678*I}-^R^(BH#N&-(z#$2*B`?pMh95=ZmTHh&?vv zkAOSj?IE{Vo`Jbm~2H>_U;}Okh0yd>8hf^YQfeaFN)fS?{Q8UNrKh z3Ep`ZGpBm#XSjId?e=ns!1(^uo%Qe1B_m(wgV%exRP5=cc>Nt+I`Z@eho|>>8Sj_Q ze%ZkAC|>uwT;uI(Ufw*;%+q;SXgqrDeO@v4oT1)re@9m`53k+3zH;Qam*RE5t3$R`uT3qyy&s_a>Llesa}XZHaCiZ-pFxpz0VuR9*?E(;7uZr zPw~3nO(V~~c-`-2kzez>d0=aPw;1ql*?7C(`CAQmw;u3r6WH4MZW~ygufF$@Vr*^~ z)7trNA6T7lx6eBSw&r(7^Z32wPI*rrn>$6Y=6C17@WX4@?=F$!3`_6tu93%M$?tBF z#}6DnvB&1_5tJXg#2%Y_M8NrqN9?h=X9Q@`BRpb{&AlR6^SgIoYkv0`@a{X{-EY9V z|A6;^!20?686FrId(Ku*gpAFDV&Z(@oTcCAgPkj^-{(VIiyn8{c@N#eI`3hD(P#1c zdw95c^&YzBBLYK*@89ls>5-8`r+8iSQIV(r;t_jn9vuN5#p`~LiTs-1?>3C@Xg}ZY zd0+S3{~i1N!0@lL_g?T&&e01GxX0$tBcSin>u30j0rr>1>U^E|SApSQSnuVpcX*uBWAir=pi{iA`M1WX zuU;c$Z2m5$HQwI`#&@gkv)}bUM4sLzEMkw%KSltC7f(OKKgGU(cYB}z>{@bgI`3b+ zum2YA*uMq_XX!itZ^rt)pb=y9?=hiMSl9dyV`%C-KmTu5oBuRc_t|;>6&StL8CX3w z{~ZBmFTCI9|2SX0pzX2w-w5E8U)OxBF?!(X*yCc){ntAp_Sif=0(x2EJt6YlulMrA z9jyC3DX{+crQgew?Nz;W-czhuXYbfk1A|lVw)gV10q^O7(M$RDUY-$o_Pkeg`@K9f z_V~ji-+Osh>^rY(K07e(bBXsH^U&hyyywOqpX#&s@;uisX+D2|y}%e+yJvV|a@1uBw;* z9$vGfiH67KwGr?=<8KQ6@NVnx%j+TrE6x7iUvI45LFc_8Fzy8%zN7sey)pLOHM+-g z91COfrkKzvy!*Y`Sm7OeOJH~u*8SdUz4{(?>}`Rqo$u||tX?|r9o8(*j=gi>_pTib zZI8{nBcT8KPW1D=C-T(Rd+5CPng_;R_y2x*U+k%^K0ELI)W);q_W|?j&N}ad1Kx)Q zybl{IzpnX_0q>&&-p2;Kj~nCr$%Dw- z!28^Q_jzMW@AeCUkuQwZWAnub3ahoSFBz*o`}w{c*xLEN5*WWn#p~bQubPJzchk@Q zHSdepv9BAWNAy@dHs6SVeersq-;6weSBlp)zZH4*#p{~iHm|VG`%YkMehUWq+6zlwldoui-c*O6c29T6DktM6dr@h4N*!uj_2 z_lw$v^X)-IbBR~qgC!oh-V3qE9{sKP;j_l8`&jZr4<4Aj=l?rkk9_&nza89Tj6LoW zoU>HV5i<7pF2e&W9(T<4*fGJYo`^m6juS!o)maNWZUk$*;|+MnH?Q7p_d7x3>7BH* zpK!oCk$G^$i`8TA#1Y`J^xjVr`L*+%big~=fOm59>U{0@cJCB{v8Ts+_YpGoP8kz@ zF7ZwkdHUqt!R0I-d#8>7Ug>qe(?ovF?{~~wx|h@LX!dt>I%7+Ho<1i40)hl@oX4{+A*cX8(n>%2<@ z#+mB(q4O>|z%FIYIv;$Gy-P=cSDm5#?=O3oiG2CN>3)|rZ|Qq|xdC>0>(C3HUGoY% zJo@t3yJ7_F=|kslcYP&eXi?M8aAoJjaU2U{?>azh zdG+2qb`4|X>WPrCcg>i{(MvrMGWM<&6Bs?}9PRAajvV#$!b9w_cby1IQ@lb#^SV3O z#6$atL-Xg*q4;N*e~EJutdL2gpeoF2AV=8h|Ira$(qiOPyOK;1O4LL0A}Jh71{6Tu zqJx=5r9Q4nTiDJ|1yC%OK|@q4ijxuu&-_vSH2G+VS%^X%*E*!@lWTUXQ`Bj+X2$c( zu|?@mKqPW(c~>85!5nvz3mg}PloV#pB&8yb(lGee5HBHDw1ujz+Q!?#%u*wQU}jQX zasXN(h03(jw{j#I+XXYp5O_TK$y(+_69mHz%eG_uAVSzgn}p2 z#iC4EX;FeeE@;r#T$t##m5N=%B7vOPY;RRCD3P~ZMa)XVSr|blQhRGo17z%CG&_Ok zk9w<3WwT0DItPx&k=IH|hm!e`xvY~WIWABNf65B zT&h+Nx(oTmHi&3oGp{s}kHqq1;8~TWE~v^bqf*O3HWi*k5R!ofGfu3yDo|a}QzIQq z0;R17F?&JDA0=j@2$4&5@?v?iPsv)nEtCH2U7U$T&2C-p)dpbIvZ|O>HpNsTD-8*e zPG?taRph9jr`%~)J_?1#tPe;f(v;nt6qZxWs#O_=MVw5^h>=AUvE1}SI~+M#6HLXvi=fo6^XY)M%w89|v5BGRo`XlCa+Dp1rD^VXVq3Qz)a zp;Xa^u1P8?pd`yxrQDQIeH4gfGK6W5PO{4k&-y7{2;`|&sshWir;+30lT-my6_V1}O0iLeY_fLI zPgQ9^XjN(Et}Lk`Jl(htHLw$Oq;|p<9}q56+!V9NYu5vQnmp$I929 zx27A5iJN4if$WAwiJYd+lHplPR_fUB6H+u)q0}%o+go<^NaG-kBuFTmJu(lw9;kTg z#?8jQJ~~UCAdgZ|)MS0ai`)@pX}oA)dIcGia4Hrm*n-8VdcwqJT(Zh%;T8unBa47U zSB899WL9{YrcSB3I28`AQX*aEuzSfP_xn)ehuKRVTqil)3rVkbOTNd*bDRQPMpjqr zJ?-+7S4&cvTq#xYXoj10DrV9+DqQ;?j&D$o0xLan%$I( zXpRfvLL#e0YZU3$v?e&hQM5qab>m~N&zk;#tG5N;a)}sZqheLN zCTYx)Y51fGYZXtYHN5*T>5Dzmwy>`?cGXL$`8X_j>dIAF*5c8hEY?+|`XUY^%{n); za*j~ltY|0Kov1|%rfRWO#%6lzSdofc9BhjqUR4X3r>R|g>r&`423np`^#}DB6BK~A zMaTv!?^coltICil(JbDlTN*QIM|*B#tdv$M<4zz%Xr2!g71f?XrW`sWb~Bxg!3^^r z^1!KX`6Q{hP>2WCgp_RD^V2llgs~&-P)d_IyJRY#pcD_<-qhW$W;LDt$!F@Z&I3l$ zb5QaYIcBv+3?B3TkMo6^W|=i*t4S_uq&iQNByFkGJw-`wVW=6S$q;DGVn`k7Y{m84 z^!;j)DT3RJZ7OIH-@Q1kh5)y%kIN*w#Z$7 z4GWoFoq6vYN^2?Lpq~{M4EWV|m1`xLH=b~ndF8GHrgY(BNuc_PSe#xh2@BTQbScTt z7P5~mCuvT`^f|GofZp(wpK6`R+KC}ZtX50X4-v%;73Ort*>8D6XbMsa0ezT|%V`P@ z=8>|HXMVSyG)`_?dzHrT?2h2uh=^lSzZ_S z|8oe(p$j?`e=8-i~ZM#%`!GevH66&4yU8StHLefK+h}AZXVkI*xg)dC5jwPy@ z)j)+p#X6{#6nqZ1VpkNT9(%XwC|zb}-1C#oAP@tRlm|1XnAl0kYFTetpcdocs%V=r zsZENZ1L%^&)P+3Kc9XSu9e18Lq4TM=oancn^qfJ?c6j%Jmbze`bcxXxawPLym*#Uf zJ)&y6H*K*I%~)*Igch*a^+nYbMZJicR8lgD?x;v7k%^10220vlNcn|nm65>2aG<4n zRmo0WHjrg8JII^LJt-skI^2S4hyi_8N)?;2%Vl516EOpjA=y?7{JQ9X+J{YgDJt98 zs46GkEe)r{lv^l~niZ+jlXU3|XJ44i*@+aBqJ3?obCOm{NN1C1xyWj@&kDgHdI>V$ zM=5^R#H^2HRh_32Th{VO#ln?$N+-x_U|m6J$8lc=B-JpBLK3QDC6zeIIi8U!DUsS!8?mJhv`}Od z`HG%0cJ7O+!@xf2FT<>&k$O~>ngWI3#SkZTyn$BD1J|~%i3=0URS_54(d1QZEM*$= z+N$1!rY=`25oN@tok;?2wnJTqRMOiF&iJ;*p_Ywn-Y*M$CDp!_TsjhB{3mc7j zRV00;{HQ{?wArpv)xJrcp*wY!KHBc9&VJMjgo#FH?m_l8G z8QBIkgjrcDa1~i&yFd(8OgbpRXAmZ!O(l0KC{Z~@Sx!RQRsvU9?vv4KMR!(Im7^iO zQYSn3WVI-%h3j^-SfWgRxRmjENbXV4;EKlxTq6N3aT&beSq$I2fS0x#Z8vI-30b1_Qt-%(Ts1IE2qQbik{;gYQGoMDr=$qLH9M&CiB5&mkEv{$iQo>jQALm|A*Ngk z#{hW$gGAM*WY&;F50A>bjy?HVFC!C^C##vMa%rWiYSV)H1s9nbqrh&`t!*ahMMFX} z21>b_&2~AAtCZI!Gbm7*a4kxT6d95%Br}|5_IZecT34A;LSudtwxE4 z%rzx3^=XJO@$Lnj%zN@{9HtOCR)vnn?EVV26wWuTs7n-c3YY}dLqn(Pl1q)MDs6@!^_lSZmk zr5u{}h}D}JOD*zxU`f{kNf2vgO6ttx0L?pK_NgwH+QcfWv`g2_WHV{KHLIzuOg3c) z5It!jgV^Vq9p+A{eN$>#Lqbz#O6JKXBj;-$l325CCy~GQGy}|9@$SB3l7r*Vw73l| z$cdC?#5J-L&65TVXi($=>GwSaB(u_7=SU_7olqm`RVwY+sBnVRn>fPBqoKu^Tg!rCG*ls|sqksu-Ao9Xl5{j@TxAit05X7jK4P-u<~fDi zJVWBEAB#y*8X3vkdt@g<1f*lQ#7H{Jj28Gzt3vA4oVaFXN7?|}h*ggy%01UIrXX9e yQ&N;H=PYo)E>9ja-IQ7>Rc-b{kt(N2wAhIWU&vIa;OIBH{oU?+@7o`$_5T1~bwE)7 literal 0 HcmV?d00001 diff --git a/ESP32_AP-Flasher/data/update_actions.json b/ESP32_AP-Flasher/data/update_actions.json index b34d9ed0c..f67e1f373 100644 --- a/ESP32_AP-Flasher/data/update_actions.json +++ b/ESP32_AP-Flasher/data/update_actions.json @@ -17,6 +17,7 @@ "/fonts/calibrib120.vlw", "/fonts/calibrib150.vlw", "/fonts/calibrib50.vlw", - "/fonts/calibrib60.vlw" + "/fonts/calibrib60.vlw", + "/fonts/BellCent10.vlw" ] } diff --git a/ESP32_AP-Flasher/src/contentmanager.cpp b/ESP32_AP-Flasher/src/contentmanager.cpp index e3ea135a5..40b894417 100644 --- a/ESP32_AP-Flasher/src/contentmanager.cpp +++ b/ESP32_AP-Flasher/src/contentmanager.cpp @@ -622,7 +622,7 @@ void drawString(TFT_eSprite &spr, String content, int16_t posx, int16_t posy, St } } if (font == "glasstown_nbp_tf") { - font = "BellCent10.vlw"; + font = "tahoma9.vlw"; posy -= 8; } if (font == "7x14_tf") { @@ -1244,7 +1244,7 @@ bool getCalFeed(String &filename, JsonObject &cfgobj, tagRecord *&taginfo, imgPa // 1: 20; offset cal block // 2: 30; offset left // 3: calibrib16.vlw; headers font - // 4: BellCent10.vlw; appointments font + // 4: tahoma9.vlw; appointments font // 5: 14; line height timeinfo.tm_hour = 0; @@ -1556,7 +1556,7 @@ bool getDayAheadFeed(String &filename, JsonObject &cfgobj, tagRecord *&taginfo, for (double i = minPrice; i <= maxPrice; i += yAxisScale.step) { int y = mapDouble(i, minPrice, maxPrice, spr.height() - barBottom, spr.height() - barBottom - loc["bars"][2].as()); spr.drawLine(0, y, spr.width(), y, TFT_BLACK); - drawString(spr, String(int(i * units)), yAxisX, y - 8, loc["yaxis"][0], TL_DATUM, TFT_BLACK); + drawString(spr, String(int(i * units)), yAxisX, y - 9, loc["yaxis"][0], TL_DATUM, TFT_BLACK); } uint16_t barwidth = loc["bars"][1].as() / n; diff --git a/resources/tagtypes/01.json b/resources/tagtypes/01.json index ead6d55ef..4d4e7ad53 100644 --- a/resources/tagtypes/01.json +++ b/resources/tagtypes/01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M2 2.9\"", "width": 296, "height": 128, @@ -73,9 +73,9 @@ { "text": [ 120, 90, "{ap_tagcount}", "t0_14b_tf", 1, 0, 0 ] } ], "27": { - "bars": [ 9, 288, 90, 10 ], - "time": [ "BellCent10.vlw" ], - "yaxis": [ "BellCent10.vlw", 0, 6 ], + "bars": [ 9, 288, 90, 11 ], + "time": [ "tahoma9.vlw" ], + "yaxis": [ "tahoma9.vlw", 0, 6 ], "head": [ "calibrib30.vlw" ] } } diff --git a/resources/tagtypes/02.json b/resources/tagtypes/02.json index 8bd6fba51..15d136050 100644 --- a/resources/tagtypes/02.json +++ b/resources/tagtypes/02.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M2 4.2\"", "width": 400, "height": 300, @@ -50,7 +50,7 @@ "rotate": 0, "mode": 1, "days": 4, - "gridparam": [ 5, 17, 20, "calibrib16.vlw", "BellCent10.vlw", 14 ] + "gridparam": [ 5, 17, 20, "calibrib16.vlw", "tahoma9.vlw", 14 ] } } } diff --git a/resources/tagtypes/05.json b/resources/tagtypes/05.json index b35d98ec8..caf894621 100644 --- a/resources/tagtypes/05.json +++ b/resources/tagtypes/05.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M2 7.4\"", "width": 640, "height": 384, @@ -51,7 +51,7 @@ "rotate": 0, "mode": 1, "days": 7, - "gridparam": [ 3, 17, 30, "calibrib16.vlw", "BellCent10.vlw", 14 ] + "gridparam": [ 3, 17, 30, "calibrib16.vlw", "tahoma9.vlw", 14 ] } } } diff --git a/resources/tagtypes/2F.json b/resources/tagtypes/2F.json index da4f5eb30..cd90d2401 100644 --- a/resources/tagtypes/2F.json +++ b/resources/tagtypes/2F.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M3 4.3\"", "width": 522, "height": 152, @@ -35,12 +35,12 @@ "rotate": 1, "mode": 1, "days": 1, - "gridparam": [ 5, 17, 20, "calibrib16.vlw", "BellCent10.vlw", 14 ] + "gridparam": [ 5, 17, 20, "calibrib16.vlw", "tahoma9.vlw", 14 ] }, "27": { "bars": [ 27, 468, 100, 18 ], "time": [ "calibrib16.vlw" ], - "yaxis": [ "BellCent10.vlw", 5, 6 ], + "yaxis": [ "tahoma9.vlw", 5, 6 ], "head": [ "calibrib30.vlw" ] } } diff --git a/resources/tagtypes/33.json b/resources/tagtypes/33.json index dd08928b7..7d02b8f42 100644 --- a/resources/tagtypes/33.json +++ b/resources/tagtypes/33.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M3 2.9\"", "width": 384, "height": 168, @@ -60,7 +60,7 @@ "27": { "bars": [ 12, 360, 110, 20 ], "time": [ "calibrib16.vlw" ], - "yaxis": [ "BellCent10.vlw", 1, 6 ], + "yaxis": [ "tahoma9.vlw", 1, 6 ], "head": [ "calibrib30.vlw" ] } } diff --git a/resources/tagtypes/34.json b/resources/tagtypes/34.json index dc9d42bed..9f31c83ae 100644 --- a/resources/tagtypes/34.json +++ b/resources/tagtypes/34.json @@ -12,7 +12,7 @@ }, "shortlut": 0, "zlib_compression": "27", - "options": [ "led" ], + "options": [ "button", "led" ], "contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20 ], "usetemplate": 2 } \ No newline at end of file diff --git a/resources/tagtypes/35.json b/resources/tagtypes/35.json index 1ac5551dd..e44f9d339 100644 --- a/resources/tagtypes/35.json +++ b/resources/tagtypes/35.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M3 6.0\"", "width": 600, "height": 448, @@ -12,7 +12,7 @@ }, "shortlut": 0, "zlib_compression": "27", - "options": [ "led" ], + "options": [ "button", "led" ], "contentids": [ 22, 23, 1, 4, 5, 8, 9, 7, 19, 10, 11 ], "usetemplate": 1, "template": { @@ -35,7 +35,7 @@ "rotate": 0, "mode": 1, "days": 7, - "gridparam": [ 7, 17, 30, "calibrib16.vlw", "BellCent10.vlw", 14 ] + "gridparam": [ 7, 17, 30, "calibrib16.vlw", "tahoma9.vlw", 14 ] } } } diff --git a/resources/tagtypes/36.json b/resources/tagtypes/36.json index 7b68b36ec..d7d552db5 100644 --- a/resources/tagtypes/36.json +++ b/resources/tagtypes/36.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "M3 7.5\"", "width": 800, "height": 480, @@ -51,7 +51,7 @@ "rotate": 0, "mode": 1, "days": 7, - "gridparam": [ 3, 17, 30, "calibrib16.vlw", "BellCent10.vlw", 14 ] + "gridparam": [ 3, 17, 30, "calibrib16.vlw", "tahoma9.vlw", 14 ] } } } diff --git a/resources/tagtypes/55.json b/resources/tagtypes/55.json index 0abbf2be8..05d97e46b 100644 --- a/resources/tagtypes/55.json +++ b/resources/tagtypes/55.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "HS BWR 2.13\"", "width": 256, "height": 128, @@ -75,8 +75,8 @@ ], "27": { "bars": [ 26, 216, 80, 20 ], - "time": [ "BellCent10.vlw" ], - "yaxis": [ "BellCent10.vlw", 6, 6 ], + "time": [ "tahoma9.vlw" ], + "yaxis": [ "tahoma9.vlw", 6, 6 ], "head": [ "bahnschrift20.vlw" ] } } diff --git a/resources/tagtypes/60.json b/resources/tagtypes/60.json index 7a451085d..6c295ed49 100644 --- a/resources/tagtypes/60.json +++ b/resources/tagtypes/60.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "HS BWY 3.5\"", "width": 384, "height": 184, @@ -19,7 +19,7 @@ "27": { "bars": [ 12, 360, 125, 20 ], "time": [ "calibrib16.vlw" ], - "yaxis": [ "BellCent10.vlw", 1, 6 ], + "yaxis": [ "tahoma9.vlw", 1, 6 ], "head": [ "calibrib30.vlw" ] } } diff --git a/resources/tagtypes/BD.json b/resources/tagtypes/BD.json index 8b476055b..d10a01962 100644 --- a/resources/tagtypes/BD.json +++ b/resources/tagtypes/BD.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "name": "BLE EPD BWR 2.9\" Silabs", "width": 384, "height": 168, @@ -57,7 +57,7 @@ "27": { "bars": [ 12, 360, 110, 20 ], "time": [ "calibrib16.vlw" ], - "yaxis": [ "BellCent10.vlw", 1, 6 ], + "yaxis": [ "tahoma9.vlw", 1, 6 ], "head": [ "calibrib30.vlw" ] } }