From 04215606037d02af39e41dfe70a6c7bcb1e5f874 Mon Sep 17 00:00:00 2001
From: Rune Harlyk <rune@harlyk.dk>
Date: Fri, 23 Feb 2024 12:45:11 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A2=20Adds=20math=20function=20to=20co?=
 =?UTF-8?q?nvert=20to=20uint8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/components/Controls.svelte      | 14 +++++++-------
 app/src/lib/utilities/math-utilities.ts |  5 +++++
 app/test/specs/toUint8.spec.ts          | 24 ++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 app/test/specs/toUint8.spec.ts

diff --git a/app/src/components/Controls.svelte b/app/src/components/Controls.svelte
index b4f9aed..bffbdc3 100644
--- a/app/src/components/Controls.svelte
+++ b/app/src/components/Controls.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import nipplejs from 'nipplejs';
 	import { onMount } from 'svelte';
-	import { throttler } from '$lib/utilities';
+	import { throttler, toUint8 } from '$lib/utilities';
 	import socketService from '$lib/services/socket-service';
 	import { emulateModel, input, outControllerData } from '$lib/store';
 
@@ -67,12 +67,12 @@
 
 	const updateData = () => {
 		data[0] = 0;
-		data[1] = $input.left.x * 127 + 128;
-		data[2] = $input.left.y * 127 + 128;
-		data[3] = $input.right.x * 127 + 128;
-		data[4] = $input.right.y * 127 + 128;
-		data[5] = $input.height;
-		data[6] = $input.speed;
+		data[1] = toUint8($input.left.x, -1, 1);
+		data[2] = toUint8($input.left.y, -1, 1);
+		data[3] = toUint8($input.right.x, -1, 1);
+		data[4] = toUint8($input.right.y, -1, 1);
+		data[5] = toUint8($input.height, 0, 100);;
+		data[6] = toUint8($input.speed, 0, 100);
 
 		outControllerData.set(data);
 
diff --git a/app/src/lib/utilities/math-utilities.ts b/app/src/lib/utilities/math-utilities.ts
index e69de29..6a67dc9 100644
--- a/app/src/lib/utilities/math-utilities.ts
+++ b/app/src/lib/utilities/math-utilities.ts
@@ -0,0 +1,5 @@
+export const toUint8 = (number:number, min:number, max:number) => {
+    number = Math.max(min, Math.min(max, number));
+    let scaled = ((number - min) / (max - min)) * 255;
+    return Math.round(scaled) & 0xFF;
+  }
\ No newline at end of file
diff --git a/app/test/specs/toUint8.spec.ts b/app/test/specs/toUint8.spec.ts
new file mode 100644
index 0000000..04565a3
--- /dev/null
+++ b/app/test/specs/toUint8.spec.ts
@@ -0,0 +1,24 @@
+import { describe, it, expect } from 'vitest';
+import { toUint8 } from '../../src/lib/utilities';
+
+describe('toUint8', () => {
+  it('min interval value should get 0', () => {
+    expect(toUint8(-1, -1, 1)).toBe(0);
+  });
+
+  it('middle interval value should get 128', () => {
+    expect(toUint8(0, -1, 1)).toBe(128);
+  });
+
+  it('max interval value should get 255', () => {
+    expect(toUint8(1, -1, 1)).toBe(255);
+  });
+
+  it('min value should be clamped', () => {
+    expect(toUint8(-2, -1, 1)).toBe(0);
+  });
+
+  it('max value should be clamped', () => {
+    expect(toUint8(2, -1, 1)).toBe(255);
+  });
+});
\ No newline at end of file