Skip to content

Commit

Permalink
Merge branch 'feat/update_examples' into 'master'
Browse files Browse the repository at this point in the history
feat: update keyboard and usb extern lcd examples

See merge request ae_group/esp-iot-solution!1075
  • Loading branch information
lijunru-hub committed Sep 3, 2024
2 parents 056c9f8 + deb258c commit 59ebd6b
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 5 deletions.
5 changes: 5 additions & 0 deletions examples/keyboard/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ Note: keyboard_rgb_martix comes from the **QMK** project. Due to the use of the

### Change LOG

* v0.2.1 - 2024-08-12

- Added debounce time to prevent buttons from being triggered twice consecutively.
- The speed of the heatmap lighting effect can now be adjusted according to the effect speed, with levels ranging from 1 to 4.

* v0.2.0 - 2024-8-12

* Added support for lighting effects in BLE mode, with the keyboard backlight turning off by default after 60 seconds.
Expand Down
5 changes: 5 additions & 0 deletions examples/keyboard/README_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ Note: keyboard_rgb_martix 来自 **QMK** 工程,由于使用 GPL 协议,如

#### Change LOG

* v0.2.1 - 2024-8-12

* 增加消抖时间,避免按键连续触发两次
* 热力图灯效的速度可以跟随灯效速度调节,为 1-4 档

* v0.2.0 - 2024-8-12

* BLE 模式下支持灯效,默认 60s 关闭键盘灯光
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ dependencies:
led_strip:
version: "^2.5.3"

lijunru-hub/keyboard_rgb_matrix: "^0.1.1"
lijunru-hub/keyboard_rgb_matrix: "^0.1.2"
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ extern "C" {

/*!< Keyboard active level */
#define KBD_ATTIVE_LEVEL 1
#define KBD_TICKS_INTERVAL_US 500
#define KBD_TICKS_INTERVAL_US 1000

/*!< Keyboard matrix GPIO */
#define KBD_ROW_NUM 6
Expand Down
2 changes: 1 addition & 1 deletion examples/keyboard/main/idf_component.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 0.2.0
version: 0.2.1
dependencies:
idf: ">=5.2"
espressif/tinyusb:
Expand Down
4 changes: 2 additions & 2 deletions examples/usb/device/usb_extend_screen/main/app_uac.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ static esp_err_t uac_device_input_cb(uint8_t *buf, size_t len, size_t *bytes_rea

static void uac_device_set_mute_cb(uint32_t mute, void *arg)
{
ESP_LOGI(TAG, "uac_device_set_mute_cb: %"PRIu32"", mute);
ESP_LOGD(TAG, "uac_device_set_mute_cb: %"PRIu32"", mute);
bsp_extra_codec_mute_set(mute);
}

static void uac_device_set_volume_cb(uint32_t volume, void *arg)
{
ESP_LOGI(TAG, "uac_device_set_volume_cb: %"PRIu32"", volume);
ESP_LOGD(TAG, "uac_device_set_volume_cb: %"PRIu32"", volume);
bsp_extra_codec_volume_set(volume, NULL);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ dependencies:
leeebo/tinyusb_src:
version: "*"
espressif/esp_lcd_ek79007: "*"
espressif/esp_codec_dev: "1.3.0"

0 comments on commit 59ebd6b

Please sign in to comment.