From 07919d917340722cc446bf3e13d41a73cfb3c118 Mon Sep 17 00:00:00 2001 From: jstevensog Date: Thu, 3 Jan 2019 13:32:49 +1100 Subject: [PATCH 1/3] Untested fix for Monochrome Pebble Trend --- .../pebble/PebbleDisplayTrend.java | 42 ++++++++++++++---- .../pebble/PebbleDisplayType.java | 29 ++++++------ .../UtilityModels/pebble/PebbleWatchSync.java | 1 + app/src/main/res/raw/xdrip_pebble2.bin | Bin 355103 -> 357393 bytes 4 files changed, 50 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayTrend.java b/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayTrend.java index 9ffe451545..4da13c2af1 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayTrend.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayTrend.java @@ -172,11 +172,18 @@ private void evaluateDataFromPebble(PebbleDictionary data) { Log.d(TAG, "receiveData: pebble_sync_value=" + pebble_sync_value + ", pebble_platform=" + pebble_platform + ", pebble_app_version=" + pebble_app_version); switch ((int) pebble_platform) { - case 0: - if (PebbleUtil.pebbleDisplayType != PebbleDisplayType.TrendClassic) { - PebbleUtil.pebbleDisplayType = PebbleDisplayType.TrendClassic; + case 6: + if (PebbleUtil.pebbleDisplayType != PebbleDisplayType.TrendClayClassic) { + PebbleUtil.pebbleDisplayType = PebbleDisplayType.TrendClayClassic; //JoH.static_toast_short("Switching to Pebble Classic Trend"); - Log.d(TAG, "Changing to Classic Trend due to platform id"); + Log.d(TAG, "Changing to Classic Trend due to platform id" + pebble_platform); + } + break; + case 5: + if (PebbleUtil.pebbleDisplayType != PebbleDisplayType.TrendClay) { + PebbleUtil.pebbleDisplayType = PebbleDisplayType.TrendClay; + //JoH.static_toast_short("Switching to Pebble Classic Trend"); + Log.d(TAG, "Changing to Clay Trend due to platform id " + pebble_platform); } break; } @@ -307,6 +314,10 @@ && getBooleanValue("pebble_show_bwp")) { } private synchronized void sendTrendToPebble(boolean clearTrend) { + int width; + int height; + short resolution; + boolean colour; //create a sparkline bitmap to send to the pebble final Bitmap blankTrend; @@ -344,13 +355,28 @@ private synchronized void sendTrendToPebble(boolean clearTrend) { } - Log.d(TAG, "sendTrendToPebble: highLine is " + highLine + ", lowLine is " + lowLine + ",trendPeriod is " + trendPeriod); + Log.d(TAG, "sendTrendToPebble: highLine is " + highLine + ", lowLine is " + lowLine + ",trendPeriod is " + trendPeriod + ", pebbleDisplayType is " + PebbleUtil.pebbleDisplayType); + if(PebbleUtil.pebbleDisplayType == PebbleDisplayType.TrendClayClassic) + { + width = 100; + height = 40; + resolution = 2; + colour = false; + } + else + { + width = 144; + height = 84; + resolution = 16; + colour = true; + } + Log.d(TAG, "sendTrendToPebble: width is "+ width +", height is "+ height +", resolution is "+resolution + ", pebbleDisplayType is " +PebbleUtil.pebbleDisplayType); Bitmap bgTrend = new BgSparklineBuilder(this.context) .setBgGraphBuilder(this.bgGraphBuilder) .setStart(System.currentTimeMillis() - 60000 * 60 * trendPeriod) .setEnd(System.currentTimeMillis()) - .setHeightPx(PebbleUtil.pebbleDisplayType == PebbleDisplayType.TrendClassic ? 63 : 84) // 84 - .setWidthPx(PebbleUtil.pebbleDisplayType == PebbleDisplayType.TrendClassic ? 84 : 144) // 144 + .setHeightPx(height) // 84 + .setWidthPx(width) // 144 .showHighLine(highLine) .showLowLine(lowLine) .setTinyDots(Pref.getBoolean("pebble_tiny_dots", false)) @@ -359,7 +385,7 @@ private synchronized void sendTrendToPebble(boolean clearTrend) { //encode the trend bitmap as a PNG - final byte[] img = SimpleImageEncoder.encodeBitmapAsPNG(clearTrend ? blankTrend : bgTrend, true, PebbleUtil.pebbleDisplayType == PebbleDisplayType.TrendClassic ? 2 : 16, true); + final byte[] img = SimpleImageEncoder.encodeBitmapAsPNG(clearTrend ? blankTrend : bgTrend, colour, resolution, true); if (debugPNG) { try { diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayType.java b/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayType.java index 4a8e65991f..982a729471 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayType.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleDisplayType.java @@ -1,14 +1,15 @@ -package com.eveningoutpost.dexdrip.UtilityModels.pebble; - -/** - * Created by andy on 01/06/16. - */ -public enum PebbleDisplayType { - - None, - Standard, - Trend, - TrendClassic, - TrendClay; - -} +package com.eveningoutpost.dexdrip.UtilityModels.pebble; + +/** + * Created by andy on 01/06/16. + */ +public enum PebbleDisplayType { + + None, + Standard, + Trend, + TrendClassic, + TrendClay, + TrendClayClassic; + +} diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleWatchSync.java b/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleWatchSync.java index e269471fb5..c97e12b23a 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleWatchSync.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/pebble/PebbleWatchSync.java @@ -89,6 +89,7 @@ private void initPebbleDisplays() { pebbleDisplays.put(PebbleDisplayType.Trend, new PebbleDisplayTrendOld()); pebbleDisplays.put(PebbleDisplayType.TrendClassic, new PebbleDisplayTrendOld()); pebbleDisplays.put(PebbleDisplayType.TrendClay, new PebbleDisplayTrend()); + pebbleDisplays.put(PebbleDisplayType.TrendClayClassic, new PebbleDisplayTrend()); } for (PebbleDisplayInterface pdi : pebbleDisplays.values()) { diff --git a/app/src/main/res/raw/xdrip_pebble2.bin b/app/src/main/res/raw/xdrip_pebble2.bin index ba36de0e3d50e25b9c37e47a7ec6b1a06313d279..2a29131b1f44190aeb586ebea2e525f87a1fc4b1 100644 GIT binary patch delta 24342 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 bh4h{tB@jGVN=Jk7w*}rYK5ssORgC%{rE30- delta 22083 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 U3Eh1z_v2D^-@p%zn90=t0|wFEfdBvi From cb063c4e6f0212dc93d421d680b196208b4e0229 Mon Sep 17 00:00:00 2001 From: jstevensog Date: Thu, 3 Jan 2019 14:33:31 +1100 Subject: [PATCH 2/3] New (untested) pbw --- app/src/main/res/raw/xdrip_pebble2.bin | Bin 357393 -> 357494 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/src/main/res/raw/xdrip_pebble2.bin b/app/src/main/res/raw/xdrip_pebble2.bin index 2a29131b1f44190aeb586ebea2e525f87a1fc4b1..d26fc154b025c837fa9c7e5b0dda859b8fd8d152 100644 GIT binary patch delta 12426 zcmaKS30zd=-v4tB=KwA!0wS_GFfM~Eu?vbi>NtVJ;+A4s5u#3JHK8|0K@KjZ_r6*d z=rOa!GGA|5L8(aQjJNLXwQh@6CT%jN7Mk6TNN{GD<^O%o4ClS~z5n-x&v$;`XZt<- z@_Wwnbl1qNiqeYt$&}wC zhDWezVpljDD;^!e-t)i2cui55WB(hnKBW{{3ZK zmhAVqN4&3w``iB=JV~rs!F?EZ9W`I@$;Z__=7QTt*MS$EcUPD&Iq}Agp>pK z0uKX?z*E3p;0SOE_y)KQ1mzPl6i5Jm$t5KGctlBrDYEperrxl@pzrO-t~0RGMxVyY zCN)Z-L}THS8LeJgL0IWK-(VA)RA-2((pahAD#9hR(z!W4-b6jaPk)CDegJfH2su%L z!a$BW{@1sIc4y7WD%KjUhR~#qh9K!a`3|IrvuazPmxpBzX=OCTK{P?qC~=#a)265U zH0DR7sZ5aMmMP0&CO9;vq!OCstcEm=F`=a0)01gQM~PpVxpd(xIm$$6(ab^82^kea zwal(p;)yOVdn=amD(j9cz{b< z9_y=Y4J!#VvAcJ5WfDfS!BEjNxtdmCk2jAIu8Bcdv^sF?5o#~Ln1fBx-0@>gXL4FT}gPS1V1^xk~0Q-QC0Uj^|>wqJ`9s?osA$I@Pf1Lob9syK=1_77Azou>=7k-ltDmP`kAjyw7-{?<0ekjx)pr8IYek-v48slmE8UTm;%6XG)ZgI*63 zM<D^ik7Y=s#Bai`e)mH%id=e#^4b+pa0r+pXmlTC-p%z!J%XveLSKlc`Z+$eFjZ zjLdF*Zzp?JQ)l>8CXKAL-!;ulYhT@u7|cg+XBtBsGs+tbnHUz8{W0yCW+sW1mh}HQ zByhcsG36@t(Dw#M zkfv-!4bzmR)Cd{5=q?d!WwK)}6GLJy(2k-ltM3hqs57LNvC^Hc)H$0BI^&Rl{s*Cd zf+;1?PQ*RVBoOQpv6di**8E+_kqZz1e7eiGnb;?yz2DPg0|4d%=YS`HKVT=;KvL{R z`~MYk0sKA!-v|CT$Yqc}q!MBScTC5S1+0J!oB)~-W`ukK;d=#;_3(HBjtSrgA&VeS z0>W{k9bX#MG~QHi2s2jnG*%~}(`{#wZ<$;m65?sqAKoJM_ypgxBoUj;q@hUo}-2eJjA z9c4gA8PHL@krw(vWsEx9 zw}2(CRO@mKB|4jFCchx|cA3%m`ZOL!o2rb7>u8r|w225jRD=x@r~}^stU?$)%RUJh z;QybH7p4$082m->aL6%;^EBnhqe|-qLz1H1XHRxbaE)-q#Si(lM=kx~TzOTxZBK z>U-bJW~3WFf-&}un7f|SE_er#80iaNTGc8|t|PM~6Vr>9@D%(D9T{aArcGFA@Q~KTwKUmMe%duC+oS_x&(TE!j z=^2L|81fqAD9B02X}L0;?CY~+E-VIfyGsri%0|rLjC9EzSkh}{U2B-S|!@x-3DYW%O$hF58l`TRe)o4;M!`{OzU0BLU(Y^&3@^osT z>AHn0^GP!!4fQe7y}t6m+#=GGjauu1c2j9-Nxgv{vW8)MPLoRzu6L9KjzYFP3Hq-3QL@(g9F(DTnhdHO${kM_$`P16LN$3~m2hC#`` zK3SfE3=%CBj>$?EjC9%8*j`Xts1|~b5M{EP(YZ>evC{gJIf2+8`-tx6bD8By#s*}c zX=J1?eHo=0%Fw2D&8x0AkiCqw*Q+sSp=fu@I+LI=)3r4cyBtQFV?2IGTd@(#7+IU5D}TKAO4_@|6M{J-}~|g&+88_}vdQz)yhu6Z~EP zUP8DGnMUIZAW=}12}d|E4em3DK)^Y0f`kVkzXfIi9XJAB(Bia)okTuPbW_jYfvqbC zo5SMs=@o)us+pwEKc7}wZ%DRIZci^cu`A=tm zEKO^UY#%*mqao5l_s%$LYU?Pa4e2lEh*miL9c}feK4O7jh1;7kmrkpCGU0i$`THHuknhF`g}_yF&H8z8d@6 z2pbE0nkPDBE}Gdcw$yQ1!owboG5+*yY*x3Dut5Ri!PBqbo>5)8ylgq9O?_bZS%f|( zdl>01&wV92%mqfWc!Q0*+n1p!>7u?&852g&64eA@q!3>vYMN+y&apU@JLS)0>K()JvNi%awkj>L03Rq!04?CLkhPG5AcKI%4k1;*O&|{L+oIsBX*y{y>L6 zRf)R}v_p^^rjYblz~x5TsyqRi?~AC>6ynImNNN2SWIgm3F@qKT3lT@Zf=|K;9(o@X z`l&6&NJ}9J(%lI}?KMO`{#xN8Q~8K^etjzH?;2)mj~ z3!?8mhStDl=ei)5G8g2zBZeudx46Zi&D{9=UvR_rP0}IlW>oYLmw`Qwk?w~cx-V^V z`@X`V#7H*tyzF!VBW%%U%BWhpEHKg| z{r>)5fGS*&$!vKN6|*OZkV0yufYan(TFVSnOG%@ zk^Qfhb;`|KHW}!JuC59rSeg>3!5B3o638e%5HeQDC@7H8NEaOkY=1NE5D2a;<|k8A zg@K**G<@{El|z&1;SP$OjI>xR-Nxk!@4JMuM(mF?{2m1Bs%V5rr@wcwNhw48Q)p%} z`YyPhmq%8G{QmxWoq1X-y@Y0@^9ZA5<{k7GYbM-T#x-S(bkv0gLx~Qc)O0m?)5-7i z_C4jKe*0WCB`ZuM6K0|R(xM@`8c8n7)y10(6OBv~oncp<-o9b|_ZFw%YMhaNgDXMI ze4I-de#z_w18qX}69ze9i{lL+Ka zkU79|1YU^4RR>T8{!$DUWL%~V4TQe~z6OX#SRCSnK_pU=5Ey`|Aeq{F^WIVuJy z(06;WZ*VxM)@X$M+O z!hIybDUmULuuvy?x_+W1#+s5>kf~!1Zb( zO+^t71Yb_b#)?KHv(MLeP9BO_JI5bGmN2&(JLPS-al}yy>HIZcR0~U2(%`$*($-FS zjiOKAy;P{B^&1KEmq;H%ZKV;&uSZ5Vv60aWEg}WOzc?SY-$A5H;QD-EJls_q4MZE+ zSkT@n=jQuugH_P?w;y+P4I(&U1pHPjd0g?FLWf1E1$qQs@r_47!&24e9q*u7KLqmK zhWBJrbxh__@-aJFW7=nq`o3}W<%Cb=&@)6jf;}>4N3uC@lgMxd1sYdjwckqX9Z8E{8Aq5)g5S3$haN*XX+*MmQHzh z9)o_0wcL+V@5rOg7-vl}rlPKmc@;g~$Ywr5taAx6v?S$FrzF=oTVE>r zXl*{boPx2_k_#;SDS_6yqQ_Z{bpr$WXLpt{ELn$P9)&_R=lZ`M5a|`KaAiY{<`p#R zHYnegOYPFnmFz#m5!IUOze?zo*X1(Ghv!K2;2OkSqs07HiP?^rRk{Ao!r;yIf1<|H z;(7csTDAsQNAE)f!xYPv4JpRh_!v8roNb}=qd>^5=<%R0>B6|jJ=vOLo!CyB^MTFY zzAX2O%hdEJ&uu|CNZg1Z=uENW7Z9uA~!IEMi>w9@tEPRrS=PG)bYH`VvTv|L`74kj4 zKC7F9BDk8qRg6r1Z!9Ywe3IKTa=W|TK^4(VJ`98z#Db@|F+#H%kYZebl?-n-q|^OZ zHfUSlHTj#0aq#;iEo~+<`g4;S`&d9tHR8Xj#BUA6XB}@TH#u*a9zcp3hrez|Y2A7s zW$8MxtN$wMn_?_Fbwt32vd0w9t^J3wJ;qyJH62zq##aLyBav9oD}l`rUpYMoRX)x0 zqRI^O8R=w=c+L@H+xb1J=O(IPeZ|FWmHiN3jX+CjsFt{8-_!5x6-H83QlF?_Ho2 zet#Z;Pcq<{;M>8EfX@ZLgm}-?H#0ay=w3yg=~k6Q89r@2}o4NW!=*DG&A9tK_jOmHs+8o{f83BU>9 zB+|t|o`HM~$V8kBxQ78NfiK~=68I3Htyl^C2;9UyhUNIjB_ErfXz|<6Y1MR~@~)b; zOV4m)80JgS+XVTYnApsX!raTK77LrXCs`(2{HU2b5I5O5AA=>%I;0hoUY=VrPnoUs z<|AKh+=G;x#h3PQzlaR&{K&7pZ)mU9a+o?F&_Iwl7n8wcV=nW%hcNFS0kPe6D?)%IDa3sN7)R zNx7gj`!xGLHK4$LK;_wX9Xn97G<&hi$J;F`*VwHpkF{@8d6a#J%7@u^t31>$shqV7 zvg&Z#NYFrLy|z%5OSW*8->?;^{HpCem0z;`RplMFvnv0>_KC_rv7J--hc<_w3m9}~ zY%$zG#_!tVResEtsq!~%MJhjHD^>Z+HnYkP*y>fj*S1gPyKM(l{wLc@D&J;1#0di# zH`tD-0an{lmDk!@RKCV`mLG_}(sotlRkoWdzuVRvJP>E0tsrE8m)nX|UTiZAaG`Ie zt$4uES7a+ydA@C~$}?@tR6fyGrSh@18kHy7;zI{Ai?P)V8sHH&v&x6sEGiGS)q{ul z=RIk=w4Xa3J)*u8v+AGzmbD#fcgdp@Z_W^7C@CGV}ArUoHGNt}rJnTeM&0W~)($T;s|^>D$Q7d*d&Q z_g~}kxNFbl9;6Q3Xv%B#q> z8$WR_j-&6h+PZ$>8X0C?+XKIH*O{2?2>La>$hpQ*-aZA7SNz{;Cr5~@f8#Ql+2V7* z;qJS%?JvJ^3|)mkkT@+zpV5dnByKFzDGtBIJpvCGD{i^P<+H&N;=8xFG$u^^`4;yL zPL>1jIPl59M?ZcX|Ce_hqNAIeh~<21wK(iH7Zc}ykikgveE;?!L!5D&D+|K&3i0XN zT+&qfhJt?kq&lbnA8#laSil2sC>W{MN8eBci@)9GvX~2EQV$o$d@WAx;bx$y{&x%v zEElTuB0hNj^D_qVg&r=q%>OWfk?OqkVZxjL_Ar5w9`^pvhY7ePRy2zL^Id{C=67xs z^SL}l2q)H z^dv8c!(Chsvs0Yq;wCVM#Rpy7Z_Mj$OZ!nSbneCoale~8#OxENd$<`0-|RuaG4ZsA z6VQ1H)uP_Z9bm4CKX|!1re9p*<90D|;?F+r9t3Nv_Z0J0%C8!y=lJ^>uegfi6B0O_%axN|1(9B|Y0Wh_ zOv8qu_J4Pzc#z}UkmnK}+Qy0k&nF@4pQ^<}JZ}K&supkZd<@w2YB4mJ&qixa3FgNz zOU0$Zd>s65R*M^h`P@`$7{44ajC){%QbWsc7;p3JgCTiUF)?YTkBHv{^A&gaP1(UP zc$)L@V65d+nQQ!KbJn2PZ1n@?thhLYpN{;xtHu2xd~EC<#oQd?(V8EG^_Qt=Ujps> zYsJq(_+;jwcq;^TdPN)+%Fkk2#igOVmT4D-P=wMgWW;ar+=XeU9J083Oy}J9mO&-_Vx)N$Cz=IZu1~N2van;ZIGS zIz#u*S2k3_xVZ!$T;x#W#yg1L<pK2lIC@3&f8G^I5Qo`UmsrBmIWPJk`)RO6?4B z>JYwy*&^;5!au+~-PSjRU&W&EY1Lx&F#ct%F8pwQO#FArb%w@rBF%SFW3ZuwG&Lx1 z;FLq3emJij`pymKUy97mria8grXu& zi3t{d`Tx2!=Z9qG=H=$)?zrN2GH_ zuW%#9^tJrZ|K1^HtmUII8!OlHGuh#(;(@h%ic&&aZDm{fH$@il>RNt6@Zef(&gB0A D-qHkE delta 12396 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 From 1a2926e92733efee0c5ff5645bf3d0b2873353e7 Mon Sep 17 00:00:00 2001 From: jstevensog Date: Sat, 3 Jan 2026 22:16:01 +1100 Subject: [PATCH 3/3] Updated com.getpebble.pebblekit version to latest. Note, this does NOT fix the PebbleKit.isWatchConnected(this.context) always returning false issue. That appears to be a bug in tbe Pebble app. --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 947e443633..513f1e0ade 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -288,7 +288,7 @@ dependencies { implementation 'com.google.firebase:firebase-messaging:15.0.0' // implementation 'com.google.android.gms:play-services-maps:15.0.0' implementation 'com.google.android.gms:play-services-wearable:15.0.0' - implementation 'com.google.android.gms:play-services-location:15.0.0' + implementation 'com.google.android.gms:play-services-location:16.0.0' implementation "androidx.work:work-runtime:2.9.1" implementation "com.google.android.gms:play-services-oss-licenses:15.0.0" implementation "com.google.protobuf:protobuf-java:4.27.2" @@ -304,7 +304,7 @@ dependencies { //implementation 'org.influxdb:influxdb-java:2.6' implementation 'com.google.code.gson:gson:2.8.6' implementation 'com.squareup.retrofit:converter-gson:2.0.0-beta2' - implementation 'com.getpebble:pebblekit:3.1.0' + implementation 'com.getpebble:pebblekit:4.0.1' implementation ("androidx.health.connect:connect-client:1.1.0-alpha06") { exclude group: 'androidx.core', module: 'core' }