From 9fe99d6a0c9b3233c2ace19c2cec76556834b098 Mon Sep 17 00:00:00 2001 From: pvvx Date: Sun, 12 Dec 2021 19:33:02 +0300 Subject: [PATCH] https://github.com/pvvx/ATC_MiThermometer/issues/163 --- ATC_V35.bin => ATC_V35a.bin | Bin 63652 -> 63668 bytes CGG1_v35.bin => CGG1_v35a.bin | Bin 64916 -> 64916 bytes MHO_C401_v35.bin => MHO_C401_v35a.bin | Bin 64548 -> 64548 bytes README.md | 2 +- firmware.json | 2 +- src/app.c | 6 +++--- src/ble.c | 2 +- src/mi_beacon.c | 4 ++-- 8 files changed, 8 insertions(+), 8 deletions(-) rename ATC_V35.bin => ATC_V35a.bin (51%) rename CGG1_v35.bin => CGG1_v35a.bin (65%) rename MHO_C401_v35.bin => MHO_C401_v35a.bin (65%) diff --git a/ATC_V35.bin b/ATC_V35a.bin similarity index 51% rename from ATC_V35.bin rename to ATC_V35a.bin index 64d2f955371f4e1590cafec1f219cec17534ac1f..57a635a6d47867665912dde5a719bbe4eaa5ca28 100644 GIT binary patch delta 11109 zcmch7dsvj!_VC{G&I~imAVY|NfD8f(5;2Gdc*(&F;Dr-pmSz@SFfBRisdJ=@F(x*4 zvKn04J2Nm>v^4bujh?bJht!j%p0raZtvp)RiSpF|6)#7b-&!w1{m%1z-(TPJ&GW2x z@4fcA?X@rOUhADr9m38I!4}7N*2nMTYwAy>a(n%)d_EmU@_jrpaD^{bR)jfObFI> zT~@gl#)ie`t#f%ZxGmCdYC7BBP)+zx!x&>#3Y()*rL&iD+ZvC;7T+jnbhd>Kw7fVC zUJA?SX@S|SHaEuNV&0IL>TaESP>*ETG$GTS|kA@MG^ z)@EuPtV@^~{P{*xL#JKA4lS`}X|%Q&;JQh*fA!>8eHR9M6@HCvV#B*uwQZckWKOsG zq+}U4s$q*YMKZM{csWw!H8fhuwq7SWAFX3`zpG<=Ce^V<1k2kBR)^(N2sH@L5e}hR z&6qf)j(HJSm*N%+DTF(^?&!{ggF2C)fjRmFz9I0mem>_L;B-VD*Fsdk=niJ zsk6u3A+ZQ1M<(e;^tH2Ld1U&~fliH%rek2DLibg%31=(ecZ`vqq?@78Fb!ir3XBQJ$)91a`u`5xd=E*d$q^I?YPlW?Wgvb86h)8JwYgsKTH3i!X*&n2qLU+Zc9kY1u6KWnJ7*8oRWQl26d$wBJMl*PtQh%jhL8V-uGgLVO>7HLMvha%ic`xS2~^1>>fazMe;18M=X` zZwUjwT z3o{_Znd{)m*knEkAT~4JjynPm3Y~p2v(53a>Jd14R;98%3tz+zjdoQmxt_A!(%kEji8I;t42=E7PvG%nVof;uQ}-Q(RV5jb#eb=w+G_NV68s z#Es+wASON~PlfF%F5@J2qjJ(cmhh%|6VFY^(Iu2NP0Y7UFU`^qysAFfH2Lgg))^= zYYo}w*^Y~?dR(MVT&5-|QyL|8ixTJ(?&X~@J0Vkhx`BHYmF?AbcqQTG^sgI!ug;X3 zjRi<`sv%QqH=5Pm;^z&_XG$^njZz$X<5L)$7|*xBgNd1ZIjl;Ij_4hu9Z#q_@FkY0 zf>_Id3yJZ$LPaYo6d(s_qmGH0}0-gNYr%WIApuNmntLsQZdssD0V`~!6Z&9r9ij{jc$ zZ#$HDe&-H~Df2tnc1^Hbe6>-BtDgG@n!CkkTsN&s+gRrnYi%0Y6?zOMO{nIV(wky1TEO*(5${uL3XUOFad!}4&wGWfa%}`_$zAW!8afgSGs!&w$>FRjlPHb=XgyHiA zPgs*(5DGN{y_g8&@F+&Hw^(bJrB;?z@0qHeea)f1;nQ|%q*7%{aYnbe)n4n<{!E9O z5m_vr8~*z`4b+K!4fa;~@Jhy>Cq2*Woa*>eMK0UQT3aoqnW|BSpNVQ6>>E6TCqPW< zQhpBBq)yO&>+TuWX*iLZknpyf3{y1;LOg0wpsc^SpZCsE-x5E9u(VA63go86#2)gD zp1HqG$Qy0d_+xR}YViQOC5kX7Eg^FRE)F`l_RV4P;z-1H0m2xB41}{Sq0mBHIA-vr zC1@XWN4_}`wM>A6X;b-ph)SQ$S3-4qEYE~B=_L`wL7XJD08XX9$tMO@4FS$eAtqy- z>Plm~)exAKae?!NP%^AA^K1!fz{5tPw=iR5&k<_FtAzn!K{*}_c%1G;Xos!CCTQol zI<3@W3tSlnJf5n=WW>{hn6gmF65PL1z<1|koTq~Ju9cC0YJ95cQle%X3of*V*-pX6 zyQcF8;itPM)Q)X9g4d-n_Vu`AiJipt+GDu4j-}#O*@L=+oLTO_AGZ*K7u&R*wqQwK zv*fJRCZhT@#95x*ulyYOP9m6*Hx&9MR7rJ&vmu0i*oStI_>?Kr&?Z?jF` z^*?Mi`sVf5g-4G+fY!8E^lVs?L{@PcB*F?MW2GorgPxg)+6}PSl+Txd&-9>5wj6Gm zKINO?SZ)?xude4Nq>ygCo^j$1#W5C#B|``zekV#^3nPbb=2HS+4=?2WO^6w>pFa(! zMp(;eAoBaHlHou?0^RpCXcpGTF-s^!%yh2D@6P8cJ$9PlME;Q|hFuyZ<0>UyEwPkfM}a47w>wg!v6aL0!t4mE=X>i~RP+== zd*GGAXr4<=B{I?=$Ubtzdx#s1?No$evHfLVX3!ol|akrOMD}2 z9y3l`hy6rz5-yB+5^;0KmZVTSh!WZnl=mT^^l$_LLHP(S12{bP&B7Ip|Hfr?pg|Y$ z#8kHJSTM{s#d&@j-}YH+m@TLA{ItL0bkh1HdubBLRS|vGF3}?uWT3;~C_q zaHjVc{u>#^efk#3UL22HLx@X7Ts3_b?tu=()nV_jzTW5hdLNc~XJYT2eHtlf>iv<` z25gYk{bAL_=(34e%Ru<`Cm6`;MX1$|vrxE*u~mDiw`az;AbvYS@9%&60cTQ{xb8O; zj0v*N&k?s4ZTTX$m-qI(BAx=h-k;((UYRD3hjf+(W=(ooA>gqd=qOpC0Fyafn}IAe z8Y!@R%2c(0I{;cHoeJ1176|Xm7@?1#7$gm01Hz&}(cEMnMNPv{Tz;ewPm{HE5*g z3aiFxS2{0Pds?fiN_Z9=u9|)a4cT(<9n3_oL(pG>yA}>euX26swX|Os-^KjH2i{=E z4RH(xDA&ce-Gb%@1}o=L@E%yaaCAzHD=fTXilu3`LMKcgPc$#ML*n}$inPeDBjDh| z-2Af`aws+Dnv~(I`&Yidy1!(t!M@`Nqm+!5qm#9l*;Zw%pu>BJKO6%o=3N$MhwR6O zs+QsLR|B&iE6Hr|n5q@}HfwKyK$9~KWf-dN(6gp<1K75NBMif$y>R%kkvZ;$vuFd+ zQp$i*0c(+#(gAewHY2bq?pNTAM4?gH;vsucf_5xsP3QnDfQm(;mUwreYmY<6qLkWC z8jO-)+hM2Y{SLu)$gQ-^vkSJaMukmsg~X$7lLoUdZWAUx*tUT|rB`M1V_>DSZI+)q zoeb;mI@Pu>9SR>V82|cqwe7qk9l6?E2Cu?)#-*?jz15kdi<9D~XqtHo-QNV8*O6F@ zvD<&d8h4~OL94KJdIax4EH8TEwHO)Ne)b5qcQ7X-*iJMK@(m{^;DiabPh4U6Jmyl_ zPB{!X%zNySsP336QX|+lG;&)38pV9fe?z?LHpr1z%IkQHpmTB`W3rc^9^-s)>ph=yUP zc2bkhti(WWsyQ1|K$y>JU~(9D0CqiImZY(>Em5s(Q?yp_PcyG08ry;fgYM*H!FC5E zKamqz+CcdeIn`51Yi`aHWASFv@WjT58l3N*kmIHp4`Y|4@E|<8WMtB2=g(H^V^vBm zYwFeOqgFVhi6!>7Hw9qT(0)Rke379GWb z+dsskv=Wy-)sb#3RQzEE-yV4L52ywp>8Wg92~(e%KEdnemCLGW%IG*C_L*3xqk`71 z7u&sJ>Ja}FLhtcG{<0&C2z>ig8Rz36=TFrGbWUNX;NzRu2`SQ-LDPj%(hZS2;hjHi z;D3dZ6@Y&IdPNGK9k{hZ#ra7Po}S9zfqS2hNgz>%s#TSbs}=9Crf8$`KWUeY7Zi9t zI-&OI)(Gkkg&3Oo){HtRd!~fjVdFFD{B`)?83+FcW<1-%e}=H8)h##E4N;w0$melMY z+$wD(O3|Q{kDa>8o)p-xGKlwnoE%yc`(c$OeJW+w$hK?ZYmQ7QRk}YAXRLhanz*h9 zfAgAXmGKWC{_L!4qQ!yKH?NDoYe$K-p~I5J7emsjH%qeJT8*F; znoTW<{%c}Crv|ea@_Ix4N_z3^<=)NUFZp6?8_~;#3hbf;s!`q zox@Eqb@j#+3jXdvE&cJp&p=p)Cy#;dz6^I!CEieh*ZopE)NSsQ_X5fr=f3P!q4v@4 zU%VMu=3^3&tjTkC$YqYZ)2qRDmRpJKo8lQyx7UE}RQFBfX6|1ze^z8w-JK(a?91ai3j}hyN=Pp!l2f-?zPQbDf>;oL z%=O>&Rpq3<^}mvgSH+VqN~4ydE8446Qa_1pF&x7qdXw;`(qf9?JK^FQJ--P5S+g~& z9EsQ#9^|^Xa+;y?z^)gcR`7=)=OrIzvroLVG=@mN$6H(ZG%OKJU5s6W8GqizUkvD8 zuIIcd;98f!Rn%7wdtZ4a;$eqTdaAiXP22tfc<|M99)Ojvmhp9gBd=z0-UU}*dzQZk zPueD7q_W$#l0N|X^*PD+I78wd=XmuU8SB;j#Waj1?5O%0iWTsdXo5BM<5Yw#hr{(# zb?Kf}>gEe6(pB*@NM1jd?}j<+^Y~V%U!R*}bC|u0)!dfW@OZ|iwl@^#k23Eo)j1_wF~p}lHtWj`raQm)LD4E~$q zEVoHotft!i@FR@WGL-jsv~mxmZ&;c{Es}1Tj%PLo-23nVeGkWRC*ttVxFIi!dWd2t z0`=^KD;tv2wHp{aNYKjISS)*Igxtz?Gv(R&9tt-mBoQVK=c<ETT9sul6V$= za4c0(YY)tFCPn`h?@V=gFANrE;su@XhQLeCXs)726Z4@B(ODGJn{XQp(8uah?~4t` z^ijD{8rGaCsr_A|#$}WqxLsGknTEo6qL1-1HnIT&8?3X>O^gyGYazEWKWcBIdb{ed zNxHk)|I5}3UE(fyx-m1s+o;}|)|J+s*>t(TV&_x$F)w|RBOA=Hw=pOF+1vdynk4MM za|ZKXl+yxcP`P}VU4PT{3jY#Dx);az8}4uVE-^;b~GkfotL6j9Uw z_q>crwO2evIcW{!72~-Uub}PKZ(hid3Z?5}V*}grU27NG@C@D(XhcB-lCULk%M-yB zH=UsO?a_oa{4}LYylIEyzDj&a=K53kJecm!m7PHAg4k$giS-(8iFR=Lv&I_H9Sg9h zFV}=7t@^k-R9nD%vOBj!|5so7@Sl`s=~)9OoSpeCa_T~OxDQ>Ss{CIKSV85e(kKClq zS@9%~b)epgWnolLY2x9>vHx?JyE!X@Fg19XFGYw0$L2EL4nJ;A;hy^d2x`xSY8xJzuXgeP1xbWMdVoMfZ04ulTYY!kT(<}>X zhrL@SXh{lf$vvRmx{}`o)~%DZa&{3@mP$CawWREHfU!d~=&i_x<;FtB_MonV_h5{O z?UnD~+Y?L2ZVchEOh-D})RfzyBw`(wJ+8yAc2ND+1T9SwVU@7^tsMEZu7eA2J(zm0 zD_1IQS)|rAEB#l*Qr9=QHq90c#*x-kwYu^eX7L}}_DTdvmX8sV1AKd7?B|Ut&0@9Q zue4otsw(Mw3wcNh72AK{4+QdeXgNOtMSocyX~)=VL36GY(?Tlhq4h7HW|KHN9?6L& zEXl#m2;>@4O`=HMBE(IDy>HLpZGq_KctsR>oMr$Wp%Ao;HN)6oG182Ajd^=yE*Xyq3W#lX3l{0>L zxKVzOC=c8=m^K~d?unqy@|Fcm_RO@$S8H577}Hop_}8BLv^irZ%y>YIV5&>@19LeUGazi^Cfk;?B*| zcyW8QdS_~ymA+xpWpPL&uQXNbq5l2&umO#k8#h=&q1~bv;4>!clBnAgQ$^hAuMH+l)|yJw{YABd+g3`%!M}=Z>r?dE=j$^5pnTDIAZ4@MbmIbQmf=S{>6Xh4hfl9z%M)0r2C zYKCYHm`(6N#lhTKlYOhyt96(?S2Cgv1DeCohE!|~#a5EsO0?@E*hrHUp&cbnz{})X z=hrXx%+TlP-`-VAWAF9OcC3GcP=Y|-A%92+6LEzI$=fc9@6Xo-Z} zRRhQVHUoq4)Q^|)41kaGap@fSI6t%9-GasrL>FBWe|Bfe#tuRAE{W%`MaE{!t#2Uf zPy%m*l0z%_df0a;m0JSm4ps4yhO3y?LnUM*%_Mnt3)Xw*X%V)`R$7%b7P?%%2P;3R z=Z{0=ky!o+3_X$=G0v4CnVLgB11c_rIY;J1g#QMkgpZG8#{729NaK457Em3XtGMZa zMMs~DA@#K3sgurrQh5Nb9~~M&7=8rbEm)p_>|?PJM2lCzQhC!u#jzQ5OFA~1GdOo_ zb*94cos~al#0b@l2JL8wi^!0S%_))*Ct2;tkj%~6r>V~1wZ9k2i;9L%!~6!pj(5S z+>$8&NQ=SY-=^HLx5(nE0ur^+ONldbrtChYfSc?PUACqGadQ4J^^tifH zyyz*wIA$AHfvc`PS2TWa#1a7wOSOj+61JFS^;5FI!nb zrbISXVH6itIR^iq;ZXb4+weacWOw$dsVdpuu(Gdq?9{U=(ua0`^;5(H7%^yY&1g_Y zIZXI^I;OP5uWR|AAoiO_c`>Z`CK>%AezR23?FeX2d%4clps4Ag$D91WGUHd{OD3tg zNUcN(E3ux^99~HE6>#NW$GA7J|4fvEhrt)$F6EbD(s#+aeGUx@Fe1tOu=Km!7++tz z(P5~eptKXeh41=qdFmsMMe3O5Bz%K)iZijE-aM!<4D0tfbT!Fxtqdlg%PZ4dqp-HV zGE9n)2H^n{CCkWgC{YjbrlN)cvXns%eNAkkfVg;+m)9I8ONqw%sOEUN9uYWvE>Fp8 z0=IsgFJP{7?)j_Om?h~HSX5o40+zSes%E0jxWJY6e9mV=c4sm#4U~0S6}6o&GDcut z*8`8d+|yq6=brK}FZGm~wg0>9<$Liq{?6NFFWzG9p&xd;?8Wz%`W}3(th^Wb|G%8t zW99z~#dktd*PFHB`!V^3a5q9F!s`g1AhaR$JHXg@goOxO5RM{TMCf-A=@GjAhF=0d z?kVk91`!q=>S_N0OE*Fgq3t$KkNv%1{FE{0r|d39mCoag{T@rI|DWJa?E56J{Aw&u d+>ZGr1%`uow`Ld4$yY7BZG}QNe|&k~{{U0dW~u-H delta 11424 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 diff --git a/CGG1_v35.bin b/CGG1_v35a.bin similarity index 65% rename from CGG1_v35.bin rename to CGG1_v35a.bin index 7d945c0f1268ca8d21527af7eac7991aa3ec7cb2..9245836c7a439861861c06e0fd1b4ad7b738ecf7 100644 GIT binary patch delta 7746 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 Iz~Sou1J-qx00000 delta 7629 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 diff --git a/MHO_C401_v35.bin b/MHO_C401_v35a.bin similarity index 65% rename from MHO_C401_v35.bin rename to MHO_C401_v35a.bin index 983c2ef59bfdb6402df33ecc701939fabcf50027..0bd346356d373cc83affdcd3e3bd76448685d125 100644 GIT binary patch delta 7404 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 delta 7574 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 = XIAOMI_DATA_ID_TempAndHumidity & 0xff; // (lo byte XIAOMI_DATA_ID) p->t0d.len = 0x04; p->t0d.temperature = last_temp; // x0.1 C - p->t0d.humidity = measured_data.humi / 10; // x0.1 % + p->t0d.humidity = (measured_data.humi + 5) / 10; // x0.1 % } else { p->data_id = XIAOMI_DATA_ID_Power & 0xff; // (lo byte XIAOMI_DATA_ID) p->t0a.len1 = 1; diff --git a/src/mi_beacon.c b/src/mi_beacon.c index 164dec07..c8ec2235 100644 --- a/src/mi_beacon.c +++ b/src/mi_beacon.c @@ -189,8 +189,8 @@ void atc_encrypt_beacon(uint32_t cnt) { p->head.uid = GAP_ADTYPE_SERVICE_DATA_UUID_16BIT; // 16-bit UUID p->head.UUID = ADV_CUSTOM_UUID16; // GATT Service 0x181A Environmental Sensing (little-endian) (or 0x181C 'User Data'?) p->head.counter = (uint8_t)cnt; - data.temp = measured_data.temp / 50 + 4000 / 50; - data.humi = measured_data.humi / 50; + data.temp = (measured_data.temp + 25) / 50 + 4000 / 50; + data.humi = (measured_data.humi + 25) / 50; data.bat = battery_level | ((trg.flg.trigger_on)? 0x80 : 0); memcpy(&cbn.MAC, mac_public, sizeof(cbn.MAC));