Revision 2:7c8790b6753a, committed 2020-02-04

Comitter:

danijel28

Date:

Tue Feb 04 17:58:45 2020 +0000

Parent:

1:622b1d533a1c

Commit message:

I adjust buzzer library and rename it zvucniEfekt

Changed in this revision

diff -r 622b1d533a1c -r 7c8790b6753a buzzer.cpp
--- a/buzzer.cpp	Thu May 05 14:17:20 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#include "buzzer.h"
-#include "mbed.h"
- 
-/** class to make sound with a buzzer, based on a PwmOut
- *   The class use a timeout to switch off the sound  - it is not blocking while making noise
- *
- * Example:
- * @code
- * // Beep with 1Khz for 0.5 seconds
- * #include "mbed.h"
- * #include "beep.h"
- * 
- * Beep buzzer(PTC2);
- * 
- * int main() {
- *       ...
- *   buzzer.beep(1000,0.5);    
- *       ...
- * }
- * @endcode
- */
- 
-using namespace mbed;
- // constructor
- /** Create a Beep object connected to the specified PwmOut pin
-  *
-  * @param pin PwmOut pin to connect to 
-  */
-    
-Beep::Beep(PinName pin) : _pwm(pin) {
-    _pwm.write(0.0);     // after creating it have to be off
-}
- 
- /** stop the beep instantaneous 
-  * usually not used 
-  */
-void Beep::nobeep() {
-    _pwm.write(0.0);
-}
- 
-/** Beep with given frequency and duration.
- *
- * @param frequency - the frequency of the tone in Hz
- * @param time - the duration of the tone in seconds
- */
-     
-void Beep::beep(float freq, float time) {
- 
-    _pwm.period(1.0/freq);
-    _pwm.write(0.5);            // 50% duty cycle - beep on
-    toff.attach(this,&Beep::nobeep, time);   // time to off
-}
\ No newline at end of file

diff -r 622b1d533a1c -r 7c8790b6753a buzzer.h
--- a/buzzer.h	Thu May 05 14:17:20 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-#ifndef MBED_BEEP_H
-#define MBED_BEEP_H
- 
-#include "mbed.h"
-/**
-@namespace Beep Library 
-@brief Contains member functions for the speaker funtion that allow for sending of frequency of sounds and duration through pwm
-@Author Peter Drescher (I do not own the rights to this library and it has been rightly attributed to its owner
-@Revision 2012 
-
-**/
-
-
- 
-/** class to make sound with a buzzer, roughly based on a library created by Peter Drescher 
- *   The class use a timeout to switch off the sound  - it is not blocking while making noise
- *
- * Example:
- * @code
- * // Beep with 1Khz for 0.5 seconds
- * #include "mbed.h"
- * #include "buzzer.h"
- * 
- * Beep buzzer(PTC2);
- * 
- * int main() {
- *        ...
- *   buzzer.beep(1000,0.5);    
- *       ...
- * }
- * @endcode
- */
- 
- 
-namespace mbed {
- 
-/* Class: Beep
- *  A class witch uses pwm to controle a beeper to generate sounds.
- */
-class Beep {
- 
-public:
- 
-/** Create a Beep object connected to the specified PwmOut pin
- *
- * @param pin PwmOut pin to connect to 
- */
-    Beep (PinName pin);
- 
-/** Beep with given frequency and duration.
- *
- * @param frequency - the frequency of the tone in Hz
- * @param time - the duration of the tone in seconds
- */
-    void beep (float frequency, float time);
- 
-/** stop the beep instantaneous 
- * usually not used 
- */
-    void nobeep();
- 
-private :
-    PwmOut _pwm;
-    Timeout toff;
-};
- 
-}
-#endif
- 
-            

diff -r 622b1d533a1c -r 7c8790b6753a zvucniEfekt.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zvucniEfekt.cpp	Tue Feb 04 17:58:45 2020 +0000
@@ -0,0 +1,16 @@
+#include "zvucniEfekt.h"
+#include "mbed.h"
+#include "Ticker.h"
+
+zvucniEfekt::zvucniEfekt(PinName pin) : pwm(pin) {}
+
+void zvucniEfekt::neRadiZvucnik()
+{
+    pwm.write(0);
+}
+
+void zvucniEfekt::radiZvucnik(float frekvencija, float vrijemeTrajanja)
+{
+    pwm.period(1/frekvencija);
+    pwm.write(0.5);
+}
\ No newline at end of file

diff -r 622b1d533a1c -r 7c8790b6753a zvucniEfekt.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zvucniEfekt.h	Tue Feb 04 17:58:45 2020 +0000
@@ -0,0 +1,16 @@
+#ifndef zvucniEfekt_h
+#define zvucniEfekt_h
+#include "mbed.h"
+
+class zvucniEfekt
+{
+public:
+    zvucniEfekt (PinName pin);
+    void radiZvucnik (float frekvencija, float vrijemeTrajanja);
+    void neRadiZvucnik();
+private :
+    PwmOut pwm;
+};
+#endif
+
+