From d0124c876611df4e18175c62375caaa3501149e7 Mon Sep 17 00:00:00 2001
From: Julian Waller <git@julusian.co.uk>
Date: Sun, 28 Jan 2024 14:36:06 +0000
Subject: [PATCH 1/3] fix: camera control float encoding

---
 src/commands/CameraControlCommand.ts | 35 +++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/commands/CameraControlCommand.ts b/src/commands/CameraControlCommand.ts
index aa080ee03..5246c4014 100644
--- a/src/commands/CameraControlCommand.ts
+++ b/src/commands/CameraControlCommand.ts
@@ -133,11 +133,23 @@ export class CameraControlCommand extends BasicWritableCommand<CameraControlPack
 				buffer = Buffer.alloc(headerSize + padToMultiple(this.properties.numberData.length * 2, 8))
 				buffer.writeUint16BE(this.properties.numberData.length, header16BitPos)
 
-				// TODO - verify this encoding is correct
 				let offset = headerSize
 				for (let i = 0; i < this.properties.numberData.length; i++) {
-					const encodedValue = this.properties.numberData[i] * 0x7ff
-					buffer.writeInt16BE(encodedValue, offset)
+					let rawValue = this.properties.numberData[i]
+
+					// This is encoding the 5.11 fixed point floats
+					// These use Two's complement to handle negative values
+
+					const invert = rawValue < 0
+					if (invert) rawValue = -rawValue
+
+					const decimal = Math.floor((rawValue % 1) * 0x800) // TODO - or round?
+					const real = Math.floor(rawValue)
+
+					let encodedValue = (real << 11) + decimal
+					if (invert) encodedValue = 65536 - encodedValue
+
+					buffer.writeUInt16BE(encodedValue, offset)
 					offset += 2
 				}
 
@@ -239,10 +251,21 @@ export class CameraControlUpdateCommand extends DeserializedCommand<CameraContro
 				break
 			}
 			case CameraControlDataType.FLOAT: {
-				// TODO - verify this encoding is correct
 				for (let i = 0; i < count16Bit; i++) {
-					const decodedValue = rawCommand.readInt16BE(offset) / 0x7ff
-					props.numberData.push(decodedValue)
+					let decodedValue = rawCommand.readUInt16BE(offset) // 0x7ff
+
+					// This is decoding the 5.11 fixed point floats
+					// These use Two's complement to handle negative values
+
+					const invert = decodedValue & 0x8000
+					if (invert) decodedValue = 0x10000 - decodedValue
+
+					const decimal = (decodedValue & 0x7ff) / 0x800
+					let real = (decodedValue >> 11) + decimal
+
+					if (invert) real = -real
+
+					props.numberData.push(real)
 					offset += 2
 				}
 				break

From 1fc093aa4e38396f8dfe78f7678193368445c0ab Mon Sep 17 00:00:00 2001
From: Julian Waller <git@julusian.co.uk>
Date: Sun, 28 Jan 2024 15:50:53 +0000
Subject: [PATCH 2/3] chore: update tests

---
 src/commands/__tests__/index.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/commands/__tests__/index.spec.ts b/src/commands/__tests__/index.spec.ts
index acbbab28e..59a2e2d7e 100644
--- a/src/commands/__tests__/index.spec.ts
+++ b/src/commands/__tests__/index.spec.ts
@@ -211,6 +211,8 @@ describe('Commands vs LibAtem', () => {
 			case 'KeFS': // TODO - TMP!
 			case '_MvC': // Not all properties parsed
 			case 'FTSU': // Unkown props getting overwritten by generator: https://github.com/LibAtem/LibAtem/blob/master/LibAtem/Commands/DataTransfer/DataTransferDownloadRequestCommand.cs
+			case 'CCmd': // LibAtem is incorrect
+			case 'CCdP': // LibAtem is incorrect
 				continue
 		}
 

From 255ecf20065af873a4d6740967664015f70aa5b2 Mon Sep 17 00:00:00 2001
From: Julian Waller <git@julusian.co.uk>
Date: Wed, 7 Feb 2024 23:41:23 +0000
Subject: [PATCH 3/3] wip: simplify

---
 src/commands/CameraControlCommand.ts | 35 +++++-----------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/src/commands/CameraControlCommand.ts b/src/commands/CameraControlCommand.ts
index 5246c4014..091266ac5 100644
--- a/src/commands/CameraControlCommand.ts
+++ b/src/commands/CameraControlCommand.ts
@@ -134,22 +134,9 @@ export class CameraControlCommand extends BasicWritableCommand<CameraControlPack
 				buffer.writeUint16BE(this.properties.numberData.length, header16BitPos)
 
 				let offset = headerSize
-				for (let i = 0; i < this.properties.numberData.length; i++) {
-					let rawValue = this.properties.numberData[i]
-
-					// This is encoding the 5.11 fixed point floats
-					// These use Two's complement to handle negative values
-
-					const invert = rawValue < 0
-					if (invert) rawValue = -rawValue
-
-					const decimal = Math.floor((rawValue % 1) * 0x800) // TODO - or round?
-					const real = Math.floor(rawValue)
-
-					let encodedValue = (real << 11) + decimal
-					if (invert) encodedValue = 65536 - encodedValue
-
-					buffer.writeUInt16BE(encodedValue, offset)
+				for (const value of this.properties.numberData) {
+					// Values are encoded as 5.11 fixed point floats
+					buffer.writeInt16BE(value * 2048, offset)
 					offset += 2
 				}
 
@@ -252,20 +239,10 @@ export class CameraControlUpdateCommand extends DeserializedCommand<CameraContro
 			}
 			case CameraControlDataType.FLOAT: {
 				for (let i = 0; i < count16Bit; i++) {
-					let decodedValue = rawCommand.readUInt16BE(offset) // 0x7ff
-
-					// This is decoding the 5.11 fixed point floats
-					// These use Two's complement to handle negative values
-
-					const invert = decodedValue & 0x8000
-					if (invert) decodedValue = 0x10000 - decodedValue
-
-					const decimal = (decodedValue & 0x7ff) / 0x800
-					let real = (decodedValue >> 11) + decimal
-
-					if (invert) real = -real
+					const decodedValue = rawCommand.readInt16BE(offset)
 
-					props.numberData.push(real)
+					// Values are encoded as 5.11 fixed point floats
+					props.numberData.push(decodedValue / 2048)
 					offset += 2
 				}
 				break