add download logic

Stevie-Ray · Feb 29, 2024 · b821df8 · b821df8
1 parent a537ae8
commit b821df8
Show file tree

Hide file tree

Showing 18 changed files with 306 additions and 195 deletions.
diff --git a/README.md b/README.md
@@ -58,6 +58,9 @@ motherboardButton.addEventListener("click", () => {
     // Manually call stop method if stream is continues
     // await stop(Motherboard)
 
+    // Download data to CSV: format => timestamp, frame, battery, samples, masses
+    // download()
+
     // Disconnect from device after we are done
     disconnect(Motherboard)
   })
@@ -74,25 +77,24 @@ available services with us.
 
 - ✅ Griptonite Motherboard
 - ✅ Tindeq Progressor
-- ✅ Entralpi
+- ☑️ Entralpi (not verified)
 - ➡️ Climbro
 - ➡️ mySmartBoard
 - ➡️ MAT Muscle Meter
 
 ### Features
 
-- ✅ Connect
-- ✅ Disconnect
-- ✅ Start data stream (live data)
-- ✅ Stop data stream
+- ✅ Connect / Disconnect
+- ✅ Start / Stop data stream
 - ✅ Battery status
 - ✅ Read calibration
-- ✅ Device info (firmware / serial etc.)
+- ✅ Device info: firmware / serial etc.
 - ✅ Check if device is connected
 - ✅ Peak / Average load
 - ✅️ Tare / unladen weight
+- ✅️ Download data to CVS
 - ➡️ Endurance
-- ➡️ Rate of Force Development (RFD)
+- ➡️ Rate of Force Development: RFD
 - ➡️ Critical Force
 
 ## Development

diff --git a/examples/chart/package.json b/examples/chart/package.json
@@ -9,8 +9,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@hangtime/grip-connect": "^0.2.7",
-    "chart.js": "^4.4.1"
+    "@hangtime/grip-connect": "^0.3.0",
+    "chart.js": "^4.4.2"
   },
   "devDependencies": {
     "typescript": "^5.3.3",

diff --git a/examples/chart/src/devices.ts b/examples/chart/src/devices.ts
@@ -7,6 +7,7 @@ import {
   battery,
   connect,
   disconnect,
+  download,
   info,
   notify,
   stream,
@@ -29,13 +30,14 @@ export function outputValue(element: HTMLDivElement, data: string) {
 }
 
 export function setupDevice(
-  element: HTMLSelectElement,
-  stopElement: HTMLButtonElement,
+  deviceElement: HTMLSelectElement,
   tareElement: HTMLButtonElement,
-  outputElement: HTMLDivElement,
+  downloadElement: HTMLButtonElement,
+  stopElement: HTMLButtonElement,
 ) {
-  element.addEventListener("change", () => {
-    const selectedDevice = element.value
+  // Device
+  deviceElement.addEventListener("change", () => {
+    const selectedDevice = deviceElement.value
     let device: Device = Motherboard
 
     if (selectedDevice === "climbro") {
@@ -55,7 +57,6 @@ export function setupDevice(
       notify((data: massObject) => {
         addData(data.massTotal, data.massMax, data.massAverage)
         chartHeight = Number(data.massMax)
-        outputValue(outputElement, JSON.stringify(data))
       })
 
       // read battery + device info
@@ -74,13 +75,17 @@ export function setupDevice(
       }
     })
   })
-
+  // Tare
   tareElement.addEventListener("click", async () => {
     await tare()
   })
-
+  // Download
+  downloadElement.addEventListener("click", async () => {
+    download()
+  })
+  // Stop
   stopElement.addEventListener("click", async () => {
-    const selectedDevice = element.value
+    const selectedDevice = deviceElement.value
 
     if (selectedDevice === "motherboard") {
       await stop(Motherboard)

diff --git a/examples/chart/src/main.ts b/examples/chart/src/main.ts
@@ -3,31 +3,35 @@ import { setupChart, setupDevice } from "./devices"
 
 document.querySelector<HTMLDivElement>("#app")!.innerHTML = `
   <div>
-    <h1>Grip Connect</h1>
-    <h2>Vite + TypeScript example</h2>
+    <h1>
+      <a href="https://github.com/Stevie-Ray/hangtime-grip-connect" target="_blank" rel="noreferrer">
+      Grip Connect
+      </a>
+    </h1>
+    <h2>Web Bluetooth API Force-Sensing strength analysis for climbers</h2>
     <canvas class="chart"></canvas>
     <div class="card">
       <select id="deviceSelect">
-        <option>Select device</option>
+        <option value="">Select device</option>
         <option value="climbro" disabled>Climbro</option>
         <option value="entralpi">Entralpi</option>
         <option value="motherboard">Motherboard</option>
+        <option value="musclemeter" disabled>Muscle Meter</option>
         <option value="smartboard" disabled>mySmartBoard</option>
         <option value="progressor">Progressor</option>
       </select>
       <button id="tare">Tare (5sec)</button>
       <button id="stop">Stop</button>
+      <button id="download">Download</button>
     </div>
-    
-    <p class="output"></p>
   </div>
 `
 
 setupDevice(
   document.querySelector<HTMLSelectElement>("#deviceSelect")!,
-  document.querySelector<HTMLButtonElement>("#stop")!,
   document.querySelector<HTMLButtonElement>("#tare")!,
-  document.querySelector<HTMLDivElement>(".output")!,
+  document.querySelector<HTMLButtonElement>("#download")!,
+  document.querySelector<HTMLButtonElement>("#stop")!,
 )
 
 setupChart(document.querySelector<HTMLCanvasElement>(".chart")!)
diff --git a/examples/chart/src/style.css b/examples/chart/src/style.css
@@ -35,6 +35,10 @@ h1 {
   line-height: 1.1;
 }
 
+h1 a {
+  color: inherit;
+}
+
 #app {
   max-width: 1280px;
   margin: 0 auto;
@@ -51,11 +55,6 @@ h1 {
   padding: 2em;
 }
 
-.output {
-  color: #888;
-  font-size: 1.25rem;
-}
-
 button {
   border-radius: 8px;
   border: 1px solid transparent;

diff --git a/examples/flappy-bird/package.json b/examples/flappy-bird/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@hangtime/grip-connect": "^0.2.7"
+    "@hangtime/grip-connect": "^0.3.0"
   },
   "devDependencies": {
     "typescript": "^5.3.3",

diff --git a/examples/flappy-bird/src/main.ts b/examples/flappy-bird/src/main.ts
@@ -5,12 +5,13 @@ import { setupDevice, setupWeight, setupDifficulty } from "./game"
 
 document.querySelector<HTMLDivElement>("#controller")!.innerHTML += `
  <select id="deviceSelect">
-        <option>Select device</option>
+        <option value="">Select device</option>
         <option value="climbro" disabled>Climbro</option>
         <option value="entralpi">Entralpi</option>
         <option value="motherboard">Motherboard</option>
-        <option value="smartboard" disabled>SmartBoard</option>
-        <option value="progressor" selected>Progressor</option>
+        <option value="musclemeter" disabled>Muscle Meter</option>
+        <option value="smartboard" disabled>mySmartBoard</option>
+        <option value="progressor">Progressor</option>
       </select>
       <input id="weightInput" placeholder="weight" value="75" type="number">
        <select id="difficultySelect">

diff --git a/examples/pong/package.json b/examples/pong/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@hangtime/grip-connect": "^0.2.7"
+    "@hangtime/grip-connect": "^0.3.0"
   },
   "devDependencies": {
     "typescript": "^5.3.3",

diff --git a/examples/pong/src/main.ts b/examples/pong/src/main.ts
@@ -5,12 +5,13 @@ import { setupDevice, setupWeight, setupDifficulty } from "./game"
 
 document.querySelector<HTMLDivElement>("#controller")!.innerHTML += `
  <select id="deviceSelect">
-        <option>Select device</option>
+        <option value="">Select device</option>
         <option value="climbro" disabled>Climbro</option>
         <option value="entralpi">Entralpi</option>
         <option value="motherboard">Motherboard</option>
-        <option value="smartboard" disabled>SmartBoard</option>
-        <option value="progressor" selected>Progressor</option>
+        <option value="musclemeter" disabled>Muscle Meter</option>
+        <option value="smartboard" disabled>mySmartBoard</option>
+        <option value="progressor">Progressor</option>
       </select>
       <input id="weightInput" placeholder="weight" value="75" type="number">
        <select id="difficultySelect">