Skip to content

Commit 3f64f47

Browse files
committed
add st7123 component
1 parent 329a87e commit 3f64f47

5 files changed

Lines changed: 35 additions & 14 deletions

File tree

app/apps/utils/audio/audio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ void play_next_tone_progression(double durationSec)
135135
return;
136136
}
137137

138-
constexpr int REPEAT_EACH_CHORD = 2;
138+
constexpr int REPEAT_EACH_CHORD = 1;
139139
constexpr int SEMITONE_SHIFT = 24;
140140

141141
static std::vector<int> melody = {60, 67, 69, 64, 65, 60, 65, 67}; // 15634145

platforms/tab5/components/m5stack_tab5/idf_component.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
dependencies:
22
espressif/esp_lcd_st7703: ^1.0.1
3+
espressif/esp_lcd_touch_st7123: ^1.0.0
34
espressif/esp_codec_dev: ^1.3.0
45
# lvgl/lvgl: ^8.4
56
# espressif/esp_lvgl_port: ^2.5.0

platforms/tab5/dependencies.lock

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ dependencies:
22
chmorgan/esp-audio-player:
33
component_hash: c8ac1998e9af863bc41b57e592f88d1a5791a0f891485122336ddabbf7a65033
44
dependencies:
5-
- name: idf
6-
require: private
7-
version: '>=5.0'
85
- name: chmorgan/esp-libhelix-mp3
96
registry_url: https://components.espressif.com
107
require: private
118
version: '>=1.0.0,<2.0.0'
9+
- name: idf
10+
require: private
11+
version: '>=5.0'
1212
source:
1313
registry_url: https://components.espressif.com/
1414
type: service
@@ -44,19 +44,19 @@ dependencies:
4444
type: service
4545
version: 0.5.3
4646
espressif/eppp_link:
47-
component_hash: c2fd9c57ac14a68a62c9d9cdeec39a2b265abc16779196ce2c9f5000c9a4dd8b
47+
component_hash: 587abf150563ee0efeeba88e3c7cf46675ab5bd752a788f4b9c88a54649221dd
4848
dependencies:
49-
- name: idf
50-
require: private
51-
version: '>=5.2'
5249
- name: espressif/esp_serial_slave_link
5350
registry_url: https://components.espressif.com
5451
require: private
5552
version: ^1.1.0
53+
- name: idf
54+
require: private
55+
version: '>=5.2'
5656
source:
5757
registry_url: https://components.espressif.com
5858
type: service
59-
version: 0.2.0
59+
version: 1.1.0
6060
espressif/esp_codec_dev:
6161
component_hash: 18c22e1411224ba6103c4aca1b01bc740af33926756e9e106370a477d52bcba1
6262
dependencies:
@@ -139,16 +139,34 @@ dependencies:
139139
registry_url: https://components.espressif.com/
140140
type: service
141141
version: 1.1.3
142+
espressif/esp_lcd_touch_st7123:
143+
component_hash: 3592f0dac4b3baf34c40679922026c1e22e9b925b9446e981cd1c23306ecfe65
144+
dependencies:
145+
- name: idf
146+
require: private
147+
version: '>=4.4.2'
148+
- name: espressif/cmake_utilities
149+
registry_url: https://components.espressif.com
150+
require: private
151+
version: 0.*
152+
- name: espressif/esp_lcd_touch
153+
registry_url: https://components.espressif.com
154+
require: public
155+
version: ^1
156+
source:
157+
registry_url: https://components.espressif.com/
158+
type: service
159+
version: 1.0.0
142160
espressif/esp_serial_slave_link:
143-
component_hash: 8c534b7d4986ca0e4c41db71f559492b795ab862f1d15359d7993034696b7bcc
161+
component_hash: d8c13c033a7604e9333b5d8ea45e0d6fec908fd552df7db20d33dd8d6916528d
144162
dependencies:
145163
- name: idf
146164
require: private
147165
version: '>=5.0'
148166
source:
149167
registry_url: https://components.espressif.com
150168
type: service
151-
version: 1.1.0
169+
version: 1.1.0~1
152170
espressif/esp_wifi_remote:
153171
component_hash: f772731a8cc7361a3eb416eac94ac46cf85369cb996c5a5fc9245a07f241fee2
154172
dependencies:
@@ -214,11 +232,12 @@ direct_dependencies:
214232
- espressif/esp_lcd_ili9881c
215233
- espressif/esp_lcd_st7703
216234
- espressif/esp_lcd_touch_gt911
235+
- espressif/esp_lcd_touch_st7123
217236
- espressif/esp_wifi_remote
218237
- espressif/led_strip
219238
- espressif/usb_host_hid
220239
- idf
221240
- lvgl/lvgl
222-
manifest_hash: 9bac4abaf23b0d4aa79c795c5a5247143f4c21376d4925b56e87cfd24b389c4e
241+
manifest_hash: e057e8886cf9f2347aa190584b841da208b81ce73a0b80bf5d12a7a22e4c9d58
223242
target: esp32p4
224243
version: 2.0.0

platforms/tab5/main/idf_component.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ dependencies:
77
chmorgan/esp-audio-player: 1.0.7
88
chmorgan/esp-file-iterator: 1.0.0
99
espressif/led_strip: 3.0.0
10-
1110
espressif/esp_lcd_ili9881c: ^1.0.1

platforms/tab5/sdkconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2832,11 +2832,13 @@ CONFIG_CU_DIAGNOSTICS_COLOR_ALWAYS=y
28322832
#
28332833
# eppp_link
28342834
#
2835-
CONFIG_EPPP_LINK_USES_LWIP=y
2835+
# CONFIG_EPPP_LINK_USES_PPP is not set
28362836
CONFIG_EPPP_LINK_DEVICE_UART=y
28372837
# CONFIG_EPPP_LINK_DEVICE_SPI is not set
28382838
# CONFIG_EPPP_LINK_DEVICE_SDIO is not set
2839+
# CONFIG_EPPP_LINK_DEVICE_ETH is not set
28392840
CONFIG_EPPP_LINK_CONN_MAX_RETRY=6
2841+
# CONFIG_EPPP_LINK_CHANNELS_SUPPORT is not set
28402842
# end of eppp_link
28412843

28422844
#

0 commit comments

Comments
 (0)