smithtek-mako-rf 3.4.2 → 3.5.1

package/smithtek-mako-rf.html

@@ -1,765 +1,771 @@
-<script type="text/javascript">
-(function () {
-
-  const TYPE_OPTIONS = [
-    "16 bit integer",
-    "16 bit unsigned",
-    "32 bit integer",
-    "32 bit unsigned",
-    "32 bit float",
-    "digital to unsigned binary encoder"
-  ];
-
-  function is32BitType(t) {
-    t = String(t || "").toLowerCase();
-    return (t === "32 bit integer" || t === "32 bit unsigned" || t === "32 bit float");
-  }
-
-  function isDigitalUnsigned(t) {
-    return String(t || "").toLowerCase() === "digital to unsigned binary encoder";
-  }
-
-  function defaultItemRow() {
-    return {
-      name: "",
-      type: "16 bit integer",
-      offset: 0,      // BYTES stored in config (legacy decoder compatibility)
-      length: 1,      // stored but hidden (1=16-bit, 2=32-bit)
-      scale: "",
-      scaleMode: "none",
-      inputLow: 4,
-      inputHigh: 20,
-      outputLow: 0,
-      outputHigh: 100,
-      clampRange: false,
-      offsetbit: 0
-    };
-  }
-
-  function buildTypeSelect(value) {
-    const $sel = $("<select></select>")
-      .addClass("st-item-type")
-      .css("width", "100%");
-    TYPE_OPTIONS.forEach(t => {
-      $sel.append($("<option></option>").attr("value", t).text(t));
-    });
-    $sel.val(String(value || "16 bit integer"));
-    return $sel;
-  }
-
-  function applyTypeRules($tr) {
-    const t = String($tr.find(".st-item-type").val() || "");
-    const $lenHidden = $tr.find(".st-item-length"); // hidden
-    const $bit = $tr.find(".st-item-offsetbit");
-    const $bitCol = $tr.find(".st-bit-col");
-
-    // auto length (hidden but saved)
-    if (is32BitType(t)) $lenHidden.val(2);
-    else $lenHidden.val(1);
-
-    // bit only for digital unsigned
-    if (isDigitalUnsigned(t)) {
-      $bit.prop("disabled", false).show();
-      $bitCol.show();
-    } else {
-      $bit.val(0);
-      $bit.prop("disabled", true).hide();
-      $bitCol.show();
-    }
-    updateScaleUi($tr);
-  }
-
-  function updateScaleUi($tr) {
-    const mode = $tr.find('.st-scale-mode').val();
-    const range = mode === 'range';
-    const digital = isDigitalUnsigned($tr.find('.st-item-type').val());
-    $tr.find('.st-item-scale').toggle(mode === 'math');
-    $tr.find('.st-range-fields').toggle(range);
-    $tr.find('.st-range-note').toggle(range && digital);
-    const inputs = $tr.find('.st-range-number');
-    inputs.each(function () {
-      const raw = String($(this).val()).trim();
-      const bad = range && (raw === '' || !Number.isFinite(Number(raw)));
-      this.setCustomValidity(bad ? 'Enter a finite number.' : '');
-      $(this).attr('aria-invalid', bad ? 'true' : 'false');
-    });
-    const low = $tr.find('.st-inputLow'), high = $tr.find('.st-inputHigh');
-    if (range && String(low.val()).trim() !== '' && String(high.val()).trim() !== '' && Number(low.val()) === Number(high.val())) {
-      high[0].setCustomValidity('Input low and input high must differ.');
-      high.attr('aria-invalid', 'true');
-    }
-  }
-
-  function validDecoderItems(items) {
-    return Array.isArray(items) && items.every(item => {
-      if (item.scaleMode !== 'range') return true;
-      if (isDigitalUnsigned(item.type) || item.type === 'bool') return false;
-      const values = ['inputLow','inputHigh','outputLow','outputHigh'].map(key => item[key]);
-      return values.every(value => (typeof value === 'string' || typeof value === 'number') && String(value).trim() !== '' && Number.isFinite(Number(value))) &&
-        Number(item.inputLow) !== Number(item.inputHigh) && Number.isFinite(Number(item.inputHigh)-Number(item.inputLow)) && Number.isFinite(Number(item.outputHigh)-Number(item.outputLow));
-    });
-  }
-
-  // Determine next row behaviour based on the last row (REGS visible)
-  function nextRowFromLast($tbody) {
-    const $last = $tbody.find("tr").last();
-    if (!$last.length) {
-      return { offsetRegs: 0, type: "16 bit integer", offsetbit: 0 };
-    }
-
-    const lastRegs = Number($last.find(".st-item-offset-regs").val());
-    const lastType = String($last.find(".st-item-type").val() || "");
-    const lastBit = Number($last.find(".st-item-offsetbit").val());
-
-    const safeRegs = Number.isFinite(lastRegs) ? lastRegs : 0;
-    const safeBit = Number.isFinite(lastBit) ? lastBit : 0;
-
-    // DIGITAL BIT-LADDER (same register, bit++, then next register)
-    if (isDigitalUnsigned(lastType)) {
-      if (safeBit < 15) {
-        return { offsetRegs: safeRegs, type: lastType, offsetbit: safeBit + 1 };
-      }
-      return { offsetRegs: safeRegs + 1, type: lastType, offsetbit: 0 };
-    }
-
-    // Normal stepping (REGS)
-    const stepRegs = is32BitType(lastType) ? 2 : 1;
-    return { offsetRegs: safeRegs + stepRegs, type: lastType, offsetbit: 0 };
-  }
-
-  function addItemRow($tbody, item, isNew) {
-    const it = item || defaultItemRow();
-    const $tr = $("<tr></tr>");
-    const rowIndex = $tbody.find("tr").length + 1;
-
-    const $name = $("<input/>")
-      .attr("type", "text")
-      .addClass("st-item-name")
-      .css("width", "100%")
-      .val(it.name ?? (isNew ? `item${rowIndex}` : ""));
-
-    const $type = buildTypeSelect(it.type);
-
-    // Visible: regs
-    const existingBytes = Number(it.offset ?? 0);
-    const existingRegs = Number.isFinite(existingBytes) ? (existingBytes / 2) : 0;
-
-    const $offsetRegs = $("<input/>")
-      .attr("type", "number")
-      .addClass("st-item-offset-regs")
-      .css("width", "100%")
-      .val(existingRegs);
-
-    // Hidden: bytes (this is what the JS runtime expects)
-    const $offsetBytes = $("<input/>")
-      .attr("type", "hidden")
-      .addClass("st-item-offset")
-      .val(Number.isFinite(existingBytes) ? existingBytes : 0);
-
-    // keep hidden bytes synced when user edits regs
-    $offsetRegs.on("input", function () {
-      const r = Number($offsetRegs.val());
-      const regs = Number.isFinite(r) ? r : 0;
-      $offsetBytes.val(regs * 2);
-    });
-
-    // hidden length field (kept in config, not shown)
-    const $lengthHidden = $("<input/>")
-      .attr("type", "hidden")
-      .addClass("st-item-length")
-      .val(it.length ?? 1);
-
-    const $scale = $("<input/>")
-      .attr("type", "text")
-      .addClass("st-item-scale")
-      .css("width", "100%")
-      .val(it.scale ?? it.scaler ?? it.scaleFactor ?? "");
-
-    const $scaleMode = $('<select></select>').addClass('st-scale-mode').attr('aria-label','Scaling mode').css({width:'82px',flex:'0 0 82px'})
-      .attr('title','None: unchanged; Math: expression such as /100; Range: input low/high to output low/high.')
-      .append($('<option value="none">None</option>'))
-      .append($('<option value="math">Math</option>'))
-      .append($('<option value="range">Range</option>'))
-      .val(it.scaleMode === 'none' ? 'none' : it.scaleMode === 'range' ? 'range' : String($scale.val()).trim() ? 'math' : 'none');
-    $scale.css({width:'100px',flex:'0 0 100px'}).attr('placeholder','/100 or +5').attr('aria-label','Math expression');
-    const $rangeFields = $('<div></div>').addClass('st-range-fields').css({display:'flex','align-items':'center',gap:'5px','flex-wrap':'nowrap'});
-    const $grid = $('<div></div>').css({display:'flex','align-items':'center',gap:'5px','flex-wrap':'nowrap'});
-    [['inputLow','In low',4],['inputHigh','In high',20],['outputLow','Out low',0],['outputHigh','Out high',100]].forEach(([key,label,fallback]) => {
-      const $input = $('<input/>').attr({type:'number',step:'any','aria-label':label,title:label.replace('In ', 'Input ').replace('Out ', 'Output ')}).addClass('st-range-number st-'+key).css({width:'62px','min-width':'62px',padding:'4px'}).val(it[key] ?? fallback);
-      const $label = $('<label></label>').css({display:'flex','align-items':'center',gap:'3px',width:'auto','white-space':'nowrap','font-size':'10px',margin:0}).append($('<span></span>').text(label)).append($input);
-      $input.on('input',() => updateScaleUi($tr));
-      $grid.append($label);
-    });
-    const $clamp = $('<input/>').attr('type','checkbox').addClass('st-clamp-range').prop('checked',it.clampRange === true).css({width:'auto',margin:'0 5px 0 0'});
-    $rangeFields.append($grid).append($('<label></label>').css({display:'flex','align-items':'center',width:'auto','white-space':'nowrap','font-size':'11px',margin:0}).append($clamp).append(document.createTextNode('Clamp')));
-    $rangeFields.append($('<div></div>').addClass('st-range-note').attr('title','Choose a numeric register type for range scaling.').css({color:'#b33','font-size':'11px'}).text('!'));
-    $scaleMode.on('change',() => updateScaleUi($tr));
-
-    const $offsetbit = $("<input/>")
-      .attr("type", "number")
-      .addClass("st-item-offsetbit")
-      .css("width", "100%")
-      .val(it.offsetbit ?? 0);
-
-    if (isNew) {
-      const next = nextRowFromLast($tbody);
-
-      $type.val(next.type);
-
-      // set regs, hidden bytes follows
-      $offsetRegs.val(next.offsetRegs).trigger("input");
-
-      // set bit for digital ladder
-      $offsetbit.val(next.offsetbit);
-    } else {
-      // ensure hidden offset is correct for existing rows
-      $offsetRegs.trigger("input");
-    }
-
-    const $del = $("<a href='#' style='color:#c00;'>Remove</a>").on("click", function (e) {
-      e.preventDefault();
-      $tr.remove();
-    });
-
-    $tr.append($("<td></td>").append($name));
-    $tr.append($("<td></td>").append($type));
-    $tr.append($("<td></td>").append($offsetRegs).append($offsetBytes));
-    $tr.append($("<td></td>").append($("<div></div>").addClass("st-scaling-inline").css({display:"flex","align-items":"center",gap:"5px","flex-wrap":"nowrap"}).append($scaleMode).append($scale).append($rangeFields)));
-
-    const $bitTd = $("<td></td>").addClass("st-bit-col").append($offsetbit);
-    $tr.append($bitTd);
-
-    // attach hidden length to the row so it saves
-    $tr.append($("<td style='display:none;'></td>").append($lengthHidden));
-
-    $tr.append($("<td></td>").append($del));
-
-    $tbody.append($tr);
-
-    applyTypeRules($tr);
-    $type.on("change", function () {
-      applyTypeRules($tr);
-    });
-  }
-
-  function readItemsFromTable($tbody) {
-    const items = [];
-    $tbody.find("tr").each(function () {
-      const $tr = $(this);
-      items.push({
-        name: String($tr.find(".st-item-name").val() ?? "").trim(),
-        type: String($tr.find(".st-item-type").val() ?? "16 bit integer").trim(),
-        offset: Number($tr.find(".st-item-offset").val()) || 0,      // BYTES saved
-        length: Number($tr.find(".st-item-length").val()) || 1,      // hidden but saved
-        scale: String($tr.find(".st-item-scale").val() ?? "").trim(),
-        scaleMode: $tr.find('.st-scale-mode').val() || 'none',
-        inputLow: String($tr.find('.st-inputLow').val() ?? '').trim(),
-        inputHigh: String($tr.find('.st-inputHigh').val() ?? '').trim(),
-        outputLow: String($tr.find('.st-outputLow').val() ?? '').trim(),
-        outputHigh: String($tr.find('.st-outputHigh').val() ?? '').trim(),
-        clampRange: $tr.find('.st-clamp-range').prop('checked') === true,
-        offsetbit: Number($tr.find(".st-item-offsetbit").val()) || 0
-      });
-    });
-    return items;
-  }
-
-  function buildFcList(mode, $fc, preferred) {
-    const isRead = mode === "read";
-    const keep = (preferred !== undefined && preferred !== null && preferred !== "")
-      ? String(preferred)
-      : String($fc.val() || "");
-
-    $fc.empty();
-
-    const readFcs = [
-      { v: 1, t: "1 - Read Coils" },
-      { v: 2, t: "2 - Read Digital Inputs" },
-      { v: 3, t: "3 - Read Holding Registers" },
-      { v: 4, t: "4 - Read Input Registers" }
-    ];
-
-    const writeFcs = [
-      { v: 5, t: "5 - Write Single Coil" },
-      { v: 6, t: "6 - Write Single Register" },
-      { v: 15, t: "15 - Write Multiple Coils" },
-      { v: 16, t: "16 - Write Multiple Registers" }
-    ];
-
-    const list = isRead ? readFcs : writeFcs;
-    list.forEach(o => $fc.append($("<option></option>").attr("value", o.v).text(o.t)));
-
-    if (list.some(o => String(o.v) === keep)) $fc.val(keep);
-    else $fc.val(String(list[0].v));
-  }
-
-  function toggleRuntimeUi(mode) {
-    const isRead = mode === "read";
-    $("#st-rf-write").toggle(!isRead);
-    $("#st-rf-decode-wrap").toggle(isRead);
-  }
-
-  function toggleValueUi(valueSource) {
-    const fixed = (valueSource || "msg.payload") === "fixed";
-    $("#st-rf-fixedwrap").toggle(fixed);
-  }
-
-  // Bus UI: hide serial settings when RF channel selected
-  function updateSerialUiForChannel() {
-    const ch = $("#node-config-input-serialPort").val();
-    const isRF = (ch === "/dev/ttyAMA2");
-
-    $("#st-row-baudRate").toggle(!isRF);
-    $("#st-row-parity").toggle(!isRF);
-    $("#st-row-stopBits").toggle(!isRF);
-
-    // show RSSI options ONLY for RF
-    $("#st-rssi-wrap").toggle(isRF);
-
-    // Optional: if not RF, force RSSI off so it can't be accidentally enabled
-    if (!isRF) {
-      $("#node-config-input-appendRssi").prop("checked", false);
-    }
-
-    if (isRF) {
-      $("#node-config-input-baudRate").val(9600);
-      $("#node-config-input-parity").val("none");
-      $("#node-config-input-stopBits").val(1);
-    }
-  }
-
-  // =========================
-  // Config node: smithtek-mako-rf-bus
-  // =========================
-  RED.nodes.registerType("smithtek-mako-rf-bus", {
-    category: "config",
-    defaults: {
-      busName: { value: "smithtek mako rf", required: true },
-      appendRssi: { value: false },
-      rssiGuardMs: { value: 10, validate: RED.validators.number() },
-      rssiTimeoutMs: { value: 100, validate: RED.validators.number() },
-
-      // Keep imported USB/by-id paths editable as well as the built-in ports.
-      serialPort: { value: "/dev/ttyAMA2", required: true },
-
-      baudRate: { value: 9600, required: true, validate: RED.validators.number() },
-      stopBits: { value: 1, required: true, validate: RED.validators.number() },
-      parity: { value: "none", required: true },
-
-      timeout_s: { value: 8, required: true, validate: RED.validators.number() },
-      retries: { value: 2, required: true, validate: RED.validators.number() },
-      gap_s: { value: 0, required: true, validate: RED.validators.number() },
-      maxQueue: { value: 50, required: true, validate: RED.validators.number() }
-
-    },
-    label: function () {
-      return this.busName || "smithtek mako rf";
-    },
-    oneditprepare: function () {
-      const select = $("#node-config-input-serialPort"), saved = this.serialPort || "/dev/ttyAMA2";
-      const builtins = ['/dev/ttyAMA2','/dev/ttyAMA0','/dev/ttyAMA1','usb:auto'];
-      if (!builtins.includes(saved)) $('<option>').val(saved).text('USB · saved device').appendTo(select);
-      select.val(saved);
-      const refresh = function () {
-        const current = select.val();
-        $('#st-usb-status').text('Checking USB connections…');
-        $.getJSON('smithtek-passport/usb').done(function(devices) {
-          select.find('option[data-detected]').remove();
-          devices.forEach(function(device) {
-            if (select.find('option').toArray().some(function(o){return o.value===device.value;})) return;
-            $('<option>').val(device.value).text(device.label).attr('data-detected','true').appendTo(select);
-          });
-          select.val(current);
-          $('#st-usb-status').text(devices.length ? 'USB devices found. Choose your device if more than one is connected.' : 'No USB devices found. Check power and the data cable.');
-        }).fail(function() { $('#st-usb-status').text('Unable to check USB connections. Try Refresh USB again.'); });
-      };
-      $('#st-usb-refresh').on('click',function(e){e.preventDefault();refresh();});
-      refresh();
-      updateSerialUiForChannel();
-      $("#node-config-input-serialPort").on("change", updateSerialUiForChannel);
-    }
-  });
-
-  // =========================
-  // Main node: smithtek-mako-rf
-  // =========================
-  RED.nodes.registerType("smithtek-mako-rf", {
-    category: "Smithtek",
-    color: "#B9B6B8",
-    defaults: {
-      name: { value: "" },
-      prefix: { value: "" },
-      bus: { type: "smithtek-mako-rf-bus", required: true },
-
-      mode: { value: "read" },
-      fc: { value: 3, required: true, validate: RED.validators.number() },
-      unitid: { value: 1, required: true, validate: RED.validators.number() },
-      address: { value: 0, required: true, validate: RED.validators.number() },
-      quantity: { value: 1, required: true, validate: RED.validators.number() },
-
-      valueSource: { value: "msg.payload" },
-      valueType: { value: "bool" },
-      valueText: { value: "" },
-      includeWriteQuantity: { value: false },
-
-      items: { value: [ defaultItemRow() ], validate: validDecoderItems }
-    },
-    inputs: 1,
-    outputs: 2,
-    outputLabels: ["Data / alarm", "Debug"],
-    icon: "bridge.svg",
-    label: function () { return this.name || "Smithtek Mako RF"; },
-
-    oneditprepare: function () {
-      buildFcList(this.mode, $("#node-input-fc"), this.fc);
-      toggleRuntimeUi(this.mode);
-      toggleValueUi(this.valueSource);
-
-      $("#node-input-mode").on("change", () => {
-        const mode = $("#node-input-mode").val();
-        buildFcList(mode, $("#node-input-fc"), $("#node-input-fc").val());
-        toggleRuntimeUi(mode);
-      });
-
-      $("#node-input-valueSource").on("change", () => {
-        toggleValueUi($("#node-input-valueSource").val());
-      });
-
-      const $tbody = $("#st-items-tbody");
-      $tbody.empty();
-
-      let items = Array.isArray(this.items) ? this.items : [];
-      if (!items.length) items = [defaultItemRow()];
-      items.forEach(it => addItemRow($tbody, it, false));
-
-      $("#st-add-item").on("click", function (e) {
-        e.preventDefault();
-        addItemRow($tbody, defaultItemRow(), true);
-      });
-
-      $("#st-clear-items").on("click", function (e) {
-        e.preventDefault();
-        $tbody.empty();
-        addItemRow($tbody, defaultItemRow(), false);
-      });
-    },
-
-    oneditsave: function () {
-      this.items = readItemsFromTable($("#st-items-tbody"));
-    }
-  });
-
-})();
-</script>
-
-<!-- =========================
-     BUS CONFIG TEMPLATE
-     ========================= -->
-<script type="text/html" data-template-name="smithtek-mako-rf-bus">
-  <div class="form-row">
-    <label for="node-config-input-busName"><i class="fa fa-tag"></i> Bus name</label>
-    <input type="text" id="node-config-input-busName" placeholder="smithtek mako rf">
-  </div>
-
-  <div class="form-row">
-    <label for="node-config-input-serialPort"><i class="fa fa-plug"></i> Channel</label>
-    <select id="node-config-input-serialPort" style="width:260px;">
-      <option value="/dev/ttyAMA2">RF</option>
-      <option value="/dev/ttyAMA0">RS485-1</option>
-      <option value="/dev/ttyAMA1">RS485-2</option>
-      <option value="usb:auto">USB · Auto detect</option>
-    </select>
-    <button type="button" id="st-usb-refresh" class="red-ui-button">Refresh USB</button>
-    <p id="st-usb-status" class="form-tips"></p>
-    <p class="form-tips">Connect your Mako before using USB. Auto detect requires exactly one USB serial device. If several are connected, select yours. Match the PLC communication speed and format.</p>
-  </div>
-
-  <div class="form-row" id="st-row-baudRate">
-    <label for="node-config-input-baudRate"><i class="fa fa-cog"></i> Baud</label>
-    <input type="number" id="node-config-input-baudRate" style="width:140px;">
-  </div>
-
-  <div class="form-row" id="st-row-parity">
-    <label for="node-config-input-parity"><i class="fa fa-adjust"></i> Parity</label>
-    <select id="node-config-input-parity" style="width:160px;">
-      <option value="none">none</option>
-      <option value="even">even</option>
-      <option value="odd">odd</option>
-      <option value="mark">mark</option>
-      <option value="space">space</option>
-    </select>
-  </div>
-
-  <div class="form-row" id="st-row-stopBits">
-    <label for="node-config-input-stopBits"><i class="fa fa-pause"></i> Stop bits</label>
-    <input type="number" id="node-config-input-stopBits" style="width:140px;">
-  </div>
-
-  <hr />
-
-  <div id="st-rssi-wrap">
-
-    <div class="form-row">
-      <label for="node-config-input-appendRssi"><i class="fa fa-signal"></i> RSSI</label>
-      <input type="checkbox" id="node-config-input-appendRssi" style="width:auto;">
-      <span style="margin-left:8px; font-size:12px; color:#888;">
-        (Append RSSI in dBm. Diagnostics add one radio query per successful read.)
-      </span>
-    </div>
-
-    <div class="form-row">
-      <label for="node-config-input-rssiGuardMs"><i class="fa fa-clock-o"></i> RSSI guard (ms)</label>
-      <input type="number" id="node-config-input-rssiGuardMs" min="0" style="width:140px;">
-      <span style="margin-left:8px; font-size:12px; color:#888;">
-        (Older RF nodes only: pause before checking signal strength. Keep the default unless advised otherwise.)
-      </span>
-    </div>
-
-    <div class="form-row">
-      <label for="node-config-input-rssiTimeoutMs"><i class="fa fa-hourglass-end"></i> RSSI timeout (ms)</label>
-      <input type="number" id="node-config-input-rssiTimeoutMs" min="10" style="width:140px;">
-      <span style="margin-left:8px; font-size:12px; color:#888;">
-        (Older RF nodes only: how long to wait for signal strength. PassPort Connect does not use this reading.)
-      </span>
-    </div>
-
-  </div>
-
-
-  <div class="form-row">
-    <label for="node-config-input-timeout_s"><i class="fa fa-clock-o"></i> Timeout (seconds)</label>
-    <input type="number" id="node-config-input-timeout_s" style="width:140px;">
-    <span style="margin-left:8px; font-size:12px; color:#888;">
-      (How long to wait for a reply. A longer wait also delays the next message if a PLC is offline.)
-    </span>
-  </div>
-
-  <div class="form-row">
-    <label for="node-config-input-retries"><i class="fa fa-repeat"></i> Retries</label>
-    <input type="number" id="node-config-input-retries" style="width:140px;">
-    <span style="margin-left:8px; font-size:12px; color:#888;">
-      (Extra attempts after a failed read. PassPort Connect commands are not automatically repeated.)
-    </span>
-  </div>
-
-  <div class="form-row">
-    <label for="node-config-input-gap_s"><i class="fa fa-arrows-h"></i> Gap (seconds)</label>
-    <input type="number" id="node-config-input-gap_s" step="0.1" min="0" style="width:140px;">
-    <span style="margin-left:8px; font-size:12px; color:#888;">
-      (A short pause between messages. Keep the default to start.)
-    </span>
-  </div>
-  <div class="form-tips">
-    Choose RF for wireless, RS485 for a wired connection, or USB for a connected Mako.
-  </div>
-  <div class="form-row">
-    <label for="node-config-input-maxQueue"><i class="fa fa-list"></i> Max queue</label>
-    <input type="number" id="node-config-input-maxQueue" min="1" style="width:140px;">
-  </div>
-  <div class="form-tips">
-    Messages take turns. Max queue is the waiting-list limit. If it fills up, slow down your repeating reads.
-  </div>
-
-
-</script>
-
-<!-- =========================
-     MAIN NODE TEMPLATE
-     ========================= -->
-<script type="text/html" data-template-name="smithtek-mako-rf">
-  <div class="form-row">
-    <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-    <input type="text" id="node-input-name" placeholder="">
-  </div>
-
-  <div class="form-row">
-    <label for="node-input-prefix"><i class="fa fa-tag"></i> Prefix</label>
-    <input type="text" id="node-input-prefix" placeholder="e.g. b1">
-    <div class="form-tips">Added before each decoder name with a space: b1 + Pressure becomes b1 Pressure. Leave blank to keep existing names.</div>
-  </div>
-
-  <div class="form-row">
-    <label for="node-input-bus"><i class="fa fa-sitemap"></i> Bus</label>
-    <input type="text" id="node-input-bus" style="width: 25%;">
-    <span style="margin-left:8px; font-size:12px; color:#888;">
-      (Add or edit your Modbus channel here, RF is for the long range radio Coms (LoRa) )
-    </span>
-  </div>
-
-  <div class="form-row">
-    <label for="node-input-mode"><i class="fa fa-random"></i> Mode</label>
-    <select id="node-input-mode" style="width: 20%;">
-      <option value="read">Read</option>
-      <option value="write">Write</option>
-    </select>
-    <span style="margin-left:8px; font-size:12px; color:#888;">
-      (Read will poll the Mako's modbus, Write will send commands to it, digital BOOLS, values etc. )
-    </span>
-  </div>
-
-  <div class="form-row">
-    <label for="node-input-unitid"><i class="fa fa-hashtag"></i> Device ID</label>
-    <input type="number" id="node-input-unitid" min="1" max="247" style="width: 140px;">
-    <span style="margin-left:8px; font-size:12px; color:#888;">
-      (The ID of your Mako Device, via RF or RS485)
-    </span>
-  </div>
-
-  <div class="form-row">
-    <label for="node-input-fc"><i class="fa fa-code"></i> Function</label>
-    <select id="node-input-fc" style="width: 25%;"></select>
-    <span style="margin-left:8px; font-size:12px; color:#888;">
-      (Match the function code with your V-NET program, Input register, holding register and so on.)
-    </span>
-  </div>
-
-  <div class="form-row">
-    <label for="node-input-address"><i class="fa fa-crosshairs"></i> Address</label>
-    <input type="number" id="node-input-address" min="0" style="width: 140px;">
-    <span style="margin-left:8px; font-size:12px; color:#888;">
-      (The address of the first register you want to read,)
-    </span>
-  </div>
-
-  <div class="form-row">
-    <label for="node-input-quantity"><i class="fa fa-list-ol"></i> Quantity</label>
-    <input type="number" id="node-input-quantity" min="1" style="width: 100px;">
-    <span style="margin-left:8px; font-size:12px; color:#888;">
-      (Qty of registers to read. 16bit = 1 register, 32bit = 2 registers. example, 3* floats would = 6 registers)
-    </span>
-  </div>
-
-  <div id="st-rf-write" style="margin-top:10px; display:none;">
-    <div class="form-row">
-      <label for="node-input-valueSource"><i class="fa fa-pencil"></i> Value source</label>
-      <select id="node-input-valueSource" style="width: 70%;">
-        <option value="msg.payload">From msg.payload</option>
-        <option value="fixed">Fixed</option>
-      </select>
-    </div>
-
-    <div id="st-rf-fixedwrap" style="margin-top:6px;">
-      <div class="form-row">
-        <label for="node-input-valueType"><i class="fa fa-sliders"></i> Fixed type</label>
-        <select id="node-input-valueType" style="width: 70%;">
-          <option value="bool">Boolean (true/false)</option>
-          <option value="number">Number</option>
-          <option value="json">JSON (array/object)</option>
-          <option value="string">String</option>
-        </select>
-      </div>
-
-      <div class="form-row">
-        <label for="node-input-valueText"><i class="fa fa-edit"></i> Fixed value</label>
-        <input type="text" id="node-input-valueText" placeholder='e.g. true | 123 | [1,0,1] | [100,200]'>
-      </div>
-    </div>
-
-    <div class="form-row">
-      <label for="node-input-includeWriteQuantity"><i class="fa fa-check-square-o"></i> Include quantity</label>
-      <input type="checkbox" id="node-input-includeWriteQuantity" style="width:auto;">
-    </div>
-  </div>
-
-  <hr />
-
-  <div id="st-rf-decode-wrap">
-    <div class="form-row" style="margin-bottom:6px;">
-      <b>Decoder map</b>
-      <span style="margin-left:8px; font-size:12px; color:#888;">
-        (Build your register table in the exact same order as your Mako V-NET program, Add new rows and change the register data type to match)
-      </span>
-      <div style="margin-top:6px;">
-        <a href="#" class="editor-button" id="st-add-item"><i class="fa fa-plus"></i> Add row</a>
-        <a href="#" class="editor-button" id="st-clear-items" style="margin-left:8px;"><i class="fa fa-trash"></i> Reset</a>
-      </div>
-    </div>
-
-    <div class="form-row">
-      <div style="overflow-x:auto;"><table class="table table-condensed" style="width:100%; min-width:1100px; table-layout:fixed;">
-        <thead>
-          <tr>
-            <th style="width:20%;">Name </th>
-            <th style="width:145px;">Register data Type</th>
-            <th style="width:65px;">Offset</th>
-            <th style="width:565px;">Scaling</th>
-            <th style="width:42px;">Bit</th>
-            <th style="width:55px;">Action</th>
-          </tr>
-        </thead>
-        <tbody id="st-items-tbody"></tbody>
-      </table></div>
-    </div>
-
-    <div style="font-size:12px; color:#666; margin-top:6px;">
-  (Register Offsets numbers should match the modbus table you have built in V-NET!, if you add a digital it will automatically increase the bit number. Bit 1 = digital 1 and so on.
-    </div>
-    <div class="form-tips">None keeps the row compact and applies no scaling. Choose Math for an inline expression such as /100, or Range to map input low/high to output low/high. Use the values actually reported by the Mako: for example 4–20 to 0–100, or 4000–20000 to 0–100 if the register reports microamps. Range replaces the Math expression. Values outside the input range continue scaling unless Clamp is checked.</div>
-  </div>
-</script>
-
-<script type="text/markdown" data-help-name="smithtek-mako-rf">
-Smithtek Mako RF / RS485.
-
-Read mode outputs decoded JSON in msg.payload using the Decoder map rows. Numeric readings are rounded to at most six decimal places after Math or Range scaling, and remain numbers. Digital points (coils, discrete inputs and register bits) output numeric 1 for on and 0 for off.
-Raw modbus response is kept in msg.modbus.raw.
-
-Prefix adds text and one space before each decoder name. Leave blank to preserve names.
-
-Output 1 (Data / alarm) carries successful readings and write responses, or the friendly named fault JSON on failure. Output 2 (Debug) carries technical error details: ok, error, code and req. Connect it to a local Debug node or leave it disconnected. Node-RED error logs and Catch handling remain enabled. A timeout alarm is sent after one poll exhausts its retries (retries 2 means 3 attempts), not after multiple bad polls. Permanent Modbus exceptions report immediately. Each failed poll emits one alarm and one debug message.
-
-Failed requests output a named numeric alarm on output 1, for example {"b1 RF ID2 Not communicating — check power/RF; disable if out of service":1}. Details remain in msg.modbus, including ok, code, error and fault. Only final failures are reported; a successful retry or intentional shutdown does not emit an alarm. Successful reads resume normal data; no automatic alarm-clear value is sent.
-
-Each numeric decoder row starts compact with None (unchanged). Choose Math or Range to show the inline settings and enable scaling. Selecting None hides both controls and disables both calculations, while retaining the entered settings. Range maps input low/high to output low/high using a straight line; for example 4–20 maps to 0–100, with 12 mapping to 50. Use raw register endpoints, not assumed electrical units. Input endpoints must differ. Reversed ranges and negative/decimal endpoints are supported. Clamp optionally limits output to the configured range. Existing rows without a scaling mode retain their Math expression.
-</script>
-
-<script type="text/javascript">
-(function(){
- const typeLabels={float32:'Float',uint32:'32-bit unsigned',int32:'32-bit signed',int16:'16-bit signed',uint16:'16-bit unsigned',boolean:'TRUE / FALSE'};
- const width={float32:2,int32:2,uint32:2,int16:1,uint16:1,boolean:1};
- function collect(){const channels=[],indices={analog:0,switches:0};$('#pl-rows tr').each(function(i){const tr=$(this),get=k=>tr.find('[data-field="'+k+'"]').val(),kind=get('kind');channels.push({...(tr.data('channel')||{}),slot:i,index:indices[kind]++,kind,name:get('name').trim(),dataType:kind==='switches'?'boolean':get('dataType'),address:Number(get('address')),pulseOnWrite:kind==='switches'&&!!(tr.data('channel')||{}).pulseOnWrite,scaleMode:kind==='switches'?'none':get('scaleMode'),scale:get('scale'),inputLow:get('inputLow'),inputHigh:get('inputHigh'),outputLow:get('outputLow'),outputHigh:get('outputHigh'),rangeCollapsed:!!tr.data('rangeCollapsed'),clampRange:tr.find('[data-field="clampRange"]').prop('checked')});});const map={schema:'smithtek.passport-channels',version:1,unitId:Number($('#pl-unit').val()),channels};map.mappingId='passport-link-v1:'+JSON.stringify([map.unitId,channels.map(c=>[c.kind,c.index,c.name,c.dataType,c.address,c.slot,!!c.pulseOnWrite,c.pulseMs||250])]);return map;}
- function modeUi(){const write=$('#node-input-mode').val()==='write';$('.pl-write-only').toggle(write);$('.pl-read-only').toggle(!write);$('.pl-single-only').toggle(write&&$('#node-input-inputMode').val()==='single');$('.pl-table tr').each(function(){$(this).children().eq(4).toggle(!write);});}
- function sync(){const map=collect();const choose=$('#node-input-writeChannel'),selected=choose.val()||choose.data('selected')||'';choose.empty().append($('<option>').val('').text('Choose channel…'));map.channels.forEach(c=>choose.append($('<option>').val(c.name).text(c.name+' · '+(typeLabels[c.dataType]||c.dataType))));if(selected&&!map.channels.some(c=>c.name===selected))choose.append($('<option>').val(selected).text(selected+' (not in table)'));choose.val(selected);modeUi();$('#node-input-mapping').val(JSON.stringify(map)).trigger('change');$('#pl-count').text(map.channels.length+' / 64 channels');$('#pl-add').prop('disabled',map.channels.length>=64);}
- function row(c){const tr=$('<tr>').data('rangeCollapsed',!!c.rangeCollapsed).data('channel',c).appendTo('#pl-rows');function field(key,type,value){return $('<input>').attr({type:type||'text','data-field':key,'aria-label':key}).val(value??'');}function select(key,options,value){const el=$('<select>').attr({'data-field':key,'aria-label':key});options.forEach(o=>$('<option>').val(o[0]).text(o[1]).appendTo(el));return el.val(value);}
- const name=field('name','text',c.name).attr('maxlength',40),kind=select('kind',[['analog','Analog'],['switches','Digital']],c.kind),type=select('dataType',Object.entries(typeLabels),c.dataType),address=field('address','number',c.address).attr({min:0,max:65535,step:1}),mode=select('scaleMode',[['none','None'],['math','Math'],['range','Range']],c.scaleMode||'none'),math=field('scale','text',c.scale).attr('placeholder','/100 or +5'),range=$('<div class="pl-range">');
- for(const [key,label] of [['inputLow','Input low'],['inputHigh','Input high'],['outputLow','Output low'],['outputHigh','Output high']])$('<label>').text(label).append(field(key,'number',c[key]).attr('step','any')).appendTo(range);
- $('<label>').text('Clamp ').append(field('clampRange','checkbox','').prop('checked',!!c.clampRange)).appendTo(range);
- const toggle=$('<button type="button" class="red-ui-button">').on('click',()=>{tr.data('rangeCollapsed',!tr.data('rangeCollapsed'));visibility();sync();});
- for(const control of [name,kind,type,address])$('<td>').append(control).appendTo(tr);$('<td>').append($('<div style="display:flex;gap:5px;align-items:center">').append(mode,toggle),math,range).appendTo(tr);
- const buttons=$('<td>');for(const [label,action] of [['↑',()=>{tr.prev().before(tr);sync();}],['↓',()=>{tr.next().after(tr);sync();}],['×',()=>{tr.remove();sync();}]])$('<button type="button" class="red-ui-button">').text(label).attr('aria-label',label==='×'?'Remove channel':label==='↑'?'Move channel up':'Move channel down').on('click',action).appendTo(buttons);buttons.appendTo(tr);
- function visibility(){const sw=kind.val()==='switches';if(sw){type.val('boolean');mode.val('none');}else if(type.val()==='boolean')type.val('float32');type.prop('disabled',sw);mode.prop('disabled',sw);math.toggle(mode.val()==='math');const isRange=mode.val()==='range',collapsed=!!tr.data('rangeCollapsed');range.toggle(isRange&&!collapsed);toggle.toggle(isRange).text(collapsed?'Show range':'Hide range').attr('aria-expanded',String(!collapsed)).css({whiteSpace:'nowrap',flexShrink:0});}
- mode.on('change',()=>{if(mode.val()==='range')tr.data('rangeCollapsed',false);});
- kind.on('change',()=>{const others=collect().channels.filter((_,i)=>i!==tr.index()).filter(c=>c.kind===kind.val());address.val(others.reduce((end,c)=>Math.max(end,c.address+(width[c.dataType]||1)),0));});
- tr.on('input change','input,select',()=>{visibility();sync();});visibility();
- }
- function valid(value){try{const m=typeof value==='string'?JSON.parse(value):value;if(!m||!Number.isInteger(m.unitId)||m.unitId<1||m.unitId>247||!m.channels.length||m.channels.length>64)return false;const names=new Set(),used=new Set();return m.channels.every(c=>{if(!c.name||names.has(c.name)||['__proto__','constructor','prototype'].includes(c.name)||!width[c.dataType]||!Number.isInteger(c.address)||c.address<0||c.address+width[c.dataType]>65536)return false;names.add(c.name);for(let i=0;i<width[c.dataType];i++){const k=c.kind+':'+(c.address+i);if(used.has(k))return false;used.add(k);}if(c.scaleMode==='range'){const vals=['inputLow','inputHigh','outputLow','outputHigh'].map(k=>c[k]);if(vals.some(v=>v===''||!Number.isFinite(Number(v)))||Number(vals[0])===Number(vals[1]))return false;}if(c.scaleMode==='math'){const s=String(c.scale||'').trim();if(!s||(!Number.isFinite(Number(s))&&!/^([*\/+\-]|>>>|>>|<<|==|!=|>|<|%)\s*(-?\d+(?:\.\d+)?)$/.test(s))||/^[/%%]\s*-?0(?:\.0+)?$/.test(s))return false;}return true;});}catch(e){return false;}}
- RED.nodes.registerType('smithtek-passport-link',{
- category:'Smithtek',paletteLabel:'PassPort Connect',color:'#6D6D6D',defaults:{prefix:{value:''},writeChannel:{value:'',validate:function(v){if(this.mode!=='write'||this.inputMode!=='single')return true;try{return JSON.parse(this.mapping).channels.some(c=>c.name===v);}catch(e){return false;}}},name:{value:''},bus:{value:'',type:'smithtek-mako-rf-bus',required:true},mode:{value:'read',required:true},inputMode:{value:'single'},mapping:{value:'',required:true,validate:valid}},inputs:1,outputs:2,icon:'passport-connect-cropped.png',label:function(){return this.name||'PassPort Connect';},outputLabels:['Named data / write confirmed','Error'],
- oneditprepare:function(){$('#node-input-writeChannel').data('selected',this.writeChannel||'').on('change',function(){$(this).data('selected',$(this).val());});$('#node-input-mode,#node-input-inputMode').on('change',modeUi);$('#node-input-inputMode').val(this.inputMode||'arrays');let map;try{map=typeof this.mapping==='string'?JSON.parse(this.mapping):this.mapping;}catch(e){}$('#pl-unit').val(map?.unitId||1);$('#pl-rows').empty();(map?.channels||[]).forEach(row);$('#pl-unit').on('input change',sync);$('#pl-add').on('click',function(){const channels=collect().channels,kind=$('#pl-add-kind').val(),label=kind==='switches'?'Digital':'Analog';let address=0;channels.filter(c=>c.kind===kind).forEach(c=>address=Math.max(address,c.address+width[c.dataType]));let i=1;while(channels.some(c=>c.name===label+' '+i))i++;row({name:label+' '+i,kind,dataType:kind==='switches'?'boolean':'float32',address});sync();});sync();},oneditsave:function(){sync();this.mapping=$('#node-input-mapping').val();}
- });
-})();
-</script>
-<style>
-.pl-table{width:100%;border-collapse:collapse}.pl-table td,.pl-table th{padding:5px;text-align:left;vertical-align:top}.pl-table input,.pl-table select{width:100%;min-width:75px}.pl-table td:first-child{min-width:140px}.pl-table td:last-child{white-space:nowrap}.pl-table td:last-child button{padding:0 6px}.pl-range{display:grid;grid-template-columns:1fr 1fr;gap:5px;min-width:220px}.pl-range label{font-size:11px;margin:0!important;width:auto!important}.pl-range input[type=checkbox]{width:auto;min-width:0}.pl-table [data-field=scale]{margin-top:5px}
-</style>
-<script type="text/html" data-template-name="smithtek-passport-link">
- <div class="form-row"><label for="node-input-name">Name</label><input id="node-input-name" type="text"></div>
- <div class="form-row"><label for="node-input-bus">Connection</label><input id="node-input-bus"></div>
- <div class="form-row"><label for="node-input-mode">Action</label><select id="node-input-mode"><option value="read">Read channels</option><option value="write">Write channels</option></select></div>
- <div class="form-row pl-write-only"><label for="node-input-inputMode">Write input</label><select id="node-input-inputMode"><option value="single">Single channel</option><option value="arrays">Mapped arrays</option><option value="named">Named values</option></select></div>
- <div class="form-row pl-single-only"><label for="node-input-writeChannel">Write channel</label><select id="node-input-writeChannel"></select></div>
- <div class="form-row pl-read-only"><label for="node-input-prefix">Prefix</label><input id="node-input-prefix" type="text" placeholder="e.g. North Mako"></div>
- <div class="form-row"><label for="pl-unit">Unit ID</label><input id="pl-unit" type="number" min="1" max="247"></div>
- <input id="node-input-mapping" type="hidden">
- <p><b>Separate Read and Write nodes:</b> copy and paste your complete Read node, then change the copy’s Action to Write. This copies the whole table. Choose the row you want to control. Later changes to one node do not update the other.</p>
- <p class="pl-write-only"><b>Single channel:</b> select Pump, then inject a Boolean true/false into msg.payload; select a setpoint and inject a number. Only that channel is written. <b>Named values:</b> send {"Pump":true,"Setpoint":25}; only supplied names are written. Names are case-sensitive and use the table names without the read Prefix. <b>Mapped arrays:</b> send matching mappingId plus Analog and/or Digital arrays (JSON keys analog and switches) in table order. These are ordered values, not named objects.</p>
- <p class="pl-read-only"><b>Prefix:</b> helps you label readings. North Mako plus Level appears as "North Mako Level". Commands still use the original row name, Level.</p>
-
- <div style="overflow:auto"><table class="pl-table"><thead><tr><th>Name</th><th>Data type</th><th>Value type</th><th>Address</th><th>Read scaling</th><th>Order / remove</th></tr></thead><tbody id="pl-rows"></tbody></table></div>
- <p><select id="pl-add-kind" aria-label="New channel kind" style="width:120px"><option value="analog">Analog</option><option value="switches">Digital</option></select> <button id="pl-add" type="button" class="red-ui-button">Add channel</button> <span id="pl-count"></span></p>
- <p>Keep this table matched to the PLC. Moving a row does not change its address. Changes here do not change the PLC program. Export again from V-net after changing the PLC table.</p>
- <p>Math and Range change named read values. Arrays in msg.channels keep the original values. Write inputs use device units; scaling is not applied to commands. Update matching nodes after changing the table.</p>
-</script>
+<script type="text/javascript">
+(function () {
+
+  const TYPE_OPTIONS = [
+    "16 bit integer",
+    "16 bit unsigned",
+    "32 bit integer",
+    "32 bit unsigned",
+    "32 bit float",
+    "digital to unsigned binary encoder"
+  ];
+
+  function is32BitType(t) {
+    t = String(t || "").toLowerCase();
+    return (t === "32 bit integer" || t === "32 bit unsigned" || t === "32 bit float");
+  }
+
+  function isDigitalUnsigned(t) {
+    return String(t || "").toLowerCase() === "digital to unsigned binary encoder";
+  }
+
+  function defaultItemRow() {
+    return {
+      name: "",
+      type: "16 bit integer",
+      offset: 0,      // BYTES stored in config (legacy decoder compatibility)
+      length: 1,      // stored but hidden (1=16-bit, 2=32-bit)
+      scale: "",
+      scaleMode: "none",
+      inputLow: 4,
+      inputHigh: 20,
+      outputLow: 0,
+      outputHigh: 100,
+      clampRange: false,
+      offsetbit: 0
+    };
+  }
+
+  function buildTypeSelect(value) {
+    const $sel = $("<select></select>")
+      .addClass("st-item-type")
+      .css("width", "100%");
+    TYPE_OPTIONS.forEach(t => {
+      $sel.append($("<option></option>").attr("value", t).text(t));
+    });
+    $sel.val(String(value || "16 bit integer"));
+    return $sel;
+  }
+
+  function applyTypeRules($tr) {
+    const t = String($tr.find(".st-item-type").val() || "");
+    const $lenHidden = $tr.find(".st-item-length"); // hidden
+    const $bit = $tr.find(".st-item-offsetbit");
+    const $bitCol = $tr.find(".st-bit-col");
+
+    // auto length (hidden but saved)
+    if (is32BitType(t)) $lenHidden.val(2);
+    else $lenHidden.val(1);
+
+    // bit only for digital unsigned
+    if (isDigitalUnsigned(t)) {
+      $bit.prop("disabled", false).show();
+      $bitCol.show();
+    } else {
+      $bit.val(0);
+      $bit.prop("disabled", true).hide();
+      $bitCol.show();
+    }
+    updateScaleUi($tr);
+  }
+
+  function updateScaleUi($tr) {
+    const mode = $tr.find('.st-scale-mode').val();
+    const range = mode === 'range';
+    const digital = isDigitalUnsigned($tr.find('.st-item-type').val());
+    $tr.find('.st-item-scale').toggle(mode === 'math');
+    $tr.find('.st-range-fields').toggle(range);
+    $tr.find('.st-range-note').toggle(range && digital);
+    const inputs = $tr.find('.st-range-number');
+    inputs.each(function () {
+      const raw = String($(this).val()).trim();
+      const bad = range && (raw === '' || !Number.isFinite(Number(raw)));
+      this.setCustomValidity(bad ? 'Enter a finite number.' : '');
+      $(this).attr('aria-invalid', bad ? 'true' : 'false');
+    });
+    const low = $tr.find('.st-inputLow'), high = $tr.find('.st-inputHigh');
+    if (range && String(low.val()).trim() !== '' && String(high.val()).trim() !== '' && Number(low.val()) === Number(high.val())) {
+      high[0].setCustomValidity('Input low and input high must differ.');
+      high.attr('aria-invalid', 'true');
+    }
+  }
+
+  function validDecoderItems(items) {
+    return Array.isArray(items) && items.every(item => {
+      if (item.scaleMode !== 'range') return true;
+      if (isDigitalUnsigned(item.type) || item.type === 'bool') return false;
+      const values = ['inputLow','inputHigh','outputLow','outputHigh'].map(key => item[key]);
+      return values.every(value => (typeof value === 'string' || typeof value === 'number') && String(value).trim() !== '' && Number.isFinite(Number(value))) &&
+        Number(item.inputLow) !== Number(item.inputHigh) && Number.isFinite(Number(item.inputHigh)-Number(item.inputLow)) && Number.isFinite(Number(item.outputHigh)-Number(item.outputLow));
+    });
+  }
+
+  // Determine next row behaviour based on the last row (REGS visible)
+  function nextRowFromLast($tbody) {
+    const $last = $tbody.find("tr").last();
+    if (!$last.length) {
+      return { offsetRegs: 0, type: "16 bit integer", offsetbit: 0 };
+    }
+
+    const lastRegs = Number($last.find(".st-item-offset-regs").val());
+    const lastType = String($last.find(".st-item-type").val() || "");
+    const lastBit = Number($last.find(".st-item-offsetbit").val());
+
+    const safeRegs = Number.isFinite(lastRegs) ? lastRegs : 0;
+    const safeBit = Number.isFinite(lastBit) ? lastBit : 0;
+
+    // DIGITAL BIT-LADDER (same register, bit++, then next register)
+    if (isDigitalUnsigned(lastType)) {
+      if (safeBit < 15) {
+        return { offsetRegs: safeRegs, type: lastType, offsetbit: safeBit + 1 };
+      }
+      return { offsetRegs: safeRegs + 1, type: lastType, offsetbit: 0 };
+    }
+
+    // Normal stepping (REGS)
+    const stepRegs = is32BitType(lastType) ? 2 : 1;
+    return { offsetRegs: safeRegs + stepRegs, type: lastType, offsetbit: 0 };
+  }
+
+  function addItemRow($tbody, item, isNew) {
+    const it = item || defaultItemRow();
+    const $tr = $("<tr></tr>");
+    const rowIndex = $tbody.find("tr").length + 1;
+
+    const $name = $("<input/>")
+      .attr("type", "text")
+      .addClass("st-item-name")
+      .css("width", "100%")
+      .val(it.name ?? (isNew ? `item${rowIndex}` : ""));
+
+    const $type = buildTypeSelect(it.type);
+
+    // Visible: regs
+    const existingBytes = Number(it.offset ?? 0);
+    const existingRegs = Number.isFinite(existingBytes) ? (existingBytes / 2) : 0;
+
+    const $offsetRegs = $("<input/>")
+      .attr("type", "number")
+      .addClass("st-item-offset-regs")
+      .css("width", "100%")
+      .val(existingRegs);
+
+    // Hidden: bytes (this is what the JS runtime expects)
+    const $offsetBytes = $("<input/>")
+      .attr("type", "hidden")
+      .addClass("st-item-offset")
+      .val(Number.isFinite(existingBytes) ? existingBytes : 0);
+
+    // keep hidden bytes synced when user edits regs
+    $offsetRegs.on("input", function () {
+      const r = Number($offsetRegs.val());
+      const regs = Number.isFinite(r) ? r : 0;
+      $offsetBytes.val(regs * 2);
+    });
+
+    // hidden length field (kept in config, not shown)
+    const $lengthHidden = $("<input/>")
+      .attr("type", "hidden")
+      .addClass("st-item-length")
+      .val(it.length ?? 1);
+
+    const $scale = $("<input/>")
+      .attr("type", "text")
+      .addClass("st-item-scale")
+      .css("width", "100%")
+      .val(it.scale ?? it.scaler ?? it.scaleFactor ?? "");
+
+    const $scaleMode = $('<select></select>').addClass('st-scale-mode').attr('aria-label','Scaling mode').css({width:'82px',flex:'0 0 82px'})
+      .attr('title','None: unchanged; Math: expression such as /100; Range: input low/high to output low/high.')
+      .append($('<option value="none">None</option>'))
+      .append($('<option value="math">Math</option>'))
+      .append($('<option value="range">Range</option>'))
+      .val(it.scaleMode === 'none' ? 'none' : it.scaleMode === 'range' ? 'range' : String($scale.val()).trim() ? 'math' : 'none');
+    $scale.css({width:'100px',flex:'0 0 100px'}).attr('placeholder','/100 or +5').attr('aria-label','Math expression');
+    const $rangeFields = $('<div></div>').addClass('st-range-fields').css({display:'flex','align-items':'center',gap:'5px','flex-wrap':'nowrap'});
+    const $grid = $('<div></div>').css({display:'flex','align-items':'center',gap:'5px','flex-wrap':'nowrap'});
+    [['inputLow','In low',4],['inputHigh','In high',20],['outputLow','Out low',0],['outputHigh','Out high',100]].forEach(([key,label,fallback]) => {
+      const $input = $('<input/>').attr({type:'number',step:'any','aria-label':label,title:label.replace('In ', 'Input ').replace('Out ', 'Output ')}).addClass('st-range-number st-'+key).css({width:'62px','min-width':'62px',padding:'4px'}).val(it[key] ?? fallback);
+      const $label = $('<label></label>').css({display:'flex','align-items':'center',gap:'3px',width:'auto','white-space':'nowrap','font-size':'10px',margin:0}).append($('<span></span>').text(label)).append($input);
+      $input.on('input',() => updateScaleUi($tr));
+      $grid.append($label);
+    });
+    const $clamp = $('<input/>').attr('type','checkbox').addClass('st-clamp-range').prop('checked',it.clampRange === true).css({width:'auto',margin:'0 5px 0 0'});
+    $rangeFields.append($grid).append($('<label></label>').css({display:'flex','align-items':'center',width:'auto','white-space':'nowrap','font-size':'11px',margin:0}).append($clamp).append(document.createTextNode('Clamp')));
+    $rangeFields.append($('<div></div>').addClass('st-range-note').attr('title','Choose a numeric register type for range scaling.').css({color:'#b33','font-size':'11px'}).text('!'));
+    $scaleMode.on('change',() => updateScaleUi($tr));
+
+    const $offsetbit = $("<input/>")
+      .attr("type", "number")
+      .addClass("st-item-offsetbit")
+      .css("width", "100%")
+      .val(it.offsetbit ?? 0);
+
+    if (isNew) {
+      const next = nextRowFromLast($tbody);
+
+      $type.val(next.type);
+
+      // set regs, hidden bytes follows
+      $offsetRegs.val(next.offsetRegs).trigger("input");
+
+      // set bit for digital ladder
+      $offsetbit.val(next.offsetbit);
+    } else {
+      // ensure hidden offset is correct for existing rows
+      $offsetRegs.trigger("input");
+    }
+
+    const $del = $("<a href='#' style='color:#c00;'>Remove</a>").on("click", function (e) {
+      e.preventDefault();
+      $tr.remove();
+    });
+
+    $tr.append($("<td></td>").append($name));
+    $tr.append($("<td></td>").append($type));
+    $tr.append($("<td></td>").append($offsetRegs).append($offsetBytes));
+    $tr.append($("<td></td>").append($("<div></div>").addClass("st-scaling-inline").css({display:"flex","align-items":"center",gap:"5px","flex-wrap":"nowrap"}).append($scaleMode).append($scale).append($rangeFields)));
+
+    const $bitTd = $("<td></td>").addClass("st-bit-col").append($offsetbit);
+    $tr.append($bitTd);
+
+    // attach hidden length to the row so it saves
+    $tr.append($("<td style='display:none;'></td>").append($lengthHidden));
+
+    $tr.append($("<td></td>").append($del));
+
+    $tbody.append($tr);
+
+    applyTypeRules($tr);
+    $type.on("change", function () {
+      applyTypeRules($tr);
+    });
+  }
+
+  function readItemsFromTable($tbody) {
+    const items = [];
+    $tbody.find("tr").each(function () {
+      const $tr = $(this);
+      items.push({
+        name: String($tr.find(".st-item-name").val() ?? "").trim(),
+        type: String($tr.find(".st-item-type").val() ?? "16 bit integer").trim(),
+        offset: Number($tr.find(".st-item-offset").val()) || 0,      // BYTES saved
+        length: Number($tr.find(".st-item-length").val()) || 1,      // hidden but saved
+        scale: String($tr.find(".st-item-scale").val() ?? "").trim(),
+        scaleMode: $tr.find('.st-scale-mode').val() || 'none',
+        inputLow: String($tr.find('.st-inputLow').val() ?? '').trim(),
+        inputHigh: String($tr.find('.st-inputHigh').val() ?? '').trim(),
+        outputLow: String($tr.find('.st-outputLow').val() ?? '').trim(),
+        outputHigh: String($tr.find('.st-outputHigh').val() ?? '').trim(),
+        clampRange: $tr.find('.st-clamp-range').prop('checked') === true,
+        offsetbit: Number($tr.find(".st-item-offsetbit").val()) || 0
+      });
+    });
+    return items;
+  }
+
+  function buildFcList(mode, $fc, preferred) {
+    const isRead = mode === "read";
+    const keep = (preferred !== undefined && preferred !== null && preferred !== "")
+      ? String(preferred)
+      : String($fc.val() || "");
+
+    $fc.empty();
+
+    const readFcs = [
+      { v: 1, t: "1 - Read Coils" },
+      { v: 2, t: "2 - Read Digital Inputs" },
+      { v: 3, t: "3 - Read Holding Registers" },
+      { v: 4, t: "4 - Read Input Registers" }
+    ];
+
+    const writeFcs = [
+      { v: 5, t: "5 - Write Single Coil" },
+      { v: 6, t: "6 - Write Single Register" },
+      { v: 15, t: "15 - Write Multiple Coils" },
+      { v: 16, t: "16 - Write Multiple Registers" }
+    ];
+
+    const list = isRead ? readFcs : writeFcs;
+    list.forEach(o => $fc.append($("<option></option>").attr("value", o.v).text(o.t)));
+
+    if (list.some(o => String(o.v) === keep)) $fc.val(keep);
+    else $fc.val(String(list[0].v));
+  }
+
+  function toggleRuntimeUi(mode) {
+    const isRead = mode === "read";
+    $("#st-rf-write").toggle(!isRead);
+    $("#st-rf-decode-wrap").toggle(isRead);
+  }
+
+  function toggleValueUi(valueSource) {
+    const fixed = (valueSource || "msg.payload") === "fixed";
+    $("#st-rf-fixedwrap").toggle(fixed);
+  }
+
+  // Bus UI: hide serial settings when RF channel selected
+  function updateSerialUiForChannel() {
+    const ch = $("#node-config-input-serialPort").val();
+    const isRF = (ch === "/dev/ttyAMA2");
+
+    $("#st-row-baudRate").toggle(!isRF);
+    $("#st-row-parity").toggle(!isRF);
+    $("#st-row-stopBits").toggle(!isRF);
+
+    // show RSSI options ONLY for RF
+    $("#st-rssi-wrap").toggle(isRF);
+
+    // Optional: if not RF, force RSSI off so it can't be accidentally enabled
+    if (!isRF) {
+      $("#node-config-input-appendRssi").prop("checked", false);
+    }
+
+    if (isRF) {
+      $("#node-config-input-baudRate").val(9600);
+      $("#node-config-input-parity").val("none");
+      $("#node-config-input-stopBits").val(1);
+    }
+  }
+
+  // =========================
+  // Config node: smithtek-mako-rf-bus
+  // =========================
+  RED.nodes.registerType("smithtek-mako-rf-bus", {
+    category: "config",
+    defaults: {
+      busName: { value: "smithtek mako rf", required: true },
+      appendRssi: { value: false },
+      rssiGuardMs: { value: 10, validate: RED.validators.number() },
+      rssiTimeoutMs: { value: 100, validate: RED.validators.number() },
+
+      // Keep imported USB/by-id paths editable as well as the built-in ports.
+      serialPort: { value: "/dev/ttyAMA2", required: true },
+
+      baudRate: { value: 9600, required: true, validate: RED.validators.number() },
+      stopBits: { value: 1, required: true, validate: RED.validators.number() },
+      parity: { value: "none", required: true },
+
+      timeout_s: { value: 8, required: true, validate: RED.validators.number() },
+      retries: { value: 2, required: true, validate: RED.validators.number() },
+      gap_s: { value: 0, required: true, validate: RED.validators.number() },
+      maxQueue: { value: 50, required: true, validate: RED.validators.number() }
+
+    },
+    label: function () {
+      return this.busName || "smithtek mako rf";
+    },
+    oneditprepare: function () {
+      const select = $("#node-config-input-serialPort"), saved = this.serialPort || "/dev/ttyAMA2";
+      const builtins = ['/dev/ttyAMA2','/dev/ttyAMA0','/dev/ttyAMA1','usb:auto'];
+      if (!builtins.includes(saved)) $('<option>').val(saved).text('USB · saved device').appendTo(select);
+      select.val(saved);
+      const refresh = function () {
+        const current = select.val();
+        $('#st-usb-status').text('Checking USB connections…');
+        $.getJSON('smithtek-passport/usb').done(function(devices) {
+          select.find('option[data-detected]').remove();
+          devices.forEach(function(device) {
+            if (select.find('option').toArray().some(function(o){return o.value===device.value;})) return;
+            $('<option>').val(device.value).text(device.label).attr('data-detected','true').appendTo(select);
+          });
+          select.val(current);
+          $('#st-usb-status').text(devices.length ? 'USB devices found. Choose your device if more than one is connected.' : 'No USB devices found. Check power and the data cable.');
+        }).fail(function() { $('#st-usb-status').text('Unable to check USB connections. Try Refresh USB again.'); });
+      };
+      $('#st-usb-refresh').on('click',function(e){e.preventDefault();refresh();});
+      refresh();
+      updateSerialUiForChannel();
+      $("#node-config-input-serialPort").on("change", updateSerialUiForChannel);
+    }
+  });
+
+  // =========================
+  // Main node: smithtek-mako-rf
+  // =========================
+  RED.nodes.registerType("smithtek-mako-rf", {
+    category: "Smithtek",
+    color: "#B9B6B8",
+    defaults: {
+      name: { value: "" },
+      prefix: { value: "" },
+      bus: { type: "smithtek-mako-rf-bus", required: true },
+
+      mode: { value: "read" },
+      fc: { value: 3, required: true, validate: RED.validators.number() },
+      unitid: { value: 1, required: true, validate: RED.validators.number() },
+      address: { value: 0, required: true, validate: RED.validators.number() },
+      quantity: { value: 1, required: true, validate: RED.validators.number() },
+
+      valueSource: { value: "msg.payload" },
+      valueType: { value: "bool" },
+      valueText: { value: "" },
+      includeWriteQuantity: { value: false },
+
+      items: { value: [ defaultItemRow() ], validate: validDecoderItems }
+    },
+    inputs: 1,
+    outputs: 2,
+    outputLabels: ["Data / alarm", "Debug"],
+    icon: "bridge.svg",
+    label: function () { return this.name || "Smithtek Mako RF"; },
+
+    oneditprepare: function () {
+      buildFcList(this.mode, $("#node-input-fc"), this.fc);
+      toggleRuntimeUi(this.mode);
+      toggleValueUi(this.valueSource);
+
+      $("#node-input-mode").on("change", () => {
+        const mode = $("#node-input-mode").val();
+        buildFcList(mode, $("#node-input-fc"), $("#node-input-fc").val());
+        toggleRuntimeUi(mode);
+      });
+
+      $("#node-input-valueSource").on("change", () => {
+        toggleValueUi($("#node-input-valueSource").val());
+      });
+
+      const $tbody = $("#st-items-tbody");
+      $tbody.empty();
+
+      let items = Array.isArray(this.items) ? this.items : [];
+      if (!items.length) items = [defaultItemRow()];
+      items.forEach(it => addItemRow($tbody, it, false));
+
+      $("#st-add-item").on("click", function (e) {
+        e.preventDefault();
+        addItemRow($tbody, defaultItemRow(), true);
+      });
+
+      $("#st-clear-items").on("click", function (e) {
+        e.preventDefault();
+        $tbody.empty();
+        addItemRow($tbody, defaultItemRow(), false);
+      });
+    },
+
+    oneditsave: function () {
+      this.items = readItemsFromTable($("#st-items-tbody"));
+    }
+  });
+
+})();
+</script>
+
+<!-- =========================
+     BUS CONFIG TEMPLATE
+     ========================= -->
+<script type="text/html" data-template-name="smithtek-mako-rf-bus">
+  <div class="form-row">
+    <label for="node-config-input-busName"><i class="fa fa-tag"></i> Bus name</label>
+    <input type="text" id="node-config-input-busName" placeholder="smithtek mako rf">
+  </div>
+
+  <div class="form-row">
+    <label for="node-config-input-serialPort"><i class="fa fa-plug"></i> Channel</label>
+    <select id="node-config-input-serialPort" style="width:260px;">
+      <option value="/dev/ttyAMA2">RF</option>
+      <option value="/dev/ttyAMA0">RS485-1</option>
+      <option value="/dev/ttyAMA1">RS485-2</option>
+      <option value="usb:auto">USB · Auto detect</option>
+    </select>
+    <button type="button" id="st-usb-refresh" class="red-ui-button">Refresh USB</button>
+    <p id="st-usb-status" class="form-tips"></p>
+    <p class="form-tips">Connect your Mako before using USB. Auto detect requires exactly one USB serial device. If several are connected, select yours. Match the PLC communication speed and format.</p>
+  </div>
+
+  <div class="form-row" id="st-row-baudRate">
+    <label for="node-config-input-baudRate"><i class="fa fa-cog"></i> Baud</label>
+    <input type="number" id="node-config-input-baudRate" style="width:140px;">
+  </div>
+
+  <div class="form-row" id="st-row-parity">
+    <label for="node-config-input-parity"><i class="fa fa-adjust"></i> Parity</label>
+    <select id="node-config-input-parity" style="width:160px;">
+      <option value="none">none</option>
+      <option value="even">even</option>
+      <option value="odd">odd</option>
+      <option value="mark">mark</option>
+      <option value="space">space</option>
+    </select>
+  </div>
+
+  <div class="form-row" id="st-row-stopBits">
+    <label for="node-config-input-stopBits"><i class="fa fa-pause"></i> Stop bits</label>
+    <input type="number" id="node-config-input-stopBits" style="width:140px;">
+  </div>
+
+  <hr />
+
+  <div id="st-rssi-wrap">
+
+    <div class="form-row">
+      <label for="node-config-input-appendRssi"><i class="fa fa-signal"></i> RSSI</label>
+      <input type="checkbox" id="node-config-input-appendRssi" style="width:auto;">
+      <span style="margin-left:8px; font-size:12px; color:#888;">
+        (Append RSSI in dBm. Diagnostics add one radio query per successful read.)
+      </span>
+    </div>
+
+    <div class="form-row">
+      <label for="node-config-input-rssiGuardMs"><i class="fa fa-clock-o"></i> RSSI guard (ms)</label>
+      <input type="number" id="node-config-input-rssiGuardMs" min="0" style="width:140px;">
+      <span style="margin-left:8px; font-size:12px; color:#888;">
+        (Older RF nodes only: pause before checking signal strength. Keep the default unless advised otherwise.)
+      </span>
+    </div>
+
+    <div class="form-row">
+      <label for="node-config-input-rssiTimeoutMs"><i class="fa fa-hourglass-end"></i> RSSI timeout (ms)</label>
+      <input type="number" id="node-config-input-rssiTimeoutMs" min="10" style="width:140px;">
+      <span style="margin-left:8px; font-size:12px; color:#888;">
+        (Older RF nodes only: how long to wait for signal strength. PassPort Connect does not use this reading.)
+      </span>
+    </div>
+
+  </div>
+
+
+  <div class="form-row">
+    <label for="node-config-input-timeout_s"><i class="fa fa-clock-o"></i> Timeout (seconds)</label>
+    <input type="number" id="node-config-input-timeout_s" style="width:140px;">
+    <span style="margin-left:8px; font-size:12px; color:#888;">
+      (How long to wait for a reply. A longer wait also delays the next message if a PLC is offline.)
+    </span>
+  </div>
+
+  <div class="form-row">
+    <label for="node-config-input-retries"><i class="fa fa-repeat"></i> Retries</label>
+    <input type="number" id="node-config-input-retries" style="width:140px;">
+    <span style="margin-left:8px; font-size:12px; color:#888;">
+      (Extra attempts after a failed read. PassPort Connect commands are not automatically repeated.)
+    </span>
+  </div>
+
+  <div class="form-row">
+    <label for="node-config-input-gap_s"><i class="fa fa-arrows-h"></i> Gap (seconds)</label>
+    <input type="number" id="node-config-input-gap_s" step="0.1" min="0" style="width:140px;">
+    <span style="margin-left:8px; font-size:12px; color:#888;">
+      (A short pause between messages. Keep the default to start.)
+    </span>
+  </div>
+  <div class="form-tips">
+    Choose RF for wireless, RS485 for a wired connection, or USB for a connected Mako.
+  </div>
+  <div class="form-row">
+    <label for="node-config-input-maxQueue"><i class="fa fa-list"></i> Max queue</label>
+    <input type="number" id="node-config-input-maxQueue" min="1" max="1000" step="1" style="width:140px;">
+  </div>
+  <div class="form-tips">
+    Messages take turns. When the waiting count reaches Max queue, this connection restarts and cancels all waiting messages and the active message. The active message is not counted towards the limit. Cancelled writes are never replayed; an already sent write may have taken effect. New messages are rejected while recovery runs. There is no five-minute recovery timer. PPC also has a separate limit of 16 unfinished messages per node; see Help.
+  </div>
+
+
+</script>
+
+<!-- =========================
+     MAIN NODE TEMPLATE
+     ========================= -->
+<script type="text/html" data-template-name="smithtek-mako-rf">
+  <div class="form-row">
+    <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+    <input type="text" id="node-input-name" placeholder="">
+  </div>
+
+  <div class="form-row">
+    <label for="node-input-prefix"><i class="fa fa-tag"></i> Prefix</label>
+    <input type="text" id="node-input-prefix" placeholder="e.g. b1">
+    <div class="form-tips">Added before each decoder name with a space: b1 + Pressure becomes b1 Pressure. Leave blank to keep existing names.</div>
+  </div>
+
+  <div class="form-row">
+    <label for="node-input-bus"><i class="fa fa-sitemap"></i> Bus</label>
+    <input type="text" id="node-input-bus" style="width: 25%;">
+    <span style="margin-left:8px; font-size:12px; color:#888;">
+      (Add or edit your Modbus channel here, RF is for the long range radio Coms (LoRa) )
+    </span>
+  </div>
+
+  <div class="form-row">
+    <label for="node-input-mode"><i class="fa fa-random"></i> Mode</label>
+    <select id="node-input-mode" style="width: 20%;">
+      <option value="read">Read</option>
+      <option value="write">Write</option>
+    </select>
+    <span style="margin-left:8px; font-size:12px; color:#888;">
+      (Read will poll the Mako's modbus, Write will send commands to it, digital BOOLS, values etc. )
+    </span>
+  </div>
+
+  <div class="form-row">
+    <label for="node-input-unitid"><i class="fa fa-hashtag"></i> Device ID</label>
+    <input type="number" id="node-input-unitid" min="1" max="247" style="width: 140px;">
+    <span style="margin-left:8px; font-size:12px; color:#888;">
+      (The ID of your Mako Device, via RF or RS485)
+    </span>
+  </div>
+
+  <div class="form-row">
+    <label for="node-input-fc"><i class="fa fa-code"></i> Function</label>
+    <select id="node-input-fc" style="width: 25%;"></select>
+    <span style="margin-left:8px; font-size:12px; color:#888;">
+      (Match the function code with your V-NET program, Input register, holding register and so on.)
+    </span>
+  </div>
+
+  <div class="form-row">
+    <label for="node-input-address"><i class="fa fa-crosshairs"></i> Address</label>
+    <input type="number" id="node-input-address" min="0" style="width: 140px;">
+    <span style="margin-left:8px; font-size:12px; color:#888;">
+      (The address of the first register you want to read,)
+    </span>
+  </div>
+
+  <div class="form-row">
+    <label for="node-input-quantity"><i class="fa fa-list-ol"></i> Quantity</label>
+    <input type="number" id="node-input-quantity" min="1" style="width: 100px;">
+    <span style="margin-left:8px; font-size:12px; color:#888;">
+      (Qty of registers to read. 16bit = 1 register, 32bit = 2 registers. example, 3* floats would = 6 registers)
+    </span>
+  </div>
+
+  <div id="st-rf-write" style="margin-top:10px; display:none;">
+    <div class="form-row">
+      <label for="node-input-valueSource"><i class="fa fa-pencil"></i> Value source</label>
+      <select id="node-input-valueSource" style="width: 70%;">
+        <option value="msg.payload">From msg.payload</option>
+        <option value="fixed">Fixed</option>
+      </select>
+    </div>
+
+    <div id="st-rf-fixedwrap" style="margin-top:6px;">
+      <div class="form-row">
+        <label for="node-input-valueType"><i class="fa fa-sliders"></i> Fixed type</label>
+        <select id="node-input-valueType" style="width: 70%;">
+          <option value="bool">Boolean (true/false)</option>
+          <option value="number">Number</option>
+          <option value="json">JSON (array/object)</option>
+          <option value="string">String</option>
+        </select>
+      </div>
+
+      <div class="form-row">
+        <label for="node-input-valueText"><i class="fa fa-edit"></i> Fixed value</label>
+        <input type="text" id="node-input-valueText" placeholder='e.g. true | 123 | [1,0,1] | [100,200]'>
+      </div>
+    </div>
+
+    <div class="form-row">
+      <label for="node-input-includeWriteQuantity"><i class="fa fa-check-square-o"></i> Include quantity</label>
+      <input type="checkbox" id="node-input-includeWriteQuantity" style="width:auto;">
+    </div>
+  </div>
+
+  <hr />
+
+  <div id="st-rf-decode-wrap">
+    <div class="form-row" style="margin-bottom:6px;">
+      <b>Decoder map</b>
+      <span style="margin-left:8px; font-size:12px; color:#888;">
+        (Build your register table in the exact same order as your Mako V-NET program, Add new rows and change the register data type to match)
+      </span>
+      <div style="margin-top:6px;">
+        <a href="#" class="editor-button" id="st-add-item"><i class="fa fa-plus"></i> Add row</a>
+        <a href="#" class="editor-button" id="st-clear-items" style="margin-left:8px;"><i class="fa fa-trash"></i> Reset</a>
+      </div>
+    </div>
+
+    <div class="form-row">
+      <div style="overflow-x:auto;"><table class="table table-condensed" style="width:100%; min-width:1100px; table-layout:fixed;">
+        <thead>
+          <tr>
+            <th style="width:20%;">Name </th>
+            <th style="width:145px;">Register data Type</th>
+            <th style="width:65px;">Offset</th>
+            <th style="width:565px;">Scaling</th>
+            <th style="width:42px;">Bit</th>
+            <th style="width:55px;">Action</th>
+          </tr>
+        </thead>
+        <tbody id="st-items-tbody"></tbody>
+      </table></div>
+    </div>
+
+    <div style="font-size:12px; color:#666; margin-top:6px;">
+  (Register Offsets numbers should match the modbus table you have built in V-NET!, if you add a digital it will automatically increase the bit number. Bit 1 = digital 1 and so on.
+    </div>
+    <div class="form-tips">None keeps the row compact and applies no scaling. Choose Math for an inline expression such as /100, or Range to map input low/high to output low/high. Use the values actually reported by the Mako: for example 4–20 to 0–100, or 4000–20000 to 0–100 if the register reports microamps. Range replaces the Math expression. Values outside the input range continue scaling unless Clamp is checked.</div>
+  </div>
+</script>
+
+<script type="text/markdown" data-help-name="smithtek-mako-rf">
+Smithtek Mako RF / RS485.
+
+**Automatic queue recovery (3.5.1):** Open this node and click the pencil beside Bus. Max queue counts waiting messages only. With Max queue 10, the tenth waiting message starts recovery. The active message and every waiting message are cancelled with EBUSRESET once through the existing alarm/debug outputs and Catch. New arrivals are rejected with EBUSRECOVERING. Cancelled writes are never replayed; an already sent write may have executed. Check the equipment and read back before resending. msg.modbus.writeMayHaveApplied and the technical error payload flag a possibly sent write.
+
+The connection must close before a fresh connection opens. It waits for late replies to stop and clears old data before accepting new FIFO work. Other connections keep working. Failed recovery reports EBUSRECOVERYFAILED and blocks new work; a port whose closure cannot be confirmed stays blocked. Check the fault and connection before redeploying. This restarts only the affected connection inside the nodes, not Node-RED, PassPort, system drivers or the PLC. There is no five-minute recovery timer; ordinary response timeouts and retries still apply.
+
+Each PPC input message uses one shared queue position and finishes its whole table before the next message. PPC retains its separate limit of 16 unfinished messages per node, including its active message. Extra messages report EQUEUEFULL through Catch without restarting the bus. For a single busy PPC node, Max queue 10 allows recovery before that separate limit. Slow down Inject repeats if the queue keeps filling.
+
+Read mode outputs decoded JSON in msg.payload using the Decoder map rows. Numeric readings are rounded to at most six decimal places after Math or Range scaling, and remain numbers. Digital points (coils, discrete inputs and register bits) output numeric 1 for on and 0 for off.
+Raw modbus response is kept in msg.modbus.raw.
+
+Prefix adds text and one space before each decoder name. Leave blank to preserve names.
+
+Output 1 (Data / alarm) carries successful readings and write responses, or the friendly named fault JSON on failure. Output 2 (Debug) carries technical error details: ok, error, code and req. Connect it to a local Debug node or leave it disconnected. Node-RED error logs and Catch handling remain enabled. A timeout alarm is sent after one poll exhausts its retries (retries 2 means 3 attempts), not after multiple bad polls. Permanent Modbus exceptions report immediately. Each failed poll emits one alarm and one debug message.
+
+Failed requests output a named numeric alarm on output 1, for example {"b1 RF ID2 Not communicating — check power/RF; disable if out of service":1}. Details remain in msg.modbus, including ok, code, error and fault. Only final failures are reported; a successful retry or intentional shutdown does not emit an alarm. Successful reads resume normal data; no automatic alarm-clear value is sent.
+
+Each numeric decoder row starts compact with None (unchanged). Choose Math or Range to show the inline settings and enable scaling. Selecting None hides both controls and disables both calculations, while retaining the entered settings. Range maps input low/high to output low/high using a straight line; for example 4–20 maps to 0–100, with 12 mapping to 50. Use raw register endpoints, not assumed electrical units. Input endpoints must differ. Reversed ranges and negative/decimal endpoints are supported. Clamp optionally limits output to the configured range. Existing rows without a scaling mode retain their Math expression.
+</script>
+
+<script type="text/javascript">
+(function(){
+ const typeLabels={float32:'Float',uint32:'32-bit unsigned',int32:'32-bit signed',int16:'16-bit signed',uint16:'16-bit unsigned',boolean:'TRUE / FALSE'};
+ const width={float32:2,int32:2,uint32:2,int16:1,uint16:1,boolean:1};
+ function collect(){const channels=[],indices={analog:0,switches:0};$('#pl-rows tr').each(function(i){const tr=$(this),get=k=>tr.find('[data-field="'+k+'"]').val(),kind=get('kind');channels.push({...(tr.data('channel')||{}),slot:i,index:indices[kind]++,kind,name:get('name').trim(),dataType:kind==='switches'?'boolean':get('dataType'),address:Number(get('address')),pulseOnWrite:kind==='switches'&&!!(tr.data('channel')||{}).pulseOnWrite,scaleMode:kind==='switches'?'none':get('scaleMode'),scale:get('scale'),inputLow:get('inputLow'),inputHigh:get('inputHigh'),outputLow:get('outputLow'),outputHigh:get('outputHigh'),rangeCollapsed:!!tr.data('rangeCollapsed'),clampRange:tr.find('[data-field="clampRange"]').prop('checked')});});const map={schema:'smithtek.passport-channels',version:1,unitId:Number($('#pl-unit').val()),channels};map.mappingId='passport-link-v1:'+JSON.stringify([map.unitId,channels.map(c=>[c.kind,c.index,c.name,c.dataType,c.address,c.slot,!!c.pulseOnWrite,c.pulseMs||250])]);return map;}
+ function modeUi(){const write=$('#node-input-mode').val()==='write';$('.pl-write-only').toggle(write);$('.pl-read-only').toggle(!write);$('.pl-single-only').toggle(write&&$('#node-input-inputMode').val()==='single');$('.pl-table tr').each(function(){$(this).children().eq(4).toggle(!write);});}
+ function sync(){const map=collect();const choose=$('#node-input-writeChannel'),selected=choose.val()||choose.data('selected')||'';choose.empty().append($('<option>').val('').text('Choose channel…'));map.channels.forEach(c=>choose.append($('<option>').val(c.name).text(c.name+' · '+(typeLabels[c.dataType]||c.dataType))));if(selected&&!map.channels.some(c=>c.name===selected))choose.append($('<option>').val(selected).text(selected+' (not in table)'));choose.val(selected);modeUi();$('#node-input-mapping').val(JSON.stringify(map)).trigger('change');$('#pl-count').text(map.channels.length+' / 128 channels');$('#pl-add').prop('disabled',map.channels.length>=128);}
+ function row(c){const tr=$('<tr>').data('rangeCollapsed',!!c.rangeCollapsed).data('channel',c).appendTo('#pl-rows');function field(key,type,value){return $('<input>').attr({type:type||'text','data-field':key,'aria-label':key}).val(value??'');}function select(key,options,value){const el=$('<select>').attr({'data-field':key,'aria-label':key});options.forEach(o=>$('<option>').val(o[0]).text(o[1]).appendTo(el));return el.val(value);}
+ const name=field('name','text',c.name).attr('maxlength',40),kind=select('kind',[['analog','Analog'],['switches','Digital']],c.kind),type=select('dataType',Object.entries(typeLabels),c.dataType),address=field('address','number',c.address).attr({min:0,max:65535,step:1}),mode=select('scaleMode',[['none','None'],['math','Math'],['range','Range']],c.scaleMode||'none'),math=field('scale','text',c.scale).attr('placeholder','/100 or +5'),range=$('<div class="pl-range">');
+ for(const [key,label] of [['inputLow','Input low'],['inputHigh','Input high'],['outputLow','Output low'],['outputHigh','Output high']])$('<label>').text(label).append(field(key,'number',c[key]).attr('step','any')).appendTo(range);
+ $('<label>').text('Clamp ').append(field('clampRange','checkbox','').prop('checked',!!c.clampRange)).appendTo(range);
+ const toggle=$('<button type="button" class="red-ui-button">').on('click',()=>{tr.data('rangeCollapsed',!tr.data('rangeCollapsed'));visibility();sync();});
+ for(const control of [name,kind,type,address])$('<td>').append(control).appendTo(tr);$('<td>').append($('<div style="display:flex;gap:5px;align-items:center">').append(mode,toggle),math,range).appendTo(tr);
+ const buttons=$('<td>');for(const [label,action] of [['↑',()=>{tr.prev().before(tr);sync();}],['↓',()=>{tr.next().after(tr);sync();}],['×',()=>{tr.remove();sync();}]])$('<button type="button" class="red-ui-button">').text(label).attr('aria-label',label==='×'?'Remove channel':label==='↑'?'Move channel up':'Move channel down').on('click',action).appendTo(buttons);buttons.appendTo(tr);
+ function visibility(){const sw=kind.val()==='switches';if(sw){type.val('boolean');mode.val('none');}else if(type.val()==='boolean')type.val('float32');type.prop('disabled',sw);mode.prop('disabled',sw);math.toggle(mode.val()==='math');const isRange=mode.val()==='range',collapsed=!!tr.data('rangeCollapsed');range.toggle(isRange&&!collapsed);toggle.toggle(isRange).text(collapsed?'Show range':'Hide range').attr('aria-expanded',String(!collapsed)).css({whiteSpace:'nowrap',flexShrink:0});}
+ mode.on('change',()=>{if(mode.val()==='range')tr.data('rangeCollapsed',false);});
+ kind.on('change',()=>{const others=collect().channels.filter((_,i)=>i!==tr.index()).filter(c=>c.kind===kind.val());address.val(others.reduce((end,c)=>Math.max(end,c.address+(width[c.dataType]||1)),0));});
+ tr.on('input change','input,select',()=>{visibility();sync();});visibility();
+ }
+ function valid(value){try{const m=typeof value==='string'?JSON.parse(value):value;if(!m||!Number.isInteger(m.unitId)||m.unitId<1||m.unitId>247||!m.channels.length||m.channels.length>128)return false;const names=new Set(),used=new Set();return m.channels.every(c=>{if(!c.name||names.has(c.name)||['__proto__','constructor','prototype'].includes(c.name)||!width[c.dataType]||!Number.isInteger(c.address)||c.address<0||c.address+width[c.dataType]>65536)return false;names.add(c.name);for(let i=0;i<width[c.dataType];i++){const k=c.kind+':'+(c.address+i);if(used.has(k))return false;used.add(k);}if(c.scaleMode==='range'){const vals=['inputLow','inputHigh','outputLow','outputHigh'].map(k=>c[k]);if(vals.some(v=>v===''||!Number.isFinite(Number(v)))||Number(vals[0])===Number(vals[1]))return false;}if(c.scaleMode==='math'){const s=String(c.scale||'').trim();if(!s||(!Number.isFinite(Number(s))&&!/^([*\/+\-]|>>>|>>|<<|==|!=|>|<|%)\s*(-?\d+(?:\.\d+)?)$/.test(s))||/^[/%%]\s*-?0(?:\.0+)?$/.test(s))return false;}return true;});}catch(e){return false;}}
+ RED.nodes.registerType('smithtek-passport-link',{
+ category:'Smithtek',paletteLabel:'PassPort Connect',color:'#6D6D6D',defaults:{prefix:{value:''},writeChannel:{value:'',validate:function(v){if(this.mode!=='write'||this.inputMode!=='single')return true;try{return JSON.parse(this.mapping).channels.some(c=>c.name===v);}catch(e){return false;}}},name:{value:''},bus:{value:'',type:'smithtek-mako-rf-bus',required:true},mode:{value:'read',required:true},inputMode:{value:'single'},mapping:{value:'',required:true,validate:valid}},inputs:1,outputs:2,icon:'passport-connect-cropped.png',label:function(){return this.name||'PassPort Connect';},outputLabels:['Named data / write confirmed','Error'],
+ oneditprepare:function(){$('#node-input-writeChannel').data('selected',this.writeChannel||'').on('change',function(){$(this).data('selected',$(this).val());});$('#node-input-mode,#node-input-inputMode').on('change',modeUi);$('#node-input-inputMode').val(this.inputMode||'arrays');let map;try{map=typeof this.mapping==='string'?JSON.parse(this.mapping):this.mapping;}catch(e){}$('#pl-unit').val(map?.unitId||1);$('#pl-rows').empty();(map?.channels||[]).forEach(row);$('#pl-unit').on('input change',sync);$('#pl-add').on('click',function(){const channels=collect().channels,kind=$('#pl-add-kind').val(),label=kind==='switches'?'Digital':'Analog';let address=0;channels.filter(c=>c.kind===kind).forEach(c=>address=Math.max(address,c.address+width[c.dataType]));let i=1;while(channels.some(c=>c.name===label+' '+i))i++;row({name:label+' '+i,kind,dataType:kind==='switches'?'boolean':'float32',address});sync();});sync();},oneditsave:function(){sync();this.mapping=$('#node-input-mapping').val();}
+ });
+})();
+</script>
+<style>
+.pl-table{width:100%;border-collapse:collapse}.pl-table td,.pl-table th{padding:5px;text-align:left;vertical-align:top}.pl-table input,.pl-table select{width:100%;min-width:75px}.pl-table td:first-child{min-width:140px}.pl-table td:last-child{white-space:nowrap}.pl-table td:last-child button{padding:0 6px}.pl-range{display:grid;grid-template-columns:1fr 1fr;gap:5px;min-width:220px}.pl-range label{font-size:11px;margin:0!important;width:auto!important}.pl-range input[type=checkbox]{width:auto;min-width:0}.pl-table [data-field=scale]{margin-top:5px}
+</style>
+<script type="text/html" data-template-name="smithtek-passport-link">
+ <div class="form-row"><label for="node-input-name">Name</label><input id="node-input-name" type="text"></div>
+ <div class="form-row"><label for="node-input-bus">Connection</label><input id="node-input-bus"></div>
+ <div class="form-row"><label for="node-input-mode">Action</label><select id="node-input-mode"><option value="read">Read channels</option><option value="write">Write channels</option></select></div>
+ <div class="form-row pl-write-only"><label for="node-input-inputMode">Write input</label><select id="node-input-inputMode"><option value="single">Single channel</option><option value="arrays">Mapped arrays</option><option value="named">Named values</option></select></div>
+ <div class="form-row pl-single-only"><label for="node-input-writeChannel">Write channel</label><select id="node-input-writeChannel"></select></div>
+ <div class="form-row pl-read-only"><label for="node-input-prefix">Prefix</label><input id="node-input-prefix" type="text" placeholder="e.g. North Mako"></div>
+ <div class="form-row"><label for="pl-unit">Unit ID</label><input id="pl-unit" type="number" min="1" max="247"></div>
+ <input id="node-input-mapping" type="hidden">
+ <p><b>Separate Read and Write nodes:</b> copy and paste your complete Read node, then change the copy’s Action to Write. This copies the whole table. Choose the row you want to control. Later changes to one node do not update the other.</p>
+ <p class="pl-write-only"><b>Single channel:</b> select Pump, then inject a Boolean true/false into msg.payload; select a setpoint and inject a number. Only that channel is written. <b>Named values:</b> send {"Pump":true,"Setpoint":25}; only supplied names are written. Names are case-sensitive and use the table names without the read Prefix. <b>Mapped arrays:</b> send matching mappingId plus Analog and/or Digital arrays (JSON keys analog and switches) in table order. These are ordered values, not named objects.</p>
+ <p class="pl-read-only"><b>Prefix:</b> helps you label readings. North Mako plus Level appears as "North Mako Level". Commands still use the original row name, Level.</p>
+
+ <div style="overflow:auto"><table class="pl-table"><thead><tr><th>Name</th><th>Data type</th><th>Value type</th><th>Address</th><th>Read scaling</th><th>Order / remove</th></tr></thead><tbody id="pl-rows"></tbody></table></div>
+ <p><select id="pl-add-kind" aria-label="New channel kind" style="width:120px"><option value="analog">Analog</option><option value="switches">Digital</option></select> <button id="pl-add" type="button" class="red-ui-button">Add channel</button> <span id="pl-count"></span></p>
+ <p>Keep this table matched to the PLC. Moving a row does not change its address. Changes here do not change the PLC program. Export again from V-net after changing the PLC table.</p>
+ <p>Math and Range change named read values. Arrays in msg.channels keep the original values. Write inputs use device units; scaling is not applied to commands. Update matching nodes after changing the table.</p>
+</script>
 <script type="text/html" data-help-name="smithtek-passport-link">
 <p>PassPort Connect (PPC) is Smithtek’s proprietary communication link between PassPort, Mako and Solaris. It lets your PassPort read measurements and send commands to a Mako or Solaris. For example, you can check a tank level, change a setting or start a pump.</p>
 <p>The smithtek-mako-rf package includes two communication nodes. Original Mako RF is for basic Modbus reads and writes. PassPort Connect is for the matching PassPort Connect table in V-NET2. Choose PassPort Connect for this guide; the two nodes use different message formats.</p>
@@ -774,7 +780,7 @@ Each numeric decoder row starts compact with None (unchanged). Choose Math or Ra
 <p>Keep the selected connection for PassPort messages. Do not also send ordinary Monitor text over it: mixed messages can stop readings and commands from working.</p>
 <h3>2 · Make your channel table</h3>
 <dl><dt>Float</dt><dd>A 32-bit floating-point number, such as 12.5 volts. Stores about seven significant digits. Large whole numbers can round: 123456789 becomes 123456792. Choose 32-bit unsigned or 32-bit signed when you need that whole number exactly.</dd><dt>16-bit signed</dt><dd>Whole numbers from −32768 to 32767.</dd><dt>16-bit unsigned</dt><dd>Whole numbers from 0 to 65535.</dd><dt>32-bit signed</dt><dd>Whole numbers from −2147483648 to 2147483647.</dd><dt>32-bit unsigned</dt><dd>Whole numbers from 0 to 4294967295.</dd><dt>Digital</dt><dd>On or off: true or false. Use this for switches and simple controls.</dd></dl>
-<p>An Analog row holds a number. A Digital row holds on or off. Mako supports up to 64 rows; Solaris supports up to 16, with space also needed for the rest of your program.</p>
+<p>An Analog row holds a number. A Digital row holds on or off. Mako supports up to 128 rows (use the updated PassPort Connect Node-RED package for tables over 64 rows); Solaris supports up to 16, with space also needed for the rest of your program.</p>
 <p>Use a different name for each row, up to 40 characters. Capital letters matter: Pump and pump are different names. The editor will tell you if a name cannot be used.</p>
 <p>V-NET2 works out the table addresses for you. An address is simply where a value is kept. Leave these alone when using an exported table.</p>
 <p>Keep the PLC table and both Node-RED tables the same. After changing a table in V-NET2, upload the changed PLC program and export fresh nodes. Replace the old nodes so you do not accidentally read or send commands twice.</p>
@@ -819,7 +825,13 @@ Each numeric decoder row starts compact with None (unchanged). Choose Math or Ra
 <p>Think of the connection as a single lane: messages take turns. A long table or a PLC that does not answer can hold up the next message, including a command.</p>
 <p>Timeout is how long PassPort waits for an answer. Read retries is how many extra times it tries a failed read. The exported defaults wait up to 8 seconds and allow 2 extra read attempts. Commands do not use these extra attempts.</p>
 <p>A queue is a waiting list of messages. If you ask for readings too quickly, the list grows and replies get late. Slow down the Inject repeat rate and remove duplicate triggers if this happens.</p>
-<p>Each Read or Write node can have up to 16 waiting messages. The shared connection also has a limit. Use a Catch node to show queue-full errors, as well as Debug on the second output for other problems.</p>
+<p>Automatic queue recovery is available in the Smithtek node package from version 3.5.1. Open a Read or Write node, then click the pencil beside Connection. Max queue sets how many messages may wait before that connection restarts. The message already being processed does not count. For example, with Max queue set to 10, the tenth waiting message starts recovery.</p>
+<p>Recovery cancels the active message and every waiting message, including the one that reached the limit. Each cancelled message reports EBUSRESET once through the second output and Catch. Messages arriving during recovery are rejected with EBUSRECOVERING; they are not saved for later.</p>
+<p>Cancelled writes are never replayed. A write already sent to the PLC may have taken effect, even if its reply was lost. Recovery does not undo it. Check the equipment and read the value back before deciding whether to send that command again. The error output includes writeMayHaveApplied to flag a command that may already have been sent.</p>
+<p>The connection closes, opens fresh, waits for late replies to stop, then clears old data. New messages can take turns again when recovery finishes. Other connections keep working. This restarts only that connection inside the nodes; it does not restart Node-RED, PassPort or the PLC, and it does not reset system drivers.</p>
+<p>If the old connection cannot be confirmed closed, recovery stops and reports EBUSRECOVERYFAILED. It will not open a second connection to the same port. Check the reported fault and the connection before redeploying. If the old port is still held open, a redeploy will remain blocked rather than risk two users of that port.</p>
+<p>There is no five-minute recovery timer. Recovery starts only when Max queue is reached; normal response timeouts and read retries still apply. Slow down repeated Inject messages if recovery happens often. Recovery clears a backlog but does not fix a missing PLC or an overloaded connection.</p>
+<p>Each PassPort Connect input message counts once in the shared waiting list, even when its table needs several requests. Its whole table finishes before the next message starts. Each Read or Write node also keeps its existing limit of 16 unfinished messages, including its active message. Any extra message reports EQUEUEFULL through Catch. This separate limit can be reached before Max queue; it does not restart the connection. For one busy PPC node, a Max queue of 10 lets bus recovery happen before that separate limit. Keep Debug on the second output and a Catch node connected while testing.</p>
 <p>Start with one PLC and manual reads. Add regular reads and other PLCs gradually, checking how long replies take. Signal conditions and the amount of information affect the speed.</p>
 <p>Signal-strength options used by the older RF node do not add a signal-strength reading to PassPort Connect.</p>
 <h3>8 · If something is not working</h3>
@@ -845,4 +857,9 @@ Each numeric decoder row starts compact with None (unchanged). Choose Math or Ra
 <p>Open Write, choose Single channel and select TestRelay. Do not leave Battery selected. Make one Inject with Boolean true and another with Boolean false. Leave automatic startup and Repeat off. Wire both to Write, Deploy, and test each button.</p>
 <p>Check the relay itself or a feedback sensor, as well as the reply. For an Analog setpoint later, select that row and send a number in the original units.</p>
 <p>For a ready-wired farm project, open Farmers quick templates. Choose the picture, enter a unique Unit ID and the required sensor settings, then choose Load &amp; export Node-RED. The project uses PassPort Connect, includes battery voltage and exports the complete Read and Write pair onto your current flow.</p>
-</script>
+<h3>Remember table values on Mako</h3>
+<p>Mako only: select the logic block, then open its table from the left-hand Properties panel. Tick Save on restart beside each row you want to remember and click Apply table. New rows start unticked. Only ticked rows restore their last saved numbers or ON/OFF commands; unticked rows start from their Initial value.</p>
+<p>Live values update immediately. Save interval (minutes) starts at 5, which is the minimum. Enter 60 for one hour, 360 for six hours, or any whole number up to 1440 (24 hours). Changed values save at those checks, starting one full interval after startup. New messages, EEPROM writes, Clear EEPROM, reset and sleep commands do not force an early table save. The PLC EEPROM interval still controls the other saved features; each table has its own interval.</p>
+<p>Power loss or a restart before the next save loses changes since the last successful save. A connected input takes over when its source publishes a value; leave remote-command rows unwired on the left. Restored measurements are old readings until refreshed. Pulse on write rows are excluded and need a new command. Uploading a new Mako program clears saved values.</p>
+<p>PLC EEPROM Save pending and Save error include remembered tables. Clear EEPROM and Read saved still work on the separate EEPROM values bank, not on these tables. To see a table value, use its output pin or read it from PassPort. Changing which rows are saved changes the saved record. A record that no longer matches uses Initial values. Older programs with whole-table saving enabled open with their ordinary rows already ticked; you can untick any you do not need.</p>
+</script>