Merge pull request #824 from intechstudio/SUKU-release-prep

SUKU button step lua syntax fixed, active change based port select en…
intechstudio · Sep 25, 2024 · fe5df0d · fe5df0d
2 parents 71eb185 + 51d73d2
commit fe5df0d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/configuration.json b/configuration.json
@@ -12,10 +12,10 @@
   "USB_PID_2": "0x8123",
   "FIRMWARE_GRID_D51_REQUIRED_MAJOR": 1,
   "FIRMWARE_GRID_D51_REQUIRED_MINOR": 2,
-  "FIRMWARE_GRID_D51_REQUIRED_PATCH": 38,
+  "FIRMWARE_GRID_D51_REQUIRED_PATCH": 39,
   "FIRMWARE_GRID_ESP32_REQUIRED_MAJOR": 1,
   "FIRMWARE_GRID_ESP32_REQUIRED_MINOR": 2,
-  "FIRMWARE_GRID_ESP32_REQUIRED_PATCH": 38,
+  "FIRMWARE_GRID_ESP32_REQUIRED_PATCH": 39,
   "FIRMWARE_GRID_URL_BEGINING": "https://github.com/intechstudio/grid-fw/releases/download/",
   "FIRMWARE_GRID_NIGHTLY_ESP32_URL": "https://github.com/intechstudio/grid-fw/raw/preview/Preview/Firmware/grid_esp32_nightly.uf2",
   "FIRMWARE_GRID_NIGHTLY_D51_URL": "https://github.com/intechstudio/grid-fw/raw/preview/Preview/Firmware/grid_d51_nightly.uf2",

diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@intechstudio/grid-protocol": "1.20240916.1230",
-    "@intechstudio/grid-uikit": "1.20240813.1834",
+    "@intechstudio/grid-uikit": "1.20240925.1114",
     "adm-zip": "^0.5.10",
     "chokidar": "^3.5.3",
     "discord.js": "^13.6.0",

diff --git a/src/renderer/config-blocks/ButtonStep_ElseIf.svelte b/src/renderer/config-blocks/ButtonStep_ElseIf.svelte
@@ -15,7 +15,7 @@
     rendering: "modifier",
     category: "special",
     displayName: undefined, //Is generated on the face
-    defaultLua: "elseif self:bstp(self) == N then",
+    defaultLua: "elseif self:bstp() == N then",
     icon: icon,
     blockIcon: icon,
     color: "#4A4AA7",

diff --git a/src/renderer/config-blocks/ButtonStep_If.svelte b/src/renderer/config-blocks/ButtonStep_If.svelte
@@ -20,7 +20,7 @@
     rounding: "top",
     category: "special",
     displayName: "Button Off",
-    defaultLua: "if self:bstp(self) == 0 then",
+    defaultLua: "if self:bstp() == 0 then",
     compositeLua: [
       {
         short: ButtonStepElseIf.information.short,

diff --git a/src/renderer/main/user-interface/ActiveChanges.svelte b/src/renderer/main/user-interface/ActiveChanges.svelte
@@ -1,6 +1,6 @@
 <script>
   import { tooltip } from "./../_actions/tooltip.ts";
-  import { get } from "svelte/store";
+  import { get, writable } from "svelte/store";
   import { logger } from "./../../runtime/runtime.store.js";
   import { appSettings } from "../../runtime/app-helper.store";
   import { writeBuffer } from "../../runtime/engine.store.ts";
@@ -168,7 +168,7 @@
   class={$$props.class}
 >
   <div class="flex flex-row justify-center items-center gap-2">
-    <PortSelector visible={$ports.length > 1} />
+    <PortSelector visible={$ports.length > 1} disabled={isChanges} />
     <div class="flex flex-col">
       <div class="mx-4 text-white font-medium">
         {changes} active changes

diff --git a/src/renderer/main/user-interface/PortSelector.svelte b/src/renderer/main/user-interface/PortSelector.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
-  import { get } from "svelte/store";
+  import { get, writable } from "svelte/store";
   import { connection_manager, GridPort } from "./../../serialport/serialport";
   import { MeltSelect } from "@intechstudio/grid-uikit";
 
   export let visible = false;
+  export let disabled = false;
 
   let selected: string;
 
@@ -36,6 +37,13 @@
   }
 </script>
 
-<div class:hidden={!visible} class="w-24 h-fit text-white">
-  <MeltSelect bind:target={selected} {options} />
+<div
+  class:hidden={!visible}
+  class="w-24 h-fit text-white {disabled ? 'opacity-50' : ''}"
+>
+  {#if disabled}
+    <MeltSelect bind:target={selected} {options} disabled={true} />
+  {:else}
+    <MeltSelect bind:target={selected} {options} disabled={false} />
+  {/if}
 </div>