Updates to build configuration for WASM port

Author: johnnohj

ports/wasm/Makefile

@@ -35,6 +35,7 @@ FROZEN_MANIFEST ?= variants/manifest.py
 QSTR_DEFS = qstrdefsport.h
 QSTR_GLOBAL_DEPENDENCIES += $(VARIANT_DIR)/mpconfigvariant.h
 
+include $(TOP)/py/circuitpy_mpconfig.mk
 include $(TOP)/py/circuitpy_defns.mk
 
 # include py core make definitions

ports/wasm/mpconfigport.h

@@ -111,7 +111,7 @@
 
 // CIRCUITPY-CHANGE: CircuitPython-specific settings
 #define CIRCUITPY_MICROPYTHON_ADVANCED (1)
-#define MICROPY_PY_ASYNC_AWAIT (1)
+// MICROPY_PY_ASYNC_AWAIT and CIRCUITPY_STATUS_BAR are set in mpconfigport.mk
 #define MICROPY_PY_UCTYPES (0)
 #define MICROPY_PY_MICROPYTHON_RINGIO (0)  // Not supported in WASM
 

ports/wasm/mpconfigport.mk

@@ -22,10 +22,10 @@
 
 # CIRCUITPY-CHANGE: CircuitPython global marker
 CFLAGS += -DCIRCUITPY=1
-
+CIRCUITPY_FULL_BUILD = 0
 # Enable VFS POSIX for Emscripten filesystem
 MICROPY_VFS = 1
-
+LONGINT_IMPL = MPZ
 # This variable can take the following values:
 #  0 - no readline, just simple stdin input
 #  1 - use MicroPython version of readline
@@ -76,6 +76,13 @@ MICROPY_VFS_LFS2 = 0
 
 CIRCUITPY_MESSAGE_COMPRESSION_LEVEL = 1
 MICROPY_EMIT_NATIVE = 0
+CIRCUITPY_USB_DEVICE = 0
+
+# Enable async/await even though FULL_BUILD=0
+MICROPY_PY_ASYNC_AWAIT = 1
+
+# WASM has no physical LEDs
+CIRCUITPY_STATUS_BAR = 0
 
 # Enable modules that we have implemented or that work without hardware
 CIRCUITPY_BOARD = 1
@@ -89,7 +96,7 @@ CIRCUITPY_MICROCONTROLLER = 1
 CIRCUITPY_NEOPIXEL_WRITE = 1
 CIRCUITPY_PWMIO = 1
 CIRCUITPY_ROTARYIO = 1
-CIRCUITPY_ROTARYIO_SOFTENCODER = 1
+# CIRCUITPY_ROTARYIO_SOFTENCODER = 1
 CIRCUITPY_TIME = 1
 
 # Enable ulab for scientific computing (pure software module)
@@ -106,3 +113,108 @@ CIRCUITPY_JSON = 1
 CIRCUITPY_OS_GETENV = 1
 CIRCUITPY_RE = 1
 CIRCUITPY_ZLIB = 0
+
+# ==============================================================================
+# EXPLICITLY DISABLE MODULES
+# ==============================================================================
+# Since CIRCUITPY_FULL_BUILD=0, many modules are already disabled by default,
+# but we explicitly disable modules that might be enabled by dependencies or
+# that require external libraries/hardware we don't support.
+
+# Note: MICROPY_PY_ASYNC_AWAIT is set by circuitpy_mpconfig.mk based on CIRCUITPY_FULL_BUILD
+# We enable it in mpconfigport.h instead to avoid redefinition
+
+# Audio modules (require external libraries like mp3 decoder, or hardware)
+CIRCUITPY_AUDIOBUSIO = 0
+CIRCUITPY_AUDIOCORE = 0
+CIRCUITPY_AUDIOIO = 0
+CIRCUITPY_AUDIOMP3 = 0
+CIRCUITPY_AUDIOPWMIO = 0
+CIRCUITPY_AUDIOMIXER = 0
+CIRCUITPY_AUDIODELAYS = 0
+CIRCUITPY_AUDIOFILTERS = 0
+CIRCUITPY_AUDIOFREEVERB = 0
+
+# Display modules (need hardware or complex implementations)
+CIRCUITPY_DISPLAYIO = 0
+CIRCUITPY_BITMAPTOOLS = 0
+CIRCUITPY_BITMAPFILTER = 0
+CIRCUITPY_FRAMEBUFFERIO = 0
+CIRCUITPY_PARALLELDISPLAYBUS = 0
+CIRCUITPY_EPAPERDISPLAY = 0
+CIRCUITPY_FOURWIRE = 0
+CIRCUITPY_I2CDISPLAYBUS = 0
+
+# Bluetooth (needs hardware)
+CIRCUITPY_BLEIO = 0
+CIRCUITPY_BLEIO_HCI = 0
+CIRCUITPY_BLEIO_NATIVE = 0
+CIRCUITPY_BLE_FILE_SERVICE = 0
+
+# Hardware-specific modules not implemented
+CIRCUITPY_ALARM = 0
+CIRCUITPY_ANALOGBUFIO = 0
+CIRCUITPY_BITBANGIO = 0
+CIRCUITPY_BITOPS = 0
+CIRCUITPY_CAMERA = 0
+CIRCUITPY_CANIO = 0
+CIRCUITPY_COUNTIO = 0
+CIRCUITPY_DUALBANK = 0
+CIRCUITPY_ESPIDF = 0
+CIRCUITPY_ESPULP = 0
+CIRCUITPY_FREQUENCYIO = 0
+CIRCUITPY_GNSS = 0
+CIRCUITPY_I2CTARGET = 0
+CIRCUITPY_IMAGECAPTURE = 0
+CIRCUITPY_KEYPAD = 0
+CIRCUITPY_MDNS = 0
+CIRCUITPY_MEMORYMAP = 0
+CIRCUITPY_NEOPIXEL = 0
+CIRCUITPY_NVM = 0
+CIRCUITPY_ONEWIREIO = 0
+CIRCUITPY_OS = 0
+CIRCUITPY_PS2IO = 0
+CIRCUITPY_PULSEIO = 0
+CIRCUITPY_RGBMATRIX = 0
+CIRCUITPY_RTC = 0
+CIRCUITPY_SDCARDIO = 0
+CIRCUITPY_SDIOIO = 0
+CIRCUITPY_SOCKETPOOL = 0
+CIRCUITPY_SSL = 0
+CIRCUITPY_STORAGE = 0
+CIRCUITPY_SUPERVISOR = 0
+CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_TOUCHIO = 0
+CIRCUITPY_USB_CDC = 0
+CIRCUITPY_USB_HID = 0
+CIRCUITPY_USB_MIDI = 0
+CIRCUITPY_USB_MSC = 0
+CIRCUITPY_USB_VIDEO = 0
+CIRCUITPY_VIDEOCORE = 0
+CIRCUITPY_WATCHDOG = 0
+CIRCUITPY_WIFI = 0
+
+# Software modules not yet needed/tested
+CIRCUITPY_AESIO = 0
+CIRCUITPY_ATEXIT = 0
+CIRCUITPY_CODEOP = 0
+CIRCUITPY_GETPASS = 0
+CIRCUITPY_GIFIO = 0
+CIRCUITPY_HASHLIB = 0
+CIRCUITPY_LOCALE = 0
+CIRCUITPY_MAX3421E = 0
+CIRCUITPY_MSGPACK = 0
+CIRCUITPY_PIXELBUF = 0
+CIRCUITPY_QRIO = 0
+CIRCUITPY_TRACEBACK = 0
+CIRCUITPY_USERCMODULE = 0
+
+# Additional software modules to consider enabling later
+CIRCUITPY_ARRAY = 1
+CIRCUITPY_COLLECTIONS = 1
+CIRCUITPY_IO = 1
+CIRCUITPY_MATH = 1
+CIRCUITPY_RANDOM = 1
+CIRCUITPY_STRUCT = 0  # Has upstream pointer type bug (mp_uint_t* vs size_t*)
+CIRCUITPY_SYS = 1
+CIRCUITPY_WARNINGS = 1

ports/wasm/mphalport.c

@@ -81,3 +81,13 @@ extern int mp_interrupt_char;
 int mp_hal_get_interrupt_char(void) {
     return mp_interrupt_char;
 }
+
+// CircuitPython os.urandom support (required by random module)
+bool common_hal_os_urandom(uint8_t *buffer, uint32_t length) {
+    // TODO: Implement using JavaScript's crypto.getRandomValues()
+    // For now, return zeros to indicate no real randomness available
+    for (uint32_t i = 0; i < length; i++) {
+        buffer[i] = 0;
+    }
+    return false;  // Return false to indicate we didn't get real random data
+}

ports/wasm/variants/standard/mpconfigvariant.h

@@ -44,5 +44,6 @@
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 
 // WASM has no physical status LEDs, disable status bar features
-#define CIRCUITPY_STATUS_BAR 0
+// NOTE: CIRCUITPY_STATUS_BAR is now set in mpconfigport.h to avoid redefinition
+// #define CIRCUITPY_STATUS_BAR 0
 

shared-bindings/busio/I2C.c

@@ -106,7 +106,9 @@ static void check_for_deinit(busio_i2c_obj_t *self) {
 //  Provided by context manager helper.
 
 static void check_lock(busio_i2c_obj_t *self) {
+    #ifndef __EMSCRIPTEN__
     asm ("");
+    #endif
     if (!common_hal_busio_i2c_has_lock(self)) {
         mp_raise_RuntimeError(MP_ERROR_TEXT("Function requires lock"));
     }