alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed left right key confusion in comments.

Browse Source 
"Left" and "Right" were swapped in some comments.
This commit is contained in:
Murray Fordyce 2020-01-26 10:28:45 -06:00 committed by jincheng
parent 08acf7979b
commit 00a23ec544
4 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/esp_hid/src/ble_hidd.c
View File

@ -1,16 +1,8 @@
// Copyright 2017-2019 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include <string.h> #include <string.h>
#include <stdbool.h> #include <stdbool.h>

26
components/esp_hid/src/esp_hidh.c
View File

@ -1,16 +1,8 @@
// Copyright 2017-2019 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "sys/queue.h" #include "sys/queue.h"
#include "esp_hidh_private.h" #include "esp_hidh_private.h"
@ -591,7 +583,7 @@ esp_hidh_dev_report_t *esp_hidh_dev_get_input_report_by_id_and_proto(esp_hidh_de
{ {
esp_hidh_dev_report_t *r = dev->reports; esp_hidh_dev_report_t *r = dev->reports;
while (r) { while (r) {
if (r->report_id == report_id && (r->report_type & 1) && r->protocol_mode == protocol_mode) { if (r->report_id == report_id && (r->report_type & ESP_HID_REPORT_TYPE_INPUT) && r->protocol_mode == protocol_mode) {
return r; return r;
} }
r = r->next; r = r->next;
@ -603,7 +595,7 @@ esp_hidh_dev_report_t *esp_hidh_dev_get_input_report_by_len_and_proto(esp_hidh_d
{ {
esp_hidh_dev_report_t *r = dev->reports; esp_hidh_dev_report_t *r = dev->reports;
while (r) { while (r) {
if (r->value_len == len && (r->report_type & 1) && r->protocol_mode == protocol_mode) { if (r->value_len == len && (r->report_type & ESP_HID_REPORT_TYPE_INPUT) && r->protocol_mode == protocol_mode) {
return r; return r;
} }
r = r->next; r = r->next;
@ -623,7 +615,7 @@ esp_hidh_dev_report_t *esp_hidh_dev_get_input_report_by_proto_and_data(esp_hidh_
*has_report_id = false; *has_report_id = false;
// first, assume data not include report id // first, assume data not include report id
while (r) { while (r) {
if (r->value_len == len && r->report_id == 0 && (r->report_type & 1) && if (r->value_len == len && r->report_id == 0 && (r->report_type & ESP_HID_REPORT_TYPE_INPUT) &&
r->protocol_mode == protocol_mode) { r->protocol_mode == protocol_mode) {
*has_report_id = false; *has_report_id = false;
break; break;
@ -639,7 +631,7 @@ esp_hidh_dev_report_t *esp_hidh_dev_get_input_report_by_proto_and_data(esp_hidh_
} }
r = dev->reports; r = dev->reports;
while (r) { while (r) {
if (r->value_len == len - 1 && r->report_id == *data && (r->report_type & 1) && if (r->value_len == len - 1 && r->report_id == *data && (r->report_type & ESP_HID_REPORT_TYPE_INPUT) &&
r->protocol_mode == protocol_mode) { r->protocol_mode == protocol_mode) {
*has_report_id = true; *has_report_id = true;
break; break;

8
examples/bluetooth/bluedroid/ble/ble_hid_device_demo/main/hid_dev.h
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Unlicense OR CC0-1.0 * SPDX-License-Identifier: Unlicense OR CC0-1.0
*/ */
@ -124,9 +124,9 @@ extern "C" {
#define HID_KEY_LEFT_SHIFT 225 // Keyboard LeftShift #define HID_KEY_LEFT_SHIFT 225 // Keyboard LeftShift
#define HID_KEY_LEFT_ALT 226 // Keyboard LeftAlt #define HID_KEY_LEFT_ALT 226 // Keyboard LeftAlt
#define HID_KEY_LEFT_GUI 227 // Keyboard LeftGUI #define HID_KEY_LEFT_GUI 227 // Keyboard LeftGUI
#define HID_KEY_RIGHT_CTRL 228 // Keyboard LeftContorl #define HID_KEY_RIGHT_CTRL 228 // Keyboard RightContorl
#define HID_KEY_RIGHT_SHIFT 229 // Keyboard LeftShift #define HID_KEY_RIGHT_SHIFT 229 // Keyboard RightShift
#define HID_KEY_RIGHT_ALT 230 // Keyboard LeftAlt #define HID_KEY_RIGHT_ALT 230 // Keyboard RightAlt
#define HID_KEY_RIGHT_GUI 231 // Keyboard RightGUI #define HID_KEY_RIGHT_GUI 231 // Keyboard RightGUI
typedef uint8_t keyboard_cmd_t; typedef uint8_t keyboard_cmd_t;

2
tools/ci/check_copyright_ignore.txt
View File

@ -507,13 +507,11 @@ components/esp_hid/private/bt_hidd.h
components/esp_hid/private/bt_hidh.h components/esp_hid/private/bt_hidh.h
components/esp_hid/private/esp_hidd_private.h components/esp_hid/private/esp_hidd_private.h
components/esp_hid/private/esp_hidh_private.h components/esp_hid/private/esp_hidh_private.h
components/esp_hid/src/ble_hidd.c
components/esp_hid/src/ble_hidh.c components/esp_hid/src/ble_hidh.c
components/esp_hid/src/bt_hidd.c components/esp_hid/src/bt_hidd.c
components/esp_hid/src/bt_hidh.c components/esp_hid/src/bt_hidh.c
components/esp_hid/src/esp_hid_common.c components/esp_hid/src/esp_hid_common.c
components/esp_hid/src/esp_hidd.c components/esp_hid/src/esp_hidd.c
components/esp_hid/src/esp_hidh.c
components/esp_hid/test/hid_descriptor.h components/esp_hid/test/hid_descriptor.h
components/esp_hid/test/test_esp_hid.c components/esp_hid/test/test_esp_hid.c
components/esp_https_ota/include/esp_https_ota.h components/esp_https_ota/include/esp_https_ota.h