Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
arduino-block-course
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stefan Gehr
arduino-block-course
Commits
d17b9a48
Commit
d17b9a48
authored
Oct 13, 2022
by
Mario Engelmann
Browse files
Options
Downloads
Patches
Plain Diff
more sound stuff
parent
c229826e
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
solarpump/StimmeMp3/A034.mp3
+0
-0
0 additions, 0 deletions
solarpump/StimmeMp3/A034.mp3
solarpump/solarpump.ino
+9
-1
9 additions, 1 deletion
solarpump/solarpump.ino
solarpump/soundFiles.h
+2
-0
2 additions, 0 deletions
solarpump/soundFiles.h
with
11 additions
and
1 deletion
solarpump/StimmeMp3/A034.mp3
0 → 100644
+
0
−
0
View file @
d17b9a48
File added
This diff is collapsed.
Click to expand it.
solarpump/solarpump.ino
+
9
−
1
View file @
d17b9a48
...
...
@@ -170,35 +170,41 @@ void setup(void) {
pinMode
(
BUTTON
,
INPUT_PULLUP
);
}
void
sayInfos
(
float
temp1up
,
float
temp1down
,
float
temp2up
,
float
temp2down
)
void
sayInfos
(
float
temp1up
,
float
temp1down
,
float
temp2up
,
float
temp2down
,
uint8_t
comma
)
{
playFileQueue
(
SOUND_EINS
);
playFileQueue
(
SOUND_OBEN
);
sayNumber
(
temp1up
,
nachKommaStellen
);
playFileQueue
(
SOUND_STILLE
);
playFileQueue
(
SOUND_EINS
);
playFileQueue
(
SOUND_UNTEN
);
sayNumber
(
temp1down
,
nachKommaStellen
);
playFileQueue
(
SOUND_STILLE
);
playFileQueue
(
SOUND_ZWEI
);
playFileQueue
(
SOUND_OBEN
);
sayNumber
(
temp2up
,
nachKommaStellen
);
playFileQueue
(
SOUND_STILLE
);
playFileQueue
(
SOUND_ZWEI
);
playFileQueue
(
SOUND_UNTEN
);
sayNumber
(
temp2down
,
nachKommaStellen
);
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
))
...
...
@@ -206,12 +212,14 @@ void sayInfos(float temp1up, float temp1down, float temp2up, float temp2down)
playFileQueue
(
SOUND_PUMPE
);
playFileQueue
(
SOUND_ZWEI
);
playFileQueue
(
SOUND_AN
);
playFileQueue
(
SOUND_STILLE
);
}
else
{
playFileQueue
(
SOUND_PUMPE
);
playFileQueue
(
SOUND_ZWEI
);
playFileQueue
(
SOUND_AUS
);
playFileQueue
(
SOUND_STILLE
);
}
}
...
...
This diff is collapsed.
Click to expand it.
solarpump/soundFiles.h
+
2
−
0
View file @
d17b9a48
...
...
@@ -2,6 +2,7 @@
#define SOUNDFILES_H
// index for the sound files for mp3 module TDB380
// the files are .mp3 instead of .wav
#define SOUND_NULL 33 // A033.wav
#define SOUND_EIN 1 // A001.wav
#define SOUND_EINS 44 // A044.wav
...
...
@@ -39,5 +40,6 @@
#define SOUND_UND 27 // A027.wav
#define SOUND_AN 31 // A031.wav
#define SOUND_AUS 32 // A032.wav
#define SOUND_STILLE 34 // A034.wav
#endif
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment