Cleanup

Author: renzenicolai

bsp/input.h

@@ -199,6 +199,7 @@ typedef enum _bsp_input_action_type {
     BSP_INPUT_ACTION_TYPE_AUDIO_JACK,
     BSP_INPUT_ACTION_TYPE_POWER_BUTTON,
     BSP_INPUT_ACTION_TYPE_FPGA_CDONE,
+    BSP_INPUT_ACTION_TYPE_PMIC_FAULT,
 } bsp_input_action_type_t;
 
 // Modifiers

idf_component.yml

@@ -1,33 +1,33 @@
 targets:
-    - esp32
-    - esp32p4
-    - esp32c6
-    - esp32c3
+  - esp32
+  - esp32p4
+  - esp32c6
+  - esp32c3
 dependencies:
-    cmake_utilities: 0.*
-    idf: '>=5.3'
-    espressif/esp_lcd_ili9341:
-      version: ^2.0.0
-    nicolaielectronics/ssd1619:
-      version: ^0.0.1
-    espressif/led_strip:
-      version: ^3.0.1
-    nicolaielectronics/mipi_dsi_abstraction:
-      version: "^0.1.0"
-      rules:
-        - if: "target == esp32p4"
-    nicolaielectronics/tanmatsu_coprocessor:
-      version: "^0.5.0"
-      rules:
-        - if: "target == esp32p4"
-    nicolaielectronics/es8156:
-      version: "^0.0.1"
-      rules:
-        - if: "target == esp32p4"
-    badgeteam/mch2022-rp2040:
-      version: "^0.0.2"
-      rules:
-        - if: "target == esp32"
+  cmake_utilities: 0.*
+  idf: ">=5.3"
+  espressif/esp_lcd_ili9341:
+    version: "^2.0.0"
+  nicolaielectronics/ssd1619:
+    version: "=>0.0.1"
+  espressif/led_strip:
+    version: "^3.0.1"
+  nicolaielectronics/mipi_dsi_abstraction:
+    version: "^0.1.0"
+    rules:
+      - if: "target == esp32p4"
+  nicolaielectronics/tanmatsu_coprocessor:
+    version: "=>0.5.0"
+    rules:
+      - if: "target == esp32p4"
+  nicolaielectronics/es8156:
+    version: ">=0.0.2"
+    rules:
+      - if: "target == esp32p4"
+  badgeteam/mch2022-rp2040:
+    version: "=>0.0.2"
+    rules:
+      - if: "target == esp32"
 description: Badge BSP
 license: MIT
 issues: https://github.com/badgeteam/esp32-component-badge-bsp/issues

targets/bornhack-2024-pov/badge_bsp_i2c.c

@@ -58,8 +58,6 @@ esp_err_t bsp_i2c_primary_bus_get_semaphore(SemaphoreHandle_t* semaphore) {
 esp_err_t bsp_i2c_primary_bus_claim(void) {
     if (i2c_concurrency_semaphore != NULL) {
         xSemaphoreTake(i2c_concurrency_semaphore, portMAX_DELAY);
-    } else {
-        ESP_LOGW(TAG, "No concurrency semaphore");
     }
     return ESP_OK;
 }

targets/bornhack-2024-pov/badge_bsp_led.c

@@ -11,8 +11,6 @@
 static led_strip_handle_t led_strip = NULL;
 
 esp_err_t bsp_led_initialize(void) {
-    ESP_LOGI("led", "test");
-
     led_strip_config_t strip_config = {
         .strip_gpio_num         = BSP_LED_DATA_PIN,
         .max_leds               = BSP_LED_NUM,

targets/esp32-p4-function-ev-board/badge_bsp_display.c

@@ -80,7 +80,6 @@ esp_err_t bsp_display_initialize(void) {
 esp_err_t bsp_display_get_parameters(size_t* h_res, size_t* v_res, lcd_color_rgb_pixel_format_t* color_fmt,
                                      lcd_rgb_data_endian_t* data_endian) {
     if (!bsp_display_initialized) {
-        ESP_LOGE(TAG, "Display not initialized");
         return ESP_FAIL;
     }
     ek79007_get_parameters(h_res, v_res, color_fmt);
@@ -92,7 +91,6 @@ esp_err_t bsp_display_get_parameters(size_t* h_res, size_t* v_res, lcd_color_rgb
 
 esp_err_t bsp_display_get_panel(esp_lcd_panel_handle_t* panel) {
     if (!bsp_display_initialized) {
-        ESP_LOGE(TAG, "Display not initialized");
         return ESP_FAIL;
     }
     *panel = ek79007_get_panel();
@@ -101,7 +99,6 @@ esp_err_t bsp_display_get_panel(esp_lcd_panel_handle_t* panel) {
 
 esp_err_t bsp_display_get_panel_io(esp_lcd_panel_io_handle_t* panel_io) {
     if (!bsp_display_initialized) {
-        ESP_LOGE(TAG, "Display not initialised");
         return ESP_FAIL;
     }
 

targets/kami/badge_bsp_i2c.c

@@ -58,8 +58,6 @@ esp_err_t bsp_i2c_primary_bus_get_semaphore(SemaphoreHandle_t* semaphore) {
 esp_err_t bsp_i2c_primary_bus_claim(void) {
     if (i2c_concurrency_semaphore != NULL) {
         xSemaphoreTake(i2c_concurrency_semaphore, portMAX_DELAY);
-    } else {
-        ESP_LOGW(TAG, "No concurrency semaphore");
     }
     return ESP_OK;
 }

targets/kami/badge_bsp_input.c

@@ -1,10 +1,10 @@
-// Board support package API: Hackerhotel 2024 implementation
 // SPDX-FileCopyrightText: 2025 Nicolai Electronics
 // SPDX-License-Identifier: MIT
 
 #include <inttypes.h>
 #include <stdint.h>
 #include <string.h>
+#include "bsp/i2c.h"
 #include "bsp/input.h"
 #include "driver/gpio.h"
 #include "esp_check.h"
@@ -14,16 +14,68 @@
 #include "freertos/projdefs.h"
 #include "freertos/queue.h"
 #include "hal/gpio_types.h"
+#include "kami_hardware.h"
+#include "mpr121.h"
 
 static char const* TAG = "BSP: INPUT";
 
-static QueueHandle_t event_queue = NULL;
+static QueueHandle_t   event_queue = NULL;
+static mpr121_handle_t mpr121      = NULL;
 
 esp_err_t bsp_input_initialize(void) {
     if (event_queue == NULL) {
         event_queue = xQueueCreate(32, sizeof(bsp_input_event_t));
         ESP_RETURN_ON_FALSE(event_queue, ESP_ERR_NO_MEM, TAG, "Failed to create input event queue");
     }
+
+    static i2c_master_bus_handle_t i2c_bus_handle_internal   = NULL;
+    static SemaphoreHandle_t       i2c_concurrency_semaphore = NULL;
+    ESP_RETURN_ON_ERROR(bsp_i2c_primary_bus_get_handle(&i2c_bus_handle_internal), TAG, "Failed to get I2C bus handle");
+    ESP_RETURN_ON_ERROR(bsp_i2c_primary_bus_get_semaphore(&i2c_concurrency_semaphore), TAG,
+                        "Failed to get I2C bus semaphore");
+
+    mpr121_config_t mpr121_config = {
+        .int_io_num            = BSP_MPR121_INT_PIN,
+        .i2c_bus               = i2c_bus_handle_internal,
+        .i2c_address           = BSP_MPR121_I2C_ADDRESS,
+        .concurrency_semaphore = i2c_concurrency_semaphore,
+        .touch_callback        = NULL,  // TODO
+        .input_callback        = NULL,  // TODO
+        .i2c_timeout           = 1000,
+    };
+
+    ESP_RETURN_ON_ERROR(mpr121_initialize(&mpr121_config, &mpr121), TAG, "Failed to initialize MPR121");
+
+    /*mpr121_touch_set_baseline(mpr121_handle_t handle, uint8_t pin, uint8_t baseline);
+    mpr121_touch_set_touch_threshold(mpr121_handle_t handle, uint8_t pin, uint8_t touch_threshold);
+    mpr121_touch_set_release_threshold(mpr121_handle_t handle, uint8_t pin, uint8_t release_threshold);*/
+
+    mpr121_gpio_set_mode(mpr121, BSP_MPR121_PIN_INPUT_CHRG, MPR121_INPUT_PULL_UP);
+    mpr121_gpio_set_mode(mpr121, BSP_MPR121_PIN_INPUT_SD_DET, MPR121_INPUT_PULL_UP);
+
+    mpr121_touch_configure(mpr121, 10, 0, true);  // Use first 10 electrodes for touch
+
+    /*while (1) {
+        for (uint8_t pin = 0; pin < 10; pin++) {
+            uint16_t value;
+            if (mpr121_touch_get_analog(mpr121, pin, &value) == ESP_OK) {
+                printf("%04x ", value);
+            } else {
+                ESP_LOGE(TAG, "Failed to read touch state from MPR121");
+            }
+        }
+        for (uint8_t pin = 10; pin < 12; pin++) {
+            bool value;
+            if (mpr121_gpio_get_level(mpr121, pin, &value) == ESP_OK) {
+                printf("%s ", value ? "H" : "L");
+            } else {
+                ESP_LOGE(TAG, "Failed to read input state from MPR121");
+            }
+        }
+        printf("\r\n");
+        vTaskDelay(100);
+    }*/
+
     return ESP_OK;
 }
 

targets/mch2022/badge_bsp_display.c

@@ -155,7 +155,6 @@ esp_err_t bsp_display_get_parameters(size_t* h_res, size_t* v_res, lcd_color_rgb
 
 esp_err_t bsp_display_get_panel(esp_lcd_panel_handle_t* panel) {
     if (!panel_handle) {
-        ESP_LOGE(TAG, "Display not initialised");
         return ESP_FAIL;
     }
 
@@ -165,7 +164,6 @@ esp_err_t bsp_display_get_panel(esp_lcd_panel_handle_t* panel) {
 
 esp_err_t bsp_display_get_panel_io(esp_lcd_panel_io_handle_t* panel_io) {
     if (!panel_handle) {
-        ESP_LOGE(TAG, "Display IO not initialised");
         return ESP_FAIL;
     }
 

targets/tanmatsu/badge_bsp_audio.c

@@ -24,7 +24,6 @@ static esp_err_t initialize_i2s(uint32_t rate) {
 
     esp_err_t res = i2s_new_channel(&chan_cfg, &i2s_handle, NULL);
     if (res != ESP_OK) {
-        ESP_LOGE(TAG, "Initializing I2S channel failed");
         return res;
     }
 
@@ -49,13 +48,11 @@ static esp_err_t initialize_i2s(uint32_t rate) {
 
     res = i2s_channel_init_std_mode(i2s_handle, &i2s_config);
     if (res != ESP_OK) {
-        ESP_LOGE(TAG, "Configuring I2S channel failed");
         return res;
     }
 
     res = i2s_channel_enable(i2s_handle);
     if (res != ESP_OK) {
-        ESP_LOGE(TAG, "Enabling I2S channel failed");
         return res;
     }
 

targets/tanmatsu/badge_bsp_device.c

@@ -46,7 +46,6 @@ esp_err_t bsp_tanmatsu_coprocessor_get_handle(tanmatsu_coprocessor_handle_t* han
 }
 
 esp_err_t bsp_device_initialize_custom(void) {
-    printf("Tanmatsu coprocessor!\r\n");
     initialized_without_coprocessor = true;
 
     BSP_RETURN_ON_FAILURE(bsp_i2c_primary_bus_get_handle(&i2c_bus_handle_internal));