@reekon-tools/boldr-utils 1.6.1 → 1.6.3

package/dist/types/firestore.d.ts

@@ -249,7 +249,8 @@ export declare enum ColumnType {
     SingleSelect = "singleSelect",
     MultiSelect = "multiSelect",
     Angle = "angle",
-    ConversionTable = "conversionTable"
+    ConversionTable = "conversionTable",
+    Instructions = "instructions"
 }
 export interface Formula extends FirestoreDoc, Timestamps {
     expression: string;
@@ -271,6 +272,11 @@ export interface SelectColumnData {
 export interface ConversionTableColumnData {
     conversions: Conversion[];
 }
+export interface InstructionsColumnData {
+    text: string;
+    textColor: string;
+    backgroundColor: string;
+}
 interface ColumnConfigBase {
     id: string;
     name: string;
@@ -302,6 +308,9 @@ export type ColumnConfig = ColumnConfigBase & ({
 } | {
     type: ColumnType.Angle;
     columnData?: undefined;
+} | {
+    type: ColumnType.Instructions;
+    columnData: InstructionsColumnData;
 });
 export interface Row {
     [key: string]: any;

package/dist/types/firestore.js

@@ -42,6 +42,7 @@ export var ColumnType;
     ColumnType["MultiSelect"] = "multiSelect";
     ColumnType["Angle"] = "angle";
     ColumnType["ConversionTable"] = "conversionTable";
+    ColumnType["Instructions"] = "instructions";
 })(ColumnType || (ColumnType = {}));
 export var MeasurementType;
 (function (MeasurementType) {

package/dist/utils/micrometersToUnit.d.ts

@@ -1,4 +1,5 @@
 import { DecimalTolerance, FractionalTolerance, Units } from '../types/firestore.js';
+export declare const roundToT1Values: (value: number, u: Units) => number;
 export declare const convertMicrometers: (micrometers: number | null | undefined, unit: Units, fractionalTolerance: FractionalTolerance, decimalTolerance: DecimalTolerance) => {
     value: string;
     unit: string;

package/dist/utils/micrometersToUnit.js

@@ -1,12 +1,35 @@
 import { Units, convertUnitsToReadable, } from '../types/firestore.js';
 import { create, all } from 'mathjs';
 const math = create(all);
+// The T1 rounds differently depending on the selected measurement unit.
+// This function mirrors the rounding behavior implemented on the firmware.
+// The value being rounded is in microns.
+export const roundToT1Values = (value, u) => {
+    switch (u) {
+        case Units.Millimeters:
+        case Units.Centimeters:
+            return Math.round(value / 500) * 500;
+        case Units.Meters:
+            return Math.round(value / 1000) * 1000;
+        case Units.Inches:
+            return Math.round(value / 508) * 508;
+        case Units.Feet:
+            return Math.round(value / 304.8) * 304.8;
+        case Units.FeetInchesDecimal:
+            return Math.round(value / 508) * 508;
+        case Units.FractionalInches:
+        case Units.FeetInchesFractional:
+            return value;
+        default:
+            return Math.round(value / 500) * 500;
+    }
+};
 export const convertMicrometers = (micrometers, unit, fractionalTolerance, decimalTolerance) => {
     if (micrometers == null || isNaN(micrometers)) {
         return { value: 'NaN', unit: '' };
     }
     try {
-        const converted = math.unit(micrometers, 'um');
+        const converted = math.unit(roundToT1Values(micrometers, unit), 'um');
         let value = 0;
         let displayUnit = '';
         switch (unit) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reekon-tools/boldr-utils",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "Shared utilities for formulas and measurement conversion used in Reekon apps",
   "author": "REEKON Tools",
   "license": "MIT",