max/project_power-bank
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Max Hunt 2019-12-22 12:19:25 +00:00
parent 23bf8f240a
commit 1ca988f3c9
1 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
UPGRADE/Code/v2/v2.ino
View File

@ -284,35 +284,23 @@ void resetScreen() {
void updateScreen() { void updateScreen() {
getBatteryCharge(); getBatteryCharge();
if (screenState == 1) { updateDisplay();
updateDisplayPct();
}
else if (screenState == 2) {
updateDisplayVoltage();
}
} }
void updateDisplayPct(){ void updateDisplay(){
display.clearDisplay();
display.drawBitmap(0, 0, battery_logo, 120, 32, 1);
display.setTextSize(2);
display.setCursor(35, 10);
display.setTextColor(0);
display.print(batteryPct);
display.println("%");
updateDispayHelper();
display.display();
screenOn = true;
}
void updateDisplayVoltage(){
display.clearDisplay(); display.clearDisplay();
display.drawBitmap(0, 0, battery_logo, 120, 32, 1); display.drawBitmap(0, 0, battery_logo, 120, 32, 1);
display.setTextSize(2); display.setTextSize(2);
display.setCursor(30, 10); display.setCursor(30, 10);
display.setTextColor(0); display.setTextColor(0);
display.print(GetVoltage()); if (screenState == 1){
display.println(" V"); display.print(batteryPct);
display.println("%");
}
else if (screenState == 2){
display.print(GetVoltage());
display.println(" V");
}
updateDispayHelper(); updateDispayHelper();
display.display(); display.display();
screenOn = true; screenOn = true;
@ -361,8 +349,7 @@ double _GetVoltage(){
} }
void safetyCheck(){ void safetyCheck(){
double currentVoltage = 0; double currentVoltage = GetVoltage();
currentVoltage = GetVoltage();
if(currentVoltage > 3.40 ){ //|| currentVoltage < 1.00 if(currentVoltage > 3.40 ){ //|| currentVoltage < 1.00
isSafe = true; isSafe = true;
} }