merge: integrate OGScope branch stack / 合并 OGScope 分支栈 - #2
Merged
Conversation
…in deploy scripts - 新增 ogscope-config-write 与 ogscope-config sudoers / Add config-write script and sudoers - install/board-update/network-init 自动安装并规范化 env 640 权限 / Auto-install on deploy paths - API 与配置页区分 direct/sudo 可写状态 / API and config UI expose direct vs sudo write access Co-authored-by: Cursor <cursoragent@cursor.com>
…aming unit test - 全仓 black 格式化与 ruff import/风格修复 / Run black and ruff across ogscope and tests - 补全 MJPEG streaming 测试 FakeSettings.shared_preview_fps / Add shared_preview_fps to fake settings Co-authored-by: Cursor <cursoragent@cursor.com>
…e delegated network from health - system/status 返回稳定 health_reasons；subordinate 或未配 WiFi 时 network 标记 delegated 不参与 health / Return stable health_reasons; delegated network does not degrade health - capabilities.network 与 OGScope 是否管网一致 / Align capabilities.network with OGScope network ownership - 更新 Core 契约与 subordinate 文档及单元测试 / Update contract docs and unit tests Co-authored-by: Cursor <cursoragent@cursor.com>
… during stop - 增加 _stopping 守卫，stop 时拒绝 ensure_started / Add _stopping guard to reject ensure_started while stopping - stop 获取控制锁失败时重试，成功后清除 health_error / Retry control lock on stop and clear health_error on success Co-authored-by: Cursor <cursoragent@cursor.com>
…pping guard on camera stop - 恢复原有 control_lock 停机逻辑，避免 ensure_started 永久被拒 / Restore original stop lock behavior - 预览释放由前端对齐 OGScope 调试台流程负责 / Stream release remains handled by debug console pattern on clients Co-authored-by: Cursor <cursoragent@cursor.com>
solve/image 与视频帧解算一致返回极轴指引 overlay，并增加对应 API 测试。 Co-authored-by: Cursor <cursoragent@cursor.com>
… board sync script - bootstrap rsync 排除 uploads/logs/data，避免板上测试数据被删 / Exclude uploads, logs, data from deploy rsync - 新增 sync_board_code.sh 用于 OGScope 代码同步 / Add sync_board_code.sh for OGScope board sync Co-authored-by: Cursor <cursoragent@cursor.com>
- 增加相机驱动与预览编码抽象，预留 Linuxpy/V4L2 接口 / Add camera driver and preview encoder abstractions with Linuxpy/V4L2 hook - 接入 Picamera2/libcamera 能力、lores 流、metadata 与高级控制 / Wire Picamera2/libcamera capabilities, lores stream, metadata, and advanced controls - 增加 TurboJPEG 依赖安装校验，并按真实首帧选择最快编码器 / Add TurboJPEG install verification and choose fastest encoder from first real frame - 更新开发者相机控制台、类型、文案和构建产物 / Update developer camera console, types, translations, and built assets
删除短接引脚触发 STA/AP 切换的运行时监控，并从配置、配置目录与架构文档中移除相关项。 Remove the runtime short-pin STA/AP switching monitor and clean up the related settings, config catalog entries, and architecture documentation.
在 Core v1 相机状态中暴露可选 ambient_hint，并补充中英文契约文档和单测。 Expose optional ambient_hint in Core v1 camera status, with bilingual contract docs and tests.
Make board-update independently repair Picamera2/libcamera runtime packages and apply the default IMX327 boot overlay during non-interactive deployments.\n\n让 board-update 在非交互部署中独立补齐 Picamera2/libcamera 运行栈，并默认应用 IMX327 boot overlay。
# Conflicts: # ogscope/core/application/core_service.py # tests/unit/test_domain_camera_streaming.py # web/static/analysis-lab/assets/system-CXtFKEU2.js # web/static/analysis-lab/system.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary / 摘要
Validation / 验证
Notes / 说明