Merge pull request #107 from drolsen/development

Rolls pump delay config into more universal system settings
drolsen · Aug 20, 2017 · 70e554e · 70e554e
2 parents 7445d19 + 1c2ddee
commit 70e554e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/Crops.cpp b/Crops.cpp
@@ -174,6 +174,7 @@ void cropBuild(){
 	SD.mkdir("dromatic/" + cropName + "/Sys/PHDly");
 	SD.mkdir("dromatic/" + cropName + "/Sys/PHAmnt");
 	SD.mkdir("dromatic/" + cropName + "/Sys/PumpCal");
+	SD.mkdir("dromatic/" + cropName + "/Sys/PumpDly");
 
 	//Crop Settings
 	SD.mkdir("dromatic/" + cropName + "/Crop");

diff --git a/Globals.cpp b/Globals.cpp
@@ -119,8 +119,7 @@ const char _startend[9] PROGMEM = "STARTEND";
 const char _weeks[6] PROGMEM = "WEEKS";
 const char _flowcal[8] PROGMEM = "FLOWCAL";
 const char _manFlush[9] PROGMEM = "MANFLUSH";
-
-const char _delay[6] PROGMEM = "DELAY";
+const char _pumpDelay[8] PROGMEM = "PUMPDLY";
 
 
 //Consolidated Repeating Displays Words
@@ -190,7 +189,7 @@ const char* const screenNames[menusBufferSize][3] PROGMEM = {
 	{ _regimens, NumberOf, RegimensDoses },
 	{ _weeks, NumberOf, Weeks },
 	{ _amt, RegimensML, Configuration },
-	{ _delay, PumpDose, DelayConfig },
+	{ _pumpDelay, PumpDose, DelayConfig },
 	{ _pumpCal, Pump, Calib },
 	{ _flowcal, FlowMeters, Calib },
 	{ _manFlush, Manual, Flush },

diff --git a/Pumps.cpp b/Pumps.cpp
@@ -68,8 +68,18 @@ void printPumpDelay(int dir = 0){
 		if (tmpInts[0] <= 0){
 			tmpInts[0] = 1;
 		}
+		if (tmpInts[0] >= 100){
+			tmpInts[0] = 100;
+		}
+	}
+	lcd.clear();
+	if (tmpInts[0] >= 10){
+		lcd.print("0");
+	}else{
+		lcd.print("00");
 	}
-	lcd.print(String(tmpInts[0] * 60000) + F(" Min(s) Delay"));
+	lcd.print(tmpInts[0]);
+	lcd.print(F(" Min(s) Delay"));
 	lcd.setCursor(0, 2);
 	lcd.print(F("<back>      <ok>"));
 	cursorX = 2;
@@ -109,7 +119,6 @@ void pumpCreate(String path, byte pumpIndex, int totalRegimens, JsonObject& regi
 	SD.mkdir(path + "/Prime");
 	if (pumpIndex <= 7){
 		SD.mkdir(path + "/Amount");
-		SD.mkdir(path + "/Delay");
 		for (byte j = 1; j <= totalRegimens; j++){
 			makeNewFile(path + "/pmpse" + j + ".dro", regimenData);
 			Serial.flush();