PyPI - micrOSDevToolKit - Versions diffs - 2.13.1__py3-none-any.whl → 2.17.0__py3-none-any.whl - Mend

micrOSDevToolKit 2.13.1py3-none-any.whl → 2.17.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of micrOSDevToolKit might be problematic. Click here for more details.

Files changed (220) hide show

micrOS/source/web/matrix_draw.html ADDED Viewed

@@ -0,0 +1,390 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
+  <meta name="theme-color" content="black" media="(prefers-color-scheme: dark)" />
+  <title>micrOS Matrix Drawer</title>
+  <link rel="stylesheet" href="ustyle.css" />
+  <script src="uapi.js" defer></script>
+  <style>
+    body { font-family: sans-serif; margin: 20px; }
+    .layout {
+      display: flex; justify-content: center; align-items: flex-start;
+      gap: 20px; margin: 20px auto; flex-wrap: wrap;
+    }
+    .matrix { display: grid; gap: 2px; touch-action: none; }
+    .pixel {
+      width: 30px; height: 30px; background: #000; border: 1px solid #333;
+      cursor: pointer; user-select: none; touch-action: none;
+    }
+    input[type="number"], input[type="color"] { margin: 10px; padding: 4px; }
+    button { margin: 6px; padding: 6px 12px; }
+    pre {
+      text-align: left; max-width: 800px; margin: auto; background: #111;
+      color: #0f0; padding: 10px; overflow-x: auto;
+    }
+    textarea {
+      width: 100%; max-width: 400px; display: block; margin: 10px auto;
+      font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace;
+      background:#111; color:#0f0; border:1px solid #333; padding:8px;
+      resize:vertical; white-space:pre; overflow:auto;
+    }
+    .side-panel { flex: 0 0 420px; }
+    h1, .controls, h3 { text-align: center; }
+  </style>
+</head>
+<body>
+  <h1>microWeb Matrix LED Drawer</h1>
+  <p id="restInfo" class="controls"></p>
+  <!-- Controls -->
+  <div class="controls">
+    <input type="color" id="colorPicker" value="#00ff00" title="Pick LED color" class="custom-color-picker" />
+    <input type="number" id="matrixSize" value="8" min="1" max="64" title="Matrix size (NxN)" />
+    <button onclick="applySize()">Resize</button>
+    <button onclick="clearMatrix()">🧹 Clear Screen</button>
+    <button onclick="restAPI('neomatrix/stop', true)">⏹️ Stop Animation</button>
+    <button onclick="restAPI('neomatrix/snake', true)">▶️ Start Animation</button>
+  </div>
+  <!-- Matrix left, tools right -->
+  <div class="layout">
+    <!-- Matrix grid -->
+    <div id="matrix" class="matrix"></div>
+    <!-- Side panel -->
+    <div class="side-panel">
+      <!-- Read device state -->
+      <button id="readStateBtn" onclick="getMatrixState()">📥 Read Matrix State</button>
+      <textarea id="matrixStateOut" rows="4"
+        placeholder="Matrix state (original format) will appear here on ONE line…"></textarea>
+      <!-- Send Matrix Data -->
+      <h3>📤 Send Matrix Data</h3>
+      <textarea id="matrixInput" rows="6"
+        placeholder="Paste like: [(0,0,(131,17,0)), (1,0,(...)), ...]"></textarea>
+      <div style="display:flex;gap:10px;flex-wrap:wrap;justify-content:center">
+        <button id="sendMatrixBtn" onclick="sendMatrixFromInput()">🚀 Send (batched 15)</button>
+        <button onclick="applyMatrixInputLocally()">🖌️ Apply Locally</button>
+      </div>
+      <p id="matrixInputStatus" style="margin:6px auto;color:#9cf;text-align:center"></p>
+    </div>
+  </div>
+  <!-- REST Debug Console -->
+  <hr>
+  <h3>🛠 REST Debug Console</h3>
+  <p id="restConsoleUrl"></p>
+  <pre id="restConsoleResponse"></pre>
+  <p id="restConsoleTime"></p>
+  <!-- === ORIGINAL SCRIPT (unchanged except pointerleave/mouseleave for robustness) === -->
+  <script>
+    const matrixContainer = document.getElementById('matrix');
+    const colorPicker = document.getElementById('colorPicker');
+    const sizeInput = document.getElementById('matrixSize');
+    let pixels = [];
+    let drawing = false;
+    let activePointerId = null;
+    const supportsPointer = window.PointerEvent;
+    // Track last painted pixel
+    let lastX = null;
+    let lastY = null;
+    // --- Queue system (no overlapping REST calls) ---
+    let updateQueue = [];
+    let updating = false;
+    async function processQueue() {
+      if (updating || updateQueue.length === 0) return;
+      updating = true;
+      const { cmd } = updateQueue.shift();
+      try {
+        await restAPI(cmd, true);
+      } catch (err) {
+        console.warn("REST call failed:", err);
+      }
+      updating = false;
+      if (updateQueue.length > 0) processQueue();
+    }
+    function queueUpdate(cmd) {
+      updateQueue.push({ cmd });
+      processQueue();
+    }
+    // -------------------------------------------------
+    function startDrawing(e) {
+      drawing = true;
+      if (supportsPointer) {
+        activePointerId = e.pointerId;
+        matrixContainer.setPointerCapture(activePointerId);
+      }
+      paintPixel(e.target);
+      e.preventDefault();
+    }
+    function moveDrawing(e) {
+      if (!drawing) return;
+      let target;
+      if (supportsPointer) {
+        target = document.elementFromPoint(e.clientX, e.clientY);
+      } else if (e.touches && e.touches.length) {
+        const t = e.touches[0];
+        target = document.elementFromPoint(t.clientX, t.clientY);
+        e.preventDefault();
+      } else {
+        target = document.elementFromPoint(e.clientX, e.clientY);
+      }
+      if (target && target.classList.contains('pixel')) {
+        paintPixel(target);
+      }
+    }
+    function stopDrawing() {
+      drawing = false;
+      lastX = null;
+      lastY = null;
+      if (supportsPointer && activePointerId !== null) {
+        matrixContainer.releasePointerCapture(activePointerId);
+        activePointerId = null;
+      }
+    }
+    if (supportsPointer) {
+      matrixContainer.addEventListener('pointermove', moveDrawing);
+      window.addEventListener('pointerup', stopDrawing);
+      window.addEventListener('pointercancel', stopDrawing);
+      matrixContainer.addEventListener('pointerleave', stopDrawing); // added
+    } else {
+      matrixContainer.addEventListener('mousemove', moveDrawing);
+      matrixContainer.addEventListener('touchmove', moveDrawing, { passive: false });
+      window.addEventListener('mouseup', stopDrawing);
+      window.addEventListener('touchend', stopDrawing);
+      window.addEventListener('touchcancel', stopDrawing);
+      matrixContainer.addEventListener('mouseleave', stopDrawing); // added
+    }
+    function hexToRgb(hex) {
+      const val = parseInt(hex.slice(1), 16);
+      return [(val >> 16) & 255, (val >> 8) & 255, val & 255];
+    }
+    function buildMatrix(size) {
+      matrixContainer.innerHTML = "";
+      pixels = [];
+      matrixContainer.style.gridTemplateColumns = `repeat(${size}, 30px)`;
+      matrixContainer.style.gridTemplateRows = `repeat(${size}, 30px)`;
+      for (let y = 0; y < size; y++) {
+        for (let x = 0; x < size; x++) {
+          const cell = document.createElement('div');
+          cell.className = "pixel";
+          cell.dataset.x = x;
+          cell.dataset.y = y;
+          cell.dataset.color = "#000000";
+          cell.style.backgroundColor = "#000000";
+          if (supportsPointer) {
+            cell.addEventListener('pointerdown', startDrawing);
+          } else {
+            cell.addEventListener('mousedown', startDrawing);
+            cell.addEventListener('touchstart', startDrawing, { passive: false });
+          }
+          matrixContainer.appendChild(cell);
+          pixels.push(cell);
+        }
+      }
+      sendClearCommand();
+    }
+    function paintPixel(pixelDiv) {
+      const color = colorPicker.value;
+      const x = parseInt(pixelDiv.dataset.x);
+      const y = parseInt(pixelDiv.dataset.y);
+      // Only update if new pixel
+      if (x === lastX && y === lastY) return;
+      lastX = x;
+      lastY = y;
+      pixelDiv.dataset.color = color;
+      pixelDiv.style.backgroundColor = color;
+      const [r, g, b] = hexToRgb(color);
+      const cmd = `neomatrix/draw_colormap/[(${x},${y},(${r},${g},${b}))]`;
+      queueUpdate(cmd);
+    }
+    function clearMatrix() {
+      pixels.forEach(p => {
+        p.dataset.color = "#000000";
+        p.style.backgroundColor = "#000000";
+      });
+      sendClearCommand();
+    }
+    function sendClearCommand() {
+      queueUpdate("neomatrix/draw_colormap/[]");
+    }
+    function applySize() {
+      buildMatrix(parseInt(sizeInput.value, 10));
+    }
+    // Initialize matrix
+    buildMatrix(parseInt(sizeInput.value, 10));
+    document.addEventListener("DOMContentLoaded", function() {
+        // Add device info
+        restInfo(showPages=false);
+    });
+  </script>
+  <!-- === END original script === -->
+  <!-- === getMatrixState (robust parsing + auto-resize) === -->
+  <script>
+    // tolerant tuple parser used here and by sender
+    function parseTuplesRegex(str) {
+      if (!str || typeof str !== 'string') return null;
+      const out = [];
+      const re = /\(\s*(\d+)\s*,\s*(\d+)\s*,\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)\s*\)/g;
+      let m;
+      while ((m = re.exec(str)) !== null) {
+        out.push({ x:+m[1], y:+m[2], r:+m[3], g:+m[4], b:+m[5] });
+      }
+      return out.length ? out : null;
+    }
+    function rgbToHex(r, g, b) {
+      const toHex = (n) => Math.max(0, Math.min(255, n|0)).toString(16).padStart(2, '0');
+      return `#${toHex(r)}${toHex(g)}${toHex(b)}`;
+    }
+    function blackoutMatrixUI() {
+      const cells = document.querySelectorAll('.pixel');
+      cells.forEach(p => { p.dataset.color = "#000000"; p.style.backgroundColor = "#000000"; });
+    }
+    function ensureGridFits(cells) {
+      if (!Array.isArray(cells) || !cells.length) return;
+      const maxX = Math.max(...cells.map(c => c.x));
+      const maxY = Math.max(...cells.map(c => c.y));
+      const need = Math.max(maxX, maxY) + 1;
+      const current = parseInt(document.getElementById('matrixSize').value, 10) || 8;
+      if (need > current) {
+        document.getElementById('matrixSize').value = need;
+        applySize();
+      }
+    }
+    async function getMatrixState() {
+      const btn = document.getElementById('readStateBtn');
+      const out = document.getElementById('matrixStateOut');
+      if (btn) btn.disabled = true;
+      if (out) out.value = "Reading…";
+      try {
+        const resp = await restAPI('neomatrix/get_colormap', true);
+        // Extract original tuple-like data as a string
+        let raw = '';
+        if (resp && typeof resp === 'object' && 'result' in resp) raw = String(resp.result);
+        else if (typeof resp === 'string') raw = resp;
+        else if (resp && typeof resp.text === 'string') raw = resp.text;
+        else if (resp && typeof resp.body === 'string') raw = resp.body;
+        else raw = JSON.stringify(resp);
+        // Single-line for easy copy
+        const oneLine = String(raw).replace(/[\r\n]+/g, ' ').trim();
+        if (out) out.value = oneLine;
+        const parsed = parseTuplesRegex(oneLine);
+        blackoutMatrixUI();
+        if (!parsed) return;
+        ensureGridFits(parsed);
+        for (const {x,y,r,g,b} of parsed) {
+          const cell = document.querySelector(`.pixel[data-x="${x}"][data-y="${y}"]`);
+          if (!cell) continue;
+          const hex = rgbToHex(r,g,b);
+          cell.dataset.color = hex;
+          cell.style.backgroundColor = hex;
+        }
+      } catch (e) {
+        if (out) out.value = "Error: could not read matrix state.";
+        blackoutMatrixUI();
+      } finally {
+        if (btn) btn.disabled = false;
+      }
+    }
+    // expose globally (matches your original pattern)
+    window.getMatrixState = getMatrixState;
+  </script>
+  <!-- === END getMatrixState === -->
+  <!-- === SENDER: GLOBAL FUNCTIONS (fixes ReferenceError) === -->
+  <script>
+    function setSenderStatus(msg, isError=false){
+      const el = document.getElementById('matrixInputStatus');
+      if (!el) return;
+      el.textContent = msg;
+      el.style.color = isError ? '#f99' : '#9cf';
+    }
+    function applyCellsToUI(cells){
+      for (const {x,y,r,g,b} of cells) {
+        const cell = document.querySelector(`.pixel[data-x="${x}"][data-y="${y}"]`);
+        if (!cell) continue;
+        const toHex = n => Math.max(0,Math.min(255,n|0)).toString(16).padStart(2,'0');
+        const hex = `#${toHex(r)}${toHex(g)}${toHex(b)}`;
+        cell.dataset.color = hex;
+        cell.style.backgroundColor = hex;
+      }
+    }
+    function buildPayload(cells){
+      const parts = cells.map(({x,y,r,g,b}) => `(${x},${y},(${r},${g},${b}))`);
+      return `[${parts.join(',')}]`.replace(/\//g, '');
+    }
+    // Make these GLOBAL so inline onclick finds them:
+    function applyMatrixInputLocally(){
+      const raw = (document.getElementById('matrixInput')?.value || '').trim();
+      const parsed = parseTuplesRegex(raw);
+      if (!parsed) { setSenderStatus('Could not parse input. Use [(x,y,(r,g,b)), ...]', true); return; }
+      applyCellsToUI(parsed);
+      setSenderStatus(`Applied ${parsed.length} cells locally.`);
+    }
+    function sendMatrixFromInput(){
+      const btn = document.getElementById('sendMatrixBtn');
+      const raw = (document.getElementById('matrixInput')?.value || '').trim();
+      const parsed = parseTuplesRegex(raw);
+      if (!parsed) { setSenderStatus('Could not parse input. Use [(x,y,(r,g,b)), ...]', true); return; }
+      if (btn) btn.disabled = true;
+      setSenderStatus(`Sending ${parsed.length} cells in batches of 15…`);
+      // Update UI immediately for responsiveness
+      applyCellsToUI(parsed);
+      const CHUNK = 10;
+      let sent = 0;
+      for (let i = 0; i < parsed.length; i += CHUNK) {
+        const chunk = parsed.slice(i, i + CHUNK);
+        const payload = buildPayload(chunk);
+        const cmd = `neomatrix/draw_colormap/${payload}`;
+        queueUpdate(cmd);
+        sent += chunk.length;
+      }
+      setSenderStatus(`Queued ${sent} cells in ${Math.ceil(parsed.length / CHUNK)} batch(es).`);
+      if (btn) btn.disabled = false;
+    }
+    // Expose on window explicitly (paranoia, but harmless)
+    window.applyMatrixInputLocally = applyMatrixInputLocally;
+    window.sendMatrixFromInput = sendMatrixFromInput;
+  </script>
+  <!-- === END sender === -->
+</body>
+</html>

micrOS/source/web/uapi.js CHANGED Viewed

@@ -41,18 +41,21 @@ function restConsole(apiUrl, data, delta) {
     document.getElementById('restConsoleTime').innerHTML = `⏱ Response time: ${delta} ms`;
 }
-function restInfo() {
+function restInfo(showPages=true) {
     // UPDATES: 'restInfo' and restConsole(...)
-    restAPICore(cmd='').then(({ response, delta, query }) => {
+    restAPICore(cmd = '').then(({ response, delta, query }) => {
         // Update API Console
         restConsole(query, response, delta)
-        // Update 'SysApiInfo' tag
+        // Update 'restInfo' tag
         const result = response['result'];
         const auth = result.auth ? "🔑" : "";
         let infoHeader = `micrOS: ${result.micrOS} ❖ node: ${result.node}${auth}`;
-        let infoSubpages = (response['result']['usr_endpoints'] ? "<br><br>📎 " + Object.entries(response['result']['usr_endpoints'])
-            .map(([key, value]) => `<a href="${value}" target="_blank" style="color: white;">${value} </a>`)
-            .join(' | ') : '');
+        let infoSubpages = "";
+        if (showPages && result['usr_endpoints']) {
+            infoSubpages = "<br><br>📎 " + Object.entries(result['usr_endpoints'])
+                .map(([key, value]) => `<a href="${value}" target="_blank" style="color: white;">${value} </a>`)
+                .join(' | ');
+        }
         document.getElementById('restInfo').innerHTML = infoHeader + infoSubpages;
     }).catch(error => {
         console.error('Error in restAPI:', error);

{microsdevtoolkit-2.13.1.dist-info → microsdevtoolkit-2.17.0.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 2.13.1
+Version: 2.17.0
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban
@@ -93,7 +93,7 @@ Access rest api over browser: `http://<nodename>.local`
 6. micrOS Node configuration [link](https://github.com/BxNxM/micrOS/#micros-node-configuration-parameters-with-description)
 7. 🧑‍💻 micrOS create custom Load Modules: [link](./APPLICATION_GUIDE.md)
 8. micrOS Gateway server with Prometheus&Grafana: [link](https://github.com/BxNxM/micrOS/#micros-gateway-in-docker)
-9. Release notes: [link](https://github.com/BxNxM/micrOS/#relese-note)
+9. Release notes: [release-note](https://github.com/BxNxM/micrOS/#release-note)
 ----------------------------------------
 ----------------------------------------
@@ -366,11 +366,11 @@ So prefer boards with more psram 2Mb-8Mb, **minumum requirement for the full fla
 LogicalPin lookup tables:
-- [tinypico](./micrOS/source/IO_tinypico.py)
-- [esp32](./micrOS/source/IO_esp32.py)
-- [esp32s2](./micrOS/source/IO_esp32s2.py)
-- [esp32s3](./micrOS/source/IO_esp32s3.py)
-- [raspberryPicoW](./micrOS/source/IO_rp2.py) - reset needed after ota update (webrepl limitation)
+- [tinypico](micrOS/source/modules/IO_tinypico.py)
+- [esp32](micrOS/source/modules/IO_esp32.py)
+- [esp32s2](micrOS/source/modules/IO_esp32s2.py)
+- [esp32s3](micrOS/source/modules/IO_esp32s3.py)
+- [raspberryPicoW](micrOS/source/modules/IO_rp2.py) - reset needed after ota update (webrepl limitation)
 - `IO_*.py` [etc.](./micrOS/source)
 > Note: Good idea to use costant variable for pin map declaration, check the files for more info, These files are also precompiled automatically into byte streams -> `.mpy`
@@ -500,13 +500,13 @@ Version **3.0.0-0** `micrOS-Autonomous`
     - (3) New intercon syntax - command level integration:                      [DONE]
     	- rgb toggle >>RingLight.local
     	- similar as (obsolete): intercon sendcmd host="RingLight.local" cmd="rgb toggle"
-    - (4) Create multi level project structure (curret is flat fs)              [TODO] FS
+    - (4) Create multi level project structure (curret is flat fs)              [WIP] FS
 		- New micrOS FS structure:
-			- Automatic dir creation at bootup: '/logs', '/web', '/data'
+			- Automatic dir creation at bootup: '/logs', '/web', '/data', '/config', '/modules'
 			- Automatic sub-dir handling /source and /precompiled
 			- Automatic dir creation over USB
-			Structure:
+			System Core File Structure:
 			- [DONE] root fs (stays untouched (approx.: 24)): /
 				- micrOS.py (core)
 				- Config.py (core)
@@ -514,31 +514,33 @@ Version **3.0.0-0** `micrOS-Autonomous`
 				- Shell.py (core)
 				- Web.py (core)
 				- Server.py (core)
-				- node_config,json (core config)
 				- etc... (core)
 			- [DONE] web folder: /web
 				- *.html
 				- *.js
 				- *.css
 				- etc.
-			- [DONE] /logs
-				- still there (created runtime)
-			- [TODO] module folder /modules - (mip complient: /modules/lib)
+			- [DONE][RUNTIME] data folder: /data
+			   - Dynamic/Runtime (approx.: 0-8):
+				   - *.pds (LM app cache - persistent data storage)
+					- *.dat (Common datalogger output)
+				- Or store any application data here
+			- [DONE][RUNTIME] logs folder: /logs
+				- *.log
+				- *.sys.log
+			- [DONE] config folder /config
+             - node_config.json (core config)
+             - *.key files (offloaded core config values, like: guimeta)
+          - [DONE] module folder /modules - (mip complient: /modules/lib)
 				- LM_* (approx.: 54)
 				- IO_* (approx.: 5)
-				- *.py/.mpy (driver)
-				- Dynamic/Runtime (approx.: 0-8):
-					- *.pds (LM app cache - persistent data storage)
-					- *.dat (Common datalogger output)
-		- (5) [TODO] Proper mip installer support (/modules or /modules/lib or /web)
+		- (5) [TODO] Proper mip installer support (/modules or /lib or /web)
 			- Note: Autonomous package management over wifi (github)
-				- pacman download
-				- pacman ls
-				- pacman dirtree
+				- pacman download            [POC][DONE][TODO]
+				- pacman ls                  [DONE]
+				- pacman dirtree             [DONE]
 				- pacman ...
 ```
@@ -552,23 +554,14 @@ Version **3.1.0-0** `micrOS-SecurePower`
     	- Remote controller / Sensor UseCase
     	- --- client mode (fyi: normally micrOS operates in server mode)
     - Intercon-Wire (?)
-    	- Idea of wired message communication protocol same as Intercon-Shell/Intercon-espnow
+    	- Idea of wired message communication protocol same as Intercon-Shell/Intercon-ESPNow
     	- Possible HW protocols: i2c / onewire / uart BUT it should support bidirectional message transfers
     	- Goal: CoProcessor easy integration feature - Arduino env support
 ```
-Version **4.0.0-0** `micrOS-???`
-```
-    Core:
-    - Network stack redesign
-        - Network
-            - wifi (defualt, current interfaces)
-            - Study of BLE (Shell)
-            - Com. (wifi/now/ble...lora?/etc?.) as plugin architecture (?)
-    - Low power mode (with BLE) and soft-sleep / deep-sleep
-```
+<a id="release-note"></a>
+## Release notes
 |  VERSION (TAG) |    RELEASE INFO    |  MICROS CORE MEMORY USAGE  |  SUPPORTED DEVICE(S) | APP PROFILES | Load Modules  |     NOTE       |
 | :----------: | :----------------: | :------------------------:   |  :-----------------: | :------------: | :------------:| -------------- |

micrOSDevToolKit 2.13.1__py3-none-any.whl → 2.17.0__py3-none-any.whl

Potentially problematic release.

micrOSDevToolKit 2.13.1py3-none-any.whl → 2.17.0py3-none-any.whl