🚸 [2.1.84] Preserve button selection

Author: thinkyhead

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 The following enhancements and changes have been made to ***Auto Build Marlin***.
 
+## 2.1.84
+- Config Editor: Keep buttons selected after refresh on value change
+- Config Editor: Full refresh for non-contiguous implicit and later dependencies
+- Schema: Extend the list of extruder-dependent config options
+
 ## 2.1.83
 - Config Editor: Show filter in sections sidebar
 - Schema: Update temp-sensor-dependent config options, add comments

abm/js/editview.js

@@ -275,10 +275,16 @@ $(function () {
     log("commitChange", [ optref, fields ]);
     $(`div.line.sid-${optref.sid}`).toggleClass('dirty', dirty);
 
-    // Refresh UI and state
-    //schema.refreshAllRequires();
-    schema.refreshRequiresAfter(optref.sid);
+    // Refresh UI and state. Refresh All if the option can affect earlier things.
+    // Otherwise just refresh those that follow it.
+    if (['EXTRUDERS'].includes(optref.name))
+      schema.refreshAllRequires();
+    else
+      schema.refreshRequiresAfter(optref.sid);
+
+    // Now refresh the UI based on the updated evaluated states.
     refreshVisibleItems();
+    // Save the web view state for VSCode restoration later.
     saveWebViewState();
 
     // This update should be ignored when it triggers onDidChangeTextDocument
@@ -520,16 +526,18 @@ $(function () {
   var allbutton_title = '⭐️ ALL';
 
   // Refresh nav buttons for the form's unfiltered sections
-  // TODO: Preserve selection if the section is still visible
-  //       and only then stay on ALL. Then show() all sections
-  //       so the ".hide" class can take precedence.
   function refreshNavButtons($inform=$form) {
     const $nav = $('#left-nav');
+
+    // Get the active button, if any, to re-activate after refresh.
+    const $active = $nav.find('button.active'),
+          activeid = $active.length > 0 ? $active.attr('id') : 'button-all';
+
     $nav.empty();
     const $sects = $inform.find('fieldset.section:not(.hide)');
 
     // All button shows all the sections with direct styling.
-    const $allbutton = $('<button id="all-button" class="active"></button>').text(allbutton_title);
+    const $allbutton = $('<button id="button-all" class="active"></button>').text(allbutton_title);
     $allbutton.click((e) => {
       $(e.target).addClass('active').siblings().removeClass('active');
       $sects.show();
@@ -539,10 +547,9 @@ $(function () {
     // Other buttons one section, with direct styling.
     for (const sect of $sects) {
       const $sect = $(sect),
+            sectid = $sect[0].classList[1],
             title = $sect.find('legend span.section-title').text(),
-            $button = $(`<button>${title}</button>`);
-
-      const sectid = $sect[0].classList[1];
+            $button = $(`<button id="button-${sectid}">${title}</button>`);
 
       // Bind the button on click to hide all other sections but its own.
       $button.click((e) => {
@@ -553,6 +560,9 @@ $(function () {
       });
       $nav.append($button);
     }
+
+    // Re-activate the previous active button by simulating a click on the button
+    $(`#${activeid}`).trigger('click');
   }
 
   /**

abm/js/schema.js

@@ -560,7 +560,8 @@ class ConfigSchema {
       'SINGLENOZZLE',
       'DUAL_X_CARRIAGE',
       'PARKING_EXTRUDER', 'MAGNETIC_PARKING_EXTRUDER',
-      'SWITCHING_TOOLHEAD', 'MAGNETIC_SWITCHING_TOOLHEAD', 'ELECTROMAGNETIC_SWITCHING_TOOLHEAD'
+      'SWITCHING_TOOLHEAD', 'MAGNETIC_SWITCHING_TOOLHEAD', 'ELECTROMAGNETIC_SWITCHING_TOOLHEAD',
+      'MIXING_EXTRUDER'
     ],
 
     // Axis Homing Submenus
@@ -736,11 +737,11 @@ class ConfigSchema {
     }
 
     // The item is enabled by its E < EXTRUDERS.
-    function HAS_EAXIS(eindex) {
+    function HAS_EAXIS(eindex, name=null) {
       const extruders = priorItemNamed('EXTRUDERS') || priorItemNamed('EXTRUDERS', Infinity);
       if (extruders == null) return false;
       const stat = eindex < extruders.value;
-      //console.log(`HAS_EAXIS(${eindex}) == ${stat ? 'true' : 'false'}`, extruders);
+      //console.log(`HAS_EAXIS(${eindex}, ${name}) == ${stat ? 'true' : 'false'}`, extruders);
       return stat;
     }
 
@@ -1022,6 +1023,7 @@ class ConfigSchema {
   }
 
   // Refresh all requires that follow a changed item.
+  // TODO: Add a flag for items whose visibility in the UI depends on a later item (like En_DRIVER_TYPE depending on EXTRUDERS).
   refreshRequiresAfter(after) {
     for (const item of this.iterateDataBySID(after + 1)) delete item.evaled;
     for (const item of this.iterateDataBySID(after + 1)) this.evaluateRequires(item);
@@ -1619,10 +1621,24 @@ class ConfigSchema {
                     || name.match(/^TEMP_SENSOR_(\d)$/)
                     || name.match(/^FIL_RUNOUT(\d)_(STATE|PULL(UP|DOWN))$/);
             if (m1) return m1[1];
-            if (['DISABLE_IDLE_E', 'STEP_STATE_E', 'NOZZLE_PARK_FEATURE', 'NOZZLE_CLEAN_FEATURE'].includes(name)) return '0';
+            if ([
+                'STEP_STATE_E','DEFAULT_NOMINAL_FILAMENT_DIA',
+                'SINGLENOZZLE','SWITCHING_EXTRUDER','MECHANICAL_SWITCHING_EXTRUDER',
+                'SWITCHING_NOZZLE','MECHANICAL_SWITCHING_NOZZLE',
+                'PARKING_EXTRUDER','MAGNETIC_PARKING_EXTRUDER',
+                'DIFFERENTIAL_EXTRUDER',
+                'SWITCHING_TOOLHEAD','MAGNETIC_SWITCHING_TOOLHEAD','ELECTROMAGNETIC_SWITCHING_TOOLHEAD',
+                'MIXING_EXTRUDER',
+                'HOTEND_OFFSET_X','HOTEND_OFFSET_Y','HOTEND_OFFSET_Z',
+                'DISABLE_IDLE_E','DISABLE_E','DISABLE_OTHER_EXTRUDERS',
+                'NOZZLE_PARK_FEATURE','NOZZLE_CLEAN_FEATURE',
+                'DISTINCT_E_FACTORS','DEFAULT_RETRACT_ACCELERATION',
+                'PIDTEMP','MPCTEMP','BANG_MAX'
+              ].includes(name)) return '0';
           }
 
           // Items that depend on *_DRIVER_TYPE to be enabled.
+          // Return the part of the given 'name' that matches an axis name, for use in test conditions.
           function is_axis_item(name) {
             const m1 = name.match(/^([XYZIJKUVW]\d?)_(CHAIN_POS|CS_PIN|CURRENT(_HOME)?|ENABLE_ON|HOLD_MULTIPLIER|HOME_DIR|HYBRID_THRESHOLD|INTERPOLATE|MAX_CURRENT|M(AX|IN)_ENDSTOP_(INVERTING|HIT_STATE)|M(AX|IN)_POS|MICROSTEPS|RSENSE|SAFETY_STOP|SENSE_RESISTOR|SLAVE_ADDRESS|STALL_SENSITIVITY)$/)
                     || name.match(/^(?:CHOPPER_TIMING|DISABLE(?:_INACTIVE|_IDLE)?|M(?:AX|IN)_SOFTWARE_ENDSTOP|SAFE_BED_LEVELING_START|STEALTHCHOP|STEP_STATE)_([XYZIJKUVW]\d?)$/)
@@ -1660,7 +1676,7 @@ class ConfigSchema {
             extend_requires(`HAS_AXIS(${axis})`);
             define_info.requires = define_info.requires.replace(` && defined(${axis}_DRIVER_TYPE)`, '');
           }
-          if (eindex) extend_requires(`HAS_EAXIS(${eindex})`);
+          if (eindex) extend_requires(`HAS_EAXIS(${eindex}, ${define_name})`);
           if (hindex) extend_requires(`HAS_SENSOR(${hindex})`);
           if (tindex) extend_requires(`ANY_THERMISTOR_IS(${tindex})`);
           if (sindex) extend_requires(`HAS_SERIAL(${sindex})`);

package.json

@@ -2,7 +2,7 @@
   "name": "auto-build",
   "displayName": "Auto Build Marlin",
   "description": "Provides an interface to configure, build, and upload Marlin Firmware.",
-  "version": "2.1.83",
+  "version": "2.1.84",
   "preview": false,
   "publisher": "marlinfirmware",
   "icon": "icon.png",