Diff: main.cpp

Revision:

5:f798a173eefa

Parent:

4:3f3d369ca0e3

Child:

6:e3ed48abbd53

diff -r 3f3d369ca0e3 -r f798a173eefa main.cpp
--- a/main.cpp	Wed Jul 20 15:09:13 2016 +0000
+++ b/main.cpp	Thu Jul 21 12:20:51 2016 +0000
@@ -4,45 +4,32 @@
 PwmOut mypwm(PC_8);
 DigitalIn sw(USER_BUTTON);
 
-
-DigitalOut myled(LED1);
-//int data;
-float data_sin;
 bool flip_flag;
 
-#define late  0.00001
-//100khz-1
-
 void flip()
 {
-    //if(data > 100)   data = 0;
-    //else data++;
-    //data_sin = sin((data/100)*6.28) + 1;
     flip_flag = 1;
 }
 
 
 int main()
 {
-
-    mypwm.period_us(10);
-    flipper.attach_us(&flip, 10);
+    double keika_t,data,late;
+    int freq_out = 5000;
+    late = 20 * 0.001 * 0.001;
+    
+    mypwm.period_us(20);
+    flipper.attach_us(&flip,20);
 
-    float keika_t;
-    int freq_out = 500;
-
-
-    //printf("pwm set to %.2f %%\n", mypwm.read() * 100);
 
     while(1) {
         
-        if(sw == 0) freq_out = 5000;
-        else freq_out = 1000;    
-        
         if(flip_flag == 1) {
-
-            data_sin = sin(6.28 * keika_t * freq_out) + 1;
-            mypwm.write( data_sin / 10 );
+            
+            if(sw == 0) data = keika_t;
+            else data = sin(6.28 * keika_t * freq_out) + 1;
+            
+            mypwm.write( data / 20 );
 
             if(keika_t + late > 1) keika_t = keika_t + late - 1;
             else keika_t += late;