From 4f2fc82014d1126937c6416c8c0d9e3c6711e3fe Mon Sep 17 00:00:00 2001
From: Stefan Gehr <stefan.kerman.gehr@fau.de>
Date: Thu, 13 Oct 2022 16:20:54 +0200
Subject: [PATCH] merge'
---
solarpump/solarpump.ino | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/solarpump/solarpump.ino b/solarpump/solarpump.ino
index d7c4c85..3ffc802 100644
--- a/solarpump/solarpump.ino
+++ b/solarpump/solarpump.ino
@@ -188,28 +188,21 @@ void loop(void) {
if (checkButton() == LOW) {
displayLight(true);
-<<<<<<< HEAD
- playFileQueue(SOUND_EINS)
+ playFileQueue(SOUND_EINS);
playFileQueue(SOUND_OBEN);
sayNumber(t1up_C, nachKommaStellen);
- playFileQueue(SOUND_EINS)
+ playFileQueue(SOUND_EINS);
playFileQueue(SOUND_UNTEN);
sayNumber(t1up_C, nachKommaStellen);
- playFileQueue(SOUND_EINS)
- playFileQueue(SOUND_OBEN);
+ playFileQueue(SOUND_EINS);
+ playFileQueue(SOUND_OBEN);
sayNumber(t1up_C, nachKommaStellen);
- playFileQueue(SOUND_EINS)
- playFileQueue(SOUND_OBEN);
+ playFileQueue(SOUND_EINS);
+ playFileQueue(SOUND_OBEN);
sayNumber(t1up_C, nachKommaStellen);
-=======
- playFileQueue(SOUND_TEMPERATURE);
- playFileQueue(SOUND_HOCHSTER_WERT);
- playFileQueue(SOUND_KOMMA);
- sayNumber(14);
->>>>>>> 728508c5cadfd2a5e5b3a23185858e4c4d0d5c45
} else {
displayLight(false);
}
--
GitLab