From cb5f833dd230a84a179c0b880d474a1c81465395 Mon Sep 17 00:00:00 2001 From: "Sergio R. Caprile" Date: Mon, 2 Dec 2024 14:19:27 -0300 Subject: [PATCH] update to Pico-SDK 2.0.0 --- .github/workflows/nightly.yml | 3 +- .github/workflows/quicktest.yml | 3 +- .../CMakeLists.txt | 33 ++++ .../FreeRTOSConfig.h | 156 ++++++++++++++++++ .../FreeRTOS_Kernel_import.cmake | 91 ++++++++++ .../pico-w-picosdk-freertos-lwip/Makefile | 24 +++ .../README.md | 4 + .../pico-w-picosdk-freertos-lwip/lwipopts.h | 55 ++++++ .../pico-w-picosdk-freertos-lwip/main.c | 46 ++++++ .../pico-w-picosdk-freertos-lwip/mongoose.c | 1 + .../pico-w-picosdk-freertos-lwip/mongoose.h | 1 + .../mongoose_config.h | 4 + .../pico-w-picosdk-freertos-lwip/net.c | 1 + .../pico-w-picosdk-freertos-lwip/net.h | 1 + .../pico-w-picosdk-freertos-lwip/packed_fs.c | 1 + .../pico_sdk_import.cmake | 84 ++++++++++ examples/pico-sdk/pico-w/Makefile | 13 -- mongoose.h | 2 + src/arch_picosdk.h | 2 + 19 files changed, 510 insertions(+), 15 deletions(-) create mode 100644 examples/pico-sdk/pico-w-picosdk-freertos-lwip/CMakeLists.txt create mode 100644 examples/pico-sdk/pico-w-picosdk-freertos-lwip/FreeRTOSConfig.h create mode 100644 examples/pico-sdk/pico-w-picosdk-freertos-lwip/FreeRTOS_Kernel_import.cmake create mode 100644 examples/pico-sdk/pico-w-picosdk-freertos-lwip/Makefile rename examples/pico-sdk/{pico-w => pico-w-picosdk-freertos-lwip}/README.md (74%) create mode 100644 examples/pico-sdk/pico-w-picosdk-freertos-lwip/lwipopts.h create mode 100644 examples/pico-sdk/pico-w-picosdk-freertos-lwip/main.c create mode 120000 examples/pico-sdk/pico-w-picosdk-freertos-lwip/mongoose.c create mode 120000 examples/pico-sdk/pico-w-picosdk-freertos-lwip/mongoose.h create mode 100644 examples/pico-sdk/pico-w-picosdk-freertos-lwip/mongoose_config.h create mode 120000 examples/pico-sdk/pico-w-picosdk-freertos-lwip/net.c create mode 120000 examples/pico-sdk/pico-w-picosdk-freertos-lwip/net.h create mode 120000 examples/pico-sdk/pico-w-picosdk-freertos-lwip/packed_fs.c create mode 100644 examples/pico-sdk/pico-w-picosdk-freertos-lwip/pico_sdk_import.cmake delete mode 100644 examples/pico-sdk/pico-w/Makefile diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 40eb73e8f1..115220e973 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -443,7 +443,8 @@ jobs: - path: nxp/rt1170-evk-make-freertos-builtin - path: renesas/ek-ra6m4-make-baremetal-builtin - path: pico-sdk/pico-rndis-dashboard - - path: pico-sdk/pico-w + - path: pico-sdk/pico-w-picosdk-baremetal-builtin + - path: pico-sdk/pico-w-picosdk-freertos-lwip - path: pico-sdk/w5500-evb-pico-picosdk-baremetal-builtin - path: pico-sdk/w5500-evb-pico2-picosdk-baremetal-builtin - path: stm32/nucleo-f746zg-make-freertos-tcp diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml index 8f0d223043..6a9f87e83c 100644 --- a/.github/workflows/quicktest.yml +++ b/.github/workflows/quicktest.yml @@ -309,7 +309,8 @@ jobs: - path: nxp/rt1170-evk-make-freertos-builtin - path: renesas/ek-ra6m4-make-baremetal-builtin - path: pico-sdk/pico-rndis-dashboard - - path: pico-sdk/pico-w + - path: pico-sdk/pico-w-picosdk-baremetal-builtin + - path: pico-sdk/pico-w-picosdk-freertos-lwip - path: pico-sdk/w5500-evb-pico-picosdk-baremetal-builtin - path: pico-sdk/w5500-evb-pico2-picosdk-baremetal-builtin - path: stm32/nucleo-f746zg-make-freertos-tcp diff --git a/examples/pico-sdk/pico-w-picosdk-freertos-lwip/CMakeLists.txt b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/CMakeLists.txt new file mode 100644 index 0000000000..6a764b6d8b --- /dev/null +++ b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 3.13) +include(pico-sdk/pico_sdk_init.cmake) +include(FreeRTOS_Kernel_import.cmake) + +project(firmware) +pico_sdk_init() + +add_executable(firmware + main.c + mongoose.c + net.c + packed_fs.c +) + +target_include_directories(firmware PUBLIC + . +) + +target_link_libraries(firmware + pico_stdlib + pico_rand + pico_cyw43_arch_lwip_sys_freertos + FreeRTOS-Kernel-Heap4 +) +pico_add_extra_outputs(firmware) # create map/bin/hex file etc. + +pico_enable_stdio_usb(firmware 1) # Route stdio +pico_enable_stdio_uart(firmware 0) # to USB + +# Mongoose build flags in mongoose_config.h + +# Example build options +add_definitions(-DHTTP_URL="http://0.0.0.0/") diff --git a/examples/pico-sdk/pico-w-picosdk-freertos-lwip/FreeRTOSConfig.h b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/FreeRTOSConfig.h new file mode 100644 index 0000000000..aea634e0ea --- /dev/null +++ b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/FreeRTOSConfig.h @@ -0,0 +1,156 @@ +/* + * FreeRTOS V202111.00 + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * http://www.FreeRTOS.org + * http://aws.amazon.com/freertos + * + * 1 tab == 4 spaces! + */ + +#ifndef FREERTOS_CONFIG_EXAMPLES_COMMON_H +#define FREERTOS_CONFIG_EXAMPLES_COMMON_H + +/*----------------------------------------------------------- + * Application specific definitions. + * + * These definitions should be adjusted for your particular hardware and + * application requirements. + * + * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE + * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. + * + * See http://www.freertos.org/a00110.html + *----------------------------------------------------------*/ + +/* Scheduler Related */ +#define configUSE_PREEMPTION 1 +#define configUSE_TICKLESS_IDLE 0 +#define configUSE_IDLE_HOOK 0 +#define configUSE_TICK_HOOK 0 +#define configTICK_RATE_HZ ( ( TickType_t ) 1000 ) +#define configMAX_PRIORITIES 32 +#define configMINIMAL_STACK_SIZE ( configSTACK_DEPTH_TYPE ) 512 +#define configUSE_16_BIT_TICKS 0 + +#define configIDLE_SHOULD_YIELD 1 + +/* Synchronization Related */ +#define configUSE_MUTEXES 1 +#define configUSE_RECURSIVE_MUTEXES 1 +#define configUSE_APPLICATION_TASK_TAG 0 +#define configUSE_COUNTING_SEMAPHORES 1 +#define configQUEUE_REGISTRY_SIZE 8 +#define configUSE_QUEUE_SETS 1 +#define configUSE_TIME_SLICING 1 +#define configUSE_NEWLIB_REENTRANT 0 +// todo need this for lwip FreeRTOS sys_arch to compile +#define configENABLE_BACKWARD_COMPATIBILITY 1 +#define configNUM_THREAD_LOCAL_STORAGE_POINTERS 5 + +/* System */ +#define configSTACK_DEPTH_TYPE uint32_t +#define configMESSAGE_BUFFER_LENGTH_TYPE size_t + +/* Memory allocation related definitions. */ +#define configSUPPORT_STATIC_ALLOCATION 0 +#define configSUPPORT_DYNAMIC_ALLOCATION 1 +#define configTOTAL_HEAP_SIZE (128*1024) +#define configAPPLICATION_ALLOCATED_HEAP 0 + +/* Hook function related definitions. */ +#define configCHECK_FOR_STACK_OVERFLOW 0 +#define configUSE_MALLOC_FAILED_HOOK 0 +#define configUSE_DAEMON_TASK_STARTUP_HOOK 0 + +/* Run time and task stats gathering related definitions. */ +#define configGENERATE_RUN_TIME_STATS 0 +#define configUSE_TRACE_FACILITY 1 +#define configUSE_STATS_FORMATTING_FUNCTIONS 0 + +/* Co-routine related definitions. */ +#define configUSE_CO_ROUTINES 0 +#define configMAX_CO_ROUTINE_PRIORITIES 1 + +/* Software timer related definitions. */ +#define configUSE_TIMERS 1 +#define configTIMER_TASK_PRIORITY ( configMAX_PRIORITIES - 1 ) +#define configTIMER_QUEUE_LENGTH 10 +#define configTIMER_TASK_STACK_DEPTH 1024 + +/* Interrupt nesting behaviour configuration. */ +/* +#define configKERNEL_INTERRUPT_PRIORITY [dependent of processor] +#define configMAX_SYSCALL_INTERRUPT_PRIORITY [dependent on processor and application] +#define configMAX_API_CALL_INTERRUPT_PRIORITY [dependent on processor and application] +*/ + +#define configNUMBER_OF_CORES 2 +/* SMP (configNUMBER_OF_CORES > 1) only */ +#define configTICK_CORE 0 +#define configRUN_MULTIPLE_PRIORITIES 1 +#if configNUMBER_OF_CORES > 1 +#define configUSE_CORE_AFFINITY 1 +#endif +#define configUSE_PASSIVE_IDLE_HOOK 0 + +/* Armv8-M */ + +/* Not currently supported */ +#define configENABLE_MPU 0 +//#define configSYSTEM_CALL_STACK_SIZE ( configSTACK_DEPTH_TYPE ) 512 +#define configENABLE_FPU 1 +/* Not currently supported */ +#define configENABLE_TRUSTZONE 0 +#define configRUN_FREERTOS_SECURE_ONLY 1 +// see https://www.freertos.org/RTOS-Cortex-M3-M4.html +#define configMAX_SYSCALL_INTERRUPT_PRIORITY 16 + +/* RP2xxx specific */ +#define configSUPPORT_PICO_SYNC_INTEROP 1 +#define configSUPPORT_PICO_TIME_INTEROP 1 + +#include +/* Define to trap errors during development. */ +#define configASSERT(x) assert(x) + +/* Set the following definitions to 1 to include the API function, or zero +to exclude the API function. */ +#define INCLUDE_vTaskPrioritySet 1 +#define INCLUDE_uxTaskPriorityGet 1 +#define INCLUDE_vTaskDelete 1 +#define INCLUDE_vTaskSuspend 1 +#define INCLUDE_vTaskDelayUntil 1 +#define INCLUDE_vTaskDelay 1 +#define INCLUDE_xTaskGetSchedulerState 1 +#define INCLUDE_xTaskGetCurrentTaskHandle 1 +#define INCLUDE_uxTaskGetStackHighWaterMark 1 +#define INCLUDE_xTaskGetIdleTaskHandle 1 +#define INCLUDE_eTaskGetState 1 +#define INCLUDE_xTimerPendFunctionCall 1 +#define INCLUDE_xTaskAbortDelay 1 +#define INCLUDE_xTaskGetHandle 1 +#define INCLUDE_xTaskResumeFromISR 1 +#define INCLUDE_xQueueGetMutexHolder 1 + +/* A header file that defines trace macro can be included here. */ + +#endif /* FREERTOS_CONFIG_H */ + diff --git a/examples/pico-sdk/pico-w-picosdk-freertos-lwip/FreeRTOS_Kernel_import.cmake b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/FreeRTOS_Kernel_import.cmake new file mode 100644 index 0000000000..15d8e77242 --- /dev/null +++ b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/FreeRTOS_Kernel_import.cmake @@ -0,0 +1,91 @@ +# This is a copy of /portable/ThirdParty/GCC/RP2040/FREERTOS_KERNEL_import.cmake + +# This can be dropped into an external project to help locate the FreeRTOS kernel +# It should be include()ed prior to project(). Alternatively this file may +# or the CMakeLists.txt in this directory may be included or added via add_subdirectory +# respectively. + +if (DEFINED ENV{FREERTOS_KERNEL_PATH} AND (NOT FREERTOS_KERNEL_PATH)) + set(FREERTOS_KERNEL_PATH $ENV{FREERTOS_KERNEL_PATH}) + message("Using FREERTOS_KERNEL_PATH from environment ('${FREERTOS_KERNEL_PATH}')") +endif () + +# first pass we look in old tree; second pass we look in new tree +foreach(SEARCH_PASS RANGE 0 1) + if (SEARCH_PASS) + # ports may be moving to submodule in the future + set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "portable/ThirdParty/Community-Supported-Ports/GCC") + set(FREERTOS_KERNEL_RP2040_BACK_PATH "../../../../..") + else() + set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "portable/ThirdParty/GCC") + set(FREERTOS_KERNEL_RP2040_BACK_PATH "../../../..") + endif() + + if(PICO_PLATFORM STREQUAL "rp2040") + set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/RP2040") + else() + if (PICO_PLATFORM STREQUAL "rp2350-riscv") + set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/RP2350_RISC-V") + else() + set(FREERTOS_KERNEL_RP2040_RELATIVE_PATH "${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/RP2350_ARM_NTZ") + endif() + endif() + + if (NOT FREERTOS_KERNEL_PATH) + # check if we are inside the FreeRTOS kernel tree (i.e. this file has been included directly) + get_filename_component(_ACTUAL_PATH ${CMAKE_CURRENT_LIST_DIR} REALPATH) + get_filename_component(_POSSIBLE_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH} REALPATH) + if (_ACTUAL_PATH STREQUAL _POSSIBLE_PATH) + get_filename_component(FREERTOS_KERNEL_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH} REALPATH) + endif() + if (_ACTUAL_PATH STREQUAL _POSSIBLE_PATH) + get_filename_component(FREERTOS_KERNEL_PATH ${CMAKE_CURRENT_LIST_DIR}/${FREERTOS_KERNEL_RP2040_BACK_PATH} REALPATH) + message("Setting FREERTOS_KERNEL_PATH to ${FREERTOS_KERNEL_PATH} based on location of FreeRTOS-Kernel-import.cmake") + break() + elseif (PICO_SDK_PATH AND EXISTS "${PICO_SDK_PATH}/../FreeRTOS-Kernel") + set(FREERTOS_KERNEL_PATH ${PICO_SDK_PATH}/../FreeRTOS-Kernel) + message("Defaulting FREERTOS_KERNEL_PATH as sibling of PICO_SDK_PATH: ${FREERTOS_KERNEL_PATH}") + break() + endif() + endif () + + if (NOT FREERTOS_KERNEL_PATH) + foreach(POSSIBLE_SUFFIX Source FreeRTOS-Kernel FreeRTOS/Source) + # check if FreeRTOS-Kernel exists under directory that included us + set(SEARCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}) + get_filename_component(_POSSIBLE_PATH ${SEARCH_ROOT}/${POSSIBLE_SUFFIX} REALPATH) + if (EXISTS ${_POSSIBLE_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/CMakeLists.txt) + get_filename_component(FREERTOS_KERNEL_PATH ${_POSSIBLE_PATH} REALPATH) + message("Setting FREERTOS_KERNEL_PATH to '${FREERTOS_KERNEL_PATH}' found relative to enclosing project") + break() + endif() + endforeach() + if (FREERTOS_KERNEL_PATH) + break() + endif() + endif() + + # user must have specified + if (FREERTOS_KERNEL_PATH) + if (EXISTS "${FREERTOS_KERNEL_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}") + break() + endif() + endif() +endforeach () + +if (NOT FREERTOS_KERNEL_PATH) + message(FATAL_ERROR "FreeRTOS location was not specified. Please set FREERTOS_KERNEL_PATH.") +endif() + +set(FREERTOS_KERNEL_PATH "${FREERTOS_KERNEL_PATH}" CACHE PATH "Path to the FreeRTOS Kernel") + +get_filename_component(FREERTOS_KERNEL_PATH "${FREERTOS_KERNEL_PATH}" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}") +if (NOT EXISTS ${FREERTOS_KERNEL_PATH}) + message(FATAL_ERROR "Directory '${FREERTOS_KERNEL_PATH}' not found") +endif() +if (NOT EXISTS ${FREERTOS_KERNEL_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}/CMakeLists.txt) + message(FATAL_ERROR "Directory '${FREERTOS_KERNEL_PATH}' does not contain a '${PICO_PLATFORM}' port here: ${FREERTOS_KERNEL_RP2040_RELATIVE_PATH}") +endif() +set(FREERTOS_KERNEL_PATH ${FREERTOS_KERNEL_PATH} CACHE PATH "Path to the FreeRTOS_KERNEL" FORCE) + +add_subdirectory(${FREERTOS_KERNEL_PATH}/${FREERTOS_KERNEL_RP2040_RELATIVE_PATH} FREERTOS_KERNEL) diff --git a/examples/pico-sdk/pico-w-picosdk-freertos-lwip/Makefile b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/Makefile new file mode 100644 index 0000000000..75bc315bde --- /dev/null +++ b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/Makefile @@ -0,0 +1,24 @@ +RM = rm -rf +MKBUILD = rm -rf build && mkdir -p build # test -d build || mkdir build +ifeq ($(OS),Windows_NT) + RM = cmd /C del /Q /F /S + MKBUILD = if not exist build mkdir build +endif + +all example: + true + +build: pico-sdk FreeRTOS-Kernel build/firmware.uf2 + +build/firmware.uf2: + $(MKBUILD) + cd build && cmake -DPICO_BOARD="pico_w" -G "Unix Makefiles" .. && make + +pico-sdk: + git clone --depth 1 -b 2.0.0 https://github.com/raspberrypi/pico-sdk $@ + cd $@ && git submodule update --init +FreeRTOS-Kernel: # FreeRTOS sources + git clone --depth 1 -b main https://github.com/raspberrypi/FreeRTOS-Kernel $@ + +clean: + $(RM) pico-sdk build FreeRTOS-Kernel diff --git a/examples/pico-sdk/pico-w/README.md b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/README.md similarity index 74% rename from examples/pico-sdk/pico-w/README.md rename to examples/pico-sdk/pico-w-picosdk-freertos-lwip/README.md index 972b4aa194..021dd3c23e 100644 --- a/examples/pico-sdk/pico-w/README.md +++ b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/README.md @@ -1 +1,5 @@ + +# Mongoose on PICO W + + See detailed tutorial at https://mongoose.ws/tutorials/rp2040/pico-w/ diff --git a/examples/pico-sdk/pico-w-picosdk-freertos-lwip/lwipopts.h b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/lwipopts.h new file mode 100644 index 0000000000..1cb098eac8 --- /dev/null +++ b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/lwipopts.h @@ -0,0 +1,55 @@ +#ifndef _LWIPOPTS_H +#define _LWIPOPTS_H + +#define TCPIP_THREAD_STACKSIZE 1024 +#define DEFAULT_THREAD_STACKSIZE 2048 +#define DEFAULT_RAW_RECVMBOX_SIZE 8 +#define TCPIP_MBOX_SIZE 16 +#define DEFAULT_UDP_RECVMBOX_SIZE TCPIP_MBOX_SIZE +#define DEFAULT_TCP_RECVMBOX_SIZE TCPIP_MBOX_SIZE +#define DEFAULT_ACCEPTMBOX_SIZE TCPIP_MBOX_SIZE +#define LWIP_TIMEVAL_PRIVATE 0 + +// not necessary, can be done either way +#define LWIP_TCPIP_CORE_LOCKING_INPUT 1 + +#define LWIP_SOCKET 1 +#define LWIP_COMPAT_SOCKETS 1 +#define LWIP_POSIX_SOCKETS_IO_NAMES 1 +// MEM_LIBC_MALLOC is incompatible with non polling versions +#define MEM_LIBC_MALLOC 0 +#define MEM_ALIGNMENT 4 +#define MEM_SIZE 20000 +#define MEMP_NUM_TCP_PCB 10 +#define MEMP_NUM_TCP_SEG 32 +#define MEMP_NUM_ARP_QUEUE 10 +#define PBUF_POOL_SIZE 24 +#define LWIP_ARP 1 +#define LWIP_ETHERNET 1 +#define LWIP_ICMP 1 +#define LWIP_RAW 1 +#define TCP_WND (8 * TCP_MSS) +#define TCP_MSS 1460 +#define TCP_SND_BUF (8 * TCP_MSS) +#define TCP_SND_QUEUELEN ((4 * (TCP_SND_BUF) + (TCP_MSS - 1)) / (TCP_MSS)) +#define LWIP_NETIF_STATUS_CALLBACK 1 +#define LWIP_NETIF_LINK_CALLBACK 1 +#define LWIP_NETIF_HOSTNAME 1 +#define LWIP_NETCONN 1 +#define MEMP_NUM_NETCONN 10 +#define MEM_STATS 0 +#define SYS_STATS 0 +#define MEMP_STATS 0 +#define LINK_STATS 0 +#define LWIP_CHKSUM_ALGORITHM 3 +#define LWIP_DHCP 1 +#define LWIP_IPV4 1 +#define LWIP_TCP 1 +#define LWIP_UDP 1 +#define LWIP_DNS 0 +#define LWIP_TCP_KEEPALIVE 1 +#define LWIP_NETIF_TX_SINGLE_PBUF 1 +#define DHCP_DOES_ARP_CHECK 0 +#define LWIP_DHCP_DOES_ACD_CHECK 0 + +#endif diff --git a/examples/pico-sdk/pico-w-picosdk-freertos-lwip/main.c b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/main.c new file mode 100644 index 0000000000..fe0d64452e --- /dev/null +++ b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/main.c @@ -0,0 +1,46 @@ +// Copyright (c) 2024 Cesanta Software Limited +// All rights reserved + +#include "pico/stdlib.h" +#include "pico/cyw43_arch.h" +#include "FreeRTOS.h" +#include + +#include "mongoose.h" +#include "net.h" + +#define WIFI_SSID "yourWiFiSSID" +#define WIFI_PASS "yourWiFiPassword" + +static void mongoose(void *args) { + struct mg_mgr mgr; // Initialise Mongoose event manager + mg_mgr_init(&mgr); // and attach it to the interface + mg_log_set(MG_LL_DEBUG); // Set log level + + cyw43_arch_init(); + cyw43_arch_enable_sta_mode(); + cyw43_arch_wifi_connect_blocking(WIFI_SSID, WIFI_PASS, CYW43_AUTH_WPA2_AES_PSK); + + MG_INFO(("Initialising application...")); + web_init(&mgr); + + MG_INFO(("Starting event loop")); + for (;;) { + mg_mgr_poll(&mgr, 0); + } + + (void) args; +} + + +int main(void) { + // initialize stdio + stdio_init_all(); + + xTaskCreate(mongoose, "mongoose", 2048, 0, configMAX_PRIORITIES - 1, NULL); + + vTaskStartScheduler(); // This blocks + + return 0; +} + diff --git a/examples/pico-sdk/pico-w-picosdk-freertos-lwip/mongoose.c b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/mongoose.c new file mode 120000 index 0000000000..5e522bbcd4 --- /dev/null +++ b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/mongoose.c @@ -0,0 +1 @@ +../../../mongoose.c \ No newline at end of file diff --git a/examples/pico-sdk/pico-w-picosdk-freertos-lwip/mongoose.h b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/mongoose.h new file mode 120000 index 0000000000..ee4ac82323 --- /dev/null +++ b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/mongoose.h @@ -0,0 +1 @@ +../../../mongoose.h \ No newline at end of file diff --git a/examples/pico-sdk/pico-w-picosdk-freertos-lwip/mongoose_config.h b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/mongoose_config.h new file mode 100644 index 0000000000..a5856c5ba3 --- /dev/null +++ b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/mongoose_config.h @@ -0,0 +1,4 @@ +#define MG_ARCH MG_ARCH_PICOSDK + +#define MG_ENABLE_LWIP 1 +#define MG_ENABLE_PACKED_FS 1 diff --git a/examples/pico-sdk/pico-w-picosdk-freertos-lwip/net.c b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/net.c new file mode 120000 index 0000000000..fe0e6f06e7 --- /dev/null +++ b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/net.c @@ -0,0 +1 @@ +../../device-dashboard/net.c \ No newline at end of file diff --git a/examples/pico-sdk/pico-w-picosdk-freertos-lwip/net.h b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/net.h new file mode 120000 index 0000000000..9de896ef4e --- /dev/null +++ b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/net.h @@ -0,0 +1 @@ +../../device-dashboard/net.h \ No newline at end of file diff --git a/examples/pico-sdk/pico-w-picosdk-freertos-lwip/packed_fs.c b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/packed_fs.c new file mode 120000 index 0000000000..e06bf09258 --- /dev/null +++ b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/packed_fs.c @@ -0,0 +1 @@ +../../device-dashboard/packed_fs.c \ No newline at end of file diff --git a/examples/pico-sdk/pico-w-picosdk-freertos-lwip/pico_sdk_import.cmake b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/pico_sdk_import.cmake new file mode 100644 index 0000000000..a0721d0d13 --- /dev/null +++ b/examples/pico-sdk/pico-w-picosdk-freertos-lwip/pico_sdk_import.cmake @@ -0,0 +1,84 @@ +# This is a copy of /external/pico_sdk_import.cmake + +# This can be dropped into an external project to help locate this SDK +# It should be include()ed prior to project() + +if (DEFINED ENV{PICO_SDK_PATH} AND (NOT PICO_SDK_PATH)) + set(PICO_SDK_PATH $ENV{PICO_SDK_PATH}) + message("Using PICO_SDK_PATH from environment ('${PICO_SDK_PATH}')") +endif () + +if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT} AND (NOT PICO_SDK_FETCH_FROM_GIT)) + set(PICO_SDK_FETCH_FROM_GIT $ENV{PICO_SDK_FETCH_FROM_GIT}) + message("Using PICO_SDK_FETCH_FROM_GIT from environment ('${PICO_SDK_FETCH_FROM_GIT}')") +endif () + +if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT_PATH} AND (NOT PICO_SDK_FETCH_FROM_GIT_PATH)) + set(PICO_SDK_FETCH_FROM_GIT_PATH $ENV{PICO_SDK_FETCH_FROM_GIT_PATH}) + message("Using PICO_SDK_FETCH_FROM_GIT_PATH from environment ('${PICO_SDK_FETCH_FROM_GIT_PATH}')") +endif () + +if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT_TAG} AND (NOT PICO_SDK_FETCH_FROM_GIT_TAG)) + set(PICO_SDK_FETCH_FROM_GIT_TAG $ENV{PICO_SDK_FETCH_FROM_GIT_TAG}) + message("Using PICO_SDK_FETCH_FROM_GIT_TAG from environment ('${PICO_SDK_FETCH_FROM_GIT_TAG}')") +endif () + +if (PICO_SDK_FETCH_FROM_GIT AND NOT PICO_SDK_FETCH_FROM_GIT_TAG) + set(PICO_SDK_FETCH_FROM_GIT_TAG "master") + message("Using master as default value for PICO_SDK_FETCH_FROM_GIT_TAG") +endif() + +set(PICO_SDK_PATH "${PICO_SDK_PATH}" CACHE PATH "Path to the Raspberry Pi Pico SDK") +set(PICO_SDK_FETCH_FROM_GIT "${PICO_SDK_FETCH_FROM_GIT}" CACHE BOOL "Set to ON to fetch copy of SDK from git if not otherwise locatable") +set(PICO_SDK_FETCH_FROM_GIT_PATH "${PICO_SDK_FETCH_FROM_GIT_PATH}" CACHE FILEPATH "location to download SDK") +set(PICO_SDK_FETCH_FROM_GIT_TAG "${PICO_SDK_FETCH_FROM_GIT_TAG}" CACHE FILEPATH "release tag for SDK") + +if (NOT PICO_SDK_PATH) + if (PICO_SDK_FETCH_FROM_GIT) + include(FetchContent) + set(FETCHCONTENT_BASE_DIR_SAVE ${FETCHCONTENT_BASE_DIR}) + if (PICO_SDK_FETCH_FROM_GIT_PATH) + get_filename_component(FETCHCONTENT_BASE_DIR "${PICO_SDK_FETCH_FROM_GIT_PATH}" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}") + endif () + # GIT_SUBMODULES_RECURSE was added in 3.17 + if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17.0") + FetchContent_Declare( + pico_sdk + GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk + GIT_TAG ${PICO_SDK_FETCH_FROM_GIT_TAG} + GIT_SUBMODULES_RECURSE FALSE + ) + else () + FetchContent_Declare( + pico_sdk + GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk + GIT_TAG ${PICO_SDK_FETCH_FROM_GIT_TAG} + ) + endif () + + if (NOT pico_sdk) + message("Downloading Raspberry Pi Pico SDK") + FetchContent_Populate(pico_sdk) + set(PICO_SDK_PATH ${pico_sdk_SOURCE_DIR}) + endif () + set(FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR_SAVE}) + else () + message(FATAL_ERROR + "SDK location was not specified. Please set PICO_SDK_PATH or set PICO_SDK_FETCH_FROM_GIT to on to fetch from git." + ) + endif () +endif () + +get_filename_component(PICO_SDK_PATH "${PICO_SDK_PATH}" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}") +if (NOT EXISTS ${PICO_SDK_PATH}) + message(FATAL_ERROR "Directory '${PICO_SDK_PATH}' not found") +endif () + +set(PICO_SDK_INIT_CMAKE_FILE ${PICO_SDK_PATH}/pico_sdk_init.cmake) +if (NOT EXISTS ${PICO_SDK_INIT_CMAKE_FILE}) + message(FATAL_ERROR "Directory '${PICO_SDK_PATH}' does not appear to contain the Raspberry Pi Pico SDK") +endif () + +set(PICO_SDK_PATH ${PICO_SDK_PATH} CACHE PATH "Path to the Raspberry Pi Pico SDK" FORCE) + +include(${PICO_SDK_INIT_CMAKE_FILE}) diff --git a/examples/pico-sdk/pico-w/Makefile b/examples/pico-sdk/pico-w/Makefile deleted file mode 100644 index 2423643365..0000000000 --- a/examples/pico-sdk/pico-w/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -NAME = raspberry-pi-pico-w - -$(NAME): - git clone --depth 1 https://github.com/mongoose-examples/$(NAME) - -build: | $(NAME) - cp ./../../../mongoose.[ch] $(NAME) - cp ./../../device-dashboard/packed_fs.c $(NAME) - cp ./../../device-dashboard/net.[ch] $(NAME) - make -C $(NAME) build - -clean: - rm -rf $(NAME) diff --git a/mongoose.h b/mongoose.h index 0a72b2e0d5..2b23e4cf89 100644 --- a/mongoose.h +++ b/mongoose.h @@ -244,7 +244,9 @@ static inline int mg_mkdir(const char *path, mode_t mode) { #if MG_ARCH == MG_ARCH_PICOSDK +#if !defined(MG_ENABLE_LWIP) || !MG_ENABLE_LWIP #include +#endif #include #include #include diff --git a/src/arch_picosdk.h b/src/arch_picosdk.h index bc2631817d..e6413ed271 100644 --- a/src/arch_picosdk.h +++ b/src/arch_picosdk.h @@ -1,7 +1,9 @@ #pragma once #if MG_ARCH == MG_ARCH_PICOSDK +#if !defined(MG_ENABLE_LWIP) || !MG_ENABLE_LWIP #include +#endif #include #include #include