
verslag
Dependencies: Encoder HIDScope MODSERIAL- mbed-dsp mbed
Fork of PROJECT_FINAL by
Revision 27:e33c352d6bb2, committed 2014-11-04
- Comitter:
- Hooglugt
- Date:
- Tue Nov 04 11:33:58 2014 +0000
- Parent:
- 26:8d91c4c54bb6
- Child:
- 28:1e3fe7204529
- Commit message:
- final script - hidscope deel eruit verwijdert
Changed in this revision
PROJECT_main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/PROJECT_main.cpp Tue Nov 04 11:30:05 2014 +0000 +++ b/PROJECT_main.cpp Tue Nov 04 11:33:58 2014 +0000 @@ -13,8 +13,6 @@ //Define objects -HIDScope scope(6); - AnalogIn emg0(PTB1); //Analog input biceps AnalogIn emg1(PTB2); //Analog input triceps @@ -136,13 +134,6 @@ looptimerflag = true; } -Ticker hid; - -void hidscope(void){ - - scope.send(); -} - void keep_in_range(float * in, float min, float max) { *in > min ? *in < max? : *in = max: *in = max; @@ -275,7 +266,6 @@ int main() { - hid.attach(hidscope, 0.01); pc.baud(115200); //baudrate instellen log_timer.attach(looper, TSAMP_EMG); //EMG, Fsample 500 Hz looptimer.attach(setlooptimerflag,TSAMP); @@ -533,12 +523,6 @@ while(!looptimerflag); looptimerflag = false; //clear flag - scope.set(0, motor2.getPosition()*omrekenfactor2); - scope.set(1, setpoint2); - scope.set(2, motor1.getPosition()*omrekenfactor1); - scope.set(3, setpoint1); - scope.set(4, state); - switch(state) { case 1: switch (direction) {