Revision 1:ab089c1f2802, committed 2010-03-18

Comitter:

djohnson

Date:

Thu Mar 18 18:54:52 2010 +0000

Parent:

0:3a9f5df0ba22

Commit message:

Changed in this revision

diff -r 3a9f5df0ba22 -r ab089c1f2802 Beeper.cpp
--- a/Beeper.cpp	Thu Mar 18 13:17:12 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#include "Beeper.h"
-#include "mbed.h"
-
-using namespace mbed;
-
-Beeper::Beeper(PinName pin) 
-  : _pwm(pin){}    
-
-
-void Beeper::beep(float freq, float time){
-
-    _pwm.period(1.0/freq);
-    _pwm.write(0.5);
-    //wait(time);
-    //_pwm.write(0.0);
-}
-void Beeper::stop() {
-_pwm.write(0.0);
-}
-
-
-    
-const float MIDINote[128] = {
-8.175798916,8.661957218,9.177023997,9.722718241,10.30086115,10.91338223,11.56232571,12.24985737,12.9782718,13.75,14.56761755,15.43385316,
-16.35159783,17.32391444,18.35404799,19.44543648,20.60172231,21.82676446,23.12465142,24.49971475,25.9565436,27.5,29.13523509,30.86770633,
-32.70319566,34.64782887,36.70809599,38.89087297,41.20344461,43.65352893,46.24930284,48.9994295,51.9130872,55.0,58.27047019,61.73541266,
-65.40639133,69.29565774,73.41619198,77.78174593,82.40688923,87.30705786,92.49860568,97.998859,103.8261744,110.0,116.5409404,123.4708253,
-130.8127827,138.5913155,146.832384,155.5634919,164.8137785,174.6141157,184.9972114,195.997718,207.6523488,220.0,233.0818808,246.9416506,
-261.6255653,277.182631,293.6647679,311.1269837,329.6275569,349.2282314,369.9944227,391.995436,415.3046976,440.0,466.1637615,493.8833013,
-523.2511306,554.365262,587.3295358,622.2539674,659.2551138,698.4564629,739.9888454,783.990872,830.6093952,880.0,932.327523,987.7666025,
-1046.502261,1108.730524,1174.659072,1244.507935,1318.510228,1396.912926,1479.977691,1567.981744,1661.21879,1760.0,1864.655046,1975.533205,
-2093.004522,2217.461048,2349.318143,2489.01587,2637.020455,2793.825851,2959.955382,3135.963488,3322.437581,3520.0,3729.310092,3951.06641,
-4186.009045,4434.922096,4698.636287,4978.03174,5274.040911,5587.651703,5919.910763,6271.926976,6644.875161,7040.0,7458.620235,7902.132835,
-8372.01809,8869.844191,9397.272573,9956.063479,10548.08182,11175.30341,11839.82153,12543.85395
-};
- 
-void Beeper::note(int note, float time){
-    
-    if ((note > -1) && (note <128)){
-        _pwm.period(1.0/MIDINote[note]);
-        _pwm.write(0.5);
-        wait(time);
-        _pwm.write(0.0);}
-        
-} 

diff -r 3a9f5df0ba22 -r ab089c1f2802 Beeper.h
--- a/Beeper.h	Thu Mar 18 13:17:12 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#ifndef MBED_BEEPER_H
-#define MBED_BEEPER_H
- 
-#include "mbed.h"
-
-namespace mbed {
-
-/* Class: Beeper
- *  A class witch uses pwm to controle a beeper to generate sounds.
- */
-class Beeper {
-
-public:
-    
-    /* Constructor: Beeper
-     *  Creates a new beeper object.
-     * 
-     * Variables:
-     *  pin - The pin which is connected to the beeper.
-     */
-    Beeper (PinName pin);
-
-    /* Function: beep
-     *  Beep with given frequency and duration.
-     *
-     * Variables: 
-     *  frequency - The frequency to use.
-     *  time - The turation to beep.
-     */
-    void beep (float frequency, float time);
-
-    /* Function: note
-     *  Plays a midi note for a given time.
-     *
-     * Variables:
-     *  note - The note to play.
-     *  time - The duration to play the note.
-     */
-    void note (int, float time);
-    void stop();        
-
-  private :    
-    PwmOut _pwm;
-  };
-}
-
-#endif

diff -r 3a9f5df0ba22 -r ab089c1f2802 BeeperMultiple/Beeper.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/BeeperMultiple/Beeper.cpp	Thu Mar 18 18:54:52 2010 +0000
@@ -0,0 +1,45 @@
+#include "Beeper.h"
+#include "mbed.h"
+
+using namespace mbed;
+
+Beeper::Beeper(PinName pin) 
+  : _pwm(pin){}    
+
+
+void Beeper::beep(float freq, float time){
+
+    _pwm.period(1.0/freq);
+    _pwm.write(0.5);
+    //wait(time);
+    //_pwm.write(0.0);
+}
+void Beeper::stop() {
+_pwm.write(0.0);
+}
+
+
+    
+const float MIDINote[128] = {
+8.175798916,8.661957218,9.177023997,9.722718241,10.30086115,10.91338223,11.56232571,12.24985737,12.9782718,13.75,14.56761755,15.43385316,
+16.35159783,17.32391444,18.35404799,19.44543648,20.60172231,21.82676446,23.12465142,24.49971475,25.9565436,27.5,29.13523509,30.86770633,
+32.70319566,34.64782887,36.70809599,38.89087297,41.20344461,43.65352893,46.24930284,48.9994295,51.9130872,55.0,58.27047019,61.73541266,
+65.40639133,69.29565774,73.41619198,77.78174593,82.40688923,87.30705786,92.49860568,97.998859,103.8261744,110.0,116.5409404,123.4708253,
+130.8127827,138.5913155,146.832384,155.5634919,164.8137785,174.6141157,184.9972114,195.997718,207.6523488,220.0,233.0818808,246.9416506,
+261.6255653,277.182631,293.6647679,311.1269837,329.6275569,349.2282314,369.9944227,391.995436,415.3046976,440.0,466.1637615,493.8833013,
+523.2511306,554.365262,587.3295358,622.2539674,659.2551138,698.4564629,739.9888454,783.990872,830.6093952,880.0,932.327523,987.7666025,
+1046.502261,1108.730524,1174.659072,1244.507935,1318.510228,1396.912926,1479.977691,1567.981744,1661.21879,1760.0,1864.655046,1975.533205,
+2093.004522,2217.461048,2349.318143,2489.01587,2637.020455,2793.825851,2959.955382,3135.963488,3322.437581,3520.0,3729.310092,3951.06641,
+4186.009045,4434.922096,4698.636287,4978.03174,5274.040911,5587.651703,5919.910763,6271.926976,6644.875161,7040.0,7458.620235,7902.132835,
+8372.01809,8869.844191,9397.272573,9956.063479,10548.08182,11175.30341,11839.82153,12543.85395
+};
+ 
+void Beeper::note(int note, float time){
+    
+    if ((note > -1) && (note <128)){
+        _pwm.period(1.0/MIDINote[note]);
+        _pwm.write(0.5);
+        wait(time);
+        _pwm.write(0.0);}
+        
+} 

diff -r 3a9f5df0ba22 -r ab089c1f2802 BeeperMultiple/Beeper.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/BeeperMultiple/Beeper.h	Thu Mar 18 18:54:52 2010 +0000
@@ -0,0 +1,47 @@
+#ifndef MBED_BEEPER_H
+#define MBED_BEEPER_H
+ 
+#include "mbed.h"
+
+namespace mbed {
+
+/* Class: Beeper
+ *  A class witch uses pwm to controle a beeper to generate sounds.
+ */
+class Beeper {
+
+public:
+    
+    /* Constructor: Beeper
+     *  Creates a new beeper object.
+     * 
+     * Variables:
+     *  pin - The pin which is connected to the beeper.
+     */
+    Beeper (PinName pin);
+
+    /* Function: beep
+     *  Beep with given frequency and duration.
+     *
+     * Variables: 
+     *  frequency - The frequency to use.
+     *  time - The turation to beep.
+     */
+    void beep (float frequency, float time);
+
+    /* Function: note
+     *  Plays a midi note for a given time.
+     *
+     * Variables:
+     *  note - The note to play.
+     *  time - The duration to play the note.
+     */
+    void note (int, float time);
+    void stop();        
+
+  private :    
+    PwmOut _pwm;
+  };
+}
+
+#endif