From 93fe1358e8e0dd77c52500540d13154c373222dd Mon Sep 17 00:00:00 2001
From: Monster <monster@Monsters-MacBook-Pro.local>
Date: Sat, 10 Feb 2018 19:41:37 +0300
Subject: [PATCH] Update

---
 blegw    | Bin 3059916 -> 3059916 bytes
 main.go  |   8 ++++----
 scale.go |  14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/blegw b/blegw
index 683f6bc6ad22ed9e0522e8ffb07ec56941469a4d..6369c546f70cf3e754abc0e66449f48076e845c0 100755
GIT binary patch
delta 2056
zcmeH{|4$QV9LMi@?pm&2u3ss%(AK&hO2^j?I?8?#NtFZHU>g`2GvIz0%w-tN2%RI=
zAzi608xyu?F@Bjbl0_0Q`(fua+W<#KkQmV{+u~;Y5)F+mBN;K;;JQ!mYBK+T{pK~V
zd+vE&&*ypGce&oejk9P0IK7-<2<%?Dq&w_8*k7{p#!}(euO4KlQ1!?(y8(qpkgCQU
zI<}Uf;OIGzQVkVK+R2Rpons`Ra+wovx+OU{E;%YO<CNtb$bKC!$>FFh`@7c2(yDfu
zO^0Op?g%YeQz9)pK?aNRrONu4yk~I8EmxiadEr}+B>l3ZF4*#9$!c6?{W)3Qufx)^
z`rNeK22!CclqyRDa;f62^>XD`AiaBwB+1KRDetv>Sv~;Sl9sbaWZUvs3R;)hX)k`F
z(%I)B$M4xTkkj{UrB6>!pTYn79<19x<ql7|5r6?2U;qW61Tp{?PyuQ{BTl)sKmLg#
zBxK}xR$zr_qd|z0>7tC>f&rd|e})hl;0NJ77osuVAoXMXu+$&rtx|uK|AGuxvUW0g
z7+FbyiPNDk$%`iL1vE&yP23SuGp*EV2GX+!_&G9t4BJSR877_~4QB3ENz}14rKg0U
z^2N~A9+ePb7UONnWKxKf^FqYWvr8@3m1MkL8uIgvWJe~~j2elU$pxMDsSrbTNQiK^
ze&gU$dnM{!{6SBJ?(0K#(q!RkS|ceDwd|1^$9`#AHxeqZ1--&h3zRxKU@Yorfig%j
zpH49!zx3$8Ddw{v#dp$>pWh}7DQYQ1K1rx@h#`w}w`B?u#qD2Vr^t*Dg$ePlbl^@Q
zQqK#*5ciX0wdtFxh2>HcJB29dyK_S1u_;My^z%Qdz2%K2k`zUbUuVtaW20J$b`WD0
zXW9M^EElyje-HP1xhETTuanlF7b55708Qy7+EW3lAb{tI0OJ-pKzk}c)!o^p1BDNg
z@#aJ_xv;Phc4l*c4$uPz(V1;D{f;`s=l(Wgk9{AbZ+E4>fAIK?sg{CotXeuN!wq&5
zU<NV)3y=k516HxYZi_c@RzI%An{g|n$KFzLQ@3qIsmMO0q$<fDy|%ji8RcKJnu^gC
zW=&>XO<hD4V@PuXSrLobG<OiAHj##a%~EaQu>x;l3b6`bMHxqt269|R%x4&%K=>ns
zx8gF~r#OJv*KiJ9tlWx?7MM|iH3-(0j__E(CXNMiUhhR8hS72kkSn5P`{!D-7Qce9
zUyp0`c(We28cxzy@zkn43vaqjA?6&SuTZ!GF|&xC2=+Z{+YUc`2N`J9?q2p~d=#!e
zm}p*&v27da9uSBPZ^T;+>@ROaRyDmRtV-Gehp0+APbScKc=F*Iz$H#TTzmFClpEgJ
z^$g$^cXshTr_eaLZq3U@)!|iZ9<UBr59EuhRu9whX*=`HK2NEZ?l1+zWib!%tXLK+
oc%Rih@AG-fD|}^@B^|qpcZrkvMSEWg`)(Ehg`)3f(dfm00mGH?q5uE@

delta 1733
zcmd^<|4$ob9LMi@uI;X+M@x^E7Fxdb7*xIt16c3}2d0CA;TUrx41%DE3}a+&8G&U4
zR0_x0HbX(rEbdEUm;?-)zj(MsEpAOFE+UvEnoX49mXTp3(JUL;sGqy*V)i%K=5^0K
z&+B<VpHJ?RySjV<T?NjsZ!t&AtpEF4#q*z6Jy-9#Zuh-Ug;C|`EVUg8qex%H2&XeN
z1pK-#A$cH#s8d|_$Gb**^y$pzD{e&&PbrSr{5DmUS3nNMvx*!EsB)+?O_g>-I%7Mb
z$~Q(y#o9JvvIFEmevXo?4XQN<LT)uV19JXLk0O1lBjz1hs-)u58RnuY@6}-CSSBSV
z8$s%Ic}lXdM~&*+v(@AT$g;kCMY3wMMA=e~D({1AiOI-G)wVpAoH3orbQV03%<T1u
z%WIB)aedA4=KuWiUYl+p?B>I61Ym#!G=LV+0b2kH&;te_P71q?m;XdTaWH{qcTrqm
zx0wr+Q=AZFXW-#;f}ag5;~0BI9s_=sg4ZdppHb#P)~w8f?1VBOW9`a(j6E-olu=Ic
z+{ef+=33}@G$TH1p`Sr##6uSPq+?j#4#$irF@G%PXFn2WPh*Ez&Ol;VtYhevZCuE?
z5GeU0Y$68lb?G@lv#{D4jYc`a$#Q~^rS9yv{}WxURhE2gqxf<ny$>~tQX<`-S|@iC
zszIDUulzz20s7iECRix`Y4AJKV4AqsN>??%4T1|;-%$qFfINf_Bd%<zzk~}lLDY3X
zj=J`%(S^b5u`YgmBzI99>tfCZU3{f1`PkiDNLx)HF=JJ06OA@HyETauw6}hSvxPZM
znB@YnXZ7`1&mEjl%W_<ZzN~C8#!jq+6XlH^Tmbal$bYr+<XVfHa(T7Zlz7}mJJCyG
zf{nH|b-*zJ>z=RSi7j@?g{vMHzN8kek44+$!sSqS>l1}1tZLylxp4X2$Q?fKesp!u
zMl{N&Cec7VU;@liYEpvb26|O``tJnnaT2WQcX*)$0Urd5as$s_PY`g`@^wxNzyOJW
z6|ezGfL*F{I#&16i9TG7D{-^NgiDI09fusFI<4!3j@T~#+U=;xiRk_!4MdRiGI5D(
z24W6*CsEv|$c`vX#kh?$2Af#d<FG!T#9}SpsnK97(qI$T<0Yg&g=hmoEF#SZ7=MEB
z5W)?(2={8=MN|V$CJS^8IKc`#yf_Z68Thk34(V)9a#J@N<k5OEkRqXV=Z8kdfa?+V
znQ*lUSDJ9Md7Mm^CLcO&xO#;^nv00MMqn?}L=gE|fA6E#7Wm`a$V|o^?xuF(Q*d`|
zdf&q!)mlLw0f8vK0`D|?fAfyNMjnGs5qXr?MxB65(neFqH_$Xc^&kyMm!=+MTsVSK
z`S#9Cz%8|RvR#vCTD)P;O2Iowv4Ub5-ss2zwgTBej%0Lr*4w{$%Ts71UySzgML`en
slvEVVJxaxwdJ9X6O3Dh0w;ecGa8Npzli&9OUwSha$dgKM=8ygGFGK2H6951J

diff --git a/main.go b/main.go
index b9bbaed..6555dbc 100644
--- a/main.go
+++ b/main.go
@@ -89,6 +89,8 @@ func onPeriphConnected(p gatt.Peripheral, err error) {
 	// 	fmt.Printf("Failed to read characteristic, err: %s\n", err)
 	// 	return
 	// }
+	// parseData(b)
+	// return
 	// fmt.Printf("    value         %x | %q\n", b, b)
 
 	histChar := getCharByUUID(WEIGHT_MEASUREMENT_HISTORY_CHARACTERISTIC, chars)
@@ -101,13 +103,11 @@ func onPeriphConnected(p gatt.Peripheral, err error) {
 		log.Printf("Got back from %s: %#x\n", c.UUID(), b)
 		//weight :=
 		if len(b) == 20 {
-			first := b[0:10]
-			weight := parseData(first)
+			weight := parseData(b[0:10])
 			if weight != nil {
 				weights = append(weights, weight)
 			}
-			second := b[10:20]
-			weight = parseData(second)
+			weight = parseData(b[10:20])
 			if weight != nil {
 				weights = append(weights, weight)
 			}
diff --git a/scale.go b/scale.go
index cec65c2..f6ec7c3 100644
--- a/scale.go
+++ b/scale.go
@@ -14,14 +14,14 @@ func parseData(weightBytes []byte) *Weight {
 	isLBSUnit := isBitSet(ctrlByte, 0)
 	isCattyUnit := isBitSet(ctrlByte, 4)
 
-	// fmt.Printf("IsWeightRemoved: %v\n", isWeightRemoved)
+	// fmt.Printf("IsWeightRemoved: %v\n", isBitSet(ctrlByte, 7))
 	// fmt.Printf("6 LSB Unknown: %v\n", isBitSet(ctrlByte, 6))
-	// fmt.Printf("IsStabilized: %v\n", isStabilized)
-	// fmt.Printf("IsCattyOrKg: %v\n", isCattyUnit)
-	// fmt.Printf("3 LSB Unknown: %v\n", isBitSet(ctrlByte, 3))
-	// fmt.Printf("2 LSB Unknown: %v\n", isBitSet(ctrlByte, 2))
-	// fmt.Printf("1 LSB Unknown: %v\n", isBitSet(ctrlByte, 1))
-	// fmt.Printf("IsLBS: %v\n", isLBSUnit)
+	// fmt.Printf("IsStabilized: %v\n", isBitSet(ctrlByte, 5))
+	// fmt.Printf("IsCattyOrKg: %v\n", isBitSet(ctrlByte, 4))
+	// fmt.Printf("BMI and Height present: %v\n", isBitSet(ctrlByte, 3))
+	// fmt.Printf("User ID present: %v\n", isBitSet(ctrlByte, 2))
+	// fmt.Printf("Time stamp present: %v\n", isBitSet(ctrlByte, 1))
+	// fmt.Printf("IsLBS: %v\n", isBitSet(ctrlByte, 0))
 
 	// // Only if the value is stabilized and the weight is *not* removed, the date is valid
 	if isStabilized && !isWeightRemoved {