Skip to content

Attempting to Merge main into Documentation #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jun 9, 2025

Conversation

Mikefly123
Copy link
Member

@Mikefly123 Mikefly123 commented May 30, 2025

Summary

Taylor is doing some great work getting docstrings into the code base and setting things up for automatic generation of the docs site!

I noticed that the Documentation branch was becoming quite behind compared to main and took some time to get everything caught up! The number of changes at play here is pretty disgusting tbh, but I think it's either we do a big update now or get wrecked later when we try to merge back into main haha.

I think all of the conflicts with the contents of the actual code files are reflecting what is on main and abandoning anything that was in this branch. Any documentation files override what was on main and accept what is in Documentation.

How was this tested

  • Relentless use of the merge conflict editor in VS Code
  • Added new unit tests
  • Ran code on hardware (screenshots are helpful)
  • Other (Please describe)
Screenshot 2025-05-29 at 6 16 47 PM

There are still a ton of typecheck errors, but I think these are present on main so it's an upstream problem to solve.

nateinaction and others added 19 commits March 27, 2025 19:07
Co-authored-by: Nate Gay <[email protected]>
Co-authored-by: Nate Gay <[email protected]>
Also had to remove:

Could not determine a constructor for the tag 'tag:yaml.org,2002:python/name:pymdownx.emoji.gemoji'
  in "pysquared/mkdocs.yml", line 85, column 20
@Mikefly123 Mikefly123 requested review from Copilot and TaylorGilg May 30, 2025 01:17
@Mikefly123 Mikefly123 self-assigned this May 30, 2025
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR syncs the Documentation branch with the latest changes from main while adding new mocks, updating doc guides, and modifying build and CI configurations.

  • Added several new mock implementations for various hardware components.
  • Removed legacy files (e.g., config.json, older adafruit_rfm mocks) and updated documentation and build scripts.

Reviewed Changes

Copilot reviewed 123 out of 123 changed files in this pull request and generated no comments.

Show a summary per file
File Description
mocks/proves_sx126/sx126x.py New mock file defining constants for SX126.
mocks/proves_sx126/sx1262.py New mock file introducing the SX1262 class interface.
mocks/circuitpython/rtc.py Updated RTC mock with a new datetime attribute.
mocks/circuitpython/byte_array.py Refactored ByteArray with modified setitem signature.
mocks/circuitpython/adafruit_rfm/* Removed legacy adafruit_rfm mocks from circuitpython folder.
mocks/adafruit_rfm/* Added updated mocks for Adafruit RFM components.
mocks/adafruit_lsm6ds/lsm6dsox.py, lis2mdl.py, ina219.py New mocks for sensor and power monitor components.
lib/requirements.txt Removed the requirements file, likely shifting dependency management.
docs/dev-guide.md Updated documentation with clearer installation instructions.
README.md Revised repo title and supported boards section.
Makefile Updated build, typecheck, and clean targets for improved consistency.
.pre-commit-config.yaml & .github/workflows/ci.yaml Minor adjustments to pre-commit and CI configurations.

Copy link
Contributor

@TaylorGilg TaylorGilg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you so much for catching up the documentation branch with current main!!

  • For the main modules, I added more in depth comments in a uniform format explaining the purposes of each module, their methods, function attributes, function return values, and error catching. These comments serve as the base for the contents of the markdown pages.

Start Up:

  1. cd pysquared> cd pysquared
  2. mkdocs build -> builds html based on markdown files in pysquared/pysquared/docs
  3. mkdocs serve -> hosts html files on localhost
  • Feel free to leave any feedback on if any comments are poorly describing any particular behavior in the modules.
  • Please leave any extra notes and details that you think should be included to best describe the quirks of the logic of modules, circuitpython, hardware, etc and give good context to modules.
  • I know we all touch a lot of different places in the repo but if there are any places where people can be credited as authors please let me know.

Notes:

  • This documentation doesn't cover the new managers, mocks, or tests.
  • I left packet_manager and packet_sender alone (no new comments or markdown pages) because I know Nate is making changes to those files right now.

Copy link
Member

@hrfarmer hrfarmer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll take a look at the documentation specific stuff when I get a chance, but I think those make typecheck errors do need to be looked at. I get no errors or warnings whenever I run make typecheck on main, so I think something may have been merged incorrectly. (They all come from cdh.py)

@Mikefly123
Copy link
Member Author

Hey @TaylorGilg thanks for the slight rollback on cdh.py! It looks like the type checker is now appeased.

Just as a heads up, I did just open #257 with some additional unit tests to try and get the SonarCloud quality gate over that 80% line on this! Let me know what you think about it

Signed-off-by: Michael Pham <[email protected]>
Co-authored-by: Copilot <[email protected]>
Copy link

sonarqubecloud bot commented Jun 8, 2025

@Mikefly123 Mikefly123 merged commit 000519a into Documentation Jun 9, 2025
5 checks passed
@Mikefly123 Mikefly123 deleted the main-docs-merge branch June 9, 2025 17:09
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.

8 participants