Merge remote-tracking branch 'origin/main' into webaudio-compat

2026-09-04 06:41:43 -04:00 · 2022-04-19 21:35:08 +02:00
parent f8739e341b 56c3c0462c
commit 1778d19bde
13 changed files with 94 additions and 13 deletions
@@ -1,16 +1,16 @@
 {
  "files": {
    "main.css": "/static/css/main.0d689283.css",
-    "main.js": "/static/js/main.df1472e5.js",
+    "main.js": "/static/js/main.0683441e.js",
    "static/js/787.1c52cb78.chunk.js": "/static/js/787.1c52cb78.chunk.js",
    "static/media/logo.svg": "/static/media/logo.ac95051720b3dccfe511e0e02d8e1029.svg",
    "index.html": "/index.html",
    "main.0d689283.css.map": "/static/css/main.0d689283.css.map",
-    "main.df1472e5.js.map": "/static/js/main.df1472e5.js.map",
+    "main.0683441e.js.map": "/static/js/main.0683441e.js.map",
    "787.1c52cb78.chunk.js.map": "/static/js/787.1c52cb78.chunk.js.map"
  },
  "entrypoints": [
    "static/css/main.0d689283.css",
-    "static/js/main.df1472e5.js"
+    "static/js/main.0683441e.js"
  ]
 }
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Strudel REPL"/><title>Strudel REPL</title><script defer="defer" src="/static/js/main.df1472e5.js"></script><link href="/static/css/main.0d689283.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Strudel REPL"/><title>Strudel REPL</title><script defer="defer" src="/static/js/main.0683441e.js"></script><link href="/static/css/main.0d689283.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><link rel="icon" href="/tutorial/favicon.e3ab9dd9.ico"><link rel="stylesheet" type="text/css" href="/tutorial/index.757e9f9d.css"><meta name="viewport" content="width=device-width, initial-scale=1"><meta name="description" content="Strudel REPL"><title>Strudel Tutorial</title></head><body> <div id="root"></div> <noscript>You need to enable JavaScript to run this app.</noscript> <script src="/tutorial/index.a35b0e47.js" defer></script> </body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><link rel="icon" href="/tutorial/favicon.e3ab9dd9.ico"><link rel="stylesheet" type="text/css" href="/tutorial/index.757e9f9d.css"><meta name="viewport" content="width=device-width, initial-scale=1"><meta name="description" content="Strudel REPL"><title>Strudel Tutorial</title></head><body> <div id="root"></div> <noscript>You need to enable JavaScript to run this app.</noscript> <script src="/tutorial/index.70ef7c10.js" defer></script> </body></html>
@@ -0,0 +1,4 @@
+# @strudel.cycles/serial
+
+This package adds webserial functionality to strudel Patterns, for e.g. sending messages to arduino microcontrollers.
+
@@ -0,0 +1,24 @@
+{
+  "name": "@strudel.cycles/serial",
+  "version": "0.0.6",
+  "description": "Webserial API for strudel",
+  "main": "serial.mjs",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tidalcycles/strudel.git"
+  },
+  "keywords": [
+    "titdalcycles",
+    "strudel",
+    "pattern",
+    "livecoding",
+    "algorave"
+  ],
+  "author": "Alex McLean <alex@slab.org>",
+  "license": "GPL-3.0-or-later",
+  "bugs": {
+    "url": "https://github.com/tidalcycles/strudel/issues"
+  },
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
+  "dependencies": {}
+}
@@ -0,0 +1,52 @@
+import { Pattern, isPattern } from '@strudel.cycles/core';
+
+var serialWriter;
+var choosing = false;
+
+export async function getWriter(br=115200) {
+  if (choosing) {
+    return;
+  }
+  choosing = true;
+  if (serialWriter) {
+    return serialWriter;
+  }
+  if ('serial' in navigator) {
+    const port = await navigator.serial.requestPort();
+    await port.open({ baudRate: br });
+    const textEncoder = new TextEncoderStream();
+    const writableStreamClosed = textEncoder.readable.pipeTo(port.writable);
+    const writer = textEncoder.writable.getWriter();
+    serialWriter = function (message) {
+      writer.write(message)
+    }
+  }
+  else {
+    throw('Webserial is not available in this browser.')
+  }
+}
+
+const latency = 0.1;
+
+// Pattern.prototype.midi = function (output: string | number, channel = 1) {
+Pattern.prototype.serial = async function (...args) {
+  return this._withEvent((event) => {
+    if (!serialWriter) {
+      getWriter(...args);
+    }
+    const onTrigger = (time, event, currentTime) => {
+      var message = "";
+      if (typeof event.value === 'object') {
+        for (const [key, val] of Object.entries(event.value).flat()) {
+          message += `${key}:${val};`
+        }
+      }
+      else {
+        message = event.value;
+      }
+      const offset = (time - currentTime + latency) * 1000;
+      window.setTimeout(serialWriter, offset, message);
+    };
+    return event.setContext({ ...event.context, onTrigger });
+  });
+};
@@ -31,6 +31,7 @@ import '@strudel.cycles/tone/pianoroll.mjs';
 import '@strudel.cycles/tone/draw.mjs';
 import '@strudel.cycles/osc/osc.mjs';
 import '@strudel.cycles/webaudio/webaudio.mjs';
+import '@strudel.cycles/serial/serial.mjs';
 import controls from '@strudel.cycles/core/controls.mjs';

 extend(