Fixes in battery life, data aggregation and alarm delay..

SleepGarmin-android/app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdk 33
+    compileSdk 34
     namespace "com.urbandroid.sleep.garmin"
 
     defaultConfig {

SleepGarmin-android/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.android.tools.build:gradle:8.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

SleepGarmin-watch2/source/AlarmManager.mc

@@ -33,7 +33,7 @@ class AlarmManager {
 	function startAlarmAfterDelay() {
 		self.ctx.businessManager.logTransmit("AlarmManager#startAlarmAfterDelay");
 		if (alarmDelayTimerRunning) {
-			startAlarmNow(true);
+			self.ctx.alarmManager.startAlarmVibration();
 		}
 	}
 
@@ -46,7 +46,10 @@ class AlarmManager {
 		self.ctx.businessManager.logTransmit("AlarmManager#startAlarm, delay: " + delay);
 		if (delay == -1) {
 			startAlarmWithoutVibration();
+		} else if (delay == 0) {
+			startAlarmNow(true);
 		} else {
+			startAlarmNow(false);
 			alarmDelayTimerRunning = true;
 			alarmDelayTimer.start(method(:startAlarmAfterDelay), delay, false);
 		}

SleepGarmin-watch2/source/BusinessManager.mc

@@ -7,16 +7,30 @@ class BusinessManager {
 
  	var ctx;
 
+	var lastUpdate = -1;
+
+    var lastUpdateUi = -1;
+
  	function initialize(ctx) {
  		self.ctx = ctx;
  	}
 
  	// Hook that is called on every data received callback - we use this so that we do not have to have our own Timer, which is presumably battery intensive.
  	function onDataHook() {
- 		DebugManager.log("BusinessManager onDataHook");
- 		self.ctx.commManager.triggerSend();
- 		updateTime(true);
- 		lockScreen();
+
+		// DebugManager.log("BusinessManager onDataHook");
+		var now = System.getTimer();
+
+		if ((lastUpdate == -1) || (now - lastUpdate > 2000)) {
+ 			self.ctx.commManager.triggerSend();
+			lastUpdate = now;
+		}
+
+		if ((lastUpdateUi == -1) || (now - lastUpdateUi > 5000)) {
+ 			updateTime(true);
+	 		lockScreen();
+			lastUpdateUi = now;
+		}
  	}
 
 

SleepGarmin-watch2/source/CommManager.mc

@@ -12,6 +12,7 @@ class CommManager {
 	// From phone
 	static const MSG_START = "StartTracking";
 	static const MSG_START_HR = "StartHRTracking";
+	static const MSG_START_OXI = "StartOxiTracking";
 	static const MSG_STOP = "StopApp";
 	static const MSG_CHECK = "Check";
 	static const MSG_BATCH_SIZE = "BatchSize;";
@@ -238,6 +239,17 @@ class CommManager {
 			return;
 		}
 
+		if (msg.equals(CommManager.MSG_START_HR)) {
+			self.ctx.sensorManager.startHr();
+			return;
+		}
+
+		if (msg.equals(CommManager.MSG_START_OXI)) {
+			self.ctx.sensorManager.startOxi();
+			return;
+		}
+
+
 		if (msg.equals(CommManager.MSG_STOP)) {
 			self.ctx.businessManager.exit();
 			return;

SleepGarmin-watch2/source/DataUtil.mc

@@ -32,9 +32,9 @@ class DataUtil {
 	static function max(arr) {
 		if (arr.size() == 0) { return null; }
 
-		var max = arr[0];
-		for( var i = 1; i < arr.size(); i += 1 ) {
-			if (arr[i] > arr[i-1]) { max = arr[i]; }
+		var max = 0;
+		for( var i = 0; i < arr.size(); i += 1 ) {
+			if (arr[i] > max) { max = arr[i]; }
 		}
 		return max;
 	}

SleepGarmin-watch2/source/SensorManager.mc

@@ -5,6 +5,8 @@ class SensorManager {
 
 	const SENSOR_PERIOD_SEC = 4;
 	const OXI_READING_PERIOD_SEC = 4;
+	const SENSOR_FREQ = 15;
+	const SENSOR_AGGREG_WINDOW = 10;
 
 	var ctx;
 
@@ -27,6 +29,13 @@ class SensorManager {
         DebugManager.log("MaxSampleRate " + maxSampleRate);
     }
 
+	function startHr() {
+		// Sensor.enableSensorType(Sensor.SensorType.SENSOR_HEARTRATE)
+	}
+
+	function startOxi() {
+		// Sensor.enableSensorType(Sensor.SensorType.SENSOR_PULSE_OXIMETRY)		
+	}
 
     function start() {
         DebugManager.log("SensorManager startAccelerometer");
@@ -35,10 +44,7 @@ class SensorManager {
 			:period => SENSOR_PERIOD_SEC,
 			:accelerometer => {
 				:enabled => true,
-				:sampleRate => 10
-			},
-			:heartBeatIntervals => {
-				:enabled => true
+				:sampleRate => SENSOR_FREQ
 			}
 		};
         Sensor.registerSensorDataListener(SensorManager.method(:onData), options);
@@ -76,7 +82,7 @@ class SensorManager {
         accYBuf.addAll(yArr);
         accZBuf.addAll(zArr);
 
-        var maxCount = 100; // Maximum number of values to go into one aggregate (sampleRate [Hz] x batchPeriod [s])
+        var maxCount = SENSOR_AGGREG_WINDOW * SENSOR_FREQ; // Maximum number of values to go into one aggregate (sampleRate [Hz] x batchPeriod [s])
 
         // Since maximum sensor batching period is 4 seconds and we need to have aggregate period of 10 seconds, we need to aggregate two and half sensor batches. Then we need to retain the remaining half of the third batch.
         // In order to do that, we first add all the data from three batches into one array and then aggregate just first 100 values, deleting them from the batch arrays.