Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: Encoder HIDScope MODSERIAL TouchButton mbed-dsp mbed
Fork of Robot2mooiemanier by
Revision 21:b7fb79882cb8, committed 2014-10-31
- Comitter:
- s1340735
- Date:
- Fri Oct 31 13:30:21 2014 +0000
- Parent:
- 20:99a8e9da2d6d
- Child:
- 22:f3a827faa135
- Commit message:
- motor 1 zonder shizzle
Changed in this revision
| main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/main.cpp Fri Oct 31 13:17:30 2014 +0000
+++ b/main.cpp Fri Oct 31 13:30:21 2014 +0000
@@ -138,7 +138,7 @@
myled2 = 1;
myled3 = 1;
- pc.printf("calibratie tricep aan\n");
+ /*pc.printf("calibratie tricep aan\n");
wait(2);
Calibratie_Triceps();
@@ -153,7 +153,7 @@
myled1=1;
myled2=1;
- myled3=1;
+ myled3=1;*/
}
if (key==2) {
//green
@@ -161,7 +161,7 @@
myled2 = 0;
myled3 = 1;
- pc.printf("calibratie bicep snelheid 1 aan\n");
+ /*pc.printf("calibratie bicep snelheid 1 aan\n");
wait(2);
Calibratie_Biceps();
@@ -204,7 +204,7 @@
pc.printf("caliratie biceps is klaar\n");
myled1=1;
myled2=1;
- myled3=1;
+ myled3=1;*/
}
if (key==3) {
@@ -212,7 +212,7 @@
myled1 = 1;
myled2 = 1;
myled3 = 0;
- wait(3);
+ /*wait(3);
if(drempelwaardeT==0) {
pc.printf("geen waarde calibratie TRICEPS \n");
@@ -237,9 +237,9 @@
myled1 = 0;
myled2 = 0;
myled3 = 0;
- } else {
+ } else {*/
- pc.printf("eerst positie dan snelheid aangeven /n");
+ /*pc.printf("eerst positie dan snelheid aangeven /n");
//bepaling van positie met triceps 1
Ticker log_timerT1;
@@ -316,11 +316,11 @@
looptimer2.attach(motor2aansturing,TSAMP1);
wait(8);
looptimer2.detach();
- pc.printf("Detach Motor 1\n");
+ pc.printf("Detach Motor 1\n"); */
//------------------------------------------------------------------------------------------------------------------------------- eind aansturing motor 2
wait(2);
- Ticker log_timerB;
+ /* Ticker log_timerB;
arm_biquad_cascade_df1_init_f32(¬chB,1,notch_const,notch_states);
arm_biquad_cascade_df1_init_f32(&lowpassB,1,lowpass_const,lowpass_states);
@@ -358,8 +358,10 @@
myled3 = 0;
//*** INPUT MOTOR 1 ***
- snelheidsstand=yB1+yB2+yB3;
+ snelheidsstand=yB1+yB2+yB3; */
+ snelheidsstand=3;
+
//controle snelheidsstand op scherm
if (snelheidsstand==0) {
pc.printf("Motor 1 beweegt niet \n");
