Pico

CMakeLists.txt

@@ -10,7 +10,7 @@ if (DEFINED ENV{IDF_PATH})
    INCLUDE_DIRS "./src" ${HTTP_INCLUDE_PUBLIC_DIRS} ${MQTT_INCLUDE_PUBLIC_DIRS}
    REQUIRES mbedtls srtp json esp_netif
   )
-  add_definitions("-DESP32 -DHTTP_DO_NOT_USE_CUSTOM_CONFIG -DMQTT_DO_NOT_USE_CUSTOM_CONFIG")
+  add_definitions("-DCONFIG_USE_LWIP=1" "-DCONFIG_USE_USRSCTP=0" "-DCONFIG_AUDIO_BUFFER_SIZE=8096" "-DCONFIG_DATA_BUFFER_SIZE=102400" "-DHTTP_DO_NOT_USE_CUSTOM_CONFIG" "-DMQTT_DO_NOT_USE_CUSTOM_CONFIG")
   return()
 endif()
 

README.md

@@ -41,4 +41,5 @@ $ ./generic/sample/sample
 
 ### Examples for Platforms
 - [ESP32](https://github.com/sepfy/libpeer/tree/main/examples/esp32): MJPEG over datachannel
+- [PICO](https://github.com/sepfy/libpeer/tree/main/examples/pico): Ping pong with datachannel
 - [Raspberry Pi](https://github.com/sepfy/libpeer/tree/main/examples/raspberrypi): Video and two-way audio stream

examples/esp32/main/app_main.c

@@ -130,8 +130,6 @@ void app_main(void) {
   peer_signaling_set_config(&service_config);
   peer_signaling_join_channel();
 
-  peer_signaling_join_channel(deviceid, g_pc);
-
 #if defined(CONFIG_ESP32S3_XIAO_SENSE)
   StackType_t* stack_memory = (StackType_t*)heap_caps_malloc(8192 * sizeof(StackType_t), MALLOC_CAP_SPIRAM);
   StaticTask_t task_buffer;

examples/esp32/main/idf_component.yml

@@ -1,6 +1,8 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  sepfy/libpeer: ">=0.0.2"
+  sepfy/libpeer:
+    path: ../../../
+    version: ">=0.0.2"
   espressif/esp_audio_codec: "^2.0.0"
   espressif/esp32-camera: "^2.0.4"
   protocol_examples_common:

examples/esp32/sdkconfig.defaults

@@ -1,13 +1,9 @@
 # This file was generated using idf.py save-defconfig. It can be edited manually.
 # Espressif IoT Development Framework (ESP-IDF) 5.2.2 Project Minimal Configuration
 #
-CONFIG_IDF_TARGET="esp32s3"
 CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_ESP32S3_XIAO_SENSE=y
-CONFIG_EXAMPLE_WIFI_SSID="myssid"
-CONFIG_EXAMPLE_WIFI_PASSWORD="mypassword"
 CONFIG_EXAMPLE_CONNECT_IPV6=n
 CONFIG_ESP_PHY_REDUCE_TX_POWER=y
 CONFIG_SPIRAM=y
@@ -17,9 +13,7 @@ CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=n
 CONFIG_ESP_IPC_TASK_STACK_SIZE=2048
-CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=16
 CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM=32
-CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=64
 CONFIG_LWIP_IPV6_AUTOCONFIG=y
 CONFIG_LWIP_IPV6_DHCP6=y
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744

examples/pico/.gitignore

@@ -0,0 +1 @@
+build

examples/pico/CMakeLists.txt

@@ -0,0 +1,126 @@
+cmake_minimum_required(VERSION 3.13)
+
+set(PICO_BOARD pico_w)
+
+include($ENV{PICO_SDK_PATH}/pico_sdk_init.cmake)
+
+project(pico-peer)
+pico_sdk_init()
+
+include(FreeRTOS_Kernel_import.cmake)
+
+include(${CMAKE_CURRENT_LIST_DIR}/../../third_party/coreHTTP/httpFilePaths.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../../third_party/coreMQTT/mqttFilePaths.cmake)
+include_directories(
+  ${CMAKE_CURRENT_LIST_DIR}/
+  ${CMAKE_BINARY_DIR}/
+  ${CMAKE_CURRENT_LIST_DIR}/../../third_party/libsrtp/include/
+  ${CMAKE_CURRENT_LIST_DIR}/../../third_party/libsrtp/crypto/include/
+  ${CMAKE_CURRENT_LIST_DIR}/../../third_party/cJSON/
+  ${CMAKE_CURRENT_LIST_DIR}/../../src/
+  ${HTTP_INCLUDE_PUBLIC_DIRS}
+  ${MQTT_INCLUDE_PUBLIC_DIRS}
+)
+
+set(PICO_SDK_LIBS
+  pico_stdlib
+  pico_cyw43_arch_lwip_sys_freertos
+  pico_mbedtls
+  FreeRTOS-Kernel-Heap4
+)
+
+# Build libsrtp
+file(GLOB LIBSRTP_SRC
+  ../../third_party/libsrtp/srtp/srtp.c
+  ../../third_party/libsrtp/crypto/cipher/cipher.c
+  ../../third_party/libsrtp/crypto/cipher/null_cipher.c
+  ../../third_party/libsrtp/crypto/cipher/aes.c
+  ../../third_party/libsrtp/crypto/cipher/aes_icm.c
+  ../../third_party/libsrtp/crypto/cipher/cipher_test_cases.c
+  ../../third_party/libsrtp/crypto/hash/auth.c
+  ../../third_party/libsrtp/crypto/hash/null_auth.c
+  ../../third_party/libsrtp/crypto/hash/hmac.c
+  ../../third_party/libsrtp/crypto/hash/sha1.c
+  ../../third_party/libsrtp/crypto/hash/auth_test_cases.c
+  ../../third_party/libsrtp/crypto/kernel/alloc.c
+  ../../third_party/libsrtp/crypto/kernel/crypto_kernel.c
+  ../../third_party/libsrtp/crypto/kernel/err.c
+  ../../third_party/libsrtp/crypto/kernel/key.c
+  ../../third_party/libsrtp/crypto/math/datatypes.c
+  ../../third_party/libsrtp/crypto/math/stat.c
+  ../../third_party/libsrtp/crypto/replay/rdb.c
+  ../../third_party/libsrtp/crypto/replay/rdbx.c
+  ../../third_party/libsrtp/crypto/replay/ut_sim.c
+)
+
+add_library(srtp STATIC
+  ${LIBSRTP_SRC}
+)
+
+target_compile_definitions(srtp PRIVATE
+  HAVE_CONFIG_H
+  PRIx64=PRIx32
+)
+
+target_link_libraries(srtp
+  ${PICO_SDK_LIBS}
+)
+
+add_custom_command(TARGET srtp
+  POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/srtp2/
+  COMMAND ${CMAKE_COMMAND} -E copy
+  ../../../third_party/libsrtp/include/srtp.h
+  ${CMAKE_BINARY_DIR}/srtp2/
+)
+
+# Build cJSON
+add_library(cjson STATIC
+  ../../third_party/cJSON/cJSON.c
+)
+
+# Build peer
+file(GLOB LIBPEER_SRC "../../src/*.c")
+add_library(peer STATIC
+  ${LIBPEER_SRC}
+  ${HTTP_SOURCES}
+  ${MQTT_SOURCES}
+  ${MQTT_SERIALIZER_SOURCES}
+)
+
+target_compile_definitions(peer PRIVATE
+  __BYTE_ORDER=__LITTLE_ENDIAN
+  CONFIG_USE_LWIP=1
+  CONFIG_USE_USRSCTP=0
+  CONFIG_MBEDTLS_2_X=1
+  CONFIG_DATA_BUFFER_SIZE=4096
+  HTTP_DO_NOT_USE_CUSTOM_CONFIG
+  MQTT_DO_NOT_USE_CUSTOM_CONFIG
+)
+
+target_link_libraries(peer
+  ${PICO_SDK_LIBS}
+  srtp
+  cjson
+)
+
+# Build pico_peer
+add_executable(pico_peer
+  main.c
+)
+
+target_compile_definitions(pico_peer PRIVATE
+  WIFI_SSID="$ENV{WIFI_SSID}"
+  WIFI_PASSWORD="$ENV{WIFI_PASSWORD}"
+  PICO_HEAP_SIZE=0x20000
+  #PICO_DEBUG_MALLOC=1
+)
+
+target_link_libraries(pico_peer
+  ${PICO_SDK_LIBS}
+  peer
+)
+
+pico_enable_stdio_usb(pico_peer 1)
+pico_enable_stdio_uart(pico_peer 0)
+pico_add_extra_outputs(pico_peer)

examples/pico/FreeRTOSConfig.h

@@ -0,0 +1,113 @@
+#ifndef FREERTOS_CONFIG_H
+#define FREERTOS_CONFIG_H
+
+/* 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 (48 * 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 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 <assert.h>
+/* 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
+
+#endif  // FREERTOS_CONFIG_H

examples/pico/FreeRTOS_Kernel_import.cmake

@@ -0,0 +1,91 @@
+# This is a copy of <FREERTOS_KERNEL_PATH>/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)