updated values string to integer in board list

Author: Ritika Mishra

src/components/Canvas.tsx

@@ -12,11 +12,11 @@ import { WebglPlot, ColorRGBA, WebglLine } from "webgl-plot";
 
 interface CanvasProps {
   pauseRef: React.RefObject<boolean>;
-  selectedBits: BitSelection;
+  selectedBits?: BitSelection; // Add `?` to make it optional
   isDisplay: boolean;
   canvasCount?: number;
   timeBase?: number;
-  currentSamplingRate:number;
+  currentSamplingRate: number;
   Zoom: number;
   currentSnapshot: number;
   snapShotRef: React.MutableRefObject<boolean[]>;
@@ -60,17 +60,17 @@ const Canvas = forwardRef(
     //select point
     const getpoints = useCallback((bits: BitSelection): number => {
       switch (bits) {
-        case "ten":
+        case 10:
           return 250;
-        case "twelve":
-        case "fourteen":
-        case "sixteen":
+        case 12:
+        case 14:
+        case 16:
           return 500;
         default:
           return 500; // Default fallback
       }
     }, []);
-    
+
 
     useEffect(() => {
       numXRef.current = (currentSamplingRate * timeBase);
@@ -188,7 +188,7 @@ const Canvas = forwardRef(
       const opacityLightMajor = "0.4"; // Opacity for every 5th line in light theme
       const opacityLightMinor = "0.1"; // Opacity for other lines in light theme
       const distanceminor = samplingRate * 0.04;
-      const numGridLines = getpoints(selectedBits) * 4 / distanceminor;
+      const numGridLines = getpoints(selectedBits ?? 10) * 4 / distanceminor;
       for (let j = 1; j < numGridLines; j++) {
         const gridLineX = document.createElement("div");
         gridLineX.className = "absolute bg-[rgb(128,128,128)]";

src/components/Connection.tsx

@@ -48,7 +48,7 @@ interface ConnectionProps {
   onPauseChange: (pause: boolean) => void; // Callback to pass pause state to parent
   datastream: (data: number[]) => void;
   Connection: (isConnected: boolean) => void;
-  selectedBits: BitSelection;
+  selectedBits?: BitSelection; // Add `?` if it's optional
   setSelectedBits: React.Dispatch<React.SetStateAction<BitSelection>>;
   isDisplay: boolean;
   setIsDisplay: React.Dispatch<React.SetStateAction<boolean>>;
@@ -90,7 +90,7 @@ const Connection: React.FC<ConnectionProps> = ({
   const isRecordingRef = useRef<boolean>(false); // Ref to track if the device is recording
   const [isEndTimePopoverOpen, setIsEndTimePopoverOpen] = useState(false);
   const [detectedBits, setDetectedBits] = useState<BitSelection | null>(null); // State to store the detected bits
-  const detectedBitsRef = React.useRef<BitSelection>("ten");
+  const detectedBitsRef = React.useRef<BitSelection>(10);
   const [datasets, setDatasets] = useState<any[]>([]);
   const currentFilenameRef = useRef<string>("");
   const [isRecordButtonDisabled, setIsRecordButtonDisabled] = useState(false);
@@ -101,7 +101,7 @@ const Connection: React.FC<ConnectionProps> = ({
   const endTimeRef = useRef<number | null>(null); // Ref to store the end time of the recording
   const [popoverVisible, setPopoverVisible] = useState(false);
   const portRef = useRef<SerialPort | null>(null); // Ref to store the serial port
-  const [ifBits, setifBits] = useState<BitSelection>("auto");
+  const [ifBits, setifBits] = useState<BitSelection>(10);
   const [showAllChannels, setShowAllChannels] = useState(false);
   const [FullZoom, setFullZoom] = useState(false);
   const canvasnumbersRef = useRef<number>(1);
@@ -350,19 +350,18 @@ const Connection: React.FC<ConnectionProps> = ({
       const board = BoardsList.find(
         (b) =>
           b.chords_id.toLowerCase() === deviceName.toLowerCase() &&
-          (!fieldPid || parseInt(b.field_pid, 10) === fieldPid) // Match field_pid if provided
+          (!fieldPid || (b.field_pid) === fieldPid) // Match field_pid if provided
       );
 
       if (board) {
         setifBits(board.adc_resolution as BitSelection);
         setSelectedBits(board.adc_resolution as BitSelection);
         detectedBitsRef.current = board.adc_resolution as BitSelection;
 
-        const channel = board.channel_count ? parseInt(board.channel_count, 10) : 0;
+        const channel = board.channel_count ? (board.channel_count) : 0;
         maxCanvasCountRef.current = channel;
-
         if (board.sampling_rate) {
-          setCurrentSamplingRate(parseInt(board.sampling_rate, 10));
+          setCurrentSamplingRate(board.sampling_rate);
         }
 
         return {
@@ -373,8 +372,8 @@ const Connection: React.FC<ConnectionProps> = ({
           ),
           adcResolution: board.adc_resolution,
           channelCount: board.channel_count,
-          baudRate: parseInt(board.baud_Rate, 10),   // Return baudRate
-          serialTimeout: parseInt(board.serial_timeout, 10), // Return serialTimeout
+          baudRate: (board.baud_Rate),   // Return baudRate
+          serialTimeout: (board.serial_timeout), // Return serialTimeout
         };
       }
 
@@ -405,6 +404,7 @@ const Connection: React.FC<ConnectionProps> = ({
         await disconnectDevice();
       }
 
+
       const savedPorts = JSON.parse(localStorage.getItem('savedDevices') || '[]');
       let port = null;
 
@@ -422,8 +422,6 @@ const Connection: React.FC<ConnectionProps> = ({
             );
           }) || null;
       }
-      // Request a new port if no saved port matches
-      // port = await navigator.serial.requestPort();
 
       let baudRate;
       let serialTimeout
@@ -437,11 +435,11 @@ const Connection: React.FC<ConnectionProps> = ({
 
         // Match the board from BoardsList
         const board = BoardsList.find(
-          (b) => parseInt(b.field_pid, 10) === usbProductId
+          (b) => (b.field_pid) === usbProductId
         );
 
-        baudRate = board ? parseInt(board.baud_Rate, 10) : 0;
-        serialTimeout = board ? parseInt(board.serial_timeout, 10) : 0;
+        baudRate = board ? (board.baud_Rate) : 0;
+        serialTimeout = board ? (board.serial_timeout) : 0;
 
         const usbVendorId = newPortInfo.usbVendorId ?? 0;
         // const usbProductId = newPortInfo.usbProductId ?? 0;
@@ -706,10 +704,10 @@ const Connection: React.FC<ConnectionProps> = ({
     const notchFilters = Array.from({ length: maxCanvasCountRef.current }, () => new Notch());
     const EXGFilters = Array.from({ length: maxCanvasCountRef.current }, () => new EXGFilter());
     notchFilters.forEach((filter) => {
-      filter.setbits(detectedBitsRef.current); // Set the bits value for all instances
+      filter.setbits(detectedBitsRef.current.toString()); // Set the bits value for all instances
     });
     EXGFilters.forEach((filter) => {
-      filter.setbits(detectedBitsRef.current); // Set the bits value for all instances
+      filter.setbits(detectedBitsRef.current.toString()); // Set the bits value for all instances
     });
     try {
       while (isConnectedRef.current) {

src/components/DataPass.tsx

@@ -6,10 +6,10 @@ import React, { useState, useCallback, useRef } from "react";
 import Canvas from "./Canvas";
 import Navbar from "./Navbar"; // Import the Navbar
 
-export type BitSelection = "ten" | "twelve" | "fourteen" | "sixteen" | "auto";
+export type BitSelection = 10 | 12 | 14 | 16;
 
 const DataPass = () => {
-  const [selectedBits, setSelectedBits] = useState<BitSelection>("auto"); // Selected bits
+  const [selectedBits, setSelectedBits] = useState<BitSelection>(10); // Default to 10
   const [isConnected, setIsConnected] = useState<boolean>(false); // Connection status
   const [isDisplay, setIsDisplay] = useState<boolean>(true); // Display state
   const [canvasCount, setCanvasCount] = useState<number>(1); // Number of canvases

src/components/boards.ts

@@ -2,81 +2,81 @@ export const BoardsList = Object.freeze([
   {
     chords_id: "UNO-R3",
     device_name: "Arduino UNO R3",
-    field_pid: "67",
-    adc_resolution: "10",
-    channel_count: "6",
-    sampling_rate: "250",
-    serial_timeout: "2000",
-    baud_Rate: "230400"
+    field_pid: 67,
+    adc_resolution: 10,
+    channel_count: 6,
+    sampling_rate: 250,
+    serial_timeout: 2000,
+    baud_Rate: 230400
   },
   {
     chords_id: "NANO-CLONE",
     device_name: "Arduino Nano Clone",
-    field_pid: "29987",
-    adc_resolution: "10",
-    channel_count: "8",
-    sampling_rate: "250",
-    serial_timeout: "2000",
-    baud_Rate: "115200"
+    field_pid: 29987,
+    adc_resolution: 10,
+    channel_count: 8,
+    sampling_rate: 250,
+    serial_timeout: 2000,
+    baud_Rate: 115200
   },
   {
     chords_id: "GENUINO-UNO",
     device_name: "Genuino UNO",
-    field_pid: "579",
-    adc_resolution: "10",
-    channel_count: "6",
-    sampling_rate: "250",
-    serial_timeout: "2000",
-    baud_Rate: "230400"
+    field_pid: 579,
+    adc_resolution: 10,
+    channel_count: 6,
+    sampling_rate: 250,
+    serial_timeout: 2000,
+    baud_Rate: 230400
   },
   {
     chords_id: "UNO-R4",
     device_name: "Arduino UNO R4 Minima",
-    field_pid: "105",
-    adc_resolution: "14",
-    channel_count: "6",
-    sampling_rate: "500",
-    serial_timeout: "100",
-    baud_Rate: "230400"
+    field_pid: 105,
+    adc_resolution: 14,
+    channel_count: 6,
+    sampling_rate: 500,
+    serial_timeout: 100,
+    baud_Rate: 230400
   },
   {
     chords_id: "UNO-R4",
     device_name: "Arduino UNO R4 Wifi",
-    field_pid: "4098",
-    adc_resolution: "14",
-    channel_count: "6",
-    sampling_rate: "500",
-    serial_timeout: "100",
-    baud_Rate: "230400"
+    field_pid: 4098,
+    adc_resolution: 14,
+    channel_count: 6,
+    sampling_rate: 500,
+    serial_timeout: 100,
+    baud_Rate: 230400
   },
   {
     chords_id: "UNO-CLONE",
     device_name: "Maker UNO / UNO Clone",
-    field_pid: "29987",
-    adc_resolution: "10",
-    channel_count: "6",
-    sampling_rate: "250",
-    serial_timeout: "2000",
-    baud_Rate: "115200"
+    field_pid: 29987,
+    adc_resolution: 10,
+    channel_count: 6,
+    sampling_rate: 250,
+    serial_timeout: 2000,
+    baud_Rate: 115200
   },
   {
     chords_id: "RPI-PICO-RP2040",
     device_name: "Raspberry Pi Pico",
-    field_pid: "192",
-    adc_resolution: "12",
-    channel_count: "3",
-    sampling_rate: "500",
-    serial_timeout: "100",
-    baud_Rate: "230400"
+    field_pid: 192,
+    adc_resolution: 12,
+    channel_count: 3,
+    sampling_rate: 500,
+    serial_timeout: 100,
+    baud_Rate: 230400
   },
   {
     chords_id: "GIGA-R1",
     device_name: "Arduino GIGA R1",
-    field_pid: "614",
-    adc_resolution: "16",
-    channel_count: "6",
-    sampling_rate: "500",
-    serial_timeout: "100",
-    baud_Rate: "230400"
+    field_pid: 614,
+    adc_resolution: 16,
+    channel_count: 6,
+    sampling_rate: 500,
+    serial_timeout: 100,
+    baud_Rate: 230400
   },
 ]);