Merge branch 'main' into feat-v4

brown-ccv · May 7, 2024 · 7f3c8a1 · 7f3c8a1
2 parents 2097fbe + 85fca30
commit 7f3c8a1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "electron-log": "^5.0.0",
     "electron-squirrel-startup": "^1.0.0",
     "execa": "^8.0.1",
-    "firebase": "^10.8.1",
+    "firebase": "^10.11.0",
     "fs-extra": "^11.1.1",
     "jspsych": "^7.2.3",
     "lodash": "^4.17.19",

diff --git a/public/electron/serialPort.js b/public/electron/serialPort.js
@@ -35,7 +35,7 @@ function getDevice(portList, comVendorName, productId) {
  * @param {string | undefined} productId The product identifier of the desired device
  * @returns The SerialPort device
  */
-// TODO @brown-ccv: This should fail, not return false
+// TODO @brown-ccv #460: This should fail, not return false
 async function getPort(comVendorName, productId) {
   let portList;
   try {