Skip to content

Rebase dev branch onto current master, preserving random timer feature#118

Merged
cerebrate merged 2 commits intodevfrom
copilot/sub-pr-117
Feb 26, 2026
Merged

Rebase dev branch onto current master, preserving random timer feature#118
cerebrate merged 2 commits intodevfrom
copilot/sub-pr-117

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Feb 26, 2026

The dev branch had diverged significantly from master (which moved to .NET 9 + CsWin32), causing unresolvable merge conflicts in PR #117.

Changes

Framework & API migration (master baseline)

  • Target framework: net6.0-windowsnet9.0-windows7.0
  • Replaced PInvoke.User32/PInvoke.Kernel32 with Microsoft.Windows.CsWin32 source generator
  • Updated Helpers.cs, Program.cs, MainForm.cs, MainForm.Designer.cs to use Windows.Win32.PInvoke API and modern C# (file-scoped namespaces, collection expressions)
  • Added missing NativeMethods.txt and App.config required by master

Random timer feature (dev-unique, preserved)

  • --random/-r CLI option wired through Program.csMainForm constructor
  • cbRandom checkbox + lbRandom display integrated into master's settings panel layout
  • RandomTimer user setting persisted via Settings.Default
  • Random interval uses Random.Shared and clamps to [1, JigglePeriod] seconds
if (RandomTimer)
{
    var newInterval = Random.Shared.Next(1, JigglePeriod + 1) * 1000;
    lbRandom.Text = $@"{newInterval / 1000} s";
    jiggleTimer.Interval = newInterval;
}

Other alignment with master

  • JigglePeriod default: 1 → 60s; tbPeriod.Maximum: 60 → 10800
  • Tray menu switched to master's inline-item approach (replaces named ToolStripMenuItem fields)
  • FolderProfile.pubxml updated to net9.0-windows7.0
  • README: preserved hardware jiggler section, updated CLI options docs to include -r/--random

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

…m timer feature

Co-authored-by: cerebrate <371623+cerebrate@users.noreply.github.com>
Copilot AI changed the title [WIP] Clean up the old dev branch Rebase dev branch onto current master, preserving random timer feature Feb 26, 2026
Copilot AI requested a review from cerebrate February 26, 2026 20:36
@cerebrate cerebrate marked this pull request as ready for review February 26, 2026 20:37
@cerebrate
Copy link
Copy Markdown
Member

lgtm!

@cerebrate cerebrate merged commit 65d637e into dev Feb 26, 2026
@cerebrate cerebrate deleted the copilot/sub-pr-117 branch February 26, 2026 20:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants