From 398c448768ee05e9b13ff086f66704f2ce2bac70 Mon Sep 17 00:00:00 2001 From: David Volovskiy Date: Sun, 23 Feb 2025 13:45:23 -0500 Subject: [PATCH] Added 2% and 98% to ring --- apps/daisy/app.js | 25 +++++++++++++++++++++---- apps/thering/98p.png | Bin 0 -> 1354 bytes 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 apps/thering/98p.png diff --git a/apps/daisy/app.js b/apps/daisy/app.js index b88eb18ed..9b9325167 100644 --- a/apps/daisy/app.js +++ b/apps/daisy/app.js @@ -254,7 +254,7 @@ function drawClock() { g.reset(); g.setColor(g.theme.bg); g.fillRect(0, 0, w, h); - g.drawImage(getGaugeImage(ring_percent), 0, 0); + g.drawImage(getGaugeImage(ring_percent, settings.ring), 0, 0); setLargeFont(); g.setColor(settings.fg); @@ -312,15 +312,24 @@ Bangle.on('HRM', function(hrm) { // putting into 1 function like this, rather than individual variables // reduces ram usage from 70%-13% -function getGaugeImage(p) { +function getGaugeImage(p, type) { + const endsDontShow = ['Minutes', 'Seconds']; // Don't show non-5% iincrements with these ring types // p0 - if (p < 5) return { + if (p < 2 || (p < 5 && endsDontShow.includes(type))) return { width : 176, height : 176, bpp : 2, transparent : -1, palette : pal1, buffer : require("heatshrink").decompress(atob("AH4A/AH4ACgtVAAVUFUgpDAAdAFMEBFQ4ABqBVnLMQqLLLzWEABLgbVgohEGopYaiofDBihWVHJpYYDgYPbKx1ACJhYZIwT4OcAZWYHyRYUIgQXQH4RqOThCXUYRpCHNyQVVQQTwVQiSZWIQSEQNgSYSIYiEQQSyEUCQLDSOAyCnQiSCYQiSCYQiSCZDaDARObKuBSZwcaVzR0QFYKuZWAYNZWCJJKMoKuaWAahKBhiwTJRSudURorBFTgfMVzqjDO5DaeZ5jaeJhhiKbi4rIbT4hLqoriPI7afUpS5BbTwiKFdZgIADSmHFYIqgbgIrGcgIriEYwzHADZ7HRY4rdaYrjHADcBFYoGBFcgkEGQwAeFYqKHFbzUEcQ4AdiorwiorlEogxFAD59FWoorhoArDqArjgIr/FbYwFAEJSDFf4rXgornqgrDFUkAior/Ff4rGAYYAjKYYr/Ff4r/FbdVFdFAFYNQFcsBFf4r/Ff4r/Ff4r/Ff4r/Ff4r/Ff4r/FbdUFcsFFYUVFdADBFf4r/Ff4rbAYYAjKYYr/Ff4rFoArkqorCgIrnqAr/FbIEFAEBSFFf4rYqgrjgorEiormAocVAogAfEooxFFcB9EFdq1DAD9VFYkBFctQFYoGEADokHFcp8FRQoAdag7iFFb4HFioHGADYjHGY4rcPYyLHADbTHcYNQFT4iIFdZgIADKmJqrcgiorIBIIrhMKIAXUpIrBbjzaBFZAKKbS5MJFcKkJbj4fLBYLcdqorKbjzPMbjxKNMhauTURawdJJorBWDShBFZiRBWDQcOHRyuPOhorBWDIbPWDRzQSYKEYIwLLOHgSEXDIJyPQjD2SQjCCQQjSCRCYY/QN4xDRQiyCSQgjdSCqqECLCRWBYyiECISBWCYqgXCLCBWCQSYYEIhxqCeChYFThoQCKypYEIxgPPLB4cKFQZWXDoosIBhhYWcArWDKzYhHABA1EADArNoArcFhgqeWQysgLJxVfcBLWdAH4A5A")) }; + // p2 + if (p < 5) return { + width : 176, height : 176, bpp : 2, + transparent : -1, + palette: pal1, + buffer : require("heatshrink").decompress(atob("AH4A/ADNUFE8FqtVq2q1AqkFIIrDAAOAFMEBFQYrE1WgKsYrGLL4qFFY2pqDWeFZdUVkAhCAQMKFYdVLDUVFQYMHlWq0oMJKyoOJlQrCLDBWDB5clB5xWOoARMCARYWKwT4OgpYXKwY+SLChECC6A/CNRycIS6jCNIQ5uSCqqCCeCqESTKxCCQiBsCTCRDEQiCCWQigSBYaRwGQU6ESQTCESQTCESQTIbQYCJzZVwKTODjSuaOiArBVzKwDBrKwRJJRlBVzSwDUJQMMWCZKKVzqiNFYIqcD5iudUYZ3IbTzPMbTxMMMRTcXFZDafEJdVFcR5HbT6lKXILaeERQrrMBAAaUw4rBFUDcBFYzkBFcQjGGY4AbPY6LHFbrTFcY4AbgIrFAwIrkEggyGADwrFRQ4reagjiHADsVFeEVFcolEGIoAfPoq1FFcNAFYdQFccBFf4rbGAoAhKQYr/Fa8FFc9UFYYqkgEVFf4r/FYwDDAEZTDFf4r/Ff4rbqorooArBqArlgIr/Ff4r/Ff4r/Ff4r/Ff4r/Ff4r/Ff4rbqgrlgorCioroAYIr/Ff4r/FbYDDAEZTDFf4r/FYtAFclVFYUBFc9QFf4rZAgoAgKQor/FbFUFccFFYkVFcwFDioFEAD4lFGIorgPogrtWoYAfqorEgIrlqArFAwgAdEg4rlPgqKFADrUHcQorfA4sVA4wAbEY4zHFbh7GRY4AbaY7jBqAqfERArrMBAAZUxNVbkEVFZAJBFcJhRAC6lJFYLcebQIrIBRTaXJhIrhUhLcfD5YLBbjtVFZTceZ5jceJRpkLVyaiLWDpJNFYKwaUIIrMSIKwaDhw6OVx50NFYKwZDZ6waOaCTBQjBGBZZw8CQi4ZBOR6EYeySEYQSCEaQSITDH6BvGIaKEWQSSEEbqQVVQgRYSKwLGUQgRCQKwTFUC4RYQKwSCTDAhEONQTwULAqcNCARWVLAhGMB55YPDhQqDKy4dFFhAMMLCzgFawZWbEI4AIGogAYFZtAFbgsMFTyyGVkBZOKr7gJazoA/AHI")) + }; + // p5 if (p < 10) return { width : 176, height : 176, bpp : 2, @@ -466,13 +475,21 @@ function getGaugeImage(p) { }; // p95 - if (p < 99) return { + if (p < 98 || (p < 100 && endsDontShow.includes(type))) return { width : 176, height : 176, bpp : 2, transparent : -1, palette : pal2, buffer : require("heatshrink").decompress(atob("AH4A/AH4AChWq1WpqtUFUgpBFYYABoApggQqDFYlVqBVjFYxZfFQorGLLsFFZrgbgNVFAeoGohYfiorDBhIACKzVVtQqIFgpYYDgVqB5xYXKwVVoARMLDJGCfBzgDKzA+SLChECC6A/CNRycIS6jCNIQ5uSCqqCCeCqESTKxCCQiBsCTCRDEQiCCWQigSBYaRwGQU6ESQTCESQTCESQTIbQYCJzZVwKTODjSuaOiArBVzKwDBrKwRJJRlBVzSwDUJQMMWCZKKVzqiNFYIqcD5iudUYZ3IbTzPMbTxMMMRTcXFZDafEJdVFcR5HbT6lKXILaeERQrrMBAAaUw4rBFUDcBFYzkBFcQjGGY4AbPY6LHFbrTFcY4AbgIrFAwIrkEggyGADwrFRQ4reagjiHADsVFeEVFcolEGIoAfPoq1FFcNAFYdQFccBFf4rbGAoAhKQYr/Fa8FFc9UFYYqkgEVFf4r/FYwDDAEZTDFf4r/Ff4rbqorooArBqArlgIr/Ff4r/Ff4r/Ff4r/Ff4r/Ff4r/Ff4rbqgrlgorCioroAYIr/Ff4r/FbYDDAEZTDFf4r/FYtAFclVFYUBFc9QFf4rZAgoAgKQor/FbFUFccFFYkVFcwFDioFEAD4lFGIorgPogrtWoYAfqorEgIrlqArFAwgAdEg4rlPgqKFADrUHcQorfA4sVA4wAbEY4zHFbh7GRY4AbaY7jBqAqfERArrMBAAZUxNVbkEVFZAJBFcJhRAC6lJFYLcebQIrIBRTaXJhIrhUhLcfD5YLBbjtVFZTceZ5jceJRpkLVyaiLWDpJNFYKwaUIIrMSIKwaDhw6OVx50NFYKwZDZ6waOaCTBQjBGBZZw8CQi4ZBOR6EYeySEYQSCEaQSITDH6BvGIaKEWQSSEEbqQVVQgRYSKwLGUQgRCQKwTFUC4RYQKwSCTDAhEONQTwULAqcNCARWVLAhGMB55YPDhQqDKy4dFFhAMMLCzgFawZWbEI4AIGogAYFZtAFbgsMFTyyGVkBZOKr7gJazoA/AHIA==")) }; + // p98 + if (p < 100) return { + width : 176, height : 176, bpp : 2, + transparent : -1, + palette : pal2, + buffer : require("heatshrink").decompress(atob("AH4A/AH4ACgtV1WpqtUFUlVAAIrCAANAFMEBEoQrFqtQKsQrHLL4jEFY5ZdawIrMcDasEEIo1FLDUVD4YMUKyo5NLDAcDB7ZWOoARMLDJGCfBzgDKzA+SLChECC6A/CNRycIS6jCNIQ5uSCqqCCeCqESTKxCCQiBsCTCRDEQiCCWQigSBYaRwGQU6ESQTCESQTCESQTIbQYCJzZVwKTODjSuaOiArBVzKwDBrKwRJJRlBVzSwDUJQMMWCZKKVzqiNFYIqcD5iudUYZ3IbTzPMbTxMMMRTcXFZDafEJdVFcR5HbT6lKXILaeERQrrMBAAaUw4rBFUDcBFYzkBFcQjGGY4AbPY6LHFbrTFcY4AbgIrFAwIrkEggyGADwrFRQ4reagjiHADsVFeEVFcolEGIoAfPoq1FFcNAFYdQFccBFf4rbGAoAhKQYr/Fa8FFc9UFYYqkgEVFf4r/FYwDDAEZTDFf4r/Ff4rbqorooArBqArlgIr/Ff4r/Ff4r/Ff4r/Ff4r/Ff4r/Ff4rbqgrlgorCioroAYIr/Ff4r/FbYDDAEZTDFf4r/FYtAFclVFYUBFc9QFf4rZAgoAgKQor/FbFUFccFFYkVFcwFDioFEAD4lFGIorgPogrtWoYAfqorEgIrlqArFAwgAdEg4rlPgqKFADrUHcQorfA4sVA4wAbEY4zHFbh7GRY4AbaY7jBqAqfERArrMBAAZUxNVbkEVFZAJBFcJhRAC6lJFYLcebQIrIBRTaXJhIrhUhLcfD5YLBbjtVFZTceZ5jceJRpkLVyaiLWDpJNFYKwaUIIrMSIKwaDhw6OVx50NFYKwZDZ6waOaCTBQjBGBZZw8CQi4ZBOR6EYeySEYQSCEaQSITDH6BvGIaKEWQSSEEbqQVVQgRYSKwLGUQgRCQKwTFUC4RYQKwSCTDAhEONQTwULAqcNCARWVLAhGMB55YPDhQqDKy4dFFhAMMLCzgFawZWbEI4AIGogAYFZtAFbgsMFTyyGVkBZOKr7gJazoA/AHI")) + }; + // p100 return { width : 176, height : 176, bpp : 2, diff --git a/apps/thering/98p.png b/apps/thering/98p.png new file mode 100644 index 0000000000000000000000000000000000000000..0136a292c4204e7bc2d5138a5537f7f4daa4c304 GIT binary patch literal 1354 zcmeAS@N?(olHy`uVBq!ia0vp^8$g(Y4M?uv{v-}av6p!Iy0X7y5*JdD*>FoN8Ym=Q z;u=vBoS#-wo>-L1;O^rBG)AE;wMfBO&!n(*$wQzLj*!LpeYZeSkfJR z9T^xl_H+M9WCilslDyqrK=KR>Kb?2i0~IXwba4!+nDh4L-K-RM9@j+sDg}e}Zw+|P zgyzf-{&n-#s?v|KyP{QfXDR;t0R${PC)pX4o-i{AeqwCk_{lKO&i?;(`~UxbT?()N zJpGsNyeG_Oz6F=eWEB3!`IDh|4qKS4L14YRT|-z}$XrI@&r2D@U6=6uc(>vy^BRuw zm;>KkbmR}1--=G3>uPu4O~KXtn?L5od}2(Kjrz-W@8`4{hPRGaH-G-8@sr_id+_>;+NRVr||T)i@eY zD_Q^3JjrmwzN;5nSM;+@-@TC~;{N+r#}EJS3%8T1eph)ldE@(a%yO&jSmxyK{?~Y; z_VHGJXZ5>luiJ8H&6>Twl0)sq{@TyVSGe75UpI7$@0B&-^*vDjGW%d&!j2c2ixMNg zDlJSFH2C<)dTXr+pZkFyYqw22^zcgeVHss+wYWWjmrw6#+;DXTP^yURsLgkEIipj^pa6nf7jl8y|0HG zB$(Q^ZfW>=K0Tn~{@v63LG}W_1r63fP%F@VD{S)(z8rVpWok2pp{&du2x_G#gPYM|1!Ky^lQ z%f)^ad|kZpcx7@Uzj{(i$5+umLSG+0)V~&XdOAb=WHz589UbLUKcv1=JrKTUWsAOY z(wq}7HD7vPJ>4*W&a_GUrgVICi*xUcUl+$!^Tc$@kEbp@>P5dj<(&4)oSA;x?~{N_ z&-*9k##s_MVUSqd(eS$MkXh+m5k9vgpm=`7c=dF1T&}#B^P$jMao%R3k8`VLZIG7W z`xTWT6SFtu%gfgXsw#Z0RR4d*F7Pq$@Aml50xL4}_PuiqxNx`X?cocq)sMgOA9;71 zuR=wzdRF1})pFgn-}ijFc%%6EYI*+uzd?yL_k$5fW!uf|phP_Ji1Po=NE`xQFV@YPr0tV!oC|jPtVN-<(((G zmERUUzp*v=Cxf}(T-j$6`2)%s<|}X5Ui^u%itkaWNZFS;H4J@6{D9@bi@s;I7We+Q z*EC4Bmsq{feP82dci;@Oztxv*-=9q4e^B`2mBgGhU?z9yf90SS^nOkQ=gb1miuwz$ zWQ9Hmyb|dA)>6}O^U6Y@*ZxnKE0nHiB8r#;8~-!>T$X1lwRGVuP{HNt>gTe~DWM4f Df@5@1 literal 0 HcmV?d00001