v4.0-beta.0

Author: ricardoquesada

CMakeLists.txt

@@ -2,8 +2,6 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(ENV{BLUEPAD32_ARDUINO} TRUE)
-
 set(RMAKER_PATH ${CMAKE_SOURCE_DIR}/components/esp-rainmaker)
 set(EXTRA_COMPONENT_DIRS ${RMAKER_PATH}/components/esp-insights/components ${RMAKER_PATH}/components)
 

bluepad32_files/package_esp32_bluepad32_index.json

@@ -9,6 +9,90 @@
         "online": "https://discord.gg/r5aMn6Cw5q"
       },
       "platforms": [
+        {
+          "name": "esp32_bluepad32",
+          "architecture": "esp32",
+          "version": "4.0-beta.0",
+          "category": "Contributed",
+          "url": "https://github.com/ricardoquesada/esp32-arduino-lib-builder/releases/download/4.0-beta.0/esp32-bluepad32-4.0-beta.0.zip",
+          "archiveFileName": "esp32-bluepad32-4.0-beta.0.zip",
+          "checksum": "SHA-256:3310b79c23f5dee3578896cd55aec170c6098db2bae5c0a9d96f8a64ac8a18cf",
+          "size": "197519090",
+          "help": {
+            "online": "https://discord.gg/r5aMn6Cw5q"
+          },
+          "boards": [
+            {
+              "name": "ESP32 Dev Board"
+            },
+            {
+              "name": "ESP32-S3 Dev Board"
+            },
+            {
+              "name": "ESP32-C3 Dev Board"
+            },
+            {
+              "name": "Arduino Nano ESP32"
+            }
+          ],
+          "toolsDependencies": [
+            {
+              "packager": "esp32",
+              "name": "xtensa-esp32-elf-gcc",
+              "version": "esp-2021r2-patch5-8.4.0"
+            },
+            {
+              "packager": "esp32",
+              "name": "xtensa-esp32s2-elf-gcc",
+              "version": "esp-2021r2-patch5-8.4.0"
+            },
+            {
+              "packager": "esp32",
+              "name": "xtensa-esp32s3-elf-gcc",
+              "version": "esp-2021r2-patch5-8.4.0"
+            },
+            {
+              "packager": "esp32",
+              "name": "xtensa-esp-elf-gdb",
+              "version": "11.2_20220823"
+            },
+            {
+              "packager": "esp32",
+              "name": "riscv32-esp-elf-gcc",
+              "version": "esp-2021r2-patch5-8.4.0"
+            },
+            {
+              "packager": "esp32",
+              "name": "riscv32-esp-elf-gdb",
+              "version": "11.2_20220823"
+            },
+            {
+              "packager": "esp32",
+              "name": "openocd-esp32",
+              "version": "v0.12.0-esp32-20230419"
+            },
+            {
+              "packager": "esp32",
+              "name": "esptool_py",
+              "version": "4.5.1"
+            },
+            {
+              "packager": "esp32",
+              "name": "mkspiffs",
+              "version": "0.2.3"
+            },
+            {
+              "packager": "esp32",
+              "name": "mklittlefs",
+              "version": "3.0.0-gnu12-dc7f933"
+            },
+            {
+              "packager": "arduino",
+              "name": "dfu-util",
+              "version": "0.11.0-arduino5"
+            }
+          ]
+        },
         {
           "name": "esp32_bluepad32",
           "architecture": "esp32",

bluepad32_files/platform.txt

@@ -0,0 +1,15 @@
+include(CMakePrintHelpers)
+
+set(srcs
+        "main.c"
+        )
+
+ set(requires
+         arduino
+         bluepad32
+         bluepad32_arduino
+         btstack)
+
+
+idf_component_register(SRCS "${srcs}"
+                REQUIRES ${requires})

components/bluepad32_arduino_bootstrap/CMakeLists.txt

@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2019 Ricardo Quesada
+// http://retro.moe/unijoysticle2
+
+#include "sdkconfig.h"
+
+#include <stddef.h>
+
+// BTstack related
+#include <btstack_port_esp32.h>
+#include <btstack_run_loop.h>
+
+// Bluepad32 related
+#include <arduino_platform.h>
+#include <uni.h>
+
+//
+// Autostart
+//
+int app_main(void) {
+    // hci_dump_open(NULL, HCI_DUMP_STDOUT);
+
+    // Configure BTstack for ESP32 VHCI Controller
+    btstack_init();
+
+    // hci_dump_init(hci_dump_embedded_stdout_get_instance());
+
+    // Must be called before uni_init()
+    uni_platform_set_custom(get_arduino_platform());
+
+    // Init Bluepad32.
+    uni_init(0 /* argc */, NULL /* argv */);
+
+    // Does not return.
+    btstack_run_loop_execute();
+    return 0;
+}

components/bluepad32_arduino_bootstrap/main.c

@@ -105,6 +105,6 @@ CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y
 CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
 
 # Bluepad32 begin
-CONFIG_BLUEPAD32_PLATFORM_ARDUINO=y
+CONFIG_BLUEPAD32_PLATFORM_CUSTOM=y
 CONFIG_BLUEPAD32_USB_CONSOLE_ENABLE=n
 # Bluepad32 end

configs/defconfig.common

@@ -47,7 +47,7 @@ AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py"
 AR_SDK="$AR_TOOLS/sdk/$IDF_TARGET"
 
 function get_os(){
-  	OSBITS=`arch`
+  	OSBITS=`uname -m`
   	if [[ "$OSTYPE" == "linux"* ]]; then
         if [[ "$OSBITS" == "i686" ]]; then
         	echo "linux32"