Diff: square_app.cpp

Revision:

40:ca1789c40924

Parent:

38:8d1e47006b2c

Child:

41:db959505e044

diff -r ab2557044815 -r ca1789c40924 square_app.cpp
--- a/square_app.cpp	Thu Dec 17 14:12:29 2015 +0000
+++ b/square_app.cpp	Thu Dec 17 14:21:26 2015 +0000
@@ -3,6 +3,7 @@
 SquareApp::SquareApp(Serial* serial) : App("Square wave", serial) {
     this->analogOut = new AnalogOut (PA_4);
     this->amplitude = 3.0f;
+    this->frequence = 20.0f;
 }
 
 void SquareApp::start()
@@ -16,7 +17,7 @@
 void SquareApp::run()
 {
    float p;
-   p = (20.0f*timer.read())-floor(20.0f*timer.read());
+   p = (frequence*timer.read())-floor(frequence*timer.read());
    if ( p < 0.5f ) {
        this->analogOut->write(0);
     } else { this->analogOut->write(this->amplitude/3.0f);} 
@@ -32,4 +33,8 @@
 void SquareApp::setamplitude(float newamplitude)
 {
     this->amplitude = newamplitude;
-}
\ No newline at end of file
+}
+void SquareApp::setfrequence(float newfrequence)
+{
+    this->frequence = newfrequence;
+}