Skip to content

WIP: add board battery percentage #403

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.

Sign up for GitHub

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
446564 wants to merge 2 commits into from
Closed

WIP: add board battery percentage #403

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99cdb3a
add board battery percentage
446564 Jun 17, 2025
7716733
WIP: not building
446564 Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions examples/companion_radio/UITask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,7 @@ void UITask::newMsg(uint8_t path_len, const char* from_name, const char* text, i
}
}

void UITask::renderBatteryIndicator(uint16_t batteryMilliVolts) {
// Convert millivolts to percentage
const int minMilliVolts = 3000; // Minimum voltage (e.g., 3.0V)
const int maxMilliVolts = 4200; // Maximum voltage (e.g., 4.2V)
int batteryPercentage = ((batteryMilliVolts - minMilliVolts) * 100) / (maxMilliVolts - minMilliVolts);
void UITask::renderBatteryIndicator(uint16_t batteryPercentage) {
if (batteryPercentage < 0) batteryPercentage = 0; // Clamp to 0%
if (batteryPercentage > 100) batteryPercentage = 100; // Clamp to 100%

Expand Down Expand Up @@ -211,7 +207,7 @@ void UITask::renderCurrScreen() {
_display->print(_node_prefs->node_name);

// battery voltage
renderBatteryIndicator(_board->getBattMilliVolts());
renderBatteryIndicator(_board->getBattPercent());

// freq / sf
_display->setCursor(0, 20);
Expand Down
2 changes: 1 addition & 1 deletion examples/companion_radio/UITask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class UITask {

void renderCurrScreen();
void userLedHandler();
void renderBatteryIndicator(uint16_t batteryMilliVolts);
void renderBatteryIndicator(uint16_t batteryPercentage);

// Button action handlers
void handleButtonAnyPress();
Expand Down
21 changes: 21 additions & 0 deletions src/MeshCore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,30 @@ namespace mesh {
#define BD_STARTUP_NORMAL 0 // getStartupReason() codes
#define BD_STARTUP_RX_PACKET 1

#define BATT_LIPO 0
#define BATT_LIFEPO 1

class MainBoard {
public:
virtual uint16_t getBattMilliVolts() = 0;
uint8_t getBattPercent() {
uint32_t mv = getBattMilliVolts();
// Convert millivolts to percentage
int minMilliVolts;
int maxMilliVolts;
switch (getBattType()) {
case BATT_LIPO:
minMilliVolts = 3000;
Comment thread
446564 marked this conversation as resolved.
Outdated
maxMilliVolts = 4200;
break;
case BATT_LIFEPO:
minMilliVolts = 2500;
maxMilliVolts = 3400;
break;
}
return ((mv - minMilliVolts) * 100) / (maxMilliVolts - minMilliVolts);
}
uint8_t getBattType() { return BATT_LIPO; };
virtual const char* getManufacturerName() const = 0;
virtual void onBeforeTransmit() { }
virtual void onAfterTransmit() { }
Expand Down