From 1ca988f3c9029502c30e42f9db93ad714c2f5b21 Mon Sep 17 00:00:00 2001
From: Max Hunt <mh2817@ic.ac.uk>
Date: Sun, 22 Dec 2019 12:19:25 +0000
Subject: [PATCH] Update

---
 UPGRADE/Code/v2/v2.ino | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/UPGRADE/Code/v2/v2.ino b/UPGRADE/Code/v2/v2.ino
index 2099aa6..eb863a4 100644
--- a/UPGRADE/Code/v2/v2.ino
+++ b/UPGRADE/Code/v2/v2.ino
@@ -284,35 +284,23 @@ void resetScreen() {
 
 void updateScreen() {
 	getBatteryCharge();
-	if (screenState == 1) {
-		updateDisplayPct();
-	}
-	else if (screenState == 2) {
-		updateDisplayVoltage();
-	}
+	updateDisplay();
 }
 
-void updateDisplayPct(){
-	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(){
+void updateDisplay(){
 	display.clearDisplay();
 	display.drawBitmap(0, 0, battery_logo, 120, 32, 1);
 	display.setTextSize(2);
 	display.setCursor(30, 10);
 	display.setTextColor(0);
-	display.print(GetVoltage());
-	display.println(" V");
+	if (screenState == 1){
+		display.print(batteryPct);
+		display.println("%");
+	}
+	else  if (screenState == 2){
+		display.print(GetVoltage());
+		display.println(" V");
+	}
 	updateDispayHelper();
 	display.display();
 	screenOn = true;
@@ -361,8 +349,7 @@ double _GetVoltage(){
 }
 
 void safetyCheck(){
-	double currentVoltage = 0;
-	currentVoltage = GetVoltage();
+	double currentVoltage = GetVoltage();
 	if(currentVoltage > 3.40 ){ //|| currentVoltage < 1.00
 		isSafe = true;
 	}