Skip to content

Commit 78ea6de

Browse files
zeynepdiclezeynepdicle
committed
fixed bug
- changed library .cpp file (form delete function changed to free function)
1 parent 75835aa commit 78ea6de

File tree

7 files changed

+743
-778
lines changed

7 files changed

+743
-778
lines changed

‎README.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
***** Add photo ****
55

6-
Arduino library for Deneyap Speaker PAM8302A
6+
Arduino library for Deneyap Speaker
77

88
## :mag_right:Specifications
99
- `Product ID` **M29**, **mpv1.0**
@@ -34,6 +34,8 @@ Use the example of "MelodiCalma2" for the other Deneyap development boards.
3434
- `library.properties ` General library properties for the Arduino package manager
3535

3636
## Version History
37+
1.0.2 - fixed bug
38+
3739
1.0.1 - updated sketches
3840

3941
1.0.0 - initial release
@@ -46,12 +48,12 @@ Use the example of "MelodiCalma2" for the other Deneyap development boards.
4648
|:--- | :--- | :---|
4749
|3.3V | Power |3.3V |
4850
|GND | Ground | GND |
49-
|IN+ |Amplified Speaker Input pin|DAC&GPIO pin|
50-
|OUT+ |Speaker (+)| any GPIO pin |
51-
|OUT- |Speaker (-)| GND |
51+
|IN+ |Amplified Speaker Output| DAC |
52+
|OUT+ |Speaker +| any GPIO pin |
53+
|OUT- |Speaker -| GND |
5254
|SD |Closed|Digital pin|
5355

5456
## :bookmark_tabs:License Information
55-
Based on XT_DAC_Audio Arduino Library. Changed to work with Deneyap Speaker PAM8302A.
57+
Based on XT_DAC_Audio Arduino Library. Changed to work with Deneyap Speaker.
5658

5759
Please review the [LICENSE](https://github.com/deneyapkart/deneyap-hoparlor-arduino-library/blob/master/LICENSE) file for license information.

‎docs/README_tr.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
***** Fotoğraf eklenecek ****
44

5-
Deneyap Hoparlör PAM8302A için Arduino kütüphanesidir.
5+
Deneyap Hoparlör için Arduino kütüphanesidir.
66

77
## :mag_right:Özellikler
88
- `Ürün ID` **M29**, **mpv1.0**
@@ -33,6 +33,8 @@ Diğer Deneyap Geliştirme Kartları için "MelodiCalma2" örneğini kullanın.
3333
- `library.properties` Arduino yöneticisi için genel kütüphane özellikleri
3434

3535
## Sürüm Geçmişi
36+
1.0.2 - hata giderildi
37+
3638
1.0.1 - Örnek uygulama güncellendi
3739

3840
1.0.0 - ilk sürüm
@@ -43,10 +45,10 @@ Diğer Deneyap Geliştirme Kartları için "MelodiCalma2" örneğini kullanın.
4345

4446
|Hoparlör| Fonksiyon| Kart pinleri |
4547
| :--- | :--- | :--- |
46-
|3.3V |3.3V Besleme Gerilimi|3.3V|
47-
|GND |Toprak|GND|
48-
|IN+ |Kuvvetlendirilmiş Hoparlör giriş pini| DAC&GPIO pini|
49-
|OUT+ |Hoparlör (+)|herhangi bir GPIO pini|
48+
|3.3V |3.3V Besleme Gerilimi| 3.3V |
49+
|GND |Toprak|GND |
50+
|IN+ |Kuvvetlendirilmiş Hoparlör girişi| DAC |
51+
|OUT+ |Hoparlör (+)|herhangi bir GPIO pin|
5052
|OUT- |Hoparlör (-)| GND |
5153
|SD |Kapatma|Dijital pin|
5254

‎examples/MelodiCalma2/MelodiCalma2.ino‎

Lines changed: 44 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,10 @@
66
* IN+ | D0 (herhangi bir GPIO pini)
77
* 3v3 | 3.3V
88
* GND | GND
9-
*
10-
* Bu örnek Deneyap Hoparlör için oluşturulmuştur
11-
* ------> https://docs.deneyapkart.org/tr/content/contentDetail/deneyap-module-deneyap-speaker-m29 <------
12-
* ------> https://github.com/deneyapkart/deneyap-hoparlor-arduino-library <------
139
*/
14-
#include <Deneyap_Hoparlor.h> // Deneyap Hoparlör kutuphanesi eklenmesi
10+
#include "pitches.h"
1511

16-
#define SpeakerPin D2
12+
#define SpeakerPin D0
1713
#define Frequency 500
1814

1915
void setup() {
@@ -22,93 +18,93 @@ void setup() {
2218
/* Melodinin nota verileri -> https://github.com/deneyapkart/deneyap-hoparlor-arduino-library/blob/master/src/MusicDefinition.h
2319
Bu veriler ile istediğiniz melodileri oluşturabilirsiniz.*/
2420
void loop() {
25-
tone(SpeakerPin, FNOTE_C5, Frequency);
21+
tone(SpeakerPin, NOTE_C5, Frequency);
2622
noTone(SpeakerPin);
27-
tone(SpeakerPin, FNOTE_C5, Frequency);
23+
tone(SpeakerPin, NOTE_C5, Frequency);
2824
noTone(SpeakerPin);
29-
tone(SpeakerPin, FNOTE_G5, Frequency);
25+
tone(SpeakerPin, NOTE_G5, Frequency);
3026
noTone(SpeakerPin);
31-
tone(SpeakerPin, FNOTE_G5, Frequency);
27+
tone(SpeakerPin, NOTE_G5, Frequency);
3228
noTone(SpeakerPin);
33-
tone(SpeakerPin, FNOTE_A5, Frequency);
29+
tone(SpeakerPin, NOTE_A5, Frequency);
3430
noTone(SpeakerPin);
35-
tone(SpeakerPin, FNOTE_A5, Frequency);
31+
tone(SpeakerPin, NOTE_A5, Frequency);
3632
noTone(SpeakerPin);
37-
tone(SpeakerPin, FNOTE_G5, Frequency);
33+
tone(SpeakerPin, NOTE_G5, Frequency);
3834
noTone(SpeakerPin);
3935

40-
tone(SpeakerPin, FNOTE_F5, Frequency);
36+
tone(SpeakerPin, NOTE_F5, Frequency);
4137
noTone(SpeakerPin);
42-
tone(SpeakerPin, FNOTE_F5, Frequency);
38+
tone(SpeakerPin, NOTE_F5, Frequency);
4339
noTone(SpeakerPin);
44-
tone(SpeakerPin, FNOTE_E5, Frequency);
40+
tone(SpeakerPin, NOTE_E5, Frequency);
4541
noTone(SpeakerPin);
46-
tone(SpeakerPin, FNOTE_E5, Frequency);
42+
tone(SpeakerPin, NOTE_E5, Frequency);
4743
noTone(SpeakerPin);
48-
tone(SpeakerPin, FNOTE_D5, Frequency);
44+
tone(SpeakerPin, NOTE_D5, Frequency);
4945
noTone(SpeakerPin);
50-
tone(SpeakerPin, FNOTE_D5, Frequency);
46+
tone(SpeakerPin, NOTE_D5, Frequency);
5147
noTone(SpeakerPin);
52-
tone(SpeakerPin, FNOTE_C5, Frequency);
48+
tone(SpeakerPin, NOTE_C5, Frequency);
5349
noTone(SpeakerPin);
5450

55-
tone(SpeakerPin, FNOTE_G5, Frequency);
51+
tone(SpeakerPin, NOTE_G5, Frequency);
5652
noTone(SpeakerPin);
57-
tone(SpeakerPin, FNOTE_G5, Frequency);
53+
tone(SpeakerPin, NOTE_G5, Frequency);
5854
noTone(SpeakerPin);
59-
tone(SpeakerPin, FNOTE_F5, Frequency);
55+
tone(SpeakerPin, NOTE_F5, Frequency);
6056
noTone(SpeakerPin);
61-
tone(SpeakerPin, FNOTE_F5, Frequency);
57+
tone(SpeakerPin, NOTE_F5, Frequency);
6258
noTone(SpeakerPin);
63-
tone(SpeakerPin, FNOTE_E5, Frequency);
59+
tone(SpeakerPin, NOTE_E5, Frequency);
6460
noTone(SpeakerPin);
65-
tone(SpeakerPin, FNOTE_E5, Frequency);
61+
tone(SpeakerPin, NOTE_E5, Frequency);
6662
noTone(SpeakerPin);
67-
tone(SpeakerPin, FNOTE_D5, Frequency);
63+
tone(SpeakerPin, NOTE_D5, Frequency);
6864
noTone(SpeakerPin);
6965

70-
tone(SpeakerPin, FNOTE_G5, Frequency);
66+
tone(SpeakerPin, NOTE_G5, Frequency);
7167
noTone(SpeakerPin);
72-
tone(SpeakerPin, FNOTE_G5, Frequency);
68+
tone(SpeakerPin, NOTE_G5, Frequency);
7369
noTone(SpeakerPin);
74-
tone(SpeakerPin, FNOTE_F5, Frequency);
70+
tone(SpeakerPin, NOTE_F5, Frequency);
7571
noTone(SpeakerPin);
76-
tone(SpeakerPin, FNOTE_F5, Frequency);
72+
tone(SpeakerPin, NOTE_F5, Frequency);
7773
noTone(SpeakerPin);
78-
tone(SpeakerPin, FNOTE_E5, Frequency);
74+
tone(SpeakerPin, NOTE_E5, Frequency);
7975
noTone(SpeakerPin);
80-
tone(SpeakerPin, FNOTE_E5, Frequency);
76+
tone(SpeakerPin, NOTE_E5, Frequency);
8177
noTone(SpeakerPin);
82-
tone(SpeakerPin, FNOTE_D5, Frequency);
78+
tone(SpeakerPin, NOTE_D5, Frequency);
8379
noTone(SpeakerPin);
8480

85-
tone(SpeakerPin, FNOTE_C5, Frequency);
81+
tone(SpeakerPin, NOTE_C5, Frequency);
8682
noTone(SpeakerPin);
87-
tone(SpeakerPin, FNOTE_C5, Frequency);
83+
tone(SpeakerPin, NOTE_C5, Frequency);
8884
noTone(SpeakerPin);
89-
tone(SpeakerPin, FNOTE_G5, Frequency);
85+
tone(SpeakerPin, NOTE_G5, Frequency);
9086
noTone(SpeakerPin);
91-
tone(SpeakerPin, FNOTE_G5, Frequency);
87+
tone(SpeakerPin, NOTE_G5, Frequency);
9288
noTone(SpeakerPin);
93-
tone(SpeakerPin, FNOTE_A5, Frequency);
89+
tone(SpeakerPin, NOTE_A5, Frequency);
9490
noTone(SpeakerPin);
95-
tone(SpeakerPin, FNOTE_A5, Frequency);
91+
tone(SpeakerPin, NOTE_A5, Frequency);
9692
noTone(SpeakerPin);
97-
tone(SpeakerPin, FNOTE_G5, Frequency);
93+
tone(SpeakerPin, NOTE_G5, Frequency);
9894
noTone(SpeakerPin);
9995

100-
tone(SpeakerPin, FNOTE_F5, Frequency);
96+
tone(SpeakerPin, NOTE_F5, Frequency);
10197
noTone(SpeakerPin);
102-
tone(SpeakerPin, FNOTE_F5, Frequency);
98+
tone(SpeakerPin, NOTE_F5, Frequency);
10399
noTone(SpeakerPin);
104-
tone(SpeakerPin, FNOTE_E5, Frequency);
100+
tone(SpeakerPin, NOTE_E5, Frequency);
105101
noTone(SpeakerPin);
106-
tone(SpeakerPin, FNOTE_E5, Frequency);
102+
tone(SpeakerPin, NOTE_E5, Frequency);
107103
noTone(SpeakerPin);
108-
tone(SpeakerPin, FNOTE_D5, Frequency);
104+
tone(SpeakerPin, NOTE_D5, Frequency);
109105
noTone(SpeakerPin);
110-
tone(SpeakerPin, FNOTE_D5, Frequency);
106+
tone(SpeakerPin, NOTE_D5, Frequency);
111107
noTone(SpeakerPin);
112-
tone(SpeakerPin, FNOTE_C5, Frequency);
108+
tone(SpeakerPin, NOTE_C5, Frequency);
113109
noTone(SpeakerPin);
114110
}

‎examples/MelodiCalma2/pitches.h‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
/*************************************************
2+
Public Constants
3+
*************************************************/
4+
5+
#define NOTE_B0 31
6+
#define NOTE_C1 33
7+
#define NOTE_CS1 35
8+
#define NOTE_D1 37
9+
#define NOTE_DS1 39
10+
#define NOTE_E1 41
11+
#define NOTE_F1 44
12+
#define NOTE_FS1 46
13+
#define NOTE_G1 49
14+
#define NOTE_GS1 52
15+
#define NOTE_A1 55
16+
#define NOTE_AS1 58
17+
#define NOTE_B1 62
18+
#define NOTE_C2 65
19+
#define NOTE_CS2 69
20+
#define NOTE_D2 73
21+
#define NOTE_DS2 78
22+
#define NOTE_E2 82
23+
#define NOTE_F2 87
24+
#define NOTE_FS2 93
25+
#define NOTE_G2 98
26+
#define NOTE_GS2 104
27+
#define NOTE_A2 110
28+
#define NOTE_AS2 117
29+
#define NOTE_B2 123
30+
#define NOTE_C3 131
31+
#define NOTE_CS3 139
32+
#define NOTE_D3 147
33+
#define NOTE_DS3 156
34+
#define NOTE_E3 165
35+
#define NOTE_F3 175
36+
#define NOTE_FS3 185
37+
#define NOTE_G3 196
38+
#define NOTE_GS3 208
39+
#define NOTE_A3 220
40+
#define NOTE_AS3 233
41+
#define NOTE_B3 247
42+
#define NOTE_C4 262
43+
#define NOTE_CS4 277
44+
#define NOTE_D4 294
45+
#define NOTE_DS4 311
46+
#define NOTE_E4 330
47+
#define NOTE_F4 349
48+
#define NOTE_FS4 370
49+
#define NOTE_G4 392
50+
#define NOTE_GS4 415
51+
#define NOTE_A4 440
52+
#define NOTE_AS4 466
53+
#define NOTE_B4 494
54+
#define NOTE_C5 523
55+
#define NOTE_CS5 554
56+
#define NOTE_D5 587
57+
#define NOTE_DS5 622
58+
#define NOTE_E5 659
59+
#define NOTE_F5 698
60+
#define NOTE_FS5 740
61+
#define NOTE_G5 784
62+
#define NOTE_GS5 831
63+
#define NOTE_A5 880
64+
#define NOTE_AS5 932
65+
#define NOTE_B5 988
66+
#define NOTE_C6 1047
67+
#define NOTE_CS6 1109
68+
#define NOTE_D6 1175
69+
#define NOTE_DS6 1245
70+
#define NOTE_E6 1319
71+
#define NOTE_F6 1397
72+
#define NOTE_FS6 1480
73+
#define NOTE_G6 1568
74+
#define NOTE_GS6 1661
75+
#define NOTE_A6 1760
76+
#define NOTE_AS6 1865
77+
#define NOTE_B6 1976
78+
#define NOTE_C7 2093
79+
#define NOTE_CS7 2217
80+
#define NOTE_D7 2349
81+
#define NOTE_DS7 2489
82+
#define NOTE_E7 2637
83+
#define NOTE_F7 2794
84+
#define NOTE_FS7 2960
85+
#define NOTE_G7 3136
86+
#define NOTE_GS7 3322
87+
#define NOTE_A7 3520
88+
#define NOTE_AS7 3729
89+
#define NOTE_B7 3951
90+
#define NOTE_C8 4186
91+
#define NOTE_CS8 4435
92+
#define NOTE_D8 4699
93+
#define NOTE_DS8 4978

‎library.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name=Deneyap Hoparlor
22
version=1.0.1
33
author=Turkish Technnology Team Foundation (T3)
44
maintainer=Turkish Technnology Team Foundation (T3)
5-
sentence=Arduino library for Deneyap Speaker PAM8302A
6-
paragraph=A simple and efficient library to use Deneyap Speaker PAM8302A
5+
sentence=Arduino library for Deneyap Speaker
6+
paragraph=A simple and efficient library to use Deneyap Speaker
77
category=Sensors
88
url=https://github.com/deneyapkart/deneyap-hoparlor-arduino-library
99
architectures=*

0 commit comments

Comments
 (0)