Feature/software icon export on pr11

README

@@ -0,0 +1 @@
+Changes from recovered fw dir. Not sure if this is latest

README.md

@@ -17,6 +17,15 @@ Click and drag to draw, CTRL + click to erase.
 
 Brightness can also be adjusted using the slider.
 
+## Features
+
+- Import/export capability for matrix patterns
+  - Matrix values are saved as a 34 by 9 byte array
+- Persist button
+  - Continually wakes the matrix when selected, so the display does not turn off
+- Export for Software
+  - Export patterns in column-major format (9x34) with binary or grayscale values
+
 ## More Information
 
 - [Framework Laptop 16](https://frame.work/products/laptop16-diy-amd-7040)

app.js

@@ -20,6 +20,7 @@ const VERSION_CMD = 0x20;
 
 const WIDTH = 9;
 const HEIGHT = 34;
+const WAKE_LOOP_INTERVAL_MSEC = 50_000
 
 const PATTERNS = [
   'Custom',
@@ -42,15 +43,19 @@ var msbendian = false;
 let portLeft = null;
 let portRight = null;
 let swap = false;
+let persist = false
 
 $(function() {
   matrix_left = createArray(34, 9);
   matrix_right = createArray(34, 9);
+
   updateTableLeft();
   updateTableRight();
   initOptions();
+  initSoftwareExportOptions();
+  startWakeLoop()
 
-  for (pattern of PATTERNS) {
+  for (const pattern of PATTERNS) {
     $("#select-left").append(`<option value="${pattern}">${pattern}</option>`);
     $("#select-left").on("change", async function() {
       if (pattern == 'Custom') return;
@@ -144,6 +149,24 @@ function initOptions() {
     matrix_left = createArray(matrix_left.length, matrix_left[0].length);
     updateTableLeft();
     sendToDisplay(true);
+  });
+  $('#importLeftBtn').click(function() {
+   importMatrixLeft();
+  });
+   $('#importRightBtn').click(function() {
+   importMatrixRight();
+  });
+   $('#exportLeftBtn').click(function() {
+    //Export raw data (i.e. a 2D array instead of a 1d array of encoded bits)
+   exportMatrixLeft(true);
+  // No need to suport export of encoded file since import can handle either type
+  //  exportMatrixLeft(false)
+  });
+   $('#exportRightBtn').click(function() {
+   //Export raw data (i.e. a 2D array instead of a 1d array of encoded bits)
+   exportMatrixRight(true);
+  // No need to suport export of encoded file since import can handle either type
+  //  exportMatrixRight(false)
   });
 	$('#wakeBtn').click(function() {
     wake(portLeft, true);
@@ -152,6 +175,9 @@ function initOptions() {
 	$('#sleepBtn').click(function() {
     wake(portLeft, false);
     wake(portRight, false);
+  });
+  $('#persistCb').click(function() {
+    persist = !persist;
   });
 	$('#bootloaderBtn').click(function() {
     bootloader(portLeft);
@@ -178,6 +204,49 @@ function initOptions() {
   });
 }
 
+function initSoftwareExportOptions() {
+  $('#exportLeftSoftwareBtn').click(function() {
+    const grayscale = $('input[name="exportFormat"]:checked').val() !== 'binary';
+    exportMatrixSoftware(matrix_left, 'left', grayscale);
+  });
+
+  $('#exportRightSoftwareBtn').click(function() {
+    const grayscale = $('input[name="exportFormat"]:checked').val() !== 'binary';
+    exportMatrixSoftware(matrix_right, 'right', grayscale);
+  });
+}
+
+function exportMatrixSoftware(matrix, side, grayscale = true) {
+  const width = matrix[0].length;   // 9
+  const height = matrix.length;     // 34
+
+  // Fixed column-major: 9 columns x 34 rows
+  const vals = Array(width).fill(0).map(() => Array(height).fill(0));
+  for (let col = 0; col < width; col++) {
+    for (let row = 0; row < height; row++) {
+      const isLit = matrix[row][col] === 0;  // LED on
+      if (grayscale) {
+        vals[col][row] = isLit ? 255 : 0;
+      } else {
+        vals[col][row] = isLit ? 1 : 0;
+      }
+    }
+  }
+
+  const formatStr = grayscale ? 'grayscale' : 'binary';
+  const filename = `matrix_${side}_${formatStr}_colmajor.json`;
+
+  const blob = new Blob([JSON.stringify(vals, null, 2)], { type: "application/json" });
+  const url = URL.createObjectURL(blob);
+  const a = document.createElement("a");
+  a.href = url;
+  a.download = filename;
+  document.body.appendChild(a);
+  a.click();
+  document.body.removeChild(a);
+  URL.revokeObjectURL(url);
+}
+
 async function command(port, id, params) {
   const writer = port.writable.getWriter();
 
@@ -228,6 +297,7 @@ async function checkFirmwareVersion(port, side) {
   reader.releaseLock();
 }
 
+//Get matrix values encoded as a 39-byte array
 function prepareValsForDrawingLeft() {
 	const width = matrix_left[0].length;
 	const height = matrix_left.length;
@@ -246,6 +316,7 @@ function prepareValsForDrawingLeft() {
   return vals;
 }
 
+//Get matrix values encoded as a 39-byte array
 function prepareValsForDrawingRight() {
 	const width = matrix_right[0].length;
 	const height = matrix_right.length;
@@ -264,6 +335,144 @@ function prepareValsForDrawingRight() {
   return vals;
 }
 
+//Get matrix values set directly in a 34 x 9 item array
+function getRawVals(matrix) {
+	const width = matrix[0].length;
+	const height = matrix.length;
+
+  let vals = new Array(height)
+  for (const i in [...Array(height).keys()]) {
+    vals[i] = Array(width).fill(0)
+  }
+
+  for (let col = 0; col < width; col++) {
+    for (let row = 0; row < height; row++) {
+      const cell = matrix[row][col];
+      vals[row][col] = (cell == null || cell == 1) ? 0 : 1
+    }
+  }
+  return vals;
+}
+
+//Set matrix values by decoding a 39-byte array
+function setMatrixFromVals(matrix, vals) {
+  const width = matrix[0].length;
+  const height = matrix.length;
+
+  for (let row = 0; row < height; row++) {
+    for (let col = 0; col < width; col++) {
+      const i = col + row * width;
+      const val = vals[Math.trunc(i/8)]
+      const bit = (val >> i % 8) & 1;
+      matrix[row][col] = (bit + 1) % 2;
+    }
+  }
+}
+
+//Set matrix values from a 34 x 9 item array
+function setMatrixFromRawVals(matrix, vals) {
+  const width = matrix[0].length;
+  const height = matrix.length;
+
+  for (let row = 0; row < height; row++) {
+    for (let col = 0; col < width; col++) {
+      matrix[row][col] = !!!vals[row][col]
+    }
+  }
+}
+
+function exportMatrixLeft(raw) {
+  let vals
+  if (raw) {
+    //set vals as a 34 by 9 byte array
+    vals = getRawVals(matrix_left)
+  } else {
+    //encode vals into a 39-byte array
+    vals = prepareValsForDrawingLeft();
+  }
+  //save json file
+  const blob = new Blob([JSON.stringify(vals)], { type: "application/json" });
+  const url = URL.createObjectURL(blob);
+  const a = document.createElement("a");
+  a.href = url;
+  a.download = "matrix_left.json";
+  document.body.appendChild(a);
+  a.click();
+  document.body.removeChild(a);
+  URL.revokeObjectURL(url);
+}
+
+function exportMatrixRight(raw) {
+  let vals
+  if (raw) {
+    //set vals as a 34 by 9 byte array
+    vals = getRawVals(matrix_right)
+  } else {
+    //encode vals into a 39-byte array
+    vals = prepareValsForDrawingRight();
+  }
+  console.log('Exported values')
+  console.log(vals)
+  //save json file
+  const blob = new Blob([JSON.stringify(vals)], { type: "application/json" });
+  const url = URL.createObjectURL(blob);
+  const a = document.createElement("a");
+  a.href = url;
+  a.download = `${raw ? 'matrix_right(raw).json' : 'matrix_right.json'}`;
+  document.body.appendChild(a);
+  a.click();
+  document.body.removeChild(a);
+  URL.revokeObjectURL(url);
+}
+
+function importMatrixLeft() {
+  const input = document.createElement("input");
+  input.type = "file";
+  input.accept = ".json";
+  input.onchange = async function (event) {
+    const file = event.target.files[0];
+    if (!file) return;
+
+    const reader = new FileReader();
+    reader.onload = function (e) {
+      const vals = JSON.parse(e.target.result);
+      if (vals[0].length > 1) {
+        setMatrixFromRawVals(matrix_left, vals)
+      } else {
+        setMatrixFromVals(matrix_left, vals);
+      }
+      updateMatrix(matrix_left, 'left')
+      sendToDisplay(true);
+      $("#select-left").val('Custom');
+    };
+    reader.readAsText(file);
+  };
+  input.click();
+}
+function importMatrixRight() {
+  const input = document.createElement("input");
+  input.type = "file";
+  input.accept = ".json";
+  input.onchange = async function (event) {
+    const file = event.target.files[0];
+    if (!file) return;
+
+    const reader = new FileReader();
+    reader.onload = function (e) {
+      const vals = JSON.parse(e.target.result);
+      if (vals[0].length > 1) {
+        setMatrixFromRawVals(matrix_right, vals)
+      } else {
+        setMatrixFromVals(matrix_right, vals);
+      }
+      updateMatrix(matrix_right, 'right')
+      sendToDisplay(true);
+       $("#select-right").val('Custom');
+    };
+    reader.readAsText(file);
+  };
+  input.click();
+}
 
 async function sendToDisplay(recurse) {
     await sendToDisplayLeft(recurse);
@@ -386,6 +595,15 @@ function createArray(length) {
     return arr;
 }
 
+function startWakeLoop() {
+  setInterval(() => {
+    if (persist) {
+      wake(portLeft, true);
+      wake(portRight, true);
+    }
+  }, WAKE_LOOP_INTERVAL_MSEC)
+}
+
 async function wake(port, wake) {
   await sendCommand(port, 0x03, [wake ? 0 : 1]);
 }

index.html

@@ -70,7 +70,9 @@ <h2>Device Information</h2>
                 <button type="button" class="btn btn-default" id="sleepBtn">Sleep</button>
                 <button type="button" class="btn btn-default" id="bootloaderBtn">Bootloader</button>
               </div>
-
+              <div class="btn-group">
+                <input type="checkbox" id="persistCb" class="btn btn-default">Keep Awake
+              </div>
               <p class="slider-wrapper">
                 <label for="brightnessRange">Brightness:</label>
                 <input type="range" id="brightnessRange" min="0" max="255">
@@ -80,8 +82,31 @@ <h2>Device Information</h2>
                 <button type="button" class="btn btn-default" id="clearLeftBtn">Clear Left</button>
                 <button type="button" class="btn btn-default" id="clearRightBtn">Clear Right</button>
               </div>
-              <!--<button type="button" class="btn btn-default" id="sendButton">Send</button>-->
-            </div>
+              <div class="btn-group">
+                <button type="button" class="btn btn-default" id="importLeftBtn">Import Left</button>
+                <button type="button" class="btn btn-default" id="importRightBtn">Import Right</button>
+              </div>
+              <div class="btn-group">
+                  <button type="button" class="btn btn-default" id="exportLeftBtn">Export Left</button>
+                  <button type="button" class="btn btn-default" id="exportRightBtn">Export Right</button>
+              </div>
+              <div class="export-section">
+                <h3>Export for Software</h3>
+
+                <div class="radio-group">
+                  <label><input type="radio" name="exportFormat" value="binary"> Binary (0/1)</label>
+                  <label><input type="radio" name="exportFormat" value="grayscale" checked> Grayscale (0-255)</label>
+                </div>
+
+                <p>Layout: fixed column-major (9x34), matching the LED matrix orientation.</p>
+
+                <div class="btn-group">
+                  <button type="button" class="btn btn-default" id="exportLeftSoftwareBtn">Export Left (JSON)</button>
+                  <button type="button" class="btn btn-default" id="exportRightSoftwareBtn">Export Right (JSON)</button>
+                </div>
+              </div>
+                <!--<button type="button" class="btn btn-default" id="sendButton">Send</button>-->
+              </div>
 
             <div>
               <h2>Learn More</h2>