Eric Glunn
/
4180Project_All_Features
Contains all code needed for analog digital and oscope
Diff: main.cpp
- Revision:
- 1:14e49afb1d7c
- Parent:
- 0:f4b1c6a95f25
- Child:
- 2:9a88de905577
diff -r f4b1c6a95f25 -r 14e49afb1d7c main.cpp --- a/main.cpp Mon Apr 20 19:43:36 2020 +0000 +++ b/main.cpp Tue Apr 21 00:07:44 2020 +0000 @@ -10,6 +10,7 @@ #define pin3 0b00000100 #define pin4 0b00000010 #define pin5 0b00000001 +#define FULL 0b11111111 DigitalOut myled(LED1); @@ -73,19 +74,19 @@ AnalogSample[i]=0; } if( (command & pin1) == pin1){ - AnalogSample[0]=a1*255; + AnalogSample[0]=a1*254; } if( (command & pin2) == pin2){ - AnalogSample[1]=a2*255; + AnalogSample[1]=a2 * 254; } if( (command & pin3) == pin3){ - AnalogSample[2]=a3*255; + AnalogSample[2]=a3*254; } if( (command & pin4) == pin4){ - AnalogSample[3]=a4*255; + AnalogSample[3]=a4*254; } if( (command & pin5) == pin5){ - AnalogSample[4]=a5*255; + AnalogSample[4]=a5*254; } newAnalog=true; @@ -108,7 +109,7 @@ break; case analog: - tickerboi.attach(&analog_sample_func, .01); //Ticker will call analog read every 10ms + tickerboi.attach(&analog_sample_func, 1); //Ticker will call analog read every 10ms AnalogRunning=true; } } @@ -128,7 +129,7 @@ } if(newAnalog){ //if analog sampling was run - PC.putc(analog); //First bit is 0b01000000 + PC.putc(FULL); //First bit is 0b01000000 for(int i=0; i<5; i++){ //Send all of the analog bits PC.putc(AnalogSample[i]); }