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 TextLCD mbed-dsp mbed
Revision 1:0d5864272412, committed 2014-10-30
- Comitter:
- DominiqueC
- Date:
- Thu Oct 30 19:40:26 2014 +0000
- Parent:
- 0:653af6a8a659
- Child:
- 2:8596695c56df
- Commit message:
- test1
Changed in this revision
| main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/main.cpp Thu Oct 30 16:59:01 2014 +0000
+++ b/main.cpp Thu Oct 30 19:40:26 2014 +0000
@@ -88,6 +88,7 @@
enum kalibratiestates {BICEPSMAX,TRICEPSMAX};
+
volatile bool looptimerflag;
void setlooptimerflag(void)
{
@@ -189,7 +190,8 @@
tijdtimer.start();
pc.printf("Biceps meting, meting loopt"); //pc scherm
while (tijdtimer <= 3) {
- if (envelop_emg0 > max_value_biceps) {
+ if (envelop_emg0 > max_value_biceps);
+ {
max_value_biceps = envelop_emg0;
}
}
@@ -198,9 +200,9 @@
tijdtimer.reset();
pc.printf("max value %f\n\r", max_value_biceps); //pc scherm
wait(1);
- state = TRICEPSMAX;
+ state = TRICEPSMAX;
+ break;
} //einde if statement
- break;
} //einde case bicepsmax
case TRICEPSMAX: { //maximale inspanning triceps
pc.printf("Kalibratie. 2:TRICEPS MAX"); //pc scherm
@@ -225,4 +227,7 @@
} //einde default
} //einde switch states
break;
- }}}} // einde kalibratie case
+ }// einde kalibratie case
+ }
+ }
+}