From 709d2ca14aa7137c1c4616faceec277e6fadd27f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BF=83=E5=B9=B3=E6=B0=94=E5=92=8C?= <2394609457@qq.com> Date: Wed, 3 Jun 2026 16:55:08 +0800 Subject: [PATCH] =?UTF-8?q?build(=E5=A4=87=E4=BB=BD):=202026=E5=B9=B406?= =?UTF-8?q?=E6=9C=8803=E6=97=A516=E6=97=B655=E5=88=8605=E7=A7=92=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .obsidian/workspace.json | 80 +++++++++++++------ .../操作说明-ESP32S3-示例代码.md | 8 +- ...才不管那么多》莱亚布卢门塔尔（北京科技出版社）.md | 22 ++++- 3 files changed, 83 insertions(+), 27 deletions(-) diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index 93678f4..0b982ad 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -4,16 +4,16 @@ "type": "split", "children": [ { - "id": "af01ad6243d761d9", + "id": "9c4ef402de6088f6", "type": "tabs", "children": [ { - "id": "a0a732e90a1f7ee9", + "id": "75cc38aed235acc6", "type": "leaf", "state": { "type": "markdown", "state": { - "file": "01-项目/2605-MicroPythonESP32S3/操作说明-ESP32S3-示例代码.md", + "file": "Untitled 7.md", "mode": "source", "source": false, "backlinks": true, @@ -28,7 +28,37 @@ } }, "icon": "lucide-file", - "title": "操作说明-ESP32S3-示例代码" + "title": "Untitled 7" + } + } + ] + }, + { + "id": "4c297b6cd2538df0", + "type": "tabs", + "children": [ + { + "id": "1aee8bb30ace835f", + "type": "leaf", + "state": { + "type": "markdown", + "state": { + "file": "Untitled 4.md", + "mode": "source", + "source": false, + "backlinks": true, + "backlinkOpts": { + "collapseAll": false, + "extraContext": false, + "sortOrder": "alphabetical", + "showSearch": false, + "searchQuery": "", + "backlinkCollapsed": false, + "unlinkedCollapsed": true + } + }, + "icon": "lucide-file", + "title": "Untitled 4" } } ] @@ -63,7 +93,7 @@ "state": { "type": "search", "state": { - "query": "idf.py", + "query": "2026-05-31-103991/2026-05-31-103991", "matchingCase": false, "explainSearch": false, "collapseAll": false, @@ -198,34 +228,35 @@ "templater-obsidian:Templater": false } }, - "active": "a0a732e90a1f7ee9", + "active": "1aee8bb30ace835f", "lastOpenFiles": [ - "attachments/Pasted image 20260603101137.png", - "01-项目/2605-MicroPythonESP32S3/项目-总结.md", - "01-项目/2605-MicroPythonESP32S3/操作说明-ESP32S3-示例代码.md", "Untitled 1.md", - "01-项目/2603-CNB/参数配置-云构建语法.md", - "Untitled 7.md", - "Untitled 6.md", - "Untitled 3.md", - "Untitled 4.md", "Untitled.md", - "2备忘-日常待办-待办事项.md", + "01-项目/2605-读书笔记/《生活》陈梦琪（生活记录出版社）.md", "Untitled 9.md", - "01-项目/2604-物联数据中台/账号信息.md", - "01-项目/2604-juecha/觉察知识-供应商模型-阿里百炼API说明.md", - "Untitled 15.md", "Untitled 10.md", "Untitled 11.md", + "Untitled 7.md", + "Untitled 15.md", + "模板文件/模板-豆包-DataView语法.md", + "模板文件/模板-健康运动-练背日志.md", + "模板文件/模板-豆包-DataView归档.md", + "模板文件/模板-豆包-问题解答.md", + "模板文件/模板-豆包-文档整理.md", + "模板文件/模板-豆包-翻译内容.md", + "模板文件/模板-备忘.md", + "04-归档/MaixCam-自定义开机启动画面.md", + "Untitled 4.md", + "01-项目/2605-读书笔记/《海鸥才不管那么多》莱亚布卢门塔尔（北京科技出版社）.md", + "Untitled 2.md", "Untitled 16.md", + "Untitled 17.md", "Untitled 18.md", "Untitled 20.md", - "Untitled 17.md", - "模板文件/模板-健康运动-练肩日志.md", - "01-项目/2602-健康运动/健康运动-周2-练背训练日志.md", - "模板文件/模板-健康运动-练背日志.md", - "模板文件/模板-健康运动-练腿日志.md", - "01-项目/2605-读书笔记/《生活》陈梦琪（生活记录出版社）.md", + "Untitled 6.md", + "Untitled 3.md", + "01-项目/2605-MicroPythonESP32S3/操作说明-ESP32S3-示例代码.md", + "attachments/Pasted image 20260603101137.png", "01-项目/2605-MicroPythonESP32S3", "01-项目/2605-读书笔记", "attachments/Pasted image 20260525181302.png", @@ -241,7 +272,6 @@ "04-归档/归档资源/归档说明-优创未来样例程序.md.baiduyun.uploading.cfg", "Untitled 29.md.baiduyun.uploading.cfg", "attachments/Snipaste_2026-04-29_10-35-36.png.baiduyun.uploading.cfg", - "attachments/Snipaste_2026-04-29_10-35-36.png", "模板文件/模板-需求-取消.md.baiduyun.uploading.cfg", "模板文件/模板-RAG转化.md.baiduyun.uploading.cfg", "未命名.md.baiduyun.uploading.cfg", diff --git a/01-项目/2605-MicroPythonESP32S3/操作说明-ESP32S3-示例代码.md b/01-项目/2605-MicroPythonESP32S3/操作说明-ESP32S3-示例代码.md index d290c57..a929050 100644 --- a/01-项目/2605-MicroPythonESP32S3/操作说明-ESP32S3-示例代码.md +++ b/01-项目/2605-MicroPythonESP32S3/操作说明-ESP32S3-示例代码.md @@ -67,7 +67,13 @@ idf.py set-target esp32s3 && \ idf.py build cd /workspace/output/esp32-s3-cam/build -esptool.py --chip esp32s3 merge_bin -o ../merged_firmware.bin @flash_args +esptool.py --chip esp32s3 merge_bin -o ../merged.bin @flash_args +``` + + +```bash + +cd /workspace/output/esp32_video/spi_lcd_touch && source /opt/esp/idf/export.sh && idf.py fullclean && idf.py set-target esp32s3 && idf.py build ``` \ No newline at end of file diff --git a/01-项目/2605-读书笔记/《海鸥才不管那么多》莱亚布卢门塔尔（北京科技出版社）.md b/01-项目/2605-读书笔记/《海鸥才不管那么多》莱亚布卢门塔尔（北京科技出版社）.md index 7024573..1786455 100644 --- a/01-项目/2605-读书笔记/《海鸥才不管那么多》莱亚布卢门塔尔（北京科技出版社）.md +++ b/01-项目/2605-读书笔记/《海鸥才不管那么多》莱亚布卢门塔尔（北京科技出版社）.md @@ -100,7 +100,27 @@ # 批注 慎用这个方法，但的确给了我们启示，也许我们可以善用既定事实来解决犹豫不决的问题，因为当你纠结看什么视频时，其实你看什么已经不那么重要了，你总想那么完美，一方面你在纠结前期可以直接选一个，如果你不喜欢就会换的（善用这个点，接纳失败，接纳不完美），另一方面，你怎么觉得纠结来纠结去不算一种浪费时间，不算一种失败呢 - +--- + +> 创建/更新：2026-06-03-160299/2026-06-03-160214 + +# 一句话描述 + 你可以心理上用阿Q,但你的大脑要保持清醒 +# 摘抄 + 我不会为自己伸张正义，而是就这样忍受着那些我无法改变的事情，并且在这个过程中我还会觉得自己处事无比成熟。 +# 批注 + 慎用阿Q精神胜利法，你可以精神胜利安慰，但是你要保持理智，明确是非，明确自己的边界，不要过度妥协讨好。其次你所面对的只是不同的情景不同的行为模式罢了，一切更多的是情绪受环境影响，要么调整模式，要么调整心理，总之内耗毫无意义。 + +--- + +> 创建/更新：2026-06-03-162853/2026-06-03-162853 + +# 一句话描述 + +# 摘抄 + 站在社会的角度为人和善、容易相处当然是件好事。但是这也并不意味着，捍卫自己利益、给自己的需求留出空间是不好的。 +# 批注 +