Macintosh-HW
/
quack
mirror of https://github.com/demik/quack.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

some bluetooth code cleaning

This commit is contained in:
demik 2020-12-18 11:08:52 +01:00
parent d9173145de
commit 50ace37f10
3 changed files with 108 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
main/blue.c
View File

@ -30,51 +30,75 @@
#include "blue.h"
#include "led.h"
static const char *TAG = "blue";
#define BTMOUSE_BUTTON1 (1 << 0)
#define BTMOUSE_BUTTON2 (1 << 1)
#define BTMOUSE_BUTTON3 (1 << 2)
#define BTMOUSE_BUTTONE 248
/* debug tag */
static const char *TAG = "blue";
void hidh_callback(void *handler_args, esp_event_base_t base, int32_t id, void *event_data)
{
esp_hidh_event_t event = (esp_hidh_event_t)id;
esp_hidh_event_data_t *param = (esp_hidh_event_data_t *)event_data;
const uint8_t *bda = NULL;
/*
* esp_hidh_event_data_t:
* struct {
* esp_hidh_dev_t *dev; HID Remote bluetooth device
* esp_hid_usage_t usage; HID report usage
* uint16_t report_id; HID report index
* uint16_t length; HID data length
* uint8_t *data; The pointer to the HID data
* uint8_t map_index; HID report map index
* } input;
*/
* bda = esp_hidh_event_data_t = union
*
* struct {
* esp_hidh_dev_t *dev; // HID Remote bluetooth device
* } open;
*
* struct {
* esp_hidh_dev_t *dev; // HID Remote bluetooth device
* int reason; // Reason why the connection was closed. BLE Only
* } close;
*
* struct {
* esp_hidh_dev_t *dev; // HID Remote bluetooth device
* uint8_t level; // Battery Level (0-100%)
* } battery;
*
* struct {
* esp_hidh_dev_t *dev; // HID Remote bluetooth device
* esp_hid_usage_t usage; // HID report usage
* uint16_t report_id; // HID report index
* uint16_t length; // HID data length
* uint8_t *data; // The pointer to the HID data
* uint8_t map_index; // HID report map index
* } input;
*
* struct {
* esp_hidh_dev_t *dev; // HID Remote bluetooth device
* esp_hid_usage_t usage; // HID report usage
* uint16_t report_id; // HID report index
* uint16_t length; // HID data length
* uint8_t *data; // The pointer to the HID data
* uint8_t map_index; // HID report map index
* } feature;
*/
char click;
short x, y;
switch (event) {
case ESP_HIDH_OPEN_EVENT: {
const uint8_t *bda = esp_hidh_dev_bda_get(param->open.dev);
if (strlen((char *)param->open.dev) > 0)
ESP_LOGI(TAG, "opened connection with device: " ESP_BD_ADDR_STR " named %s", ESP_BD_ADDR_HEX(bda), esp_hidh_dev_name_get(param->open.dev));
else
ESP_LOGI(TAG, "opened connection with device: " ESP_BD_ADDR_STR, ESP_BD_ADDR_HEX(bda));
//esp_hidh_dev_dump(param->open.dev, stdout);
case ESP_HIDH_OPEN_EVENT: {
bda = esp_hidh_dev_bda_get(param->open.dev);
ESP_LOGI(TAG, "opened connection with " ESP_BD_ADDR_STR, ESP_BD_ADDR_HEX(bda));
esp_hidh_dev_dump(param->open.dev, stdout);
xTaskNotify(t_blue, LED_ON, eSetValueWithOverwrite);
break;
}
case ESP_HIDH_BATTERY_EVENT: {
const uint8_t *bda = esp_hidh_dev_bda_get(param->battery.dev);
ESP_LOGI(TAG, ESP_BD_ADDR_STR " BATTERY: %d%%", ESP_BD_ADDR_HEX(bda), param->battery.level);
bda = esp_hidh_dev_bda_get(param->battery.dev);
ESP_LOGI(TAG, ESP_BD_ADDR_STR " battery: %d%%", ESP_BD_ADDR_HEX(bda), param->battery.level);
break;
}
case ESP_HIDH_INPUT_EVENT: {
const uint8_t *bda = esp_hidh_dev_bda_get(param->input.dev);
bda = esp_hidh_dev_bda_get(param->input.dev);
ESP_LOGD(TAG, ESP_BD_ADDR_STR " INPUT: %8s, MAP: %2u, ID: %3u, Len: %d, Data:", ESP_BD_ADDR_HEX(bda), esp_hid_usage_str(param->input.usage), param->input.map_index, param->input.report_id, param->input.length);
ESP_LOG_BUFFER_HEX(TAG, param->input.data, param->input.length);
xTaskNotify(t_yellow, LED_ONCE, eSetValueWithOverwrite);
@ -85,68 +109,24 @@ void hidh_callback(void *handler_args, esp_event_base_t base, int32_t id, void *
break;
}
case ESP_HIDH_FEATURE_EVENT: {
const uint8_t *bda = esp_hidh_dev_bda_get(param->feature.dev);
bda = esp_hidh_dev_bda_get(param->feature.dev);
ESP_LOGI(TAG, ESP_BD_ADDR_STR " FEATURE: %8s, MAP: %2u, ID: %3u, Len: %d", ESP_BD_ADDR_HEX(bda), esp_hid_usage_str(param->feature.usage), param->feature.map_index, param->feature.report_id, param->feature.length);
ESP_LOG_BUFFER_HEX(TAG, param->feature.data, param->feature.length);
break;
}
case ESP_HIDH_CLOSE_EVENT: {
const uint8_t *bda = esp_hidh_dev_bda_get(param->close.dev);
ESP_LOGI(TAG, ESP_BD_ADDR_STR " CLOSE: '%s' %s", ESP_BD_ADDR_HEX(bda), esp_hidh_dev_name_get(param->close.dev), esp_hid_disconnect_reason_str(esp_hidh_dev_transport_get(param->close.dev), param->close.reason));
bda = esp_hidh_dev_bda_get(param->close.dev);
ESP_LOGI(TAG, "closed connection with device " ESP_BD_ADDR_STR ", reason: %s", ESP_BD_ADDR_HEX(bda),
esp_hid_disconnect_reason_str(esp_hidh_dev_transport_get(param->close.dev), param->close.reason));
esp_hidh_dev_free(param->close.dev);
xTaskNotify(t_blue, LED_SLOW, eSetValueWithOverwrite);
break;
}
default:
ESP_LOGI(TAG, "EVENT: %d", event);
ESP_LOGI(TAG, "Unknwown event: %d", event);
}
}
#define SCAN_DURATION_SECONDS 6
void hid_demo_task(void *pvParameters)
{
size_t len = 0;
esp_hid_scan_result_t *mouse = NULL;
esp_hid_scan_result_t *results = NULL;
ESP_LOGI(TAG, "starting scan on core %d…", xPortGetCoreID());
esp_hid_scan(SCAN_DURATION_SECONDS, &len, &results);
ESP_LOGI(TAG, "scan returned %u result(s)", len);
if (len) {
esp_hid_scan_result_t *r = results;
while (r) {
ESP_LOGI(TAG, "found %s device: " ESP_BD_ADDR_STR ", RSSI: %d, NAME: %s",
(r->transport == ESP_HID_TRANSPORT_BLE) ? "BLE" : "BT",
ESP_BD_ADDR_HEX(r->bda), r->rssi, r->name ? r->name : "");
if (r->transport == ESP_HID_TRANSPORT_BLE) {
printf("APPEARANCE: 0x%04x, ", r->ble.appearance);
printf("ADDR_TYPE: '%s', ", ble_addr_type_str(r->ble.addr_type));
} else {
if (strcmp("PERIPHERAL", esp_hid_cod_major_str(r->bt.cod.major)) == 0
&& (r->bt.cod.minor & ESP_HID_COD_MIN_MOUSE)) {
ESP_LOGI(TAG, "found generic mouse");
mouse = r;
}
}
r = r->next;
}
if (mouse) {
// try to connect to the last mouse found
esp_hidh_dev_open(mouse->bda, mouse->transport, mouse->ble.addr_type);
}
else {
ESP_LOGI(TAG, "devices found but no mouse detected");
}
esp_hid_scan_results_free(results);
}
vTaskDelete(NULL);
}
void blue_init(void)
{
esp_err_t ret;
@ -156,6 +136,7 @@ void blue_init(void)
ESP_ERROR_CHECK(nvs_flash_erase());
ret = nvs_flash_init();
}
ESP_ERROR_CHECK(ret);
ESP_ERROR_CHECK(esp_hid_gap_init(ESP_BT_MODE_BTDM));
ESP_ERROR_CHECK(esp_ble_gattc_register_callback(esp_hidh_gattc_event_handler));
@ -166,11 +147,55 @@ void blue_init(void)
ESP_ERROR_CHECK(esp_hidh_init(&config));
/* at this point, everything but bluetooth is started.
/*
* at this point, everything but bluetooth is started.
* put green steady, start blinking blue and keep scanning until a device is found
*/
xTaskNotify(t_green, LED_ON, eSetValueWithOverwrite);
xTaskNotify(t_blue, LED_SLOW, eSetValueWithOverwrite);
xTaskCreatePinnedToCore(&hid_demo_task, "hid_task", 6 * 1024, NULL, 2, NULL, 0);
xTaskCreatePinnedToCore(&blue_scan, "hid_task", 6 * 1024, NULL, 2, NULL, 0);
}
void blue_scan(void *pvParameters)
{
size_t len = 0;
esp_hid_scan_result_t *mouse = NULL;
esp_hid_scan_result_t *results = NULL;
ESP_LOGI(TAG, "starting scan on core %d…", xPortGetCoreID());
esp_hid_scan(BLUE_SCAN_DURATION, &len, &results);
ESP_LOGI(TAG, "scan returned %u result(s)", len);
if (len) {
esp_hid_scan_result_t *r = results;
while (r) {
ESP_LOGI(TAG, "found %s device: " ESP_BD_ADDR_STR ", RSSI: %d, NAME: %s",
(r->transport == ESP_HID_TRANSPORT_BLE) ? "BLE" : "BT",
ESP_BD_ADDR_HEX(r->bda), r->rssi, r->name ? r->name : "");
if (r->transport == ESP_HID_TRANSPORT_BLE) {
printf("APPEARANCE: 0x%04x, ", r->ble.appearance);
printf("ADDR_TYPE: '%s', ", ble_addr_type_str(r->ble.addr_type));
} else {
if (strcmp("PERIPHERAL", esp_hid_cod_major_str(r->bt.cod.major)) == 0
&& (r->bt.cod.minor & ESP_HID_COD_MIN_MOUSE)) {
ESP_LOGI(TAG, "found generic mouse");
mouse = r;
}
}
r = r->next;
}
if (mouse) {
// try to connect to the last mouse found
esp_hidh_dev_open(mouse->bda, mouse->transport, mouse->ble.addr_type);
}
else {
ESP_LOGI(TAG, "devices found but no mouse detected");
}
esp_hid_scan_results_free(results);
}
vTaskDelete(NULL);
}

4
main/blue.h
View File

@ -25,8 +25,12 @@
#ifndef BLUE_H
#define BLUE_H
/* defines */
#define BLUE_SCAN_DURATION 6
/* prototypes */
void blue_init(void);
void blue_scan(void *pvParameters);
/* global variables for tasks handles */
extern TaskHandle_t t_green, t_blue, t_yellow, t_red;

6
sdkconfig
View File

@ -459,6 +459,12 @@ CONFIG_SPI_MASTER_ISR_IN_IRAM=y
CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
# end of SPI configuration
#
# TWAI configuration
#
# CONFIG_TWAI_ISR_IN_IRAM is not set
# end of TWAI configuration
#
# UART configuration
#