Integration Branch (testing-102)

[Q1WP]

Source Branch: testing-102
Base Version: 2.0.7

Summary

Integration branch merging all three feature branches (bugfixes-complete, feature/macros-and-service-tracking, feature/ui-tweaks) with carefully resolved conflicts. This branch represents the complete, tested enhancement package.

Purpose

This branch serves as:

1. Reference implementation showing how the three feature branches integrate
2. Conflict resolution guide for maintainers doing their own merges
3. Complete testing target with all features working together

Recommendation: Maintainers may prefer to merge the three source branches individually in sequence, using this branch as a reference for conflict resolution decisions.

---

Merge Sequence

The three feature branches were developed in parallel against the same base, leading to conflicts when integrated:

Phase	Branch Merged	Conflicts	Files
1	bugfixes-complete	Clean	—
2	feature/macros-and-service-tracking	15	8
3	feature/ui-tweaks	73	12

Total: 88 conflicts resolved across 12 files

---

Phase 2: macros-service after bugfixes

State.py — reset() method

Both branches modified the reset behavior.

Branch	Changes
bugfixes	Clears distance_mode, clears %dreferenced, clears macro state
macros-service	Clears macro state only

Resolution: Take bugfixes — safety-critical behavior (distance mode reset, reference clearing) must be preserved.

Config.py — Macro iteration variable

Branch	Code
bugfixes	Uses macro_id (undefined)
macros-service	Uses i + 1 (correct)

Resolution: Take macros-service — fixes the bug.

Planner.py — get_modal_state() guard

Branch	Code
bugfixes	Calls get_modal_state() directly
macros-service	Adds hasattr() guard first

Resolution: Take macros-service — prevents crashes on older camotics.so without the method.

FileSystem.py — Warning on missing macro source

Branch	Behavior
bugfixes	Logs warning when macro source not found
macros-service	Silent (expected for pre-existing configs)

Resolution: Take macros-service — don't warn on expected behavior.

app.js — State initialization

Branch	Changes
bugfixes	Full state object with all properties initialized
macros-service	Partial initialization

Resolution: Take bugfixes — Vue 1.x reactivity requires pre-initialized properties.

view-control.js — Safety features

Branch	Changes
bugfixes	program-cleared, program-reloaded events; _get_unreferenced_axes()
macros-service	Macro tab filtering, visibility

Resolution: Take bugfixes — safety features required for proper operation.

---

Phase 3: ui-tweaks after merged branch

view-control.js/pug/styl — Complete redesign

ui-tweaks contains a complete redesign of the control page. Attempting line-by-line merge would be error-prone and time-consuming.

Resolution: Take ui-tweaks versions directly after verifying they contain all required safety features:

• ✓ _get_unreferenced_axes() method
• ✓ _format_reference_error() method
• ✓ skip_reference_check handling in run_macro()
• ✓ program-cleared event handler
• ✓ program-reloaded event handler

view-macros.pug/styl — Confirmation UI placement

Branch	Design
macros-service	Confirmation checkbox on Safety tab
ui-tweaks	Confirmation checkbox inline in macro list

Resolution: Take macros-service versions — the Safety tab design correctly separates concerns:

• Macros tab: visibility control only (eye icon)
• Safety tab: confirmation + reference-check bypass

app.js — Multiple features

Manual merge required to preserve features from both branches:

Feature	Source
popupMessagesHeader Vue reactivity fix	bugfixes
Strict camera_available check (=== true)	bugfixes
initialized flag and E-stop handling	bugfixes
is_fullscreen state	ui-tweaks

Critical Detail: The popupMessagesHeader computed property must read state.s unconditionally BEFORE any conditional logic. Vue 1.x only tracks dependencies that are read during initial evaluation. If state.s is only read inside a conditional that's initially false, Vue won't re-evaluate when it changes.

// CORRECT - read state.s first
popupMessagesHeader() {
  let speed = parseFloat(this.state.s)  // Always read
  let toolType = this.config.tool && this.config.tool['tool-type']
  if (toolType && toolType !== 'Disabled' && !isNaN(speed)) {
    return 'GCode Messages - Spindle: ' + Math.round(speed) + ' RPM'
  }
  return 'GCode Messages'
}

program.js — Cache busting

Branch	Implementation
bugfixes	Simple url + '?_t=' + timestamp
ui-tweaks	Checks for existing query params (? vs &)

Resolution: Take ui-tweaks — handles URLs that already have query parameters.

Addition: Preserve this.time = 0 initialization from bugfixes for Vue reactivity.

Other simple conflicts

File	Resolution	Rationale
files.js	ui-tweaks	location_menu_open with click-outside guards
index.pug	ui-tweaks	Camera link hidden when on camera view
style.styl	ui-tweaks	Max-width centering for alerts
view-editor.styl	bugfixes	Flexbox layout more robust than fixed height
macros.styl	ui-tweaks	Tighter margins (cosmetic)

---

Conflict Resolution Principles

These principles guided all resolution decisions:

1. Safety First — When in doubt, preserve safety-critical code
2. Vue 1.x Reactivity — All state properties must be initialized before use
3. Complete Redesigns — Take whole files rather than line-by-line merge
4. Feature Separation — Respect intentional design decisions
5. Backwards Compatibility — Preserve guards for older library versions
6. Bug Fixes Win — Actual bug fixes take precedence over other changes

---

Testing Instance

All changes deployed and testable at:
http://bbctrl.dyndns.org:8091

This is a standalone controller not connected to a machine. The following cannot be tested remotely:

• Motor movement
• Spindle feedback (RPM display)
• Position reference after actual homing
• E-stop behavior

---

Files Summary

New Files (11)

• src/py/bbctrl/Service.py
• src/py/bbctrl/ServiceHandler.py
• src/resources/service-template.json
• src/js/view-macros.js
• src/js/view-service.js
• src/js/axis-row.js
• src/pug/templates/view-macros.pug
• src/pug/templates/view-service.pug
• src/pug/templates/axis-row.pug
• src/stylus/view-macros.styl
• src/stylus/view-service.styl

Conflict Files (12)

• src/py/bbctrl/State.py
• src/py/bbctrl/Config.py
• src/py/bbctrl/Planner.py
• src/py/bbctrl/FileSystem.py
• src/js/app.js
• src/js/view-control.js
• src/js/program.js
• src/js/files.js
• src/pug/templates/view-control.pug
• src/pug/index.pug
• src/stylus/view-control.styl
• src/stylus/macros.styl

---

Verification Checklist

Safety-critical features preserved:

Backend:

• State.reset() clears active_program
• State.reset() sets distance_mode to 90
• State.reset() clears %dreferenced for all motors
• Planner._update_modal_state() has hasattr guard
• FileSystem.is_protected_path() blocks macro directory access

Frontend:

• app.js initializes all state properties for Vue reactivity
• app.js popupMessagesHeader reads state.s before conditional
• app.js clears selection on E-stop
• view-control.js has _get_unreferenced_axes()
• view-control.js has _format_reference_error()
• view-control.js checks skip_reference_check in run_macro()
• view-control.js handles program-cleared event
• view-control.js handles program-reloaded event
• program.js initializes this.time = 0

UI Design:

• view-macros.pug has Safety tab (not inline confirm)
• view-macros.pug macro list has visibility column only
• view-macros.styl styling matches pug structure

---

For Maintainers

If merging branches individually instead of using this integration branch:

1. Merge bugfixes-complete first — Foundation safety fixes
2. Merge macros-service second — Watch for State.py conflicts; keep bugfixes safety code
3. Merge ui-tweaks last — Take whole view-control.* files after verifying safety features present; keep macros-service view-macros.* files

The most critical conflict is State.py reset() — ensure the final version includes:

self.set('distance_mode', 90)
for i in range(4):
    self.set('%dhomed' % i, 0)
    self.set('%dreferenced' % i, 0)