Merge branch 'project-ocre:main' into test-implement-modbus-server-testing

Author: PatrickRobbIOL

.clang-format

@@ -11,14 +11,15 @@ AllowShortEnumsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
-BitFieldColonSpacing: After
-BreakBeforeBraces: Attach
+BitFieldColonSpacing: Both
+BreakBeforeBraces: Linux
 ColumnLimit: 120
 ConstructorInitializerIndentWidth: 8
 ContinuationIndentWidth: 8
-IndentCaseLabels: true
-IndentWidth: 4
-InsertBraces: true
+IndentCaseLabels: true # Linux is false
+IndentWidth: 8
+LineEnding: LF
 SpaceBeforeParens: ControlStatementsExceptControlMacros
-SortIncludes: Never
-#UseTab: ForContinuationAndIndentation
+SortIncludes: false
+UseTab: Always
+TabWidth: 8

.github/workflows/coding_guidelines.yml

@@ -0,0 +1,29 @@
+name: Coding Guidelines Check
+
+# Trigger this workflow on all pull requests
+on:
+  pull_request:
+
+# Ensure only one instance of this workflow runs per branch
+# Cancel any in-progress runs when new commits are pushed
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      # Install clang-format-16 for code formatting checks
+      - name: Install clang-format-16
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y clang-format-16
+
+      - name: Run Formatting Check
+        run: ./scripts/check_formatting.sh

CMakeLists.txt

@@ -57,9 +57,15 @@ add_custom_target(generate_messages DEPENDS ${MSG_GENERATED_FILE})
 
 if(NOT "${OCRE_INPUT_FILE}" STREQUAL "")
     message("Using input file: ${OCRE_INPUT_FILE}")
+    
+    # Extract filename without extension for use in software
+    get_filename_component(OCRE_INPUT_FILE_NAME ${OCRE_INPUT_FILE} NAME_WE)
+    message("Input file name (without extension): ${OCRE_INPUT_FILE_NAME}")
+    add_definitions(-DOCRE_INPUT_FILE_NAME="${OCRE_INPUT_FILE_NAME}")
+    
     add_custom_command(
         OUTPUT ${CMAKE_CURRENT_LIST_DIR}/src/ocre/ocre_input_file.g
-        COMMAND xxd -n wasm_binary -i ${OCRE_INPUT_FILE} > ${CMAKE_CURRENT_LIST_DIR}/src/ocre/ocre_input_file.g
+        COMMAND xxd -n wasm_binary -i ${OCRE_INPUT_FILE} | sed 's/^unsigned/static const unsigned/' > ${OCRE_ROOT_DIR}/src/ocre/ocre_input_file.g
         DEPENDS ${OCRE_INPUT_FILE}
         COMMENT "Generating C header from ${OCRE_INPUT_FILE}"
     )

Kconfig

@@ -39,6 +39,13 @@ config OCRE_WAMR_HEAP_BUFFER_SIZE
   help
     A static memory allocation for WAMR to use as a heap.
 
+config OCRE_STORAGE_HEAP_BUFFER_SIZE
+  int "Storage heap buffer size in bytes"
+  default 500000
+  depends on MEMC
+  help
+    A static memory allocation for container storage to use as a heap.
+
 config OCRE_CONTAINER_DEFAULT_HEAP_SIZE
   int "Default value for the container heap size"
   default 4096
@@ -217,5 +224,53 @@ config OCRE_NETWORKING
     default n
     help
         Enable networking support for containers.
-        
+
+config OCRE_SHARED_HEAP
+    bool "Enable container shared heap support"
+    default n
+    help
+        Enable shared heap support for containers.
+
+config OCRE_SHARED_HEAP_BUF_SIZE
+    int "Shared heap buffer size in bytes"
+    default 65536
+    depends on OCRE_SHARED_HEAP
+    help
+      Size of the pre-allocated buffer for the shared heap.
+      This memory is shared between WebAssembly modules.
+
+choice OCRE_SHARED_HEAP_MODE
+    prompt "Shared heap mode"
+    depends on OCRE_SHARED_HEAP
+    default OCRE_SHARED_HEAP_BUF_VIRTUAL
+    help
+      Select the shared heap memory mode:
+      - Physical: Map physical hardware registers (e.g., GPIO) to WASM address space
+      - Virtual: Allocate shared heap from regular RAM
+
+config OCRE_SHARED_HEAP_BUF_PHYSICAL
+    bool "Physical (hardware register mapping)"
+    help
+      Enable physical memory mapping for hardware access.
+      Maps physical hardware registers (like GPIO at 0x42020000) to WASM address space.
+      Use this when containers need direct access to hardware peripherals.
+
+config OCRE_SHARED_HEAP_BUF_VIRTUAL
+    bool "Virtual (RAM allocation)"
+    help
+      Enable virtual shared heap allocated from regular RAM.
+      Use this for normal inter-module communication without
+      direct hardware access.
+
+endchoice
+
+config OCRE_SHARED_HEAP_BUF_ADDRESS
+    hex "Shared heap buffer address"
+    default 0x00
+    depends on OCRE_SHARED_HEAP
+    help
+      Shared heap buffer address.
+      - For physical mode: Physical address of hardware registers
+      - For virtual mode: Leave as 0x00 to auto-allocate from RAM
+
 endmenu

boards/b_u585i_iot02a.conf

@@ -1,5 +1,6 @@
 # Memory configuration and sizes
-CONFIG_ARM_MPU=y
+CONFIG_ARM_MPU=n
+CONFIG_FPU=y
 CONFIG_MAIN_STACK_SIZE=8192
 CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=-1
 
@@ -8,7 +9,8 @@ CONFIG_MEMC=y
 
 # Container defaults
 CONFIG_MAX_CONTAINERS=5
-CONFIG_OCRE_WAMR_HEAP_BUFFER_SIZE=8388608
+CONFIG_OCRE_WAMR_HEAP_BUFFER_SIZE=6388608
+CONFIG_OCRE_STORAGE_HEAP_BUFFER_SIZE=2000000
 
 # Bus interfaces
 CONFIG_GPIO=y

boards/b_u585i_iot02a.overlay

@@ -1,6 +1,10 @@
 #include <zephyr/dt-bindings/pinctrl/stm32-pinctrl.h>
 
 / {
+    chosen {
+        zephyr,code-partition = &slot0_partition;
+    };
+
     aliases {
         rng0 = &rng_device;
         led0 = &green_led_1;
@@ -82,12 +86,37 @@
     };
 };
 
-/* Optional: flash partitions */
+/* Flash partitions - 2MB total, no MCUboot */
 &flash0 {
+    /delete-node/ partitions;
+    
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        /* Application partition - 1900KB */
+        slot0_partition: partition@0 {
+            label = "image-0";
+            reg = <0x00000000 DT_SIZE_K(2000)>;
+        };
+        /* Dummy slot1 partition for MCUboot compatibility (unused) */
+        slot1_partition: partition@1F5000 {
+            label = "image-1";  
+            reg = <0x001F5000 DT_SIZE_K(44)>;
+        };
+    };
+};
+
+// 64MB external flash
+&mx25lm51245 {
     partitions {
-        user_data_partition: partition@100000 {
+        /delete-node/ partition;
+
+        /* Use the whole flash for the filesystem. */
+        user_data_partition: storage_partition: partition@0 {
             label = "user_data";
-            reg = <0x00100000 DT_SIZE_K(256)>;
+            reg = <0x00000000 DT_SIZE_M(64)>;
         };
     };
 };

boards/nrf5340dk_nrf5340_cpuapp.conf

@@ -0,0 +1,79 @@
+CONFIG_ARM_MPU=y
+CONFIG_MAIN_STACK_SIZE=4096
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
+CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=-1
+CONFIG_HEAP_MEM_POOL_SIZE=32768
+
+# Container defaults - Reduced for nRF5340's limited RAM
+CONFIG_MAX_CONTAINERS=2
+CONFIG_OCRE_WAMR_HEAP_BUFFER_SIZE=180000
+CONFIG_OCRE_CONTAINER_DEFAULT_HEAP_SIZE=4096
+CONFIG_OCRE_CONTAINER_DEFAULT_STACK_SIZE=4096
+
+# DISABLE OCRE SHELL (this is what's causing the shell_fprintf errors!)
+CONFIG_OCRE_SHELL=n
+
+# Disable the main Zephyr shell AND all shell subsystems
+CONFIG_NET_SHELL=n
+CONFIG_FILE_SYSTEM_SHELL=n
+CONFIG_SENSOR_SHELL=n
+
+# Override shell-related configs from prj.conf since shell is disabled
+
+# Random number generator (REQUIRED by networking and RNG sensor)
+CONFIG_ENTROPY_GENERATOR=y
+CONFIG_TEST_RANDOM_GENERATOR=y
+
+# Reduce networking stack sizes to save RAM
+CONFIG_NET_TX_STACK_SIZE=1024
+CONFIG_NET_RX_STACK_SIZE=2048
+CONFIG_NET_BUF_TX_COUNT=8
+CONFIG_NET_BUF_RX_COUNT=16
+CONFIG_NET_MGMT_EVENT_STACK_SIZE=1024
+CONFIG_NET_PKT_RX_COUNT=8
+CONFIG_NET_PKT_TX_COUNT=8
+CONFIG_NET_BUF_DATA_SIZE=128
+
+# Bus interfaces
+CONFIG_GPIO=y
+
+# Ocre Sensors support
+CONFIG_SENSOR=y
+CONFIG_OCRE_SENSORS=y
+CONFIG_RNG_SENSOR=y
+
+# Ocre GPIO Support (minimal)
+CONFIG_OCRE_GPIO=y
+CONFIG_OCRE_GPIO_MAX_PORTS=4
+CONFIG_OCRE_GPIO_PINS_PER_PORT=8
+CONFIG_OCRE_GPIO_MAX_PINS=32
+
+# Disable container messaging to save RAM
+CONFIG_OCRE_CONTAINER_MESSAGING=y
+
+# Enable container filesystem for WASI stdio
+CONFIG_OCRE_CONTAINER_FILESYSTEM=y
+
+# CONFIG_BOOTLOADER_MCUBOOT=n
+# # CONFIG_IMG_MANAGER=n
+# CONFIG_MCUBOOT_IMG_MANAGER=n
+# CONFIG_STREAM_FLASH=n
+# CONFIG_IMG_ERASE_PROGRESSIVELY=n
+
+# Flash settings
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+
+# Serial/UART
+CONFIG_SERIAL=y
+CONFIG_UART_CONSOLE=y
+CONFIG_CONSOLE=y
+
+# Reduce other buffers
+CONFIG_ZVFS_OPEN_MAX=8
+CONFIG_ZVFS_EVENTFD_MAX=5
+
+CONFIG_LOG_TRACE_SHORT_TIMESTAMP=n
+
+CONFIG_SHELL_PROMPT_UART=""

boards/nrf5340dk_nrf5340_cpuapp.overlay

@@ -0,0 +1,34 @@
+/ {
+    aliases {
+        rng0 = &rng_device;
+        led0 = &led0;
+    };
+
+    rng_device: rng_0 {
+        compatible = "custom,rng-sensor";
+        label = "RNG Sensor";
+        status = "okay";
+    };
+
+    devices {
+        compatible = "custom,devices";
+        status = "okay";
+        device_list = <&rng_device>;
+    };
+};
+
+/* Enable one LED for blinky */
+&led0 {
+    status = "okay";
+};
+
+&flash0 {
+    partitions {
+        /delete-node/ partition@f8000;
+
+        user_data_partition: partition@e0000 {
+            label = "user_data";
+            reg = <0x000e0000 DT_SIZE_K(128)>;
+        };
+    };
+};

build.sh

@@ -91,6 +91,11 @@ if [[ "$TARGET" == "z" ]]; then
                         -DDTC_OVERLAY_FILE=boards/${ZEPHYR_BOARD}.overlay\;boards/enc28j60.overlay"
             echo "Building for b_u585i_iot02a with ENC28J60 support"
             ;;
+        nrf5340)
+            ZEPHYR_BOARD="nrf5340dk/nrf5340/cpuapp"
+            CONF_EXTRA=""
+            echo "Building for nrf5340dk board: App CPU"
+            ;;
         *)
             ZEPHYR_BOARD="$BOARD_ARG"
             CONF_EXTRA=""