From f4cf5f461622e0132df3f231983349ac0bf03241 Mon Sep 17 00:00:00 2001
From: Max Hunt <mh2817@ic.ac.uk>
Date: Thu, 16 Jan 2020 14:58:21 +0000
Subject: [PATCH] Update

---
 Code/v2/v2.ino | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/Code/v2/v2.ino b/Code/v2/v2.ino
index 9469d81..3e811ec 100644
--- a/Code/v2/v2.ino
+++ b/Code/v2/v2.ino
@@ -7,7 +7,7 @@
 #include "Arduino.h"
 
 #include "LowPower.h"
-#include <avr/wdt.h>
+//#include <avr/wdt.h>
 
 #define SCREEN_WIDTH 128
 #define SCREEN_HEIGHT 32
@@ -114,13 +114,6 @@ static const int dimmerVals[] = {
 };
 
 void setup() {
-	delay(100);
-	wdt_enable(WDTO_8S);
-	display.begin(SSD1306_SWITCHCAPVCC, 0x3C);
-	display.clearDisplay();
-	display.setTextColor(WHITE);
-	Wire.begin(); 
-	Serial.begin(9600);
 	pinMode(VBAT, INPUT);
 	pinMode(CSTAT1, INPUT);
 	pinMode(CSTAT2, INPUT);
@@ -129,19 +122,30 @@ void setup() {
 	pinMode(CHGLED, OUTPUT);
 	pinMode(PWRBTN, INPUT_PULLUP);
 	pinMode(CHGBTN, INPUT_PULLUP);
+	digitalWrite(PWRLED, HIGH);
+	digitalWrite(CHGLED, HIGH);
+	delay(100);
+//	wdt_enable(WDTO_8S);
+	display.begin(SSD1306_SWITCHCAPVCC, 0x3C);
+	display.clearDisplay();
+	display.setTextColor(WHITE);
+	Wire.begin(); 
+//	Serial.begin(9600);
 	digitalWrite(FETCTRL, LOW);
 	resetScreen();
 	delay(200);
 	FuelGauge.begin();
 	FuelGauge.reset(); //<== Might cause problems
 	FuelGauge.quickstart();
+	digitalWrite(PWRLED, LOW);
+	digitalWrite(CHGLED, LOW);
 }
 
 void loop() {
   delay(100);
   delay(900);
-  Serial.println(getVoltage());
-	wdt_reset();
+//  Serial.println(getVoltage());
+//	wdt_reset();
 	checkPresses();
 	checkCharging();
 	safetyCheck();
@@ -255,6 +259,7 @@ void updateScreen(){
 	screenOn = true;
 }
 
+
 void updateDisplayChg(){
 	display.clearDisplay();
 	updateDispayHelper();