brian/xevi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7 from blind/double-save

Browse source 
Avoid converting value to a double
This commit is contained in:
John Stäck 2019-06-08 10:11:24 +02:00 • committed by GitHub
commit 91aecdb82d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
NuEVI/menu.cpp
View file

@ -487,18 +487,18 @@ void drawMenuScreen(){
//Construct the title including voltage reading. //Construct the title including voltage reading.
//Involves intricate splicing of the title string with battery voltage //Involves intricate splicing of the title string with battery voltage
char menuTitle[] = "MENU XXX Y.Y "; //Allocate string buffer of appropriate size with some placeholders char menuTitle[] = "MENU XXX Y.YV"; //Allocate string buffer of appropriate size with some placeholders
char* splice1 = menuTitle + 13; char* splice1 = menuTitle + 13;
char* splice2 = menuTitle + 17; char* splice2 = menuTitle + 17;
int vMeterReading = analogRead(vMeterPin); int vMeterReading = analogRead(vMeterPin);
memcpy(splice1, (vMeterReading > 3000) ? "USB" : "BAT", 3); memcpy(splice1, (vMeterReading > 3000) ? "USB" : "BAT", 3);
if (vMeterReading < 2294) { if (vMeterReading < 2294) {
memcpy(splice2, "LOW ", 3); memcpy(splice2, "LOW ", 4);
} else { } else {
double voltage = map(vMeterReading,0,3030,0,50)*0.1; int voltage = map(vMeterReading,0,3030,0,50);
dtostrf(voltage, 3, 1, splice2); splice2[0] = (voltage/10)+'0';
splice2[3]='V'; //Put the V at the end (last char of buffer before \0) splice2[2] = (voltage%10)+'0';
} }
drawMenu(menuTitle, mainMenuCursor, 6, drawMenu(menuTitle, mainMenuCursor, 6,