richonguzman/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git synced 2026-04-20 22:05:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 813a92a6cf into 944d1fceaf

Browse source
This commit is contained in:
db9ju 2026-04-13 17:32:45 -04:00 • committed by GitHub
commit 6ea8e7312e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/battery_utils.h
View file

@ -26,6 +26,7 @@ namespace BATTERY_Utils {
void adcCalibration();
void adcCalibrationCheck();
uint8_t externalI2CSensorActiveAddr();
void setup();
float checkInternalVoltage();

7
src/battery_utils.cpp
View file

@ -126,6 +126,13 @@ namespace BATTERY_Utils {
return ina219.begin();
}
uint8_t externalI2CSensorActiveAddr() {
if ( externalI2CSensorType != 0 ) {
return externalI2CSensorAddress;
}
return 0x00;
}
void setup() {
if ((Config.battery.sendExternalVoltage || Config.battery.monitorExternalVoltage) && Config.battery.voltageDividerR2 != 0) voltageDividerTransformation = (Config.battery.voltageDividerR1 + Config.battery.voltageDividerR2) / Config.battery.voltageDividerR2;

9
src/wx_utils.cpp
View file

@ -24,6 +24,7 @@
#include "board_pinout.h"
#include "wx_utils.h"
#include "display.h"
#include "battery_utils.h"
#define SEALEVELPRESSURE_HPA (1013.25)
@ -60,7 +61,13 @@ namespace WX_Utils {
void getWxModuleAddres() {
uint8_t err, addr;
uint8_t extI2Caddr = BATTERY_Utils::externalI2CSensorActiveAddr();
for(addr = 1; addr < 0x7F; addr++) {
if (addr == extI2Caddr) {
Serial.printf("0x%x occupied by I2C power sensor, skipping for Wx setup\n", addr);
continue;
}
#ifdef SENSOR_I2C_BUS
SENSOR_I2C_BUS.beginTransmission(addr);
err = SENSOR_I2C_BUS.endTransmission();
@ -78,7 +85,7 @@ namespace WX_Utils {
if (addr == 0x76 || addr == 0x77) { // BME or BMP
wxModuleAddress = addr;
return;
} else if (addr == 0x40) { // Si7011
} else if (addr == 0x40) { // Si7021
wxModuleAddress = addr;
return;
} else if (addr == 0x70) { // SHTC3