From c20e9b98eaa1d3f6095044d69f7de01366242582 Mon Sep 17 00:00:00 2001 From: Johannes Date: Fri, 8 Apr 2022 22:30:28 +0200 Subject: [PATCH] synced changes from eu version --- HMI/US/portrait/nspanel_US_P.HMI | Bin 10424444 -> 10424444 bytes HMI/US/portrait/nspanel_US_P.tft | Bin 8571656 -> 8571656 bytes HMI/code_gen/icons/icons.py | 39 ++++++++++++++++++++++--------- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index ddc9dcb67fbeb69016e7a5ea4014f92ee0bc9565..d100a813f5659d52c60610cd6ac77ff370dfb6a7 100644 GIT binary patch delta 1764 zcmeIxZERCj7zglkw!5}N(J|@9R@n;HGM$c%GK2zBhETxjUf2dzy0sHV+q*lM;tRfv zA0%G8U--a2^?6{1XfzgDB0zu*u;^rq}j2deUF<}}03yHHOCVujhH~A$u z=Q+=Pa{l+;@e||9IPjVX&*xfXR(2XYKgd{QX*TDlYn)0{(PtEtwcFVBwT!X2PY2nr zLxb$=p{TCI_lZ)$cP=Q}=EJ_fE`OJYMbC1^pk#hx@usVu<#k{y zl$0jca<0^~SOm4Wq^VOjds(doQ{%P7zNo58U(bhvx)NLB^D0d~7CMIgurRU2M*4ls z*^gRW(yV-~fqlLev-(*ys%yz%Nxc`Z`ERGg`)2AttOp0h&%m%A#zVK{=F5CVG%&QXb`#nP$;!dWbCaFj;9170@H} zC>7FU^f(pKTq>p#n)k7-tX-M7%m?JY9(Qb!7;aECVYd4Ug?FX*j5uEt%#uaff$lW% z{lqk*4FBxbPu_;OIA99S6@^2@eJEeTH<%cWM)N>+~49pqwo)DsqM zAGR2z*4J`WlZSG*J5GfxoiD&9*bI%Z1^f_zAgIs;8Z^UJ*aj`|BD@6K;bnLQUWM0S z2fPk%z?<+Ew8BnkgI(}8>;{5%=ztKs1ACwox?nHtgZ&VO0}z33h{8cQ1cyPuyKn@K Q!ZCOcj!R4D`x`p`1o>x=!TQUny=AQcW=q4KC# zydom3jbaSiiAER16$|1*cN!xuG%;~OG{!^>eyE9ozrjg<$(ej-&SEk%IXEd!f>7WU zA_eA+4)PPm0)#4WN|3-F6lIHH@#feXiTzua7Bf@&uz%*%55E%g1t*)?z+{h&sUrdt z(2+DN`(d@SY~P>L@d-0Si_XC!TK{H=Gc!kIouM{(RwsM$ zT4o<|FlM;J@LUjmpN&78C8Hu41(*Xm5Wx@hTrwI4zNt0FhW}U4Knuv97E%BO(jqcZ z5G|%)3ZYO6qi~9#NQ$CpT0%=HhL+KCT0tvm6|JT-Hp3Q3hOLkSsgMTg zkO3CRge=$w+aVivz)r}4U0{V=*bRA*4+T&NdtfgV!9FO464(z1;2<30qfxd2r}+NK z)Hru}Y>(z^X@#<$hmX5zby{k3nMoPyxACF=(%k#voq4`w{>CT0&C}lHJBzjM99xAp z=&CgFZbMmDxfogfQRP!sdsD`&TysA)H){6Bwm|-=%O01>@#H7G3O*B;J*Dah?+K|( zzo*2sABH1P4oBe_$WQ@Js00^O!EvaD8mNU6a1!d^6r6@La2C$NdAI=e&;S>q5!`SI znxGj7TA&paxD0L34j#Ay9nc9~&<$R=3MyQK9=Hw~+<;!V34L%2`gu(I?UL4C_z93- diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft index 176d9271f0b73891bdac30379e1941889ce837fd..97ac7609d6dc19ca167cf697c35e091f9c54f3b5 100644 GIT binary patch delta 363 zcmYkzM@|9(0EJ;@9D5fl_J+NIf`YxEqGA_&$Bw-M*8GVi?sZ8_TzCMJxq>HfYm6(s zfJ+^A{>hiT&GX*hNnXVj0wMuO1QJ9rA%qe}I1xk=MKm$Q5{H_25=bP8WKz(ON*d{8 zkVzKVBM7iAV(Tgdf>N8m-{VEB9>R+Pln(*A&{1=04 ne)cRF{nI4By?b6Qf_UrGo+~aCmx?RJwd~X0IG&^*>!allXs3#h delta 370 zcmYkz$1+1<0EXfGar6>IjozZyh?3~NMi;$zq6?CPFz<}a*t0ZdEL?z@a|^D(7E5k| zGn0*X=2?7;&wGC-c~u?+TKtgkCxAeL2quJ3!U!h<9g##4jh+}{i6fo_5;2fOGAX2z zMmiZ}l0`N-7|A7%dN=_2%(hNWs~-y%pyy%8tGR}2+hBQ;+mB2Y`&LS ovA)QQ)xJ@yyno1V9YS;aXuMEes;*QX)wS|yyjgvgbSCHLAC-WLf&c&j diff --git a/HMI/code_gen/icons/icons.py b/HMI/code_gen/icons/icons.py index 9be9835d..e49a3e54 100644 --- a/HMI/code_gen/icons/icons.py +++ b/HMI/code_gen/icons/icons.py @@ -26,15 +26,32 @@ def get_icon_id(ma_name): return icons["alert-circle-outline"] """) -# write documentation file -with open(os.path.join(__location__, "../..","icons.md"), 'w') as f: - f.write(""" -# Icons IDs -This file contains the Icons IDs included in the display firmware, addressable via serial. - -MD Icon Name | Icon ------------- | ---- -""") +# write mapping lib for typescript +with open(os.path.join(__location__, "../../../iobroker", "icon_mapping.ts"), 'w') as f: + f.write("let iconMap = new Map([\n") for icon in icon_metadata: - val = icon["name"] - f.write(f"mdi:{val} | ![{val}](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/{val}.svg)\n") + iconchar = chr(int(icon['hex'], 16)) + name = icon["name"] + f.write(f" [\"{name}\", \"{iconchar}\"],\n") + f.write("]);\n") + f.write(""" +function get_icon(ma_name:string):string{ + if(iconMap.has(ma_name)){ + return iconMap.get(ma_name); + } + return iconMap.get("alert-circle-outline"); +} +"""); + +# write documentation file +#with open(os.path.join(__location__, "../..","icons.md"), 'w') as f: +# f.write(""" +## Icons IDs +#This file contains the Icons IDs included in the display firmware, addressable via serial. +# +#MD Icon Name | Icon +#------------ | ---- +#""") +# for icon in icon_metadata: +# val = icon["name"] +# f.write(f"mdi:{val} | ![{val}](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/{val}.svg)\n")