🩹 [2.1.56] Handle MB(…)

MarlinFirmware · Sep 12, 2024 · fd214a3 · fd214a3
1 parent 104c558
commit fd214a3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 The following enhancements and changes have been made to ***Auto Build Marlin***.
 
+## 2.1.56
+- Handle `MB(...)` in schema
+
 ## 2.1.55
 - Update for new `Conditionals-#-abc.h` files
 

diff --git a/abm/abm.html b/abm/abm.html
@@ -62,7 +62,7 @@
     <button type="button" onclick="msg({ command:'monitor' })"><img src="${ img_path('btn-monitor.svg') }" /> Monitor</button>
     <button type="button" onclick="msg({ command:'refresh' })"><img src="${ img_path('btn-refresh.svg') }" /> Refresh</button>
   </div>
-  <h1><a href="https://marlinfw.org">Marlin Firmware</a> <span>Auto Build <span id="abm-vers">2.1.55</span></span></h1>
+  <h1><a href="https://marlinfw.org">Marlin Firmware</a> <span>Auto Build <span id="abm-vers">2.1.56</span></span></h1>
   <div id="error"></div>
   <div id="abm-main">
     <form id="showy">

diff --git a/abm/js/schema.js b/abm/js/schema.js
@@ -517,6 +517,15 @@ class ConfigSchema {
       return count;
     }
 
+    // Is MOTHERBOARD any one of the boards provided?
+    function MB(foo) {
+      const item = priorItemNamed('MOTHERBOARD');
+      if (!item) return false;
+      const mb = item.value.replace(/^BOARD_/, '');
+      if (foo instanceof Array) return foo.includes(mb);
+      return foo == mb;
+    }
+
     ///// Conditions based on other criteria, e.g., item.name /////
 
     function _nonzero(name) {
@@ -531,7 +540,7 @@ class ConfigSchema {
 
     // The item is enabled by its E < EXTRUDERS.
     function HAS_EAXIS(eindex) {
-      const extruders = priorItemNamed(`EXTRUDERS`);
+      const extruders = priorItemNamed('EXTRUDERS');
       if (extruders == null) return false;
       const stat = extruders && extruders.enabled && eindex < extruders.value;
       //console.log(`HAS_EAXIS(${eindex}) == ${stat ? 'true' : 'false'}`, extruders);

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "auto-build",
   "displayName": "Auto Build Marlin",
   "description": "Provides an interface to quickly build and upload Marlin Firmware.",
-  "version": "2.1.55",
+  "version": "2.1.56",
   "preview": false,
   "publisher": "marlinfirmware",
   "icon": "icon.png",