code improvements

solarpump/mp3.ino

+#include <Arduino.h>
 #include "pins.h"
 #include <SoftwareSerial.h>
 
@@ -17,7 +18,7 @@ void mp3Setup(void) {
 // immediately play a file
 void playFile(uint8_t fileNumber, bool respectBusyPin) {
 	// do nothing if we want to wait for the BUSY pin
-	if (respectBusyPin && digitalRead(MP3BUSY)) {
+	if (respectBusyPin && digitalRead(MP3BUSY) == LOW) {
 		return;
 	}
 	mp3.write(fileNumber);

solarpump/solarpump.ino

-#include <stdint.h>
+#include <Arduino.h>
 #include "pins.h"
 #include "temperature.h"
 #include "mp3.h"
@@ -154,29 +154,33 @@ void displayLight(bool turnOn) {
 
 /*
  * main setup function
- * initialize every electronic component 
+ * initialise every electronic component
  */
-// main setup function 
 void setup(void) {
 	lcd.init();
 
-	Serial.begin(9600); // for debugging
 	// start the relevant libraries used by temperature.cpp
 	temperatureBegin();
+	// start the mp3 library
 	mp3Setup();
 
+	// the pumps
 	pinMode(PUMP1, OUTPUT);
 	pinMode(PUMP2, OUTPUT);
+	// the button
 	pinMode(BUTTON, INPUT_PULLUP);
 }
 
 // say out all the relevant infos via the loudspeaker
-void sayInfos(float temp1up, float temp1down, float temp2up, float temp2down)
-{
+void sayInfos(float temp1up, float temp1down, float temp2up, float temp2down) {
 	const uint8_t decimals = 0;
+	// system 1
 	playFileQueue(SOUND_EINS);
+	// up temperature
 	playFileQueue(SOUND_OBEN);
+	// say the number
 	sayNumber(temp1up, decimals);
+	// wait a bit
 	playFileQueue(SOUND_STILLE);
 
 	playFileQueue(SOUND_EINS);
@@ -184,6 +188,15 @@ void sayInfos(float temp1up, float temp1down, float temp2up, float temp2down)
 	sayNumber(temp1down, decimals);
 	playFileQueue(SOUND_STILLE);
 
+	playFileQueue(SOUND_PUMPE);
+	playFileQueue(SOUND_EINS);
+	if (digitalRead(PUMP1)) {
+		playFileQueue(SOUND_AN);
+	} else {
+		playFileQueue(SOUND_AUS);
+	}
+	playFileQueue(SOUND_STILLE);
+
 	playFileQueue(SOUND_ZWEI);
 	playFileQueue(SOUND_OBEN);
 	sayNumber(temp2up, decimals);
@@ -194,34 +207,12 @@ void sayInfos(float temp1up, float temp1down, float temp2up, float temp2down)
 	sayNumber(temp2down, decimals);
 	playFileQueue(SOUND_STILLE);
 
-	if (digitalRead(PUMP1))
-	{
-		playFileQueue(SOUND_PUMPE);
-		playFileQueue(SOUND_EINS);
-		playFileQueue(SOUND_AN);
-		playFileQueue(SOUND_STILLE);
-	}
-	else
-	{
-		playFileQueue(SOUND_PUMPE);
-		playFileQueue(SOUND_EINS);
-		playFileQueue(SOUND_AUS);
-		playFileQueue(SOUND_STILLE);
-	}
-
-	if (digitalRead(PUMP2))
-	{
 	playFileQueue(SOUND_PUMPE);
 	playFileQueue(SOUND_ZWEI);
+	if (digitalRead(PUMP2)) {
 		playFileQueue(SOUND_AN);
-		playFileQueue(SOUND_STILLE);
-	}
-	else
-	{
-		playFileQueue(SOUND_PUMPE);
-		playFileQueue(SOUND_ZWEI);
+	} else {
 		playFileQueue(SOUND_AUS);
-		playFileQueue(SOUND_STILLE);
 	}
 }
 
@@ -247,21 +238,34 @@ void loop(void) {
 		displayLight(false);
 	}
 
-	if (t1up(&t1up_C) == LONG_TIME_ERROR || t1down(&t1down_C) == LONG_TIME_ERROR) {
-		// TODO: Warning sound
+	// update the temperatures
+	UPDATESTATE t1upState = t1up(&t1up_C);
+	UPDATESTATE t1downState = t1down(&t1down_C);
+	UPDATESTATE t2upState = t2up(&t2up_C);
+	UPDATESTATE t2downState = t2down(&t2down_C);
+
+	if (t1upState == LONG_TIME_ERROR || t1downState == LONG_TIME_ERROR || t2upState == LONG_TIME_ERROR || t2downState == LONG_TIME_ERROR) {
+		// continuously say that there is an error
+		playFile(SOUND_FEHLER, true);
+	}
+
+	// control pump of system 1
+	if (t1upState == LONG_TIME_ERROR || t1downState == LONG_TIME_ERROR) {
 		// Turn pump on to be safe
 		digitalWrite(PUMP1, HIGH);
 	} else {
+		// no errors => control pump according to the temperatures
 		controlPump(PUMP1, t1up_C, t1down_C);
 	}
-	if (t2up(&t2up_C) == LONG_TIME_ERROR || t2down(&t2down_C) == LONG_TIME_ERROR) {
-		// TODO: Warning sound
-		// Turn pump on to be safe
+
+	// same for system 2
+	if (t2upState == LONG_TIME_ERROR || t2downState == LONG_TIME_ERROR) {
 		digitalWrite(PUMP2, HIGH);
 	} else {
 		controlPump(PUMP2, t2up_C, t2down_C);
 	}
 
-	displayText(t1up_C, t1down_C, digitalRead(PUMP1), t1up_C, t2down_C, digitalRead(PUMP2),
-				t1up(&t1up_C), t1down(&t1down_C), t2up(&t2up_C), t2down(&t2down_C));
+	// write the infos to the display
+	displayText(t1up_C, t1down_C, digitalRead(PUMP1), t2up_C, t2down_C, digitalRead(PUMP2),
+				t1upState, t1downState, t2upState, t2downState);
 }

solarpump/temperature.ino

-#include <stdint.h>
 #include "pins.h"
 #include <OneWire.h>
 #include <DallasTemperature.h>