diff --git a/solarpump/Stimme/A001.wav b/solarpump/Stimme/A001.wav deleted file mode 100644 index 40e30cf9b2f731b395eebb99532e85abf3a2a45a..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A001.wav and /dev/null differ diff --git a/solarpump/Stimme/A002.wav b/solarpump/Stimme/A002.wav deleted file mode 100644 index ef30e68f6571f05d7f5fe87410cde966cfa10214..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A002.wav and /dev/null differ diff --git a/solarpump/Stimme/A003.wav b/solarpump/Stimme/A003.wav deleted file mode 100644 index 4bbcf73da83095537b33305b3923a86a5cc49ecd..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A003.wav and /dev/null differ diff --git a/solarpump/Stimme/A004.wav b/solarpump/Stimme/A004.wav deleted file mode 100644 index ac06ca5cdbd75c7683277141932cb2c9fc35fc31..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A004.wav and /dev/null differ diff --git a/solarpump/Stimme/A005.wav b/solarpump/Stimme/A005.wav deleted file mode 100644 index 6fa5d40f42e9b2017b6371ec65efcd6d2115baa8..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A005.wav and /dev/null differ diff --git a/solarpump/Stimme/A006.wav b/solarpump/Stimme/A006.wav deleted file mode 100644 index fb94a2d2c43b31929d3fe24979c826b79c407db0..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A006.wav and /dev/null differ diff --git a/solarpump/Stimme/A007.wav b/solarpump/Stimme/A007.wav deleted file mode 100644 index daed3f4fb492a59bd5480a83f054e535dfe99115..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A007.wav and /dev/null differ diff --git a/solarpump/Stimme/A008.wav b/solarpump/Stimme/A008.wav deleted file mode 100644 index 6b850631dd299199c505edd68bec9ea41ec99844..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A008.wav and /dev/null differ diff --git a/solarpump/Stimme/A009.wav b/solarpump/Stimme/A009.wav deleted file mode 100644 index 1acb6b2f1edfa71bae157a3caa5912a98f4e0518..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A009.wav and /dev/null differ diff --git a/solarpump/Stimme/A010.wav b/solarpump/Stimme/A010.wav deleted file mode 100644 index 2f02f4055b4f8bbc59cc65b08b13a4a04f0f975a..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A010.wav and /dev/null differ diff --git a/solarpump/Stimme/A011.wav b/solarpump/Stimme/A011.wav deleted file mode 100644 index 7f595f6f3007204e1a195bab5f1ed6072e7803e9..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A011.wav and /dev/null differ diff --git a/solarpump/Stimme/A012.wav b/solarpump/Stimme/A012.wav deleted file mode 100644 index 2043c0fb2a799b1b481c0c7eabef7bd44290c50d..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A012.wav and /dev/null differ diff --git a/solarpump/Stimme/A013.wav b/solarpump/Stimme/A013.wav deleted file mode 100644 index f6d7f67952bc9b6048cb2e908bef49feb815d8ab..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A013.wav and /dev/null differ diff --git a/solarpump/Stimme/A014.wav b/solarpump/Stimme/A014.wav deleted file mode 100644 index 5940f5e8d5ab21fd3f22af58ed5532706dcc5844..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A014.wav and /dev/null differ diff --git a/solarpump/Stimme/A015.wav b/solarpump/Stimme/A015.wav deleted file mode 100644 index f45a6e32ed67a6eddfb7cbcd98be28bfb735b5b2..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A015.wav and /dev/null differ diff --git a/solarpump/Stimme/A016.wav b/solarpump/Stimme/A016.wav deleted file mode 100644 index 535691cbb55991397e7e8bf01f04221520ed86a8..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A016.wav and /dev/null differ diff --git a/solarpump/Stimme/A017.wav b/solarpump/Stimme/A017.wav deleted file mode 100644 index 37fef944a34dd5cebcb760f0329cb504f5b329f0..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A017.wav and /dev/null differ diff --git a/solarpump/Stimme/A018.wav b/solarpump/Stimme/A018.wav deleted file mode 100644 index 0d2bf749ea2cc8044e097d6f46988a495a6b3f38..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A018.wav and /dev/null differ diff --git a/solarpump/Stimme/A019.wav b/solarpump/Stimme/A019.wav deleted file mode 100644 index 45ef9612581578ed34a278c67a62a81370bc7fbe..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A019.wav and /dev/null differ diff --git a/solarpump/Stimme/A020.wav b/solarpump/Stimme/A020.wav deleted file mode 100644 index 5b4afdeb4b93bd171783cbbd41788310ef7fb849..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A020.wav and /dev/null differ diff --git a/solarpump/Stimme/A021.wav b/solarpump/Stimme/A021.wav deleted file mode 100644 index 3729bad7d3463eea47d274d7aafa7ce8185b06e8..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A021.wav and /dev/null differ diff --git a/solarpump/Stimme/A022.wav b/solarpump/Stimme/A022.wav deleted file mode 100644 index 47b9b21f114b2bb3c58192004d8ed982725f1d04..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A022.wav and /dev/null differ diff --git a/solarpump/Stimme/A023.wav b/solarpump/Stimme/A023.wav deleted file mode 100644 index 4be4738df883057a59c65e67ea202d8934ccc60b..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A023.wav and /dev/null differ diff --git a/solarpump/Stimme/A024.wav b/solarpump/Stimme/A024.wav deleted file mode 100644 index 336212a4130f1d1fd7eda79f355a946e9b15ea41..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A024.wav and /dev/null differ diff --git a/solarpump/Stimme/A025.wav b/solarpump/Stimme/A025.wav deleted file mode 100644 index 001eaa828d7ce667101c7c274f5f01fc582b3246..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A025.wav and /dev/null differ diff --git a/solarpump/Stimme/A026.wav b/solarpump/Stimme/A026.wav deleted file mode 100644 index d0e36c666b6374ce4a3ce8d21b64f55df802648e..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A026.wav and /dev/null differ diff --git a/solarpump/Stimme/A027.wav b/solarpump/Stimme/A027.wav deleted file mode 100644 index d7f86c020565a35ede23e498670e0ffe9b992dcf..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A027.wav and /dev/null differ diff --git a/solarpump/Stimme/A028.wav b/solarpump/Stimme/A028.wav deleted file mode 100644 index 5502a845880d79b72d63d03b11ab6f1e9db46b4c..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A028.wav and /dev/null differ diff --git a/solarpump/Stimme/A029.wav b/solarpump/Stimme/A029.wav deleted file mode 100644 index 3741a67f2903f72b9f91b6e7d7f057961297e1ea..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A029.wav and /dev/null differ diff --git a/solarpump/Stimme/A030.wav b/solarpump/Stimme/A030.wav deleted file mode 100644 index 0c293c5de337728a21db56d1e7edd22497f91356..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A030.wav and /dev/null differ diff --git a/solarpump/Stimme/A031.wav b/solarpump/Stimme/A031.wav deleted file mode 100644 index 92846320ccedec35586fbed17ce6b932264bfd00..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A031.wav and /dev/null differ diff --git a/solarpump/Stimme/A032.wav b/solarpump/Stimme/A032.wav deleted file mode 100644 index 142edf19d0ef30752773e5a0582298d1cdfd763f..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A032.wav and /dev/null differ diff --git a/solarpump/Stimme/A033.wav b/solarpump/Stimme/A033.wav deleted file mode 100644 index 8d369a7bbd5a50693bfdeafd6a6a173eae37fd69..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A033.wav and /dev/null differ diff --git a/solarpump/Stimme/A040.wav b/solarpump/Stimme/A040.wav deleted file mode 100644 index 4b2cbe1da8fb8befeecf80ef3cb5a58c1206b41d..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A040.wav and /dev/null differ diff --git a/solarpump/Stimme/A044.wav b/solarpump/Stimme/A044.wav deleted file mode 100644 index 109ce0961bedaf259b069eb83c7ceb7947f1e9cf..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A044.wav and /dev/null differ diff --git a/solarpump/Stimme/A050.wav b/solarpump/Stimme/A050.wav deleted file mode 100644 index 0dbfe2ba3c3bbfc04c47429b990dd8706e72675f..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A050.wav and /dev/null differ diff --git a/solarpump/Stimme/A060.wav b/solarpump/Stimme/A060.wav deleted file mode 100644 index bc0631585a11911e59fc5061a76416fdbb9691ba..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A060.wav and /dev/null differ diff --git a/solarpump/Stimme/A070.wav b/solarpump/Stimme/A070.wav deleted file mode 100644 index f18f8a193e3f426a54680e683c99cd0c4a412723..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A070.wav and /dev/null differ diff --git a/solarpump/Stimme/A080.wav b/solarpump/Stimme/A080.wav deleted file mode 100644 index 99d0993248a2f277a52cd36d2590aa8247fcfd4a..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A080.wav and /dev/null differ diff --git a/solarpump/Stimme/A090.wav b/solarpump/Stimme/A090.wav deleted file mode 100644 index 423f61ea56fd2043f4b8804be2f3f717d62c5493..0000000000000000000000000000000000000000 Binary files a/solarpump/Stimme/A090.wav and /dev/null differ diff --git a/solarpump/soundTest/soundFilesNumber.h b/solarpump/soundTest/soundFilesNumber.h deleted file mode 100644 index 20c779ef3a19302b2642913c2ae16766dc693d3e..0000000000000000000000000000000000000000 --- a/solarpump/soundTest/soundFilesNumber.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef soundFilesNumber_h -#define soundFilesNumber_h - -// index for the sound files for mp3 module TDB380 -#define SOUND_NULL 33 // A033.wav -#define SOUND_EIN 1 // A001.wav -#define SOUND_EINS 44 // A044.wav -#define SOUND_ZWEI 2 // A002.wav -#define SOUND_DREI 3 // A003.wav -#define SOUND_VIER 4 // A004.wav -#define SOUND_FUNF 5 // A005.wav -#define SOUND_SECHS 6 // A006.wav -#define SOUND_SIEBEN 7 // A007.wav -#define SOUND_ACHT 8 // A008.wav -#define SOUND_NEUN 9 // A009.wav -#define SOUND_ZEHN 10 // A010.wav -#define SOUND_ELF 11 // A011.wav -#define SOUND_ZWOLF 12 // A012.wav -#define SOUND_ZWANZIG 20 // A020.wav -#define SOUND_DREISSIG 30 // A030.wav -#define SOUND_VIERZIG 40 // A040.wav -#define SOUND_FUNFZIG 50 // A050.wav -#define SOUND_SECHZIG 60 // A060.wav -#define SOUND_SIEBZIG 70 // A070.wav -#define SOUND_ACHTZIG 80 // A080.wav -#define SOUND_NEUNZIG 90 // A090.wav -#define SOUND_HUNDERT 13 // A013.wav -#define SOUND_FEHLER 15 // A015.wav -#define SOUND_CELSIUS 16 // A016.wav -#define SOUND_HOCHSTER_WERT 17 // A017.wav -#define SOUND_KLEINSTER_WERT 23 // A023.wav -#define SOUND_KOMMA 19 // A019.wav -#define SOUND_MINUS 21 // A021.wav -#define SOUND_NEUSTART 22 // A022.wav -#define SOUND_OBEN 24 // A024.wav -#define SOUND_UNTEN 28 // A028.wav -#define SOUND_PUMPE 25 // A025.wav -#define SOUND_TEMPERATURE 26 // A026.wav -#define SOUND_UND 27 // A027.wav -#define SOUND_AN 31 // A031.wav -#define SOUND_AUS 32 // A032.wav - - -#endif diff --git a/solarpump/soundTest/soundTest.ino b/solarpump/soundTest/soundTest.ino deleted file mode 100644 index 73fb7ee1c23a26338504a5c5024c09e3859608fe..0000000000000000000000000000000000000000 --- a/solarpump/soundTest/soundTest.ino +++ /dev/null @@ -1,187 +0,0 @@ -#include "soundFilesNumber.h" -#include <SoftwareSerial.h> - -#define TX 12 -#define RX 13 - -SoftwareSerial mp3(RX, TX); // RX, TX - -void setup() { - // put your setup code here, to run once: - mp3.begin(4800); - //mp3.sendCommand(CMD_SEL_DEV, 0, 2); //select sd-card - mp3.print(0xEF); - delay(1000); - mp3.write(SOUND_NEUSTART); - delay(1000); -} - -void loop() { - // put your main code here, to run repeatedly: - sayDigit(5); - delay(2000); - sayNumber(23); - delay(2000); - sayNumber(12.3452, 2); - delay(2000); - mp3.write(SOUND_TEMPERATURE); - delay(2000); - mp3.write(SOUND_NEUSTART); - delay(2000); -} - - -// says the digit -static void sayDigit(int8_t number) { - switch (number) { - case 0: - mp3.write(SOUND_NULL); - break; - case 1: - mp3.write(SOUND_EINS); - break; - case 2: - mp3.write(SOUND_ZWEI); - break; - case 3: - mp3.write(SOUND_DREI); - break; - case 4: - mp3.write(SOUND_VIER); - break; - case 5: - mp3.write(SOUND_FUNF); - break; - case 6: - mp3.write(SOUND_SECHS); - break; - case 7: - mp3.write(SOUND_SIEBEN); - break; - case 8: - mp3.write(SOUND_ACHT); - break; - case 9: - mp3.write(SOUND_NEUN); - break; - default: - break; - } -} - -// Same as sayNumber(int32_t n) only for 1 it says EIN instead of EINS. -static void sayPreNumber(int32_t number) { - if (number == 1) - mp3.write(SOUND_EIN); - else - sayNumber(number); -} - -// Same as sayNumber(int32_t n) only for 0 it does nothing -static void sayAftNumber(int32_t number) { - if (number) - sayNumber(number); -} - -// say integer number -static void sayNumber(int32_t number) { - // Negative numbers are spoken the same way as positive numbers only with "Minus" at the beginning. - if (number < 0) { - mp3.write(SOUND_MINUS); - sayNumber(-number); - // 1-digit numbers - } else if (number < 10) { - sayDigit(number); - // 2-digit numbers - } else if (number < 100) { - // extra cases for 11 and 12 - switch (number) { - case 11: - mp3.write(SOUND_ELF); - break; - case 12: - mp3.write(SOUND_ZWOLF); - break; - default: - // German specific: Say the 1-digit first, then the 10-digit - int32_t tens = number / 10; - int32_t ones = number - 10 * tens; - // first say the 1-digit - if (ones) { - sayPreNumber(ones); - // UND only for numbers > 20. (VierUNDzwanzig, but not VierUNDzehn.) - if (tens >= 2) - mp3.write(SOUND_UND); - } - // then say the 10-digit - switch (tens) { - case 1: - mp3.write(SOUND_ZEHN); - break; - case 2: - mp3.write(SOUND_ZWANZIG); - break; - case 3: - mp3.write(SOUND_DREISSIG); - break; - case 4: - mp3.write(SOUND_VIERZIG); - break; - case 5: - mp3.write(SOUND_FUNFZIG); - break; - case 6: - mp3.write(SOUND_SECHZIG); - break; - case 7: - mp3.write(SOUND_SIEBZIG); - break; - case 8: - mp3.write(SOUND_ACHTZIG); - break; - case 9: - mp3.write(SOUND_NEUNZIG); - break; - default: - break; - } - break; - } - // 3-digit numbers - } else { - int32_t hundreds = number / 100; - sayPreNumber(hundreds); - mp3.write(SOUND_HUNDERT); - sayAftNumber(number - 100 * hundreds); - } -} - -/* - * Say any number in the int-range between -999999 and 999999 (in German) - * double n: The number to say - * uint8_t roundDigits: How many digits after the comma should be said (last one will get rounded) - * Example: sayNumber(34.236, 2) will say "Vierunddreißig Komma Zwei Vier" - */ -static void sayNumber(double number, uint8_t roundDigits) { - // do the rounding at the correct digit - number = round(number * pow(10, roundDigits)) / pow(10, roundDigits); - // say the pre-decimal digits - int32_t int_n = (int32_t)number; - sayNumber(int_n); - // say the decimals - if (roundDigits) { - number = abs(number - int_n); - mp3.write(SOUND_KOMMA); - for (int8_t digit = 1; digit <= roundDigits; ++digit) { - double d_newDigit = number * pow(10, digit) - 10 * (int32_t)(number * pow(10, digit-1)); - int8_t newDigit; - // round correctly for the last digit - if (digit == roundDigits) - newDigit = (int8_t)round(d_newDigit); - else - newDigit = (int8_t)d_newDigit; - sayDigit(newDigit); - } - } -} -