forked from PeakeElectronicInnovation/modbus-io-module
-
Notifications
You must be signed in to change notification settings - Fork 1
Feature/terminal and sensor dataflow #11
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
Closed
Warrion2021
wants to merge
34
commits into
tazomatalax:main
from
Warrion2021:feature/terminal-and-sensor-dataflow
Closed
Feature/terminal and sensor dataflow #11
Warrion2021
wants to merge
34
commits into
tazomatalax:main
from
Warrion2021:feature/terminal-and-sensor-dataflow
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…egit push origin main git add . git commit -m "Resolve merge conflicts and update with latest changes"git add . git push origin maingit commit -m "The merge is necessary because I makes the changes I set out to achieve in the earlier fork "# the commit.
- Fixed JavaScript error preventing sensor data flow from displaying - Removed calibration functionality from config modal (moved to data flow) - Added stability improvements: memory monitoring, yield points, network checks - Increased JSON buffer sizes for better sensor data handling - Enhanced debugging output for troubleshooting - Added comprehensive documentation and guides
- Resolved conflicts by keeping local changes with sensor data flow fixes - Retained stability improvements and calibration modal fixes - Merged with upstream documentation changes
- Add USB RNDIS configuration in platformio.ini for local web access - Update main.cpp with dual network initialization (USB: 192.168.7.1, Ethernet: 192.168.1.10) - Enhanced debug output for SPI and network initialization troubleshooting - Corrected IP address configuration in sys_init.h (192.168.1.10 instead of .100) - Add Windows Defender exclusions script for development environment - Updated documentation with pin mapping and recovery procedures - Web interface now accessible via USB (192.168.7.1) and Ethernet (192.168.1.10) - Modbus TCP server remains on Ethernet only for proper master communication
//still some terminal issues to relsove' need to check pins are correct
one wire when scanning all pins in terminal
for data parsing config
Author
|
erminal monitoring and sensor dataflow improvements |
sensor calibrations allowed
commands direct to sensors via sendCommandToSensor function
autoconfigured sensor but caused problems with others
Owner
|
Merged Latest |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.