Diff: Multiplexer_read.cpp

Revision:

3:cb991a9ba6a6

Parent:

2:d815250d0377

Child:

4:57163b0e7dbc

--- a/Multiplexer_read.cpp	Mon Sep 08 13:30:52 2014 +0000
+++ b/Multiplexer_read.cpp	Mon Sep 08 15:53:42 2014 +0000
@@ -10,6 +10,9 @@
 DigitalOut Multiplex_select_1 (p16);
 DigitalOut Myled (LED1);
 
+DigitalOut timetest_0 (p30);
+DigitalOut timetest_1 (p29);
+
 PwmOut Bremsenstrom_MOSFET(p21);
 PwmOut Motroregler_PWM(p22);
 
@@ -173,7 +176,7 @@
     if (mosfet_pwm_cmd > 20000) mosfet_pwm_cmd = 20000;
     else if (mosfet_pwm_cmd < 0) mosfet_pwm_cmd = 0;
     
-   Bremsenstrom_MOSFET.pulsewidth_us(MOSFET_pwm_cmd);
+   Bremsenstrom_MOSFET.pulsewidth_us(mosfet_pwm_cmd);
    
     mosfet_pwm_cmd_last = mosfet_pwm_cmd;
 
@@ -254,13 +257,14 @@
     while(true) {
 
 
+
         if (pc.readable()) {
             pc.printf("\n\r Motor rpm\n\r");
             pc.scanf("%f",&motor_rpm_cmd);
             pc.printf("%f\n\r",motor_rpm_cmd);
     
         }
-
+/*
         // Calculate motor_n_cur by averaging
         int drehzeit_sum = 0;
         for (int i=0; i != DREHZEIT_SIZE; ++i)
@@ -278,10 +282,14 @@
         if (timer_pwm.read_ms() > 500) {
 //            pc.printf("drehzeit_sum: %d, motor_n_cur: %f\n\r", drehzeit_sum, motor_n_cur);
 //            pc.printf("%d  %d  %d\n\r", Drehzeit[0], Drehzeit[1], Drehzeit[2]);
+            //timetest_0 = 1;
             
             timer_pwm.reset();
             rpm_control(motor_rpm_cmd/60.0, motor_n_cur);
+           // timetest_0 = 0;
         }
+        */
+        
 
         // Myled = 0;
 
@@ -290,7 +298,7 @@
 
             
         
-/*
+
         if (timer_print.read_ms() > 1000) {
             timer_print.reset();
 
@@ -307,6 +315,6 @@
             if (err == -1)
                 pc.printf("udp.sendTo() failed. (%d)\n\r", err);
         }
-*/
+
     }
 }
\ No newline at end of file