diff --git a/examples/MicrocontrollerRP2040WithUsbC/__snapshots__/MicrocontrollerRP2040WithUsbC.circuit-schematic.snap.svg b/examples/MicrocontrollerRP2040WithUsbC/__snapshots__/MicrocontrollerRP2040WithUsbC.circuit-schematic.snap.svg
index f0a0d4b..7021270 100644
--- a/examples/MicrocontrollerRP2040WithUsbC/__snapshots__/MicrocontrollerRP2040WithUsbC.circuit-schematic.snap.svg
+++ b/examples/MicrocontrollerRP2040WithUsbC/__snapshots__/MicrocontrollerRP2040WithUsbC.circuit-schematic.snap.svg
@@ -1,4 +1,4 @@
-
\ No newline at end of file
+ D_VBUSR_3V3_EN100kΩC_IOVDD1100nFC_IOVDD2100nFC_IOVDD3100nFC_IOVDD4100nFC_IOVDD5100nFC_IOVDD6100nFR_RUN10kΩC_FLASH100nFC_USB_VDD100nFC_ADC100nFTYPE_C_16PIN_2MD_073_J_USB13EH114EH215pin13_alt116pin14_alt117A1B1218A4B919B820A521B722A623A724B625A826B527B4A928B1A12RP2040U11IOVDD62GPIO03GPIO14GPIO25GPIO36GPIO47GPIO58GPIO69GPIO710IOVDD511GPIO812GPIO913GPIO1014GPIO1115GPIO1216GPIO1317GPIO1418GPIO1519TESTEN20XIN21XOUT22IOVDD423DVDD224SWCLK25SWD26RUN27GPIO1628GPIO1729GPIO1830GPIO1931GPIO2032GPIO2133IOVDD334GPIO2235GPIO2336GPIO2437GPIO2538GPIO26_ADC039GPIO27_ADC140GPIO28_ADC241GPIO29_ADC342IOVDD243ADC_AVDD44VREG_IN45VREG_VOUT46USB_DM47USB_DP48USB_VDD49IOVDD150DVDD151QSPI_SD352QSPI_SCLK53QSPI_SD054QSPI_SD255QSPI_SD156QSPI_SS57GND/thermalpadW25Q16JVUXIQU21CS234GND56CLK78VCC9EPAP2112K_3_3TRG1U31VIN2GND3EN4NC5VOUTY112MHz / 12pFSW_BOOTSW_RUNgreenD1greenD_PWRR_BOOT10kΩR_LED330ΩR_PWR_LED330ΩR_CC15.1kΩR_CC25.1kΩR_USB127ΩR_USB227ΩC_VBUS10uFC_3V310uFC_CORE1uFC_USB1uFC_XIN18pFC_XOUT18pFL_AVDD600MHTP_SWCLKTP_GNDTP_SWDIOTP_3V3VSYSVBUSVBUSVBUSVBUSEN_RV3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3GNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDRUN_RRUN_RADC_VREFADC_VREFADC_VREFCC1USB_DN_BUSB_DN_BUSB_DP_AUSB_DP_ACC2XINXINXOUTXOUTV1V1V1V1V1V1SWCLKSWCLKSWDSWDLED_GP25LED_GP25USB_DNUSB_DNUSB_DPUSB_DPQSPI_SD3QSPI_SD3QSPI_SCLKQSPI_SCLKQSPI_SD0QSPI_SD0QSPI_SD2QSPI_SD2QSPI_SD1QSPI_SD1QSPI_SSQSPI_SSQSPI_SSPLED_DClock
\ No newline at end of file
diff --git a/lib/Microcontroller_RP2040/Microcontroller_RP2040.circuit.tsx b/lib/Microcontroller_RP2040/Microcontroller_RP2040.circuit.tsx
index 9cd48fa..8a0b4e7 100644
--- a/lib/Microcontroller_RP2040/Microcontroller_RP2040.circuit.tsx
+++ b/lib/Microcontroller_RP2040/Microcontroller_RP2040.circuit.tsx
@@ -18,16 +18,18 @@ const adcRefLabel = {
displayName: "ADC_REF",
schDisplayLabel: "ADC_REF",
} as const
+// Keep every functional subset attached to one of the four visible sections so
+// section bounds and dividers account for all schematic components.
const schSections = {
rp2040: (name: string) => `${name}__rp2040`,
usb: (name: string) => `${name}__usb`,
- power: (name: string) => `${name}__power`,
- flash: (name: string) => `${name}__flash`,
+ power: (name: string) => `${name}__rp2040`,
+ flash: (name: string) => `${name}__usb`,
clock: (name: string) => `${name}__clock`,
- controls: (name: string) => `${name}__controls`,
- display: (name: string) => `${name}__display`,
+ controls: (name: string) => `${name}__status`,
+ display: (name: string) => `${name}__status`,
status: (name: string) => `${name}__status`,
- debug: (name: string) => `${name}__debug`,
+ debug: (name: string) => `${name}__status`,
} as const
export type MicrocontrollerRP2040Props = Omit<
@@ -73,9 +75,9 @@ export const Microcontroller_RP2040 = ({
pcbX={-2}
pcbY={21}
pcbRotation={90}
- schX={7.8}
- schY={-4.6}
- schRotation={180}
+ schX={3}
+ schY={-5.8}
+ schRotation={90}
/>
{/* RUN pullup */}
@@ -359,7 +368,7 @@ export const Microcontroller_RP2040 = ({
schSectionName={schSections.clock(name)}
pcbX={-0.5}
pcbY={-6}
- schX={1.025}
+ schX={1.2}
schY={-12.5}
/>
D_VBUSR_3V3_EN100kΩC_IOVDD1100nFC_IOVDD2100nFC_IOVDD3100nFC_IOVDD4100nFC_IOVDD5100nFC_IOVDD6100nFR_RUN10kΩC_FLASH100nFC_USB_VDD100nFC_ADC100nFTYPE_C_16PIN_2MD_073_J_USB13EH114EH215pin13_alt116pin14_alt117A1B1218A4B919B820A521B722A623A724B625A826B527B4A928B1A12RP2040U11IOVDD62GPIO03GPIO14GPIO25GPIO36GPIO47GPIO58GPIO69GPIO710IOVDD511GPIO812GPIO913GPIO1014GPIO1115GPIO1216GPIO1317GPIO1418GPIO1519TESTEN20XIN21XOUT22IOVDD423DVDD224SWCLK25SWD26RUN27GPIO1628GPIO1729GPIO1830GPIO1931GPIO2032GPIO2133IOVDD334GPIO2235GPIO2336GPIO2437GPIO2538GPIO26_ADC039GPIO27_ADC140GPIO28_ADC241GPIO29_ADC342IOVDD243ADC_AVDD44VREG_IN45VREG_VOUT46USB_DM47USB_DP48USB_VDD49IOVDD150DVDD151QSPI_SD352QSPI_SCLK53QSPI_SD054QSPI_SD255QSPI_SD156QSPI_SS57GND/thermalpadW25Q16JVUXIQU21CS234GND56CLK78VCC9EPAP2112K_3_3TRG1U31VIN2GND3EN4NC5VOUTY112MHz / 12pFSW_BOOTSW_RUNgreenD1greenD_PWRR_BOOT10kΩR_LED330ΩR_PWR_LED330ΩR_CC15.1kΩR_CC25.1kΩR_USB127ΩR_USB227ΩC_VBUS10uFC_3V310uFC_CORE1uFC_USB1uFC_XIN18pFC_XOUT18pFL_AVDD600MHTP_SWCLKTP_GNDTP_SWDIOTP_3V3VSYSVBUSVBUSVBUSVBUSEN_REN_RV3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3GNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDRUN_RRUN_RADC_VREFADC_VREFADC_VREFCC1CC1USB_DN_BUSB_DN_BUSB_DP_AUSB_DP_ACC2XINXINXOUTXOUTV1V1V1V1V1V1SWCLKSWCLKSWDSWDLED_GP25LED_GP25USB_DNUSB_DNUSB_DPUSB_DPQSPI_SD3QSPI_SD3QSPI_SCLKQSPI_SCLKQSPI_SD0QSPI_SD0QSPI_SD2QSPI_SD2QSPI_SD1QSPI_SD1QSPI_SSQSPI_SSQSPI_SSLED_D1PLED_D
\ No newline at end of file
+ D_VBUSR_3V3_EN100kΩC_IOVDD1100nFC_IOVDD2100nFC_IOVDD3100nFC_IOVDD4100nFC_IOVDD5100nFC_IOVDD6100nFR_RUN10kΩC_FLASH100nFC_USB_VDD100nFC_ADC100nFTYPE_C_16PIN_2MD_073_J_USB13EH114EH215pin13_alt116pin14_alt117A1B1218A4B919B820A521B722A623A724B625A826B527B4A928B1A12RP2040U11IOVDD62GPIO03GPIO14GPIO25GPIO36GPIO47GPIO58GPIO69GPIO710IOVDD511GPIO812GPIO913GPIO1014GPIO1115GPIO1216GPIO1317GPIO1418GPIO1519TESTEN20XIN21XOUT22IOVDD423DVDD224SWCLK25SWD26RUN27GPIO1628GPIO1729GPIO1830GPIO1931GPIO2032GPIO2133IOVDD334GPIO2235GPIO2336GPIO2437GPIO2538GPIO26_ADC039GPIO27_ADC140GPIO28_ADC241GPIO29_ADC342IOVDD243ADC_AVDD44VREG_IN45VREG_VOUT46USB_DM47USB_DP48USB_VDD49IOVDD150DVDD151QSPI_SD352QSPI_SCLK53QSPI_SD054QSPI_SD255QSPI_SD156QSPI_SS57GND/thermalpadW25Q16JVUXIQU21CS234GND56CLK78VCC9EPAP2112K_3_3TRG1U31VIN2GND3EN4NC5VOUTY112MHz / 12pFSW_BOOTSW_RUNgreenD1greenD_PWRR_BOOT10kΩR_LED330ΩR_PWR_LED330ΩR_CC15.1kΩR_CC25.1kΩR_USB127ΩR_USB227ΩC_VBUS10uFC_3V310uFC_CORE1uFC_USB1uFC_XIN18pFC_XOUT18pFL_AVDD600MHTP_SWCLKTP_GNDTP_SWDIOTP_3V3VSYSVBUSVBUSVBUSVBUSEN_RV3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3V3GNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDGNDRUN_RRUN_RADC_VREFADC_VREFADC_VREFCC1USB_DN_BUSB_DN_BUSB_DP_AUSB_DP_ACC2XINXINXOUTXOUTV1V1V1V1V1V1SWCLKSWCLKSWDSWDLED_GP25LED_GP25USB_DNUSB_DNUSB_DPUSB_DPQSPI_SD3QSPI_SD3QSPI_SCLKQSPI_SCLKQSPI_SD0QSPI_SD0QSPI_SD2QSPI_SD2QSPI_SD1QSPI_SD1QSPI_SSQSPI_SSQSPI_SSPLED_D
\ No newline at end of file