default tempbasal to 1.0

buessow · Jan 7, 2024 · 2e89737 · 2e89737
1 parent c6ddc7e
commit 2e89737
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/GlucoseWatchFace/manifest.xml b/GlucoseWatchFace/manifest.xml
@@ -8,7 +8,7 @@
         launcherIcon="@Drawables.LauncherIcon" 
         name="@Strings.AppName" 
         type="watchface" 
-        version="1.1.20.pre">
+        version="1.2.0.pre">
         <iq:products>
             <iq:product id="legacyherocaptainmarvel"/>
             <iq:product id="fr55"/>

diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ bin-$(device)/%.prg: %/monkey.jungle %/manifest.xml %/source/_Version.mc %/sourc
 	[ -d "$(@D)" ] || mkdir "$(@D)"
 	monkeyc --jungle $< --output $@ $(MONKEYC_FLAGS) --optimization $(opt) --device $(device) $(test_flag)
 
-bin/%.iq: %/monkey.jungle %/manifest.xml %/source/*.mc %/resources/_version.xml %/resources*/* $(shared_dep)
+bin/%.iq: %/monkey.jungle %/manifest.xml %/source/_Version.mc %/source/*.mc %/resources/_version.xml %/resources*/* $(shared_dep)
 	[ -d "$(@D)" ] || mkdir "$(@D)"
 	monkeyc --jungle $< --output $@ $(MONKEYC_FLAGS) --optimization 3pz --package-app --release
 

diff --git a/Shared/source/Data.mc b/Shared/source/Data.mc
@@ -95,16 +95,14 @@ class Data {
 
   function getBasalCorrectionStr() as String {
     if (fakeMode != normal) { return "S10%"; }
-    if (temporaryBasalRate == null || profile == null) {
-      return  "-";
-    }
+    var tbr = Util.ifNullFloat(temporaryBasalRate, 1.0);
     var s;
-    if (temporaryBasalRate < 1) {
-      s = (temporaryBasalRate * 100).format("%0.0f") + "%";
+    if (tbr < 1.0) {
+      s = (tbr * 100).format("%0.0f") + "%";
     } else {
-      s = " " + temporaryBasalRate.format("%0.1f");
+      s = " " + tbr.format("%0.1f");
     }
-    if (!"D".equals(profile)) {
+    if (profile != null && !"D".equals(profile)) {
       s = profile + s;
     }
     return s;

diff --git a/Shared/source/Graph.mc b/Shared/source/Graph.mc
@@ -246,8 +246,8 @@ class Graph extends Ui.Drawable {
     }
     while (x < initialWidth) {
       x += glucoseBarWidth + glucoseBarPadding;
-      drawRectangle(dc, glucoseRangeColor, x, yHigh, glucoseBarWidth, yHigh + 1);
-      drawRectangle(dc, glucoseRangeColor, x, yLow, glucoseBarWidth, yLow + 1);
+      drawRectangle(dc, glucoseRangeColor, x, yHigh, glucoseBarWidth, 1);
+      drawRectangle(dc, glucoseRangeColor, x, yLow, glucoseBarWidth, -1);
     }
   }
 
@@ -340,8 +340,8 @@ class Graph extends Ui.Drawable {
   private function drawValue(dc as Gfx.Dc, startSec as Number, i as Number) as Void {
     var x = getX(startSec, glucoseBuffer.getDateSec(i));
     var y = getYForGlucose(glucoseBuffer.getValue(i));
+
     var justification;
-
     if (i < firstValueIdx + 3) {
       justification = Gfx.TEXT_JUSTIFY_LEFT;
     } else if (i > glucoseBuffer.size() - 3) {
@@ -353,20 +353,21 @@ class Graph extends Ui.Drawable {
     }
 
     dc.drawText(
-        xOffset + x, yOffset + y - 18,
-        Gfx.FONT_XTINY,
+        xOffset + x, yOffset + y - 25,
+        Gfx.FONT_TINY,
         formatValue(glucoseBuffer.getValue(i)),
         justification);
   }
 
   private function getColorForValue(glucose as Number) as Number {
-    if (useLowHighGlucoseMarks()) {
-      return glucose < lowGlucoseMark ? lowGlucoseHighlightColor
-          : glucose <= highGlucoseMark ? normalGlucoseHighlightColor
-          : highGlucoseHighlightColor;
-    } else {
-      return glucoseRangeColor;
-    }
+    return hrColor;
+    // if (useLowHighGlucoseMarks()) {
+    //   return glucose < lowGlucoseMark ? lowGlucoseHighlightColor
+    //       : glucose <= highGlucoseMark ? normalGlucoseHighlightColor
+    //       : highGlucoseHighlightColor;
+    // } else {
+    //   return glucoseRangeColor;
+    // }
   }
 
   private function drawMinMax(dc as Gfx.Dc, startSec as Number) as Void {

diff --git a/Shared/source/Util.mc b/Shared/source/Util.mc
@@ -45,6 +45,10 @@ module Util {
     return a == null ? b : a;
   }
 
+  function ifNullFloat(a as Float?, b as Float) as Float {
+    return a == null ? b : a;
+  }
+
   (:exclude)
   function join(sep as String, array as Array<String>) as String {
     var s = "";