jack zen
/
ADXL345Test1
TEST1
Fork of ADXL345Test by
Diff: main.cpp
- Revision:
- 7:d98b9775bce6
- Parent:
- 6:592373200317
--- a/main.cpp Fri Sep 01 10:53:50 2017 +0000 +++ b/main.cpp Mon Sep 04 01:40:25 2017 +0000 @@ -141,19 +141,18 @@ pc.printf(" g -> 3rd order Integration \r\n"); pc.printf(" h -> 1st order Differentiation \r\n"); pc.printf(" k -> 2nd order Differentiation \r\n"); - pc.printf(" + -> Output Zoom In 2X \r\n"); + pc.printf(" +,= -> Output Zoom In 2X \r\n"); pc.printf(" - -> Output Zoom Out 2Z \r\n"); - pc.printf(" ^ -> shift up 1% \r\n"); + pc.printf(" ^,6 -> shift up 1% \r\n"); pc.printf(" v -> shift down 1% \r\n"); pc.printf("Press any key to start. \r\n"); getc = pc.getc(); - + int error_count=0; + RangeMapper DAC_Mapper1( 0 - 1<<13, 1<<13, 0, 1); + RangeMapper DAC_Mapper2( 0 - 1<<13, 1<<13, 0, 1); while (1) { - int error_count=0; - RangeMapper DAC_Mapper1( 0 - 1<<13, 1<<13, 0, 1); - RangeMapper DAC_Mapper2( 0 - 1<<13, 1<<13, 0, 1); if (pc.readable()) { getc = pc.getc(); @@ -175,10 +174,12 @@ case 'g' : datamode = 6 ; pc.printf("Set to 3rd order Integration output.\r\n"); break; case 'h' : datamode = 7 ; pc.printf("Set to 1st order Differentiation output.\r\n"); break; case 'k' : datamode = 8 ; pc.printf("Set to 2nd order Differentiation output.\r\n"); break; + case '=' : case '+' : DAC_Mapper2.zoom(2) ; pc.printf("Mapout zoom in.\r\n"); break; case '-' : DAC_Mapper2.zoom(0.5) ; pc.printf("Mapout zoom out.\r\n"); break; - case '^' : DAC_Mapper2.shift(0.01) ; pc.printf("Mapout zoom out.\r\n"); break; - case 'v' : DAC_Mapper2.shift(-0.01) ; pc.printf("Mapout zoom out.\r\n"); break; + case '6' : + case '^' : DAC_Mapper2.shift(0.01) ; pc.printf("Mapout shift up.\r\n"); break; + case 'v' : DAC_Mapper2.shift(-0.01) ; pc.printf("Mapout shift down.\r\n"); break; default: break; } } @@ -235,7 +236,7 @@ case 8: mapdata = dp[channel].GetO2differ(); break; default: mapdata = 0; break; } - pc.printf("MAPPING OUTPUT: %jd\r\n", DAC_Mapper2.getOutput(mapdata) ); + pc.printf("MAPPING OUTPUT: %f\r\n", DAC_Mapper2.getOutput(mapdata) ); } else