Skip to content

Reverted a commit and don't know how to deal with it #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ImLunchtime wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Reverted a commit and don't know how to deal with it #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c8ed805
移除无用代码，添加图片
ImLunchtime Jul 20, 2025
b960d67
添加Content lock系统
ImLunchtime Jul 20, 2025
3ed27fe
修复内存问题
ImLunchtime Jul 20, 2025
4a3c10b
添加新App，修复启动时的内存问题
ImLunchtime Jul 21, 2025
389fcc2
修改抽屉，将控制中心改为控制面板^^
ImLunchtime Jul 21, 2025
8fc1129
整理代码
ImLunchtime Jul 22, 2025
3b1dc2a
拆分设置App
ImLunchtime Jul 22, 2025
43465dc
修改字体，修改主题
ImLunchtime Jul 24, 2025
d9398bd
界面更新
ImLunchtime Jul 24, 2025
f436fc6
修改Ark App界面
ImLunchtime Jul 27, 2025
b568ea0
添加一张照片
ImLunchtime Jul 27, 2025
f294f42
拆分抽屉Overlay代码
ImLunchtime Jul 27, 2025
74b35f5
Liquid Glass设计的抽屉
ImLunchtime Jul 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,18 @@
"idf.portWin": "COM5",
"idf.espIdfPathWin": "C:/Espressif541/frameworks/esp-idf-v5.4.1/",
"idf.toolsPathWin": "C:\\Espressif541",
"idf.pythonInstallPath": "C:\\Espressif541\\tools\\idf-python\\3.11.2\\python.exe"
"idf.pythonInstallPath": "C:\\Espressif541\\tools\\idf-python\\3.11.2\\python.exe",
"files.associations": {
"app_manager.h": "c",
"hal_sdcard.h": "c",
"menu_utils.h": "c",
"hal_audio.h": "c",
"app_settings.h": "c",
"string.h": "c",
"content_lock.h": "c",
"nvs_manager.h": "c",
"stdio.h": "c",
"stdlib.h": "c",
"hal.h": "c"
}
}
95 changes: 0 additions & 95 deletions README_AUDIO_HAL.md
View file
Open in desktop

This file was deleted.

208 changes: 0 additions & 208 deletions README_AUDIO_LOOPBACK_APP.md
View file
Open in desktop

This file was deleted.

38 changes: 31 additions & 7 deletions main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,33 @@
idf_component_register(SRCS "app_photo_images.c" "app_photo.c" "app_test.c" "app_pwm_servo.c" "hal_pwm.c" "menu_utils.c" "gesture_handler.c" "app_settings.c" "app_launcher.c" "overlay_drawer.c" "app_manager.c" "m5stack-tab5-lvgl.c"
file(GLOB_RECURSE ASSETS "assets/*.c")
idf_component_register(SRCS
"apps/photo/app_photo_images.c"
"apps/photo/app_photo.c"
"apps/pwm_servo/app_pwm_servo.c"
"hal/hal_pwm.c"
"utils/menu_utils.c"
"utils/memory_utils.c"
"managers/gesture_handler.c"
"apps/ark/app_ark.c"
"apps/settings/app_settings.c"
"apps/settings/settings_about.c"
"apps/settings/settings_display.c"
"apps/settings/settings_sound.c"
"managers/app_manager.c"
"apps/launcher/app_launcher.c"
"overlay_drawer.c"
"overlay_drawer_ui.c"
"overlay_drawer_control.c"
"overlay_drawer_events.c"
"overlay_drawer_memory.c"
"m5stack-tab5-lvgl.c"
"gui.c"
"hal.c"
"hal_audio.c"
"hal_display.c"
"hal_sdcard.c"
"app_music_player.c"
"app_file_manager.c"
INCLUDE_DIRS ".")
"hal/hal_audio.c"
"hal/hal_display.c"
"hal/hal_sdcard.c"
"apps/music_player/app_music_player.c"
"apps/file_manager/app_file_manager.c"
"managers/nvs_manager.c"
"managers/content_lock.c"
${ASSETS}
INCLUDE_DIRS ".")
Loading