From 478f8b27c5f2253ea83071a66d6bb6dc33abf48c Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sun, 21 Dec 2025 16:33:47 -0500 Subject: [PATCH] handle exported formats for packed devices --- src/kiri/core/conf.js | 3 +++ src/kiri/core/devices.js | 1 + .../{flashforge.5m.pro.json => Flashforge.Adventurer.5M.json} | 0 3 files changed, 4 insertions(+) rename src/kiri/dev/fdm/{flashforge.5m.pro.json => Flashforge.Adventurer.5M.json} (100%) diff --git a/src/kiri/core/conf.js b/src/kiri/core/conf.js index 19fa135f..3e3a3c89 100644 --- a/src/kiri/core/conf.js +++ b/src/kiri/core/conf.js @@ -76,6 +76,9 @@ function device_from_code(code,mode) { // presence of internal field indicates already converted if (code.internal >= 0) return code; + // presence of nested code field indicates newer encoding + if (code.code) return code.code; + // if (self.navigator) console.log({mode, convert: code}); let cmd = code.cmd || {}, set = code.settings || {}, diff --git a/src/kiri/core/devices.js b/src/kiri/core/devices.js index aeb38534..82a867d7 100644 --- a/src/kiri/core/devices.js +++ b/src/kiri/core/devices.js @@ -117,6 +117,7 @@ function setDeviceCode(code, devicename) { api.event.emit('device.select', devicename); try { if (typeof(code) === 'string') code = js2o(code) || {}; + if (code.code) code = code.code; let mode = api.mode.get(), lmode = mode.toLowerCase(), diff --git a/src/kiri/dev/fdm/flashforge.5m.pro.json b/src/kiri/dev/fdm/Flashforge.Adventurer.5M.json similarity index 100% rename from src/kiri/dev/fdm/flashforge.5m.pro.json rename to src/kiri/dev/fdm/Flashforge.Adventurer.5M.json