@typecad/framework-zephyr 1.0.0-alpha.13 → 1.0.0-alpha.15

package/src/toolchain/scaffold.ts

@@ -10,6 +10,9 @@
 import { writeFileSync, existsSync, mkdirSync, readFileSync, readdirSync } from 'node:fs';
 import { join } from 'node:path';
 import { resolveKconfigFragments, type KconfigUsage } from '../dt-config/kconfig.js';
+import { scanSensorParts } from './index.js';
+import { readCuttlefishLibrarySidecar } from '@typecad/cuttlefish/library-packages';
+import { SENSOR_PART_INFO } from '@typecad/hal';
 
 /** Write a file only if the content differs from the existing file.
  *  Returns true when the file was written (content changed or file was new). */
@@ -58,6 +61,30 @@ function readEmittedSources(srcDir: string): string {
   return out;
 }
 
+/**
+ * Append cuttlefish library packages' devicetree overlay fragments to the
+ * generated overlay. Library entries come from the transpiler's libraries.json
+ * sidecar (next to the emitted sources) and are already gated on the
+ * library's include token appearing in the emitted sources — no re-detection.
+ * Fragments merge after the framework overlay so library nodes (e.g.
+ * @typecad/zephyr-esp32s3-rgb's WS2812 node on I2S0) layer over it.
+ */
+export function appendLibraryOverlayFragments(overlay: string, projectRoot: string): string {
+  let out = overlay;
+  for (const entry of readCuttlefishLibrarySidecar(join(projectRoot, 'src'))) {
+    if (!entry.overlay) continue;
+    try {
+      const fragment = readFileSync(entry.overlay, 'utf8').trim();
+      if (fragment.length > 0) {
+        out += (out.endsWith('\n') ? '' : '\n') + '\n' + fragment + '\n';
+      }
+    } catch {
+      // best-effort; a missing fragment surfaces as a DT error
+    }
+  }
+  return out;
+}
+
 /**
  * Emit the Zephyr application skeleton around the generated src/main.cpp.
  *
@@ -98,17 +125,28 @@ export function scaffoldZephyrProject(projectRoot: string, debug = false, userKc
     usesDac: uses('dac_') || uses('__tc_dac'),
     usesFS: uses('__tc_fs'),
     usesHwtimer: uses('counter_') || uses('__tc_hw'),
-    usesI2c: uses('i2c_'),
-    usesSpi: uses('spi_'),
-    usesUart: uses('uart_'),
+    // The __tc_<bus> alternative matches the shim's state block — a program
+    // that only calls begin() emits `(void)__tc_i2c1_dev;` (no driver API
+    // call yet), but the shim still declared DEVICE_DT_GET(DT_NODELABEL(...))
+    // so the overlay must enable the node or the device symbol is missing.
+    usesI2c: uses('i2c_') || uses('__tc_i2c'),
+    // DT-bound sensor parts: the __tc_sensor_* state references and the
+    // sensor_sample_fetch/sensor_channel_get calls both carry the token.
+    usesSensor: uses('sensor_') || uses('__tc_sensor'),
+    usesFloatFormat: /%[-0-9.]*[eEfFgG]/.test(src),
+    usesSpi: uses('spi_') || uses('__tc_spi'),
+    usesUart: uses('uart_') || uses('__tc_uart'),
+    // USB CDC serial: every usb.* lowering calls into the __tc_usb<N>_* shim
+    // (device + init helper emitted under usesUsb).
+    usesUsb: uses('__tc_usb'),
+    // STM32F4 DBGMCU keep-SWD-alive init present (emitted for stm32f4 socs).
+    usesStm32DebugSleep: uses('__tc_stm32_dbgmcu'),
     usesWdt: uses('wdt_'),
     usesBle: uses('bt_') || uses('bt_gatt') || uses('bt_le_'),
     usesDisplay: uses('display_write') || uses('display_init') || uses('display_fill_rect') || uses('__tc_display_dev') || uses('CuttlefishDisplayTarget'),
     usesTouch: uses('ft6336u') || uses('touch_'),
-    // Power tokens: k_sleep + pm_state_force / PM_STATE_* (what power.ts emits).
-    // The old `power_` token matched nothing the power HAL emits and collides
-    // with tx_power_dbm — removed.
-    usesPower: uses('pm_') || uses('k_sleep') || uses('PM_STATE_'),
+    // (The power HAL is removed; its former pm_/k_sleep token scan is gone —
+    // nothing here must match tx_power_dbm's `power` substring.)
     usesWifi: uses('wifi_') || uses('net_mgmt') || uses('conn_mgr'),
     // HTTP: the __tc_http_* shim + http_client_req + getaddrinfo. The '_'-anchored
     // 'http_' token matches __tc_http_* and http_client_req (the core HTTP lib
@@ -141,6 +179,12 @@ export function scaffoldZephyrProject(projectRoot: string, debug = false, userKc
     '# Auto-generated by @typecad/framework-zephyr from cuttlefish.config.ts.',
     'cmake_minimum_required(VERSION 3.20.0)',
     '',
+    '# The app is its own board root: MCU-only targets generate an out-of-tree',
+    '# custom board under boards/typecad/<name>/ that Zephyr must discover.',
+    '# Harmless when boards/ holds only .overlay files (BOARD_ROOT just needs',
+    '# the directory to exist).',
+    'list(APPEND BOARD_ROOT ${CMAKE_CURRENT_SOURCE_DIR})',
+    '',
     'find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})',
     '',
     'project(zephyr_app)',
@@ -205,6 +249,36 @@ export function scaffoldZephyrProject(projectRoot: string, debug = false, userKc
     if (userKconfig && userKconfig.hasOwnProperty(sym)) continue;
     prjConf.push(`${sym}=${val}`);
   }
+  // ── Cuttlefish library packages ─────────────────────────────────────────
+  // Libraries the program imports (recorded in the transpiler's libraries.json
+  // sidecar, next to the emitted sources) contribute their manifest's kconfig
+  // lines — e.g. @typecad/zephyr-esp32s3-rgb contributes CONFIG_LED_STRIP.
+  // Sidecar entries are already gated on the library's include token
+  // appearing in the emitted sources, so no re-detection here. User
+  // zephyr.kconfig overrides still win.
+  const libraryEntries = readCuttlefishLibrarySidecar(srcDir);
+  if (libraryEntries.length > 0) {
+    prjConf.push('', '# Library packages (cuttlefish.library.json contributions).');
+    for (const entry of libraryEntries) {
+      for (const line of entry.kconfig) {
+        const sym = line.split('=')[0];
+        if (userKconfig && sym !== undefined && userKconfig.hasOwnProperty(sym)) continue;
+        prjConf.push(line);
+      }
+    }
+  }
+  // Per-part Kconfig exceptions: catalog parts whose driver is NOT default-y
+  // on its DT node carry extra lines here (empty today — every in-tree sensor
+  // driver lights up from the node; the path exists so the first exception
+  // found by the generator has somewhere to go).
+  const sensorParts = scanSensorParts(src);
+  if (sensorParts.length > 0) {
+    const extra = [...new Set(sensorParts.flatMap((sp) => SENSOR_PART_INFO[sp.part]?.kconfig ?? []))];
+    if (extra.length > 0) {
+      prjConf.push('', '# Sensor part Kconfig (catalog exceptions).');
+      for (const line of extra) prjConf.push(line);
+    }
+  }
   // Emit user-specified Kconfig from cuttlefish.config.ts zephyr.kconfig.
   // These override any matching auto-detected symbol (skipped above).
   if (userKconfig) {