Skip to content

mPWD-OS discovery#1685

Merged
garthvh merged 7 commits into
2.7.11from
mpwrd-discovery
Apr 24, 2026
Merged

mPWD-OS discovery#1685
garthvh merged 7 commits into
2.7.11from
mpwrd-discovery

Conversation

@jake-b

@jake-b jake-b commented Apr 22, 2026

Copy link
Copy Markdown
Contributor

What changed?

Added nymea-manager provisioning to iOS app

Why did it change?

Feature parity with android, and web flasher

How is this tested?

Not well, more to do. I used a Pi 5 using mPWRD-OS, but the nymea-manager did not start, so I needed to login and start it manually with a nymea-manager -m always to test.

Documentation changes may be needed.

Checklist

  • My code adheres to the project's coding and style guidelines.
  • I have conducted a self-review of my code.
  • I have commented my code, particularly in complex areas.
  • I have verified whether these changes require an update to existing documentation or if new documentation is needed, and created an issue in the docs repo if applicable.
  • I have tested the change to ensure that it works as intended.

@garthvh garthvh changed the base branch from main to 2.7.11 April 23, 2026 01:34
@garthvh

garthvh commented Apr 23, 2026

Copy link
Copy Markdown
Member

@copilot resolve the merge conflicts in this pull request

Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com>

Copilot AI commented Apr 23, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflicts in commit 3f241d04. The 3 conflicting files were:

  • Localizable.xcstrings — kept new strings from both branches
  • Meshtastic.xcodeproj/project.pbxproj — accepted new file/build references from 2.7.11
  • Meshtastic/Views/Connect/Connect.swift — kept NymeaDeviceConnectRow from this branch

@CLAassistant

CLAassistant commented Apr 23, 2026

Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 3 committers have signed the CLA.

✅ jake-b
✅ garthvh
❌ Copilot
You have signed the CLA already but the status is still pending? Let us recheck it.

Copilot AI requested a review from garthvh April 23, 2026 01:39
@garthvh

garthvh commented Apr 23, 2026

Copy link
Copy Markdown
Member

@copilot resolve the merge conflicts in this pull request

Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com>

Copilot AI commented Apr 23, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved the new merge conflicts in commit 87849ea. The 2 conflicting files were:

  • Meshtastic.xcodeproj/project.pbxproj — kept both the Provisioning group (our branch) and the new Debugging group (from 2.7.11)
  • Localizable.xcstrings — kept both "Network Name" (our branch) and "Network Location" (from 2.7.11)

@garthvh

garthvh commented Apr 24, 2026

Copy link
Copy Markdown
Member

@copilot resolve the merge conflicts in this pull request

Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com>

Copilot AI commented Apr 24, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflicts in commit 2955dc3. The 1 conflicting file was:

  • Localizable.xcstrings — kept both "Required" (our branch, Wi-Fi password field label) and "Requires a precise GPS fix from your phone" (from 2.7.11)

@garthvh garthvh merged commit 5449310 into 2.7.11 Apr 24, 2026
@garthvh garthvh deleted the mpwrd-discovery branch April 24, 2026 03:00
Copilot stopped work on behalf of garthvh due to an error April 24, 2026 03:01
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.

4 participants