micrOSDevToolKit 3.7.1__tar.gz → 3.7.2__tar.gz

{microsdevtoolkit-3.7.1/micrOSDevToolKit.egg-info → microsdevtoolkit-3.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 3.7.1
+Version: 3.7.2
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban
@@ -176,6 +176,11 @@ devToolKit.py
 3. Select **Deploy (USB)** and confirm the operation.
 4. Wait for deployment to complete and the board to restart.
 
+Current micrOS versions use `major.minor.patch` (for example, `3.7.2`).
+DevToolKit also accepts the optional numeric `-revision` suffix used by legacy
+boards and records (for example, `3.7.2-0`). Update checks compare the complete
+version strings, so these two identifiers are treated as different versions.
+
 On first deployment, DevToolKit may offer to install the Serial USB driver
 required by your platform. The first toolkit launch installs optional GUI,
 compiler, and media dependencies; keep internet access available until it

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/README.md

@@ -138,6 +138,11 @@ devToolKit.py
 3. Select **Deploy (USB)** and confirm the operation.
 4. Wait for deployment to complete and the board to restart.
 
+Current micrOS versions use `major.minor.patch` (for example, `3.7.2`).
+DevToolKit also accepts the optional numeric `-revision` suffix used by legacy
+boards and records (for example, `3.7.2-0`). Update checks compare the complete
+version strings, so these two identifiers are treated as different versions.
+
 On first deployment, DevToolKit may offer to install the Serial USB driver
 required by your platform. The first toolkit launch installs optional GUI,
 compiler, and media dependencies; keep internet access available until it

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -272,7 +272,7 @@
             25
         ],
         "web": [
-            223188,
+            225389,
             21
         ],
         "core_dep": [
@@ -285,6 +285,6 @@
         ],
         "core_score": 9.26,
         "load_score": 8.37,
-        "version": "3.7.1-0"
+        "version": "3.7.2"
     }
 }

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/micrOS/source/Shell.py

@@ -28,7 +28,7 @@ IMAGE_MODE = 'rel' if 'micrOS' in uname()[-1] else 'dev'
 
 class Shell:
     __slots__ = ['__devfid', '__auth_mode', '__hwuid', '__auth_ok', '__conf_mode']
-    MICROS_VERSION = '3.7.1-0'
+    MICROS_VERSION = '3.7.2'
 
     def __init__(self):
         """

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/micrOS/source/modules/LM_web.py

@@ -103,7 +103,7 @@ def mounts_w_access(*args, **kwargs) -> dict:
     return {}
 
 ######################## System Config ######################
-_CFG_HIDE = ("hwuid", "guimeta", "socport", "version", "auth", "soctout")
+_CFG_HIDE = ("hwuid", "guimeta", "socport", "version", "soctout")
 
 def enable_config():
     """

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/micrOS/source/web/config.css

@@ -7,6 +7,12 @@
   --config-padding: 12px;
 }
 
+.config-auth-hint {
+  color: #aaa;
+  font-size: 0.85rem;
+  margin: 8px 0 0;
+}
+
 #configContainer {
   display: flex;
   flex-direction: row;
@@ -16,15 +22,17 @@
 }
 
 #configMenu {
+  flex-shrink: 0;
   max-width: 30vw;
   min-width: 12vw;
   border-radius: 8px;
   box-sizing: border-box;
-  padding: 8px 0;
+  padding: 8px 12px 8px 0;
   background: transparent;
 }
 
 #configMenu p {
+  white-space: nowrap;
   cursor: pointer;
   padding: 0.2rem 0rem 0.2rem 1rem;
   border-radius: 3px;
@@ -164,6 +172,7 @@
 #configFields .config-package-install input { flex: 1 1 240px; width: auto; }
 #configFields #packageCatalog { width: 180px; }
 .config-package-info { width: var(--config-input-width); max-width: 100%; box-sizing: border-box; margin-bottom: 12px; overflow-wrap: anywhere; }
+.config-package-install-output { width: var(--config-input-width); max-width: 100%; box-sizing: border-box; overflow-wrap: anywhere; }
 .config-package-info p { margin: 0 0 8px; }
 .config-package-info a { color: var(--config-label); }
 .config-pin-info { margin-top: 20px; }

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/micrOS/source/web/config.js

@@ -1,7 +1,7 @@
 const configCategories = {
   'Device': {
     icon: '📟',
-    keys: ['devfid', 'boothook', 'appwd', 'dbg', 'aioqueue', 'utc', 'boostmd']
+    keys: ['devfid', 'boothook', 'auth', 'appwd', 'dbg', 'aioqueue', 'utc', 'boostmd']
   },
   'Network': {
     icon: '📡',
@@ -44,6 +44,7 @@ const configCategories = {
 const configLabelMap = {
   'devfid': 'Device name',
   'boothook': 'Startup Actions',
+  'auth': 'Authentication',
   'appwd': 'Admin Password',
   'dbg': 'Debug Mode',
   'aioqueue': 'Allowed Number of Tasks',
@@ -930,7 +931,10 @@ function loadConfigSection(category) {
   const {script: src, render: renderer} = configCategories[category];
   const container = document.getElementById('configFields');
   // Base settings stay usable even when optional enhancements are unavailable.
-  renderConfigFields(filterConfig(category), category);
+  const baseConfig = filterConfig(category);
+  // The raw task input is a fallback, not a placeholder for the scheduler UI.
+  if (category === 'Scheduler') delete baseConfig.crontasks;
+  renderConfigFields(baseConfig, category);
   if (!isEditableConfigSection(category)) {
     container.appendChild(textElement('h2', categoryTitle(category), 'config-heading-top'));
   }
@@ -960,6 +964,10 @@ function loadConfigSection(category) {
     })
     .catch(err => {
       if (!loading.isConnected) return;
+      if (category === 'Scheduler') {
+        renderConfigFields(filterConfig(category), category);
+        container.appendChild(loading);
+      }
       loading.textContent = err.message;
       container.appendChild(makeButton('Retry', () => loadConfigSection(category)));
     });
@@ -1308,9 +1316,17 @@ function renderField(container, key, value) {
 
   const label = textElement('label', configLabel(key) + ': ', 'config-label');
 
+  const authHint = key === 'auth' && typeof value === 'boolean'
+    ? textElement('p', 'On-demand module loading is disabled for the REST API.', 'config-auth-hint')
+    : null;
+  if (authHint) authHint.hidden = !value;
+
   let input;
   if (typeof value === 'boolean') {
-    input = createBooleanToggle(key, value, nextValue => trackChange(key, nextValue));
+    input = createBooleanToggle(key, value, nextValue => {
+      trackChange(key, nextValue);
+      if (authHint) authHint.hidden = !nextValue;
+    });
   } else if (typeof value === 'number') {
     input = document.createElement('input');
     input.type = 'number';
@@ -1331,6 +1347,7 @@ function renderField(container, key, value) {
   input.dataset.configKey = key;
   wrapper.appendChild(label);
   appendInputWithPasswordToggle(wrapper, input, key);
+  if (authHint) wrapper.appendChild(authHint);
   container.appendChild(wrapper);
 }
 

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/micrOS/source/web/config_packages.js

@@ -122,6 +122,7 @@ function renderPackagesSection() {
   installRow.appendChild(input);
 
   const installResult = createInlineOutput();
+  installResult.classList.add('config-package-install-output');
 
   const installBtn = makeButton('Install', () => {
     const url = input.value.trim();

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/micrOS/source/web/config_webapps.js

@@ -44,12 +44,16 @@ function renderWebAppsSection() {
 }
 
 function storeWebAppsStatus(status) {
-  Object.keys(configData).filter(key => key.startsWith('web.fs_write_access.'))
-    .forEach(key => { delete configData[key]; });
   Object.entries(status).forEach(([key, value]) => {
     if (typeof value === 'boolean') configData['web.' + key] = value;
   });
-  Object.entries(status.fs_write_access || {}).forEach(([mount, value]) => {
+  storeMountWriteAccess(status.fs_write_access || {});
+}
+
+function storeMountWriteAccess(status) {
+  Object.keys(configData).filter(key => key.startsWith('web.fs_write_access.'))
+    .forEach(key => { delete configData[key]; });
+  Object.entries(status).forEach(([mount, value]) => {
     const name = mount.replace(/^\$/, '');
     if (['modules', 'data', 'logs'].includes(name) && typeof value === 'boolean') {
       configData['web.fs_write_access.' + name] = value;
@@ -81,21 +85,32 @@ async function updateWebApp(key, value) {
   };
   if (originalGroup) originalGroup.setWebAppsPending();
   let errorMessage = '';
+  const mountPrefix = 'web.fs_write_access.';
+  const isMount = key.startsWith(mountPrefix);
   try {
-    const mountPrefix = 'web.fs_write_access.';
-    const isMount = key.startsWith(mountPrefix);
     const argument = key.slice(isMount ? mountPrefix.length : 4);
     const route = isMount ? 'web/mounts_w_access/' : 'web/load/';
     const auth = isMount ? '/pwd=' + restQuote(configData.appwd || '') : '';
     const response = await restAPI(route + argument + '=' + (value ? 'True' : 'False') + auth, false);
     if (!response || response.state !== true) throw new Error('Unable to update web app settings.');
-    const status = await getWebAppsStatus();
-    storeWebAppsStatus(status);
+    if (isMount) {
+      if (!response.result || typeof response.result !== 'object' || Array.isArray(response.result)) {
+        throw new Error('Unable to confirm mount write access.');
+      }
+      storeMountWriteAccess(response.result);
+    } else {
+      configData[key] = value;
+      if (value && ['web.fileserver', 'web.fs_explore'].includes(key) &&
+          configData['web.fileserver'] && configData['web.fs_explore'] &&
+          !['modules', 'data', 'logs'].every(mount =>
+            typeof configData['web.fs_write_access.' + mount] === 'boolean')) {
+        const status = await getWebAppsStatus();
+        storeMountWriteAccess(status.fs_write_access || {});
+      }
+    }
     if (configData[key] !== value) throw new Error('Unable to confirm web app settings.');
   } catch (error) {
     errorMessage = error.message;
-    // Reconcile with the device if the write succeeded but confirmation failed.
-    try { storeWebAppsStatus(await getWebAppsStatus()); } catch (_) {}
   } finally {
     webAppUpdating = false;
     const group = document.getElementById('configWebApps');
@@ -177,14 +192,14 @@ function renderWebApps(container) {
             if (Object.keys(current).some(key => key.startsWith('web.fs_write_access.'))) {
               options.appendChild(textElement('h4', 'Write access', 'config-table-title config-heading-top'));
               options.appendChild(accessRow);
-              options.appendChild(textElement('small', 'Hint: Mount write access resets to read-only after reboot.', 'config-hint'));
+              options.appendChild(textElement('small', 'Hint: Mount write access resets after reboot. Use command below to persist current settings.', 'config-hint'));
               const command = textElement('code', '', 'config-hint');
               const updateCommand = () => {
                 const values = configData;
                 const args = ['modules', 'data', 'logs']
                   .filter(mount => typeof values['web.fs_write_access.' + mount] === 'boolean')
                   .map(mount => `${mount}=${values['web.fs_write_access.' + mount] ? 'True' : 'False'}`);
-                command.textContent = 'web mounts_w_access ' + args.join(' ') + ' pwd="<password>"';
+                command.textContent = 'web mounts_w_access ' + args.join(' ') + ' pwd=$pwd';
               };
               updateCommand();
               options.appendChild(command);
@@ -205,7 +220,7 @@ function renderWebApps(container) {
     group.setAttribute('aria-busy', 'true');
   };
 
-  // An in-flight update will confirm status and render the current group.
+  // An in-flight update will apply its result and render the current group.
   if (webAppUpdating) {
     group.setWebAppsPending();
     return;

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/micrOS/source/web/filesui.js

@@ -82,11 +82,12 @@ function itemRow(cls, name, meta) {
   return d;
 }
 
-const fileActions = {open: openFile, edit: editor, delete: deleteFile};
+const fileActions = {open: openFile, edit: editor, download: downloadFile, delete: deleteFile};
 const fileActionBar = document.createElement('span');
 fileActionBar.className = 'file-actions';
 fileActionBar.innerHTML = '<button type="button" data-action="open">📖 Open</button>' +
   '<button type="button" data-action="edit">📄 Edit</button>' +
+  '<button type="button" data-action="download" title="Download" aria-label="Download">⬇</button>' +
   '<button type="button" class="danger" data-action="delete" title="Delete" aria-label="Delete">♻</button>';
 fileActionBar.onclick = e => {
   e.stopPropagation();
@@ -289,6 +290,16 @@ function openFile() {
   window.open(resource);
 }
 
+function downloadFile() {
+  if (!selected) return;
+  const link = document.createElement('a');
+  link.href = `/${selectedDir}/${selected}`.split('/').map(encodeURIComponent).join('/');
+  link.download = selected;
+  document.body.appendChild(link);
+  link.click();
+  link.remove();
+}
+
 function deleteFile() {
   if (!selected) return;
   if (!window.confirm(`Delete ${selected}?`)) return;

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/micrOS/source/web/uapi_widgets.js

@@ -89,7 +89,10 @@ function restWidget(container='restWidget', opts={}) {
     root.append(makeEl('h3', {}, [label]), form, url, responseBox, time);
     if (REST_CONSOLE_CACHE) {restConsole(...REST_CONSOLE_CACHE, {url, response: responseBox, time});}
     updateHint();
-    restAPICore('modules all', opts.modulesTimeout || 3000).then(({response}) => {
+    restAPICore('', opts.modulesTimeout || 3000).then(({response}) => {
+        const authDisabled = response && response.result && response.result.auth === false;
+        return restAPICore(authDisabled ? 'modules all' : 'modules', opts.modulesTimeout || 3000);
+    }).then(({response}) => {
         const commands = moduleCommandSuggestions(response);
         if (!commands.length) {throw new Error('No module suggestions');}
         return commands;

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2/micrOSDevToolKit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 3.7.1
+Version: 3.7.2
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban
@@ -176,6 +176,11 @@ devToolKit.py
 3. Select **Deploy (USB)** and confirm the operation.
 4. Wait for deployment to complete and the board to restart.
 
+Current micrOS versions use `major.minor.patch` (for example, `3.7.2`).
+DevToolKit also accepts the optional numeric `-revision` suffix used by legacy
+boards and records (for example, `3.7.2-0`). Update checks compare the complete
+version strings, so these two identifiers are treated as different versions.
+
 On first deployment, DevToolKit may offer to install the Serial USB driver
 required by your platform. The first toolkit launch installs optional GUI,
 compiler, and media dependencies; keep internet access available until it

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/micrOSDevToolKit.egg-info/SOURCES.txt

@@ -36,10 +36,10 @@ micrOS/micropython/esp32s2-LOLIN_MINI-20251209-v1.27.0.bin
 micrOS/micropython/esp32s3-4MBflash-20241129-v1.24.1.bin
 micrOS/micropython/esp32s3-8MBflash-20251209-v1.27.0.bin
 micrOS/micropython/esp32s3_spiram_oct-20251209-v1.27.0.bin
-micrOS/micropython/micrOS-esp32-1.28.0-3.7.0-0.bin
-micrOS/micropython/micrOS-esp32c3-1.28.0-3.7.0-0.bin
-micrOS/micropython/micrOS-esp32c6-1.28.0-3.7.0-0.bin
-micrOS/micropython/micrOS-esp32s3-1.28.0-3.7.0-0.bin
+micrOS/micropython/micrOS-esp32-1.28.0-3.7.2.bin
+micrOS/micropython/micrOS-esp32c3-1.28.0-3.7.2.bin
+micrOS/micropython/micrOS-esp32c6-1.28.0-3.7.2.bin
+micrOS/micropython/micrOS-esp32s3-1.28.0-3.7.2.bin
 micrOS/micropython/rpi-pico-w-20251209-v1.27.0.uf2
 micrOS/micropython/tinypico-20251209-v1.27.0.bin
 micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/setup.py

@@ -17,7 +17,7 @@ dependencies = ['adafruit-ampy', 'mpremote', 'esptool', 'ipaddress', 'netaddr',
 
 setuptools.setup(
     name='micrOSDevToolKit',
-    version='3.7.1',
+    version='3.7.2',
     author='Marcell Ban',
     author_email='miros.framework@gmail.com',
     description='Development and deployment environment for micrOS, the diy micropython automation OS (IoT)',

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/toolkit/DevEnvCompile.py

@@ -160,7 +160,7 @@ class Compile:
         # Get repo version
         with open(os.path.join(self.micrOS_dir_path, 'Shell.py'), 'r') as f:
             code_lines_string = f.read()
-        regex = r"\d+.\d+.\d+-\d+"
+        regex = r"^\s*MICROS_VERSION\s*=\s*['\"](\d+\.\d+\.\d+(?:-\d+)?)['\"]"
         repo_version = re.findall(regex, code_lines_string, re.MULTILINE)[0]
         return repo_version
 
@@ -343,7 +343,7 @@ class Compile:
         # Get node version
         if not self.dry_run and config_string is not None:
             try:
-                regex = r"\d+.\d+.\d+-\d+"
+                regex = r"['\"]version['\"]\s*:\s*['\"](\d+\.\d+\.\d+(?:-\d+)?)['\"]"
                 version_on_node = re.findall(regex, config_string, re.MULTILINE)[0]
             except Exception as e:
                 self.console("Obsolete node version - node version was not defined: {}".format(e), state='warn')

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/toolkit/DevEnvOTA.py

@@ -149,7 +149,8 @@ class OTA(Compile):
 
     def _version_compare(self, repo_version, fuid):
         """
-        version SemVer: 1.2.3-4 - major[1.2]minor[.3]patch[-4]
+        Version format: major.minor.patch, with optional legacy -revision suffix.
+        Compatibility grouping uses the first two components (major.minor).
             In case of [major] change force full update (micrOS safe core: micrOSloadoer, etc.)
             In case of [minor + patch] change install main micrOS resources + LMs
         :param fuid: friendly unique id / unique id

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/toolkit/Gateway.py

@@ -265,21 +265,18 @@ class DeviceDashboardGroup(Resource):
             css_classes = ['device-tab']
             if fuid == selected_device:
                 css_classes.append('active')
+            current = ' aria-current="true"' if fuid == selected_device else ''
             title = escape(f"{fuid} ({uid})")
             links.append(
                 f'<a class="{" ".join(css_classes)}" href="{href}" target="deviceFrame" '
-                f'data-device="{escape(fuid)}" title="{title}">{escape(fuid)}</a>'
+                f'data-device="{escape(fuid)}" title="{title}"{current}>{escape(fuid)}</a>'
             )
         return f'<nav class="device-tabs" aria-label="{label}">' + ''.join(links) + '</nav>'
 
     def get(self):
         groups = self._device_groups()
-        requested_device = request.args.get('device', '').strip()
-        known_devices = {
-            str(data[2]) for data in groups['online'].values()
-        }
-        first_online = next(iter(groups['online'].values()), None)
-        first_device = requested_device if requested_device in known_devices else str(first_online[2]) if first_online else ''
+        first_online = next(iter(sorted(groups['online'].values(), key=lambda data: str(data[2]).lower())), None)
+        first_device = str(first_online[2]) if first_online else ''
         initial_src = f"/dashboard/{quote(first_device, safe='')}" if first_device else ''
         online_tabs = self._device_tabs('online devices', groups['online'], first_device)
         iframe = (
@@ -297,16 +294,21 @@ class DeviceDashboardGroup(Resource):
     <title>micrOS Gateway Dashboards</title>
     <link rel="stylesheet" href="/gateway.css">
     <style>
-        .dashboard-shell {{ min-height: 100vh; display: grid; grid-template-rows: auto 1fr; gap: 8px; padding: 10px; }}
+        body.page-gateway {{ padding-left: env(safe-area-inset-left, 0px); padding-right: env(safe-area-inset-right, 0px); }}
+        .dashboard-shell {{ width: 100%; min-height: 100vh; display: grid; grid-template-columns: minmax(0, 1fr); grid-template-rows: auto 1fr; gap: 8px; padding: 10px 0; }}
         .dashboard-top {{ overflow: hidden; }}
-        .device-tabs {{ display: flex; gap: 6px; overflow-x: auto; padding: 4px; }}
-        .device-tab {{ display: inline-flex; align-items: center; justify-content: center; min-height: 30px; padding: 5px 10px; border-radius: 8px; background: var(--surface-strong); color: var(--text); text-decoration: none; font-weight: 700; font-size: 12px; white-space: nowrap; box-shadow: inset 0 0 0 1px var(--line); }}
+        .device-tabs {{ display: flex; flex-wrap: nowrap; gap: 8px; overflow-x: auto; padding: 4px 4px 16px; }}
+        .device-tab {{ display: inline-flex; flex: 0 0 auto; align-items: center; justify-content: center; min-height: 44px; min-width: 44px; padding: 10px 16px; border-radius: 8px; background: var(--surface-strong); color: var(--text); text-decoration: none; font-weight: 700; font-size: 14px; line-height: 1.3; text-align: center; white-space: nowrap; touch-action: manipulation; box-shadow: inset 0 0 0 1px var(--line); }}
+        .device-tab:focus-visible {{ outline: 2px solid var(--accent); outline-offset: 2px; }}
+        @media (hover: hover) {{
+            .device-tab:hover {{ box-shadow: inset 0 0 0 2px var(--accent); }}
+        }}
         .device-tab.active {{ background: var(--accent); color: #101418; box-shadow: none; }}
         .dashboard-frame {{ min-height: calc(100vh - 56px); }}
-        #deviceFrame {{ width: 100%; min-height: calc(100vh - 56px); border: 1px solid var(--line); border-radius: 8px; background: #000; }}
+        #deviceFrame {{ display: block; width: 100%; min-height: calc(100vh - 56px); border: 1px solid var(--line); border-radius: 8px; background: #000; }}
         .empty-row, .empty-panel {{ color: var(--muted); padding: 12px; border: 1px solid var(--line); border-radius: 8px; }}
         @media (max-width: 820px) {{
-            .dashboard-shell {{ padding: 6px; }}
+            .dashboard-shell {{ padding: 6px 0; }}
             #deviceFrame {{ min-height: calc(100vh - 48px); }}
         }}
     </style>
@@ -321,12 +323,90 @@ class DeviceDashboardGroup(Resource):
         </section>
     </main>
     <script>
-        document.querySelectorAll('.device-tab').forEach(link => {{
-            link.addEventListener('click', () => {{
-                document.querySelectorAll('.device-tab').forEach(item => item.classList.remove('active'));
-                link.classList.add('active');
+        const frame = document.getElementById('deviceFrame');
+        let frameObserver;
+        let resizeRequest;
+        function fitDashboard() {{
+            cancelAnimationFrame(resizeRequest);
+            resizeRequest = requestAnimationFrame(() => {{
+                const doc = frame.contentDocument;
+                if (!doc || !doc.body) return;
+                const style = frame.contentWindow.getComputedStyle(doc.body);
+                const height = Math.ceil(doc.body.getBoundingClientRect().height
+                    + (parseFloat(style.marginTop) || 0)
+                    + (parseFloat(style.marginBottom) || 0));
+                // Include the frame border when sizing its border box.
+                frame.style.height = `${{height + 2}}px`;
+            }});
+        }}
+        if (frame) {{
+            frame.addEventListener('load', () => {{
+                if (frameObserver) frameObserver.disconnect();
+                const doc = frame.contentDocument;
+                if (!doc || !doc.body) return;
+                // Remove viewport height floors only inside the embedded page.
+                const style = doc.createElement('style');
+                style.textContent = 'html, body {{ min-height: 0; }} html {{ overflow-y: hidden; }}';
+                doc.head.appendChild(style);
+                frameObserver = new ResizeObserver(fitDashboard);
+                frameObserver.observe(doc.body);
+                fitDashboard();
+            }});
+            window.addEventListener('resize', fitDashboard);
+        }}
+        const deviceTabs = Array.from(document.querySelectorAll('.device-tab'));
+        const selectionKey = 'micros.gateway.dashboard.device';
+        function centerDevice(link) {{
+            const toolbar = link.parentElement;
+            toolbar.scrollLeft = link.offsetLeft - toolbar.offsetLeft
+                - (toolbar.clientWidth - link.offsetWidth) / 2;
+        }}
+        function selectDevice(link, save = true) {{
+            deviceTabs.forEach(item => {{
+                item.classList.remove('active');
+                item.removeAttribute('aria-current');
+            }});
+            link.classList.add('active');
+            link.setAttribute('aria-current', 'true');
+            if (save) {{
+                try {{ localStorage.setItem(selectionKey, link.dataset.device); }} catch (error) {{}}
+            }}
+            requestAnimationFrame(() => centerDevice(link));
+        }}
+        deviceTabs.forEach(link => {{
+            link.addEventListener('click', event => {{
+                if (event.ctrlKey || event.metaKey || event.shiftKey || event.altKey) return;
+                selectDevice(link);
             }});
         }});
+        let savedDevice;
+        try {{ savedDevice = localStorage.getItem(selectionKey); }} catch (error) {{}}
+        const dashboardUrl = new URL(window.location.href);
+        const requestedDevice = dashboardUrl.searchParams.get('device');
+        const requestedTab = deviceTabs.find(link => link.dataset.device === requestedDevice);
+        const initialTab = requestedTab
+            || deviceTabs.find(link => link.dataset.device === savedDevice)
+            || deviceTabs[0];
+        if (initialTab && frame) {{
+            if (frame.getAttribute('src') !== initialTab.getAttribute('href')) {{
+                frame.src = initialTab.getAttribute('href');
+            }}
+            selectDevice(initialTab, Boolean(requestedTab));
+            if (dashboardUrl.searchParams.has('device')) {{
+                dashboardUrl.searchParams.delete('device');
+                window.history.replaceState(window.history.state, '', dashboardUrl.href);
+            }}
+            if (document.fonts) {{
+                document.fonts.ready.then(() => {{
+                    const active = deviceTabs.find(link => link.classList.contains('active'));
+                    if (active) centerDevice(active);
+                }});
+            }}
+            window.addEventListener('resize', () => {{
+                const active = deviceTabs.find(link => link.classList.contains('active'));
+                if (active) centerDevice(active);
+            }});
+        }}
     </script>
 </body>
 </html>"""
@@ -367,11 +447,6 @@ class DeviceDashboard(Resource):
             f'    <script>BASE_URL = {json.dumps(rest_base)};</script>',
             1
         )
-        html = html.replace(
-            '<h1> micrOS dashboard </h1>',
-            f'<h1> micrOS dashboard - {safe_device}</h1>',
-            1
-        )
         return make_response(html)
 
 

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/toolkit/dashboard_apps/SystemTest.py

@@ -5,6 +5,7 @@ import sys
 import time
 import socket
 import ast
+import re
 from pprint import pprint
 try:
     from ._app_base import AppBase
@@ -96,7 +97,7 @@ def shell_cmds_check():
     cmd_list = ['version']
     output = CLIENT.execute(cmd_list)
     if output[0]:
-        if not ('.' in output[1] and '-' in output[1]):
+        if not re.fullmatch(r'\d+\.\d+\.\d+(?:-\d+)?', output[1].strip()):
             return False, f"{info}version: {output[1]}"
     cmd_list = ['help']
     output = CLIENT.execute(cmd_list)
@@ -273,7 +274,7 @@ def micrOS_get_version():
     cmd_list = ['version']
     output = CLIENT.execute(cmd_list)
     if output[0]:
-        if '.' in output[1].strip() and '-' in output[1].strip():
+        if re.fullmatch(r'\d+\.\d+\.\d+(?:-\d+)?', output[1].strip()):
             return True, f"{info} v:{output[1].strip()}"
     _add_metrics('version', output[1])
     return False, f"{info} out: {output[1]}"

{microsdevtoolkit-3.7.1 → microsdevtoolkit-3.7.2}/toolkit/micrOSdashboard.py

@@ -568,7 +568,7 @@ class HeaderInfo:
     def version_label(self):
         width = 115
         repo_version, _ = self.devtool_obj.get_micrOS_version()
-        label = QLabel("Version: {}".format(repo_version), self.parent_obj)
+        label = QLabel("  Version: {}".format(repo_version), self.parent_obj)
         label.setGeometry(self.parent_obj.width - width - 20, 10, width, 40)
         label.setStyleSheet("background-color : gray; color: {}; border: 1px solid black;".format(micrOSGUI.TEXTCOLOR))
 

microsdevtoolkit-3.7.2/toolkit/simulator_lib/node_config.json

@@ -0,0 +1,7 @@
+{"auth": false,
+ "devfid": "simulator",
+ "appwd": "ADmin123",
+ "webui": true,
+ "boothook": "web load dashboard=True fileserver=True fs_explore=True; fileserver mounts_write_access modules=True logs=True pwd=$pwd; neopixel load; #telegram load '6185435843:AAH71wEyoOil8bRKecQHp4zazTQ_MmE7bvE' &; #telegram receiver_loop &2000",
+ "aioqueue": 4,
+ "webui_max_con": 10}