Skip to content

Commit 514df20

Browse files
committed
removed sound effect durations
-not needed, because of the delays
1 parent c3ce97f commit 514df20

File tree

1 file changed

+42
-31
lines changed

1 file changed

+42
-31
lines changed

src/sfeQwiicBuzzer.cpp

Lines changed: 42 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,15 @@ void sfeQwiicBuzzerArdI2C::soundEffect0(uint8_t volume)
171171
{
172172
for (int note = 150 ; note < 4000 ; note += 150)
173173
{
174-
on(note, 10, volume);
174+
on(note, 0, volume);
175175
delay(10);
176176
}
177177
for (int note = 4000 ; note > 150 ; note -= 150)
178178
{
179-
on(note, 10, volume);
179+
on(note, 0, volume);
180180
delay(10);
181181
}
182+
off();
182183
}
183184

184185
// SIREN FAST X3
@@ -188,55 +189,60 @@ void sfeQwiicBuzzerArdI2C::soundEffect1(uint8_t volume)
188189
{
189190
for (int note = 150 ; note < 4000 ; note += 150)
190191
{
191-
on(note, 2, volume);
192+
on(note, 0, volume);
192193
delay(2);
193194
}
194195
for (int note = 4000 ; note > 150 ; note -= 150)
195196
{
196-
on(note, 2, volume);
197+
on(note, 0, volume);
197198
delay(2);
198199
}
199200
}
201+
off();
200202
}
201203

202204
// YES SLOW
203205
void sfeQwiicBuzzerArdI2C::soundEffect2(uint8_t volume)
204206
{
205207
for (int note = 150 ; note < 4000 ; note += 150)
206208
{
207-
on(note, 40, volume);
209+
on(note, 0, volume);
208210
delay(40);
209211
}
212+
off();
210213
}
211214

212215
// YES FAST
213216
void sfeQwiicBuzzerArdI2C::soundEffect3(uint8_t volume)
214217
{
215218
for (int note = 150 ; note < 4000 ; note += 150)
216219
{
217-
on(note, 10, volume);
220+
on(note, 0, volume);
218221
delay(10);
219222
}
223+
off();
220224
}
221225

222226
// NO SLOW
223227
void sfeQwiicBuzzerArdI2C::soundEffect4(uint8_t volume)
224228
{
225229
for (int note = 4000 ; note > 150 ; note -= 150)
226230
{
227-
on(note, 40, volume);
231+
on(note, 0, volume);
228232
delay(40);
229233
}
234+
off();
230235
}
231236

232237
// NO FAST
233238
void sfeQwiicBuzzerArdI2C::soundEffect5(uint8_t volume)
234239
{
235240
for (int note = 4000 ; note > 150 ; note -= 150)
236241
{
237-
on(note, 10, volume);
242+
on(note, 0, volume);
238243
delay(10);
239244
}
245+
off();
240246
}
241247

242248
// LAUGH
@@ -246,37 +252,36 @@ void sfeQwiicBuzzerArdI2C::soundEffect6(uint8_t volume)
246252
int laughstep = 10;
247253
uint16_t i;
248254

249-
//for (i = 650; i > 525; i -= 3) // vary up //1538, 1905
250255
for (i = 1538; i < 1905; i += laughstep) // vary up //1538, 1905
251256
{
252-
on(i, 10, volume);
257+
on(i, 0, volume);
253258
delay(10);
254259
}
255-
260+
off();
256261
delay(laughdelay);
257262

258-
//for (i = 800; i > 660; i -= 3) // 1250, 1515
259263
for (i = 1250; i < 1515; i += laughstep) // 1250, 1515
260264
{
261-
on(i, 10, volume);
265+
on(i, 0, volume);
262266
delay(10);
263267
}
268+
off();
264269
delay(laughdelay);
265270

266-
//for (i = 900; i > 745; i -= 3) // 1111, 1342
267271
for (i = 1111; i < 1342; i += laughstep) // 1111, 1342
268272
{
269-
on(i, 10, volume);
273+
on(i, 0, volume);
270274
delay(10);
271275
}
276+
off();
272277
delay(laughdelay);
273278

274-
//for (i = 990; i > 850; i -= 3) // 1010, 1176
275279
for (i = 1010; i < 1176; i += laughstep) // 1010, 1176
276280
{
277-
on(i, 10, volume);
281+
on(i, 0, volume);
278282
delay(10);
279283
}
284+
off();
280285
}
281286

282287
// LAUGH FAST
@@ -288,31 +293,34 @@ void sfeQwiicBuzzerArdI2C::soundEffect7(uint8_t volume)
288293

289294
for (i = 1538; i < 1905; i += laughstep) // vary up //1538, 1905
290295
{
291-
on(i, 10, volume);
296+
on(i, 0, volume);
292297
delay(10);
293298
}
294-
299+
off();
295300
delay(laughdelay);
296301

297302
for (i = 1250; i < 1515; i += laughstep) // 1250, 1515
298303
{
299-
on(i, 10, volume);
304+
on(i, 0, volume);
300305
delay(10);
301306
}
307+
off();
302308
delay(laughdelay);
303309

304310
for (i = 1111; i < 1342; i += laughstep) // 1111, 1342
305311
{
306-
on(i, 10, volume);
312+
on(i, 0, volume);
307313
delay(10);
308314
}
315+
off();
309316
delay(laughdelay);
310317

311318
for (i = 1010; i < 1176; i += laughstep) // 1010, 1176
312319
{
313-
on(i, 10, volume);
320+
on(i, 0, volume);
314321
delay(10);
315322
}
323+
off();
316324
}
317325

318326
// CRY SLOW
@@ -324,25 +332,26 @@ void sfeQwiicBuzzerArdI2C::soundEffect8(uint8_t volume)
324332

325333
for (i = 2000; i > 1429; i -= step) // vary down //2000, 1429
326334
{
327-
on(i, 10, volume);
335+
on(i, 0, volume);
328336
delay(10);
329337
}
330-
338+
off();
331339
delay(crydelay);
332340

333341
for (i = 1667; i > 1250; i -= step) // 1667, 1250
334342
{
335-
on(i, 10, volume);
343+
on(i, 0, volume);
336344
delay(10);
337345
}
346+
off();
338347
delay(crydelay);
339348

340-
//for (i = 900; i > 745; i -= 3) // 1111, 1342
341349
for (i = 1429; i > 1053; i -= step) // 1429, 1053
342350
{
343-
on(i, 10, volume);
351+
on(i, 0, volume);
344352
delay(10);
345353
}
354+
off();
346355
}
347356

348357
// CRY FAST
@@ -354,23 +363,25 @@ void sfeQwiicBuzzerArdI2C::soundEffect9(uint8_t volume)
354363

355364
for (i = 2000; i > 1429; i -= step) // vary down //2000, 1429
356365
{
357-
on(i, 10, volume);
366+
on(i, 0, volume);
358367
delay(10);
359368
}
369+
off();
360370

361371
delay(crydelay);
362372

363373
for (i = 1667; i > 1250; i -= step) // 1667, 1250
364374
{
365-
on(i, 10, volume);
375+
on(i, 0, volume);
366376
delay(10);
367377
}
378+
off();
368379
delay(crydelay);
369380

370-
//for (i = 900; i > 745; i -= 3) // 1111, 1342
371381
for (i = 1429; i > 1053; i -= step) // 1429, 1053
372382
{
373-
on(i, 10, volume);
383+
on(i, 0, volume);
374384
delay(10);
375385
}
386+
off();
376387
}

0 commit comments

Comments
 (0)