@robotical/raftjs 2.0.4 → 2.0.6

package/dist/web/RaftCustomAttrHandler.js

@@ -9,10 +9,11 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 Object.defineProperty(exports, "__esModule", { value: true });
 class CustomAttrHandler {
+    constructor() {
+        this._jsFunctionCache = new Map();
+    }
     handleAttr(pollRespMetadata, msgBuffer, msgBufIdx) {
-        // Implement the pseudo-code:
-        // int N=(buf[0]+32-buf[2])%32;int k=3;int i=0;while(i<N){out.Red=(buf[k]<<16)|(buf[k+1]<<8)|buf[k+2];out.IR=(buf[k+3]<<16)|(buf[k+4]<<8)|buf[k+5];k+=6;i++;next;}
-        // Number of bytes in the each message
+        // Number of bytes in each message
         const numMsgBytes = pollRespMetadata.b;
         // Create a vector for each attribute in the metadata
         const attrValueVecs = [];
@@ -23,43 +24,70 @@ class CustomAttrHandler {
             attrValueVecs.push([]);
             attrValues[pollRespMetadata.a[attrIdx].n] = attrValueVecs[attrIdx];
         }
-        // Custom code for each device type
-        if (pollRespMetadata.c.n === "max30101_fifo") {
-            // Hex dump msgBuffer
-            // console.log(`CustomAttrHandler handleAttr ${pollRespMetadata.c!.n} msgBuffer: ${msgBuffer.toString('hex')}`); 
-            const buf = msgBuffer.slice(msgBufIdx);
-            if (buf.length < numMsgBytes) {
-                return [];
+        const customFnDef = pollRespMetadata.c;
+        if (!customFnDef) {
+            return attrValueVecs;
+        }
+        // Provide the message buffer sliced to the data portion
+        const buf = msgBuffer.slice(msgBufIdx);
+        if (buf.length < numMsgBytes) {
+            return [];
+        }
+        // Execute supplied JS implementation if provided
+        if (customFnDef.j && customFnDef.j.trim().length > 0) {
+            const jsFn = this.getOrCompileJsFunction(customFnDef);
+            if (!jsFn) {
+                return attrValueVecs;
             }
+            try {
+                jsFn(buf, attrValues, attrValueVecs, pollRespMetadata, msgBuffer, msgBufIdx, numMsgBytes);
+            }
+            catch (err) {
+                console.error(`CustomAttrHandler JS function ${customFnDef.n} execution failed`, err);
+            }
+            return attrValueVecs;
+        }
+        // Custom code for each device type handled natively
+        if (customFnDef.n === "max30101_fifo") {
             // Generated code ...
             const N = (buf[0] + 32 - buf[2]) % 32;
             let k = 3;
             let i = 0;
             while (i < N) {
-                attrValues['Red'].push(0);
-                attrValues['Red'][attrValues['Red'].length - 1] = (buf[k] << 16) | (buf[k + 1] << 8) | buf[k + 2];
-                attrValues['IR'].push(0);
-                attrValues['IR'][attrValues['IR'].length - 1] = (buf[k + 3] << 16) | (buf[k + 4] << 8) | buf[k + 5];
+                attrValues["Red"].push(0);
+                attrValues["Red"][attrValues["Red"].length - 1] = (buf[k] << 16) | (buf[k + 1] << 8) | buf[k + 2];
+                attrValues["IR"].push(0);
+                attrValues["IR"][attrValues["IR"].length - 1] = (buf[k + 3] << 16) | (buf[k + 4] << 8) | buf[k + 5];
                 k += 6;
                 i++;
-                ;
             }
         }
-        else if (pollRespMetadata.c.n === "gravity_o2_calc") {
-            // Get the buffer
-            const buf = msgBuffer.slice(msgBufIdx);
-            if (buf.length < numMsgBytes) {
-                return [];
-            }
-            // Implement the pseudo-code:
-            // float key = 20.9/120.0; float val = key * (buf[0] + (buf[1]/10.0) + (buf[2]/100.0)); out.oxygen = val;
+        else if (customFnDef.n === "gravity_o2_calc") {
             const key = 20.9 / 120.0;
-            const val = key * (buf[0] + (buf[1] / 10.0) + (buf[2] / 100.0));
-            // Add the value to the oxygen attribute
-            attrValues['oxygen'].push(val);
+            const val = key * (buf[0] + buf[1] / 10.0 + buf[2] / 100.0);
+            attrValues["oxygen"].push(val);
         }
         return attrValueVecs;
     }
+    getOrCompileJsFunction(customFnDef) {
+        if (!customFnDef.j) {
+            return null;
+        }
+        const cacheKey = `${customFnDef.n}::${customFnDef.j}`;
+        const cachedFn = this._jsFunctionCache.get(cacheKey);
+        if (cachedFn) {
+            return cachedFn;
+        }
+        try {
+            const compiledFn = new Function("buf", "attrValues", "attrValueVecs", "pollRespMetadata", "msgBuffer", "msgBufIdx", "numMsgBytes", customFnDef.j);
+            this._jsFunctionCache.set(cacheKey, compiledFn);
+            return compiledFn;
+        }
+        catch (err) {
+            console.error(`CustomAttrHandler failed to compile JS function ${customFnDef.n}`, err);
+            return null;
+        }
+    }
 }
 exports.default = CustomAttrHandler;
 //# sourceMappingURL=RaftCustomAttrHandler.js.map

package/dist/web/RaftCustomAttrHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"RaftCustomAttrHandler.js","sourceRoot":"","sources":["../../src/RaftCustomAttrHandler.ts"],"names":[],"mappings":";AAAA,iHAAiH;AACjH,EAAE;AACF,wBAAwB;AACxB,4CAA4C;AAC5C,EAAE;AACF,sBAAsB;AACtB,EAAE;AACF,iHAAiH;;AAIjH,MAAqB,iBAAiB;IAE3B,UAAU,CAAC,gBAA4C,EAAE,SAAqB,EAAE,SAAiB;QAEpG,6BAA6B;QAC7B,kKAAkK;QAElK,sCAAsC;QACtC,MAAM,WAAW,GAAG,gBAAgB,CAAC,CAAC,CAAC;QAEvC,qDAAqD;QACrD,MAAM,aAAa,GAAS,EAAE,CAAC;QAE/B,6CAA6C;QAC7C,MAAM,UAAU,GAAgC,EAAE,CAAC;QAEnD,+BAA+B;QAC/B,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC;YACnE,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACvB,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;QACvE,CAAC;QAED,mCAAmC;QACnC,IAAI,gBAAgB,CAAC,CAAE,CAAC,CAAC,KAAK,eAAe,EAAE,CAAC;YAC5C,qBAAqB;YACrB,iHAAiH;YACjH,MAAM,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACvC,IAAI,GAAG,CAAC,MAAM,GAAG,WAAW,EAAE,CAAC;gBAC3B,OAAO,EAAE,CAAC;YACd,CAAC;YAED,qBAAqB;YACrB,MAAM,CAAC,GAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAC,EAAE,GAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAC,EAAE,CAAC;YAC9B,IAAI,CAAC,GAAC,CAAC,CAAC;YACR,IAAI,CAAC,GAAC,CAAC,CAAC;YACR,OAAO,CAAC,GAAC,CAAC,EAAE,CAAC;gBACT,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAAC,UAAU,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,GAAC,CAAC,CAAC,GAAE,CAAC,GAAG,CAAC,CAAC,CAAC,IAAE,EAAE,CAAC,GAAC,CAAC,GAAG,CAAC,CAAC,GAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAC,GAAG,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC;gBAC9G,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAAC,UAAU,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,GAAC,CAAC,CAAC,GAAE,CAAC,GAAG,CAAC,CAAC,GAAC,CAAC,CAAC,IAAE,EAAE,CAAC,GAAC,CAAC,GAAG,CAAC,CAAC,GAAC,CAAC,CAAC,IAAE,CAAC,CAAC,GAAC,GAAG,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC;gBAC7G,CAAC,IAAE,CAAC,CAAC;gBACL,CAAC,EAAE,CAAC;gBACJ,CAAC;YACL,CAAC;QACL,CAAC;aAAM,IAAI,gBAAgB,CAAC,CAAE,CAAC,CAAC,KAAK,iBAAiB,EAAE,CAAC;YACrD,iBAAiB;YACjB,MAAM,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACvC,IAAI,GAAG,CAAC,MAAM,GAAG,WAAW,EAAE,CAAC;gBAC3B,OAAO,EAAE,CAAC;YACd,CAAC;YAED,6BAA6B;YAC7B,yGAAyG;YACzG,MAAM,GAAG,GAAG,IAAI,GAAG,KAAK,CAAC;YACzB,MAAM,GAAG,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;YAEhE,wCAAwC;YACxC,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,aAAa,CAAC;IACzB,CAAC;CACJ;AA3DD,oCA2DC"}
+{"version":3,"file":"RaftCustomAttrHandler.js","sourceRoot":"","sources":["../../src/RaftCustomAttrHandler.ts"],"names":[],"mappings":"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"}

package/dist/web/RaftDeviceInfo.d.ts

@@ -25,10 +25,12 @@ export interface DeviceTypeAttribute {
     vf?: boolean | number;
     vft?: string;
     lut?: Array<LUTRow>;
+    resolution?: string;
 }
 export interface CustomFunctionDefinition {
     n: string;
     c: string;
+    j?: string;
 }
 export interface DeviceTypePollRespMetadata {
     b: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robotical/raftjs",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "Javascript/TS library for Raft library",
   "main": "dist/web/main.js",
   "types": "dist/web/main.d.ts",

package/src/RaftChannelSimulated.ts

@@ -286,7 +286,7 @@ export default class RaftChannelSimulated implements RaftChannel {
 
     const attributes = deviceTypeInfo.resp.a;
     const dataBlockSizeBytes = deviceTypeInfo.resp.b;
-    
+
     // Create a buffer for the data
     const dataBuffer = new ArrayBuffer(dataBlockSizeBytes + 2);
     const dataView = new DataView(dataBuffer);
@@ -295,89 +295,68 @@ export default class RaftChannelSimulated implements RaftChannel {
     // Add 16 bit big endian deviceTimeMs mod 65536 to the buffer
     dataView.setUint16(bytePos, deviceTimeMs % 65536, false);
     bytePos += 2;
-    
-    // Calculate sine wave with phase offsets for each attribute
-    const numAttributes = attributes.length;
-      // Adjust frequency based on the device interval with N samples per cycle
-    const numSamplesPerCycle = 10;
-    let frequencyHz = 0.1; // Default frequency in Hz
-    if (deviceIntervalMs > 0) {
-      frequencyHz = (1000 / deviceIntervalMs) / numSamplesPerCycle;
-    }
 
-    // Amplitude of the sine wave (0 to 1)
-    const amplitude = 0.8;
-    
-    // Iterate through attributes and set values
-    for (let i = 0; i < numAttributes; i++) {
-      const attr = attributes[i];
-      // Calculate phase offset for this attribute
-      const phaseOffset = (2 * Math.PI * i) / numAttributes;
-      
-      // Generate sine wave value
+    const handledByCustomGenerator = this._fillCustomRawData(
+      deviceTypeInfo,
+      dataView,
+      bytePos,
+      dataBlockSizeBytes,
+      deviceIntervalMs,
+      deviceTimeMs
+    );
+
+    if (!handledByCustomGenerator) {
+      const numAttributes = attributes.length;
+      const numSamplesPerCycle = 10;
+      const frequencyHz = (deviceIntervalMs > 0)
+        ? (1000 / deviceIntervalMs) / numSamplesPerCycle
+        : 0.1;
       const timeRadians = deviceTimeMs * frequencyHz * (2 * Math.PI) / 1000;
-      const sinValue = Math.sin(timeRadians + phaseOffset);
-      
-      // Scale the value to fit within the attribute's range
-      let scaledValue: number;
-      if (attr.r && attr.r.length >= 2) {
-        const minValue = attr.r[0];
-        const maxValue = attr.r[1];
-        const midPoint = (maxValue + minValue) / 2;
-        const range = (maxValue - minValue) / 2;
-        scaledValue = midPoint + sinValue * range * amplitude;
-      } else {
-        // Default range if not specified
-        scaledValue = sinValue * 1000 * amplitude;
-      }
-      
-      // Convert to raw integer value if needed
-      let rawValue = scaledValue;
-      if (attr.d) {
-        // Multiply by the divisor to get the raw value (reverse of what happens when decoding)
-        rawValue = scaledValue * attr.d;
-      }
-      
-      // Write the value to the buffer based on its type
-      if (attr.t === "b") {
-        dataView.setUint8(bytePos, Math.round(rawValue));
-        bytePos += 1;
-      } else if (attr.t === "B") {
-        dataView.setUint8(bytePos, Math.round(rawValue));
-        bytePos += 1;
-      } else if (attr.t === "c") {
-        dataView.setInt8(bytePos, Math.round(rawValue));
-        bytePos += 1;
-      } else if (attr.t === "C") {
-        dataView.setUint8(bytePos, Math.round(rawValue));
-        bytePos += 1;
-      } else if (attr.t === "<h") {
-        dataView.setInt16(bytePos, Math.round(rawValue), true); // Little endian
-        bytePos += 2;
-      } else if (attr.t === ">h") {
-        dataView.setInt16(bytePos, Math.round(rawValue), false); // Big endian
-        bytePos += 2;
-      } else if (attr.t === "<H") {
-        dataView.setUint16(bytePos, Math.round(rawValue), true); // Little endian
-        bytePos += 2;
-      } else if (attr.t === ">H") {
-        dataView.setUint16(bytePos, Math.round(rawValue), false); // Big endian
-        bytePos += 2;
-      } else if (attr.t === "f" || attr.t === "<f") {
-        dataView.setFloat32(bytePos, rawValue, true); // Little endian
-        bytePos += 4;
-      } else if (attr.t === ">f") {
-        dataView.setFloat32(bytePos, rawValue, false); // Big endian
-        bytePos += 4;
-      } else {
-        RaftLog.warn(`RaftChannelSimulated._createSimulatedDeviceInfoMsg - unsupported attribute type ${attr.t}`);
-      }
 
+      // Iterate through attributes and fill the payload
+      for (let attrIdx = 0; attrIdx < numAttributes; attrIdx++) {
+        const attr = attributes[attrIdx];
+        const { typeCode, repeatCount, littleEndian } = this._parseAttrType(attr.t);
+        const scaledValues = this._generateAttributeScaledValues(
+          attr,
+          attrIdx,
+          repeatCount,
+          numAttributes,
+          timeRadians,
+          deviceTimeMs
+        );
+
+        if (scaledValues.length !== repeatCount) {
+          RaftLog.warn(`RaftChannelSimulated._createSimulatedDeviceInfoMsg - value count mismatch for ${attr.n}`);
+          continue;
+        }
+
+        for (let elemIdx = 0; elemIdx < repeatCount; elemIdx++) {
+          const scaledValue = scaledValues[elemIdx];
+          const rawValue = this._prepareRawValue(attr, typeCode, scaledValue);
+          const nextBytePos = this._writeRawValueToBuffer(
+            dataView,
+            bytePos,
+            typeCode,
+            littleEndian,
+            rawValue
+          );
+
+          if (nextBytePos < 0) {
+            RaftLog.warn(`RaftChannelSimulated._createSimulatedDeviceInfoMsg - buffer overflow writing ${attr.n}`);
+            break;
+          }
+
+          bytePos = nextBytePos;
+        }
+      }
+    } else {
+      bytePos += dataBlockSizeBytes;
     }
-    
+
     // Convert the buffer to a byte array
     const dataBytes = new Uint8Array(dataBuffer);
-    
+
     // Create the JSON message structure
     const message = {
       "BUS1": {
@@ -401,6 +380,305 @@ export default class RaftChannelSimulated implements RaftChannel {
 
   }
 
+  private _parseAttrType(attrType: string): { typeCode: string; repeatCount: number; littleEndian: boolean } {
+    const repeatMatch = attrType.match(/\[(\d+)\]\s*$/);
+    const repeatCount = repeatMatch ? parseInt(repeatMatch[1], 10) : 1;
+    const coreType = repeatMatch ? attrType.slice(0, repeatMatch.index) : attrType;
+    let littleEndian = false;
+    let typeCode = coreType.trim();
+
+    if (typeCode.startsWith("<")) {
+      littleEndian = true;
+      typeCode = typeCode.slice(1);
+    } else if (typeCode.startsWith(">")) {
+      littleEndian = false;
+      typeCode = typeCode.slice(1);
+    } else if (typeCode === "f") {
+      // Match previous behaviour - plain "f" treated as little endian floats
+      littleEndian = true;
+    }
+
+    return { typeCode, repeatCount, littleEndian };
+  }
+
+  private _generateAttributeScaledValues(
+    attr: any,
+    attrIdx: number,
+    repeatCount: number,
+    numAttributes: number,
+    timeRadians: number,
+    deviceTimeMs: number
+  ): number[] {
+    const amplitude = 0.8;
+
+    if (repeatCount > 1) {
+      const useThermalGrid = (attr && typeof attr.resolution === "string") || repeatCount >= 16;
+      if (useThermalGrid) {
+        return this._generateThermalGridValues(attr, repeatCount, timeRadians, deviceTimeMs);
+      }
+
+      const values: number[] = [];
+      for (let elemIdx = 0; elemIdx < repeatCount; elemIdx++) {
+        const phaseOffset = (2 * Math.PI * (attrIdx + elemIdx / repeatCount)) / Math.max(1, numAttributes);
+        const sinValue = Math.sin(timeRadians + phaseOffset);
+
+        if (Array.isArray(attr.r) && attr.r.length >= 2) {
+          const minValue = attr.r[0];
+          const maxValue = attr.r[1];
+          const midPoint = (maxValue + minValue) / 2;
+          const range = (maxValue - minValue) / 2;
+          const value = midPoint + sinValue * range * amplitude;
+          values.push(Math.min(maxValue, Math.max(minValue, value)));
+        } else {
+          values.push(sinValue * 1000 * amplitude);
+        }
+      }
+      return values;
+    }
+
+    const phaseOffset = numAttributes > 0 ? (2 * Math.PI * attrIdx) / numAttributes : 0;
+    const sinValue = Math.sin(timeRadians + phaseOffset);
+
+    if (Array.isArray(attr.r) && attr.r.length >= 2) {
+      const minValue = attr.r[0];
+      const maxValue = attr.r[1];
+      const midPoint = (maxValue + minValue) / 2;
+      const range = (maxValue - minValue) / 2;
+      const value = midPoint + sinValue * range * amplitude;
+      return [Math.min(maxValue, Math.max(minValue, value))];
+    }
+
+    return [sinValue * 1000 * amplitude];
+  }
+
+  private _generateThermalGridValues(
+    attr: any,
+    repeatCount: number,
+    timeRadians: number,
+    deviceTimeMs: number
+  ): number[] {
+    const { rows, cols } = this._getGridDimensions(attr, repeatCount);
+    const values: number[] = [];
+    const ambientBase = 24 + 2 * Math.sin(deviceTimeMs / 7000);
+    const hotspotPhase = deviceTimeMs / 3200;
+    const hotspotRow = (Math.sin(hotspotPhase) + 1) * (rows - 1) / 2;
+    const hotspotCol = (Math.cos(hotspotPhase) + 1) * (cols - 1) / 2;
+    const hotspotAmplitude = 6;
+    const sigma = Math.max(rows, cols) / 3 || 1;
+
+    for (let idx = 0; idx < repeatCount; idx++) {
+      const row = Math.floor(idx / cols);
+      const col = idx % cols;
+      const dist = Math.hypot(row - hotspotRow, col - hotspotCol);
+      const hotspot = hotspotAmplitude * Math.exp(-(dist * dist) / (2 * sigma * sigma));
+      const gentleWave = 0.5 * Math.sin(timeRadians + row * 0.35 + col * 0.25);
+      let value = ambientBase + hotspot + gentleWave;
+
+      if (Array.isArray(attr.r) && attr.r.length >= 2) {
+        value = Math.min(attr.r[1], Math.max(attr.r[0], value));
+      }
+
+      values.push(value);
+    }
+
+    return values;
+  }
+
+  private _fillCustomRawData(
+    deviceTypeInfo: DeviceTypeInfo,
+    dataView: DataView,
+    bytePos: number,
+    dataBlockSizeBytes: number,
+    deviceIntervalMs: number,
+    deviceTimeMs: number
+  ): boolean {
+    if (deviceTypeInfo.type !== "LTR-329") {
+      return false;
+    }
+
+    if (dataBlockSizeBytes < 4) {
+      return false;
+    }
+
+    const frequencyHz = (deviceIntervalMs > 0)
+      ? (1000 / deviceIntervalMs) / 10
+      : 0.1;
+    const timeRadians = deviceTimeMs * frequencyHz * (2 * Math.PI) / 1000;
+
+    const range = deviceTypeInfo.resp?.a?.[0]?.r ?? [0, 64000];
+    const minLux = range[0] ?? 0;
+    const maxLux = range[1] ?? 64000;
+
+    const baseLux = (maxLux + minLux) / 4;
+    const amplitudeLux = (maxLux - minLux) / 6;
+    let combined = Math.round(baseLux + amplitudeLux * Math.sin(timeRadians));
+    combined = Math.max(minLux, Math.min(maxLux, combined));
+
+    const irBase = combined * 0.35;
+    const irVariance = (combined * 0.15) * Math.sin(timeRadians + Math.PI / 4);
+    let ir = Math.round(irBase + irVariance);
+    ir = Math.max(minLux, Math.min(combined, ir));
+
+    dataView.setUint16(bytePos, combined, true);
+    dataView.setUint16(bytePos + 2, ir, true);
+
+    return true;
+  }
+
+  private _getGridDimensions(attr: any, repeatCount: number): { rows: number; cols: number } {
+    if (attr && typeof attr.resolution === "string") {
+      const match = attr.resolution.match(/(\d+)\s*x\s*(\d+)/i);
+      if (match) {
+        const rows = parseInt(match[1], 10);
+        const cols = parseInt(match[2], 10);
+        if (rows > 0 && cols > 0) {
+          return { rows, cols };
+        }
+      }
+    }
+
+    const side = Math.round(Math.sqrt(repeatCount));
+    if (side > 0 && side * side === repeatCount) {
+      return { rows: side, cols: side };
+    }
+
+    return { rows: repeatCount, cols: 1 };
+  }
+
+  private _prepareRawValue(attr: any, typeCode: string, scaledValue: number): number {
+    if (this._isFloatType(typeCode)) {
+      return scaledValue;
+    }
+
+    let raw = scaledValue;
+
+    if (attr && typeof attr.a === "number") {
+      raw -= attr.a;
+    }
+    if (attr && typeof attr.d === "number") {
+      raw *= attr.d;
+    }
+    if (attr && typeof attr.s === "number" && attr.s !== 0) {
+      const shift = attr.s;
+      const shiftFactor = Math.pow(2, Math.abs(shift));
+      if (shift > 0) {
+        raw *= shiftFactor;
+      } else {
+        raw /= shiftFactor;
+      }
+    }
+
+    return Math.round(raw);
+  }
+
+  private _writeRawValueToBuffer(
+    dataView: DataView,
+    bytePos: number,
+    typeCode: string,
+    littleEndian: boolean,
+    rawValue: number
+  ): number {
+    const valueSize = this._byteSizeForType(typeCode);
+    if (valueSize <= 0 || bytePos + valueSize > dataView.byteLength) {
+      return -1;
+    }
+
+    switch (typeCode) {
+      case "b":
+        dataView.setInt8(bytePos, this._clampRawValue(rawValue, typeCode));
+        break;
+      case "c":
+        dataView.setInt8(bytePos, this._clampRawValue(rawValue, typeCode));
+        break;
+      case "B":
+      case "C":
+        dataView.setUint8(bytePos, this._clampRawValue(rawValue, typeCode));
+        break;
+      case "?":
+        dataView.setUint8(bytePos, rawValue ? 1 : 0);
+        break;
+      case "h":
+        dataView.setInt16(bytePos, this._clampRawValue(rawValue, typeCode), littleEndian);
+        break;
+      case "H":
+        dataView.setUint16(bytePos, this._clampRawValue(rawValue, typeCode), littleEndian);
+        break;
+      case "i":
+      case "l":
+        dataView.setInt32(bytePos, this._clampRawValue(rawValue, typeCode), littleEndian);
+        break;
+      case "I":
+      case "L":
+        dataView.setUint32(bytePos, this._clampRawValue(rawValue, typeCode), littleEndian);
+        break;
+      case "f":
+        dataView.setFloat32(bytePos, rawValue, littleEndian);
+        break;
+      case "d":
+        dataView.setFloat64(bytePos, rawValue, littleEndian);
+        break;
+      default:
+        RaftLog.warn(`RaftChannelSimulated._writeRawValueToBuffer - unsupported attribute type ${typeCode}`);
+        return -1;
+    }
+
+    return bytePos + valueSize;
+  }
+
+  private _byteSizeForType(typeCode: string): number {
+    switch (typeCode) {
+      case "b":
+      case "B":
+      case "c":
+      case "C":
+      case "?":
+        return 1;
+      case "h":
+      case "H":
+        return 2;
+      case "i":
+      case "I":
+      case "l":
+      case "L":
+      case "f":
+        return 4;
+      case "d":
+        return 8;
+      default:
+        return 0;
+    }
+  }
+
+  private _clampRawValue(rawValue: number, typeCode: string): number {
+    const value = Math.round(rawValue);
+
+    switch (typeCode) {
+      case "b":
+      case "c":
+        return Math.max(-128, Math.min(127, value));
+      case "B":
+      case "C":
+      case "?":
+        return Math.max(0, Math.min(255, value));
+      case "h":
+        return Math.max(-32768, Math.min(32767, value));
+      case "H":
+        return Math.max(0, Math.min(65535, value));
+      case "i":
+      case "l":
+        return Math.max(-2147483648, Math.min(2147483647, value));
+      case "I":
+      case "L":
+        return Math.max(0, Math.min(4294967295, value));
+      default:
+        return value;
+    }
+  }
+
+  private _isFloatType(typeCode: string): boolean {
+    return typeCode === "f" || typeCode === "d";
+  }
+
   // Helper function to convert bytes to hex string
   private _bytesToHexStr(bytes: Uint8Array): string {
     return Array.from(bytes)
@@ -411,6 +689,29 @@ export default class RaftChannelSimulated implements RaftChannel {
   // Simulated device type information - this is a copy of part of DeviceTypeInfo in RaftCore
   private _deviceTypeInfo: DeviceTypeInfoRecs = 
   {
+    "AMG8833": {
+      "name": "AMG8833",
+      "desc": "Thermal Camera",
+      "manu": "Panasonic",
+      "type": "AMG8833",
+      "clas": ["TCAM"],
+      "resp": {
+          "b": 128,
+          "a": [
+              {
+                  "n": "temp",
+                  "t": "<h[64]",
+                  "resolution": "8x8",
+                  "u": "&deg;C",
+                  "r": [-55, 125],
+                  "s": -4,
+                  "d": 64,
+                  "f": ".2f",
+                  "o": "float"
+              }
+          ]
+       }
+    },
     "LSM6DS": {
       "name": "LSM6DS",
       "desc": "6-Axis IMU",
@@ -476,7 +777,40 @@ export default class RaftChannelSimulated implements RaftChannel {
               }
           ]
        }
+    },
+    "LTR-329": {
+      "name": "LTR-329",
+      "desc": "Visible light and IR Sensor",
+      "manu": "Lite On",
+      "type": "LTR-329",
+      "clas": ["LGHT"],
+      "resp": {
+        "b": 4,
+        "a": [
+          {
+            "n": "ir",
+            "t": "<h",
+            "u": "lux",
+            "r": [0, 64000],
+            "f": "d",
+            "o": "uint16"
+          },
+          {
+            "n": "visible",
+            "t": "<h",
+            "u": "lux",
+            "r": [0, 64000],
+            "f": "d",
+            "o": "uint16"
+          }
+        ],
+        "c": {
+          "n": "ltr329_light_calc",
+          "c": "int combined = buf[0] + (((uint16_t)buf[1])<<8); out.ir = buf[2] + (((uint16_t)buf[3])<<8); out.visible = combined - out.ir;",
+          "j": "let combined = buf[0] + (buf[1] << 8); let ir = buf[2] + (buf[3] << 8); attrValues['ir'].push(ir); attrValues['visible'].push(Math.max(0, combined - ir));"
+        }
+      }
     }
   };
  
-}
+}