🚸 [2.1.81] Mark MOTHERBOARD_ENV

Author: thinkyhead

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 The following enhancements and changes have been made to ***Auto Build Marlin***.
 
+## 2.1.81
+- ABM Panel: Highlight user's `MOTHERBOARD_ENV`
+- ABM Panel / Edit View: Refactor CSS in sub-rules
+
 ## 2.1.80
 - Build: Fix 'reveal' for old Windows shell
 - ABM Panel: Show hints on "USB" and Maple envs
@@ -24,8 +28,8 @@ The following enhancements and changes have been made to ***Auto Build Marlin***
 - Info Panel: Clean up appearance
 
 ## 2.1.75
-- Info Panel: Search marlinfw.org site for documentation.
-- Config Editor: Add parsing for Marlin `2.1.3-b3` macros.
+- Info Panel: Search marlinfw.org site for documentation
+- Config Editor: Add parsing for Marlin `2.1.3-b3` macros
 
 ## 2.1.74
 - Config Editor: Fix int and float value sanitizing

abm/abm.js

@@ -214,7 +214,10 @@ function allFilesAreLoaded() {
   const mb = marlin.configValue('MOTHERBOARD');
 
   if (mb) {
-    board_info = marlin.extractBoardInfo(mb);
+    const mb_env = marlin.configValue('MOTHERBOARD_ENV'); // Users can add a preferred env for their board
+
+    board_info = marlin.extractBoardInfo(mb, mb_env);
+
     log(`Board Info for ${mb} :`, board_info);
 
     if (board_info.short)
@@ -236,6 +239,7 @@ function allFilesAreLoaded() {
     postValue('machine', '');
     postValue('machine-desc', '');
     postValue('board', mbn);
+    postValue('board-env', '');
     postValue('board-desc', '');
     postValue('pins', '', '');
     postValue('pins-desc', '');
@@ -276,6 +280,8 @@ function allFilesAreLoaded() {
   postValue('board', mbn);
   postValue('board-desc', board_info.description);
 
+  if (board_info.board_env) postValue('board-env', board_info.board_env);
+
   postValue('pins', board_info.pins_files);
   if (pindef_info.board_name) postValue('pins-desc', pindef_info.board_name);
 

abm/css/abmview.css

@@ -25,6 +25,7 @@ body.vscode-dark, body.vscode-high-contrast {
   --abm-text-color-pale: #8A8;
   --abm-text-color-good: #6E6;
   --abm-text-color-limbo: #68E;
+  --abm-text-color-limbo-prefer: #6A0;
   --abm-text-color-limbo-maple: #D6B;
   --abm-text-color-busy: #FA0;
   --abm-text-color-error: #C44;
@@ -48,6 +49,7 @@ body.vscode-light, body.vscode-high-contrast-light {
   --abm-text-color-pale: #45F;
   --abm-text-color-good: #00D000;
   --abm-text-color-limbo: #46C;
+  --abm-text-color-limbo-prefer: #490;
   --abm-text-color-limbo-maple: #A08;
   --abm-text-color-busy: #A05900;
   --abm-text-color-error: #C00;
@@ -315,6 +317,8 @@ table#info>tbody>tr>td#info-envs { padding: 0; } /* Envs Cell */
 
   /* Environment Name Colors */
                .env-name { color: var(--abm-text-color-limbo); }
+  .prefer      .env-name { color: var(--abm-text-color-limbo-prefer); }
+  .prefer      .env-name::after { content: " ⭐"; font-size: 0.5em; vertical-align: top; }
   .maple       .env-name { color: var(--abm-text-color-limbo-maple); }
   .exists      .env-name { color: var(--abm-text-color-good); }
 

abm/js/abmview.js

@@ -140,6 +140,7 @@ var ABM = (() => {
           // m.val = an array of env objects:
           //   .name      - Environment Name
           //   .debug     - Debug Allowed
+          //   .prefer    - Preferred Env
           //   .native    - Native (Runnable)
           //   .busy      - Show "Please Wait..." State
           //   .exists    - The env build folder exists
@@ -167,6 +168,7 @@ var ABM = (() => {
             if (v.name.match(/.+maple.*/)) $erows.addClass('maple');
             if (v.debug) $erows.addClass('debug');
             if (v.native) $erows.addClass('native');
+            if (v.prefer) $erows.addClass('prefer');
             if (v.busy) {
               $erows.addClass('busy');
               caption = 'Please Wait…';

abm/js/marlin.js

@@ -217,7 +217,7 @@ function extractTempSensors() {
 // Return hashed array { mb, pins_files, archs, archs_arr, envs, short, description, (has_debug), (error) }
 //
 var board_info;
-function extractBoardInfo(mb) {
+function extractBoardInfo(mb, mb_env) {
   let r, out = { has_debug: false }, sb = mb.replace('BOARD_', '');
 
   // Get the include line matching the board
@@ -273,7 +273,7 @@ function extractBoardInfo(mb) {
       else if (/STM32F....C/i.test(name)) note = '(256K)';
 
       const debugenv = /_debug$/i.test(name);
-      out.envs.push({ name, note, debug: debugenv, native: type !== 'env' });
+      out.envs.push({ name, note, debug: debugenv, native: type !== 'env', prefer: (mb_env == name) });
       if (debugenv) out.has_debug = true;
     }
 

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.80",
+  "version": "2.1.81",
   "preview": false,
   "publisher": "marlinfirmware",
   "icon": "icon.png",