Rebase onto main, move CARDKB_I2C out of class body, resolve via platformio.ini

variants/promicro/platformio.ini

@@ -178,17 +178,21 @@ extends = Promicro
 build_src_filter = ${Promicro.build_src_filter}
   +<../examples/kiss_modem/>
 ; ============================================================
-; Solo build (UI completa on-device) com CardKB no barramento
-; I2C ja usado pelo OLED (SDA=D8, SCL=D7 -- confirmado contra o
-; esquematico oficial da fakeTec V5 rev.B). Requer o patch
-; CARDKB_USE_PRIMARY_WIRE em UITask.h/.cpp e SettingsScreen.h.
+; Solo build (full on-device UI) with CardKB support.
+; CardKB shares the board's primary I2C bus (already used by the
+; OLED display / RTC) instead of a dedicated second bus: the default
+; Wire1 pins on this variant (D13/D14) physically collide with the
+; LoRa SPI bus (P_LORA_NSS=13, P_LORA_MOSI=14), and no other free
+; GPIO pair is broken out on this board for a second dedicated bus.
+; Do NOT define ENV_PIN_SDA/ENV_PIN_SCL here -- that would bring up
+; a real Wire1 on the colliding pins instead.
 ; ============================================================
 [env:ProMicro_companion_solo_dual]
 extends = Promicro
 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 712704
-; -Ofast (default do core) infla o flash num build solo feature-completo;
-; -Os cabe com folga.
+; -Ofast (the core's default) doesn't fit a feature-complete solo build;
+; -Os fits with headroom.
 build_unflags = -Ofast
 build_flags = ${Promicro.build_flags}
   -I examples/companion_radio/ui-new
@@ -202,9 +206,8 @@ build_flags = ${Promicro.build_flags}
   -D UI_SENSORS_PAGE=1
   -D ENABLE_SCREENSHOT
   -Os
-  ; CardKB compartilhando o barramento do OLED/RTC (D8/D7) --
-  ; NAO definir ENV_PIN_SDA/SCL aqui, colidiria com o LoRa (D13/D14).
-  -D CARDKB_USE_PRIMARY_WIRE=1
+  ; CardKB on the shared primary bus (D8=SDA / D7=SCL on this board).
+  -D CARDKB_I2C=Wire
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Promicro.build_src_filter}