Skip to content
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

INA3221 / Power Telemetry Payload Variant Implementation #2916

Merged
merged 11 commits into from
Nov 5, 2023
Merged

INA3221 / Power Telemetry Payload Variant Implementation #2916

merged 11 commits into from
Nov 5, 2023

Conversation

RicInNewMexico
Copy link
Member

modified:   platformio.ini
modified:   src/configuration.h
modified:   src/detect/ScanI2C.h
modified:   src/detect/ScanI2CTwoWire.cpp
modified:   src/main.cpp
modified:   src/modules/Modules.cpp
new file:   src/modules/Telemetry/PowerTelemetry.cpp
new file:   src/modules/Telemetry/PowerTelemetry.h
new file:   src/modules/Telemetry/Sensor/INA3221Sensor.cpp
new file:   src/modules/Telemetry/Sensor/INA3221Sensor.h
modified:   src/mqtt/MQTT.cpp

Added the INA3221 3 channel voltage / current sensor

Added a new telemetry payload variant for power metrics

Added the INA3221 reporting to the new payload variant.

	modified:   platformio.ini
	modified:   src/configuration.h
	modified:   src/detect/ScanI2C.h
	modified:   src/detect/ScanI2CTwoWire.cpp
	modified:   src/main.cpp
	modified:   src/modules/Modules.cpp
	new file:   src/modules/Telemetry/PowerTelemetry.cpp
	new file:   src/modules/Telemetry/PowerTelemetry.h
	new file:   src/modules/Telemetry/Sensor/INA3221Sensor.cpp
	new file:   src/modules/Telemetry/Sensor/INA3221Sensor.h
	modified:   src/mqtt/MQTT.cpp
@RicInNewMexico
Copy link
Member Author

@thebentern : Ended up submitting this PR 3+ times before trunk was finally all good with it.

What did I miss that's causing some of the device checks to fail? I have no issue making corrections.

Most of my testing was done with Heltec Lora32's, which apparently are passing the CI checks and compiling fine for me.

thebentern and others added 10 commits November 3, 2023 06:38
	modified:   src/modules/Telemetry/PowerTelemetry.cpp
	modified:   src/modules/Modules.cpp
	modified:   src/modules/Telemetry/PowerTelemetry.cpp
	deleted:    variants/xiao_ble/1.0.0/libraries/SPI/SPI.cpp
	modified:   src/modules/Modules.cpp
	modified:   src/modules/Telemetry/PowerTelemetry.cpp
	modified:   src/modules/Telemetry/PowerTelemetry.cpp
	modified:   src/modules/Telemetry/PowerTelemetry.cpp
@thebentern thebentern merged commit f570204 into meshtastic:master Nov 5, 2023
56 checks passed
@RicInNewMexico RicInNewMexico deleted the TELEM branch November 13, 2023 00:00
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