Skip to content

build(openccu-base): migrate patch 0057 - #4631

Merged
jens-maus merged 2 commits into
masterfrom
jens-maus/migrate-0057
Nov 2, 2026
Merged

jens-maus merged 2 commits into
masterfrom
jens-maus/migrate-0057

Conversation

@jens-maus

@jens-maus jens-maus commented Nov 2, 2026 •

Copy link
Copy Markdown
Member

This removes OpenCCU rootfs patch 0057-WebUI-ImprovedDutyCycleDisplay.patch, now that OpenCCU/OpenCCU-Base#293 is merged.

OpenCCU-Base merge commit: 62753fc9320fb0c5122daab36f4f08c26902160d (OpenCCU/OpenCCU-Base#293, the current OpenCCU-Base HEAD). Between the previous pin 01e40077 (set by #4628) and this merge commit, OpenCCU-Base also merged OpenCCU/OpenCCU-Base#294 (98c9cd1d, a version for every program and library). The new pin includes this unrelated change; it does not touch any patched rootfs file, the license files or the eq3_char_loop source.

The Base change includes the fixes of the source patch made before the migration: #4629 (stale rows, disconnected gateways, documented API response, carrier sense aria-valuenow, hidden separator, superseded responses; the atomic and logged write of /tmp/dutycycle.json by updateDCVars.tcl stays in OpenCCU).

Changes:

Workspace refresh

update_patchfiles.sh against the pristine rootfs of the new pin refreshed the workspaces of the earlier patches 0001, 0031 and 0054 (webui.js) and 0039 and 0046 (webui.js, style.css). Each .orig/new pair gains exactly the Base change (7 pairs checked), and the generated patches only change hunk line numbers. The later workspaces 0061, 0097, 0109 and 0154 already contained the 0057 changes and stay unchanged. git diff --check is clean.

The remaining rootfs patch count is 14.

Validation


Generated by Claude Code

Summary by CodeRabbit

  • New Features
    • Script editing and execution now use a modern editor with syntax checking.
    • Time-zone selection and device time updates support more locations.
    • Help pages show OpenCCU and system information, with update options tailored to the platform.
  • Bug Fixes
    • Improved file uploads for firmware, certificates, backups, and add-ons.
    • Updated interface layouts and device views, including clearer display of long names and identifiers.
  • Updates
    • Updated the OpenCCU base version and refreshed OpenCCU branding across the interface.

@jens-maus jens-maus added 🏷️ OCCU OpenCCU-Base linked issues/PRs 🏷️ WebUI This refs the WebUI component labels Nov 2, 2026 — with Claude
@coderabbitai

coderabbitai Bot commented Nov 2, 2026 •

Copy link
Copy Markdown

Review in Change Stack →

No actionable comments were generated in the recent review.

Recent review info
Run configuration
Commits

Reviewing files that changed from the base of the PR and between 42adbe1 and c921a74.

Files ignored due to path filters: 13
  • buildroot-external/package/openccu-base/rootfs-patches/0001-OpenCCU/rootfs/www/webui/webui.js.orig is excluded by !**/*.orig
  • buildroot-external/package/openccu-base/rootfs-patches/0031-WebUI-Fix-FileUpload/rootfs/www/webui/webui.js.orig is excluded by !**/*.orig
  • buildroot-external/package/openccu-base/rootfs-patches/0039-WebUI-Fix-Style-Glitches/rootfs/www/webui/style.css.orig is excluded by !**/*.orig
  • buildroot-external/package/openccu-base/rootfs-patches/0039-WebUI-Fix-Style-Glitches/rootfs/www/webui/webui.js.orig is excluded by !**/*.orig
  • buildroot-external/package/openccu-base/rootfs-patches/0046-WebUI-ImprovedScriptEditor/rootfs/www/webui/style.css.orig is excluded by !**/*.orig
  • buildroot-external/package/openccu-base/rootfs-patches/0046-WebUI-ImprovedScriptEditor/rootfs/www/webui/webui.js.orig is excluded by !**/*.orig
  • buildroot-external/package/openccu-base/rootfs-patches/0054-WebUI-AddTimeZones/rootfs/www/webui/webui.js.orig is excluded by !**/*.orig
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay/rootfs/www/api/methods.conf.orig is excluded by !**/*.orig
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay/rootfs/www/api/methods/interface/getdutycycle.tcl.orig is excluded by !**/*.orig
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay/rootfs/www/rega/pages/tabs/startpage.htm.orig is excluded by !**/*.orig
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay/rootfs/www/webui/css/extern/hmBootstrap.css.orig is excluded by !**/*.orig
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay/rootfs/www/webui/style.css.orig is excluded by !**/*.orig
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay/rootfs/www/webui/webui.js.orig is excluded by !**/*.orig
Files selected for processing: 24
  • buildroot-external/package/openccu-base/openccu-base.hash
  • buildroot-external/package/openccu-base/openccu-base.mk
  • buildroot-external/package/openccu-base/rootfs-patches/0001-OpenCCU.patch
  • buildroot-external/package/openccu-base/rootfs-patches/0001-OpenCCU/rootfs/www/webui/webui.js
  • buildroot-external/package/openccu-base/rootfs-patches/0031-WebUI-Fix-FileUpload.patch
  • buildroot-external/package/openccu-base/rootfs-patches/0031-WebUI-Fix-FileUpload/rootfs/www/webui/webui.js
  • buildroot-external/package/openccu-base/rootfs-patches/0039-WebUI-Fix-Style-Glitches.patch
  • buildroot-external/package/openccu-base/rootfs-patches/0039-WebUI-Fix-Style-Glitches/rootfs/www/webui/style.css
  • buildroot-external/package/openccu-base/rootfs-patches/0039-WebUI-Fix-Style-Glitches/rootfs/www/webui/webui.js
  • buildroot-external/package/openccu-base/rootfs-patches/0046-WebUI-ImprovedScriptEditor.patch
  • buildroot-external/package/openccu-base/rootfs-patches/0046-WebUI-ImprovedScriptEditor/rootfs/www/webui/style.css
  • buildroot-external/package/openccu-base/rootfs-patches/0046-WebUI-ImprovedScriptEditor/rootfs/www/webui/webui.js
  • buildroot-external/package/openccu-base/rootfs-patches/0054-WebUI-AddTimeZones.patch
  • buildroot-external/package/openccu-base/rootfs-patches/0054-WebUI-AddTimeZones/rootfs/www/webui/webui.js
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay.patch
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay/rootfs/www/api/methods.conf
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay/rootfs/www/api/methods/interface/getdutycycle.tcl
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay/rootfs/www/rega/pages/tabs/startpage.htm
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay/rootfs/www/webui/css/extern/hmBootstrap.css
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay/rootfs/www/webui/style.css
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay/rootfs/www/webui/webui.js
  • buildroot-external/package/openccu-base/rootfs-patches/series
  • docs/base-patch-migration/index.json
  • docs/base-patch-migration/state.json
Files with no reviewable changes: 6
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay/rootfs/www/webui/css/extern/hmBootstrap.css
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay/rootfs/www/api/methods.conf
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay/rootfs/www/rega/pages/tabs/startpage.htm
  • buildroot-external/package/openccu-base/rootfs-patches/series
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay/rootfs/www/api/methods/interface/getdutycycle.tcl
  • buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay.patch

Included review availability: This review used your included allowance. Your plan provides up to 4 included reviews per hour; 3 remain after this review.

Walkthrough

The OpenCCU-Base commit pin advances. WebUI patch definitions and migration records are updated, including duty-cycle display, timezone, layout, script-editor, and firmware presentation changes. The standalone duty-cycle patch is removed from the patch series.

Changes

OpenCCU-Base Migration

Layer / File(s) Summary
Base pin and migration records
buildroot-external/package/openccu-base/openccu-base.mk, buildroot-external/package/openccu-base/openccu-base.hash, docs/base-patch-migration/*
The package pin and source checksum change. Migration patch hashes and migration state are updated.
Firmware presentation and window naming
buildroot-external/package/openccu-base/rootfs-patches/0001-OpenCCU.patch, buildroot-external/package/openccu-base/rootfs-patches/0031-WebUI-Fix-FileUpload.patch
The version display and update check use OpenCCU values and assets. The WebUI sets the current window name to ccu-main-window.
Per-interface duty-cycle display
buildroot-external/package/openccu-base/rootfs-patches/{0001-OpenCCU,0031-WebUI-Fix-FileUpload,0039-WebUI-Fix-Style-Glitches,0046-WebUI-ImprovedScriptEditor,0054-WebUI-AddTimeZones}*
Duty-cycle refresh uses Interface.getDutyCycle for returned interfaces and displays valid duty-cycle and carrier-sense values. It discards stale responses and hides unavailable rows. Associated progress-bar styles are removed and parting-line styling is added.
Timezone offset handling
buildroot-external/package/openccu-base/rootfs-patches/0054-WebUI-AddTimeZones.patch
Position updates use the returned UTC offsets instead of translating timezone abbreviations. The all-device update uses the argument-free setter and retains its retry behavior.
WebUI layout adjustments
buildroot-external/package/openccu-base/rootfs-patches/0039-WebUI-Fix-Style-Glitches*
The patch changes layout, overflow, table, control, dialog, and image-preview styling across WebUI pages.
CodeMirror script editor
buildroot-external/package/openccu-base/rootfs-patches/0046-WebUI-ImprovedScriptEditor.patch
The script editor uses CodeMirror input and output. Script execution checks syntax before running, and editor dialogs use screen-relative sizing.
Remove standalone duty-cycle patch
buildroot-external/package/openccu-base/rootfs-patches/0057-WebUI-ImprovedDutyCycleDisplay*, buildroot-external/package/openccu-base/rootfs-patches/series
The 0057 patch and its series entry are removed, along with its API registry, endpoint, start-page template, and stylesheet.

Estimated code review effort: 4 (Complex) | ~45 minutes

Change: Other

Possibly related issues

Possibly related PRs

  • OpenCCU/OpenCCU#4628: This PR records the completion of the preceding patch migration and advances the OpenCCU-Base pin.
  • OpenCCU/OpenCCU#4541: This PR changes content and patch handling for 0057, which this PR removes after migrating its duty-cycle implementation.

Suggested labels: dependencies

Merge Risk: Minimal · up to c921a

No issue introduced by this change remains identified. Merge after the normal checks.

Pre-merge checks: Passed 5
Check name Status Explanation
Description Check Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check Passed The title clearly and concisely identifies the main change: migrating patch 0057 for openccu-base.
Docstring Coverage Passed No eligible functions found in the changed files. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentat…
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Full details: Docstring Coverage

Explanation

No eligible functions found in the changed files. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentation-only edits and deletions within surviving functions are included; unchanged diff context and fully deleted functions are excluded. Analyzed 0 functions across 0 files. (16 skipped: 11 unsupported, 5 too large.)

Finishing Touches
Generate docstrings
  • Commit to this branch
  • Create a new PR
Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

@jens-maus jens-maus added this to the next release milestone Nov 2, 2026
@jens-maus
jens-maus merged commit 2c832ec into master Nov 2, 2026
25 checks passed
@jens-maus
jens-maus deleted the jens-maus/migrate-0057 branch November 2, 2026 18:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🏷️ OCCU OpenCCU-Base linked issues/PRs 🏷️ WebUI This refs the WebUI component

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant