merge

solarpump/solarpump.ino

@@ -170,49 +170,29 @@ void setup(void) {
 	pinMode(BUTTON, INPUT_PULLUP);
 }
 
-<<<<<<< HEAD
-void sayInfos(float temp1up, float temp1down, float temp2up, float temp2down, uint8_t comma)
-=======
 // say out all the relevant infos via the loudspeaker
-void sayInfos(float t1up_C, float t1down_C, float t2up_C, float t2down_C)
->>>>>>> 5798fb6b122134e1e016b6e47ca39eb79566fdc7
+void sayInfos(float temp1up, float temp1down, float temp2up, float temp2down)
 {
 	const uint8_t decimals = 0;
 	playFileQueue(SOUND_EINS);
 	playFileQueue(SOUND_OBEN);
-<<<<<<< HEAD
-	sayNumber(temp1up, nachKommaStellen);
+	sayNumber(temp1up, decimals);
 	playFileQueue(SOUND_STILLE);
 
 	playFileQueue(SOUND_EINS);
 	playFileQueue(SOUND_UNTEN);
-	sayNumber(temp1down, nachKommaStellen);
+	sayNumber(temp1down, decimals);
 	playFileQueue(SOUND_STILLE);
 
 	playFileQueue(SOUND_ZWEI);
 	playFileQueue(SOUND_OBEN);
-	sayNumber(temp2up, nachKommaStellen);
+	sayNumber(temp2up, decimals);
 	playFileQueue(SOUND_STILLE);
 
 	playFileQueue(SOUND_ZWEI);
 	playFileQueue(SOUND_UNTEN);
-	sayNumber(temp2down, nachKommaStellen);
+	sayNumber(temp2down, decimals);
 	playFileQueue(SOUND_STILLE);
-=======
-	sayNumber(t1up_C, decimals);
-
-	playFileQueue(SOUND_EINS);
-	playFileQueue(SOUND_UNTEN);
-	sayNumber(t1down_C, decimals);
-
-	playFileQueue(SOUND_ZWEI);
-	playFileQueue(SOUND_OBEN);
-	sayNumber(t2up_C, decimals);
-
-	playFileQueue(SOUND_ZWEI);
-	playFileQueue(SOUND_UNTEN);
-	sayNumber(t2down_C, decimals);
->>>>>>> 5798fb6b122134e1e016b6e47ca39eb79566fdc7
 
 	if (digitalRead(PUMP1))
 	{