Working code for pc app 12/01/2018 commit
Dependencies: mbed MS5607 mbed-dsp
Fork of Turrentine_Code by
main.cpp@1:ab3dacbfcde6, 2018-01-12 (annotated)
- Committer:
- intrinseca
- Date:
- Fri Jan 12 13:17:35 2018 +0000
- Revision:
- 1:ab3dacbfcde6
- Parent:
- 0:2c6d81be69d8
- Child:
- 2:3d3e21c907e4
Update serial output
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
AlexStokoe | 0:2c6d81be69d8 | 1 | #include "mbed.h" |
AlexStokoe | 0:2c6d81be69d8 | 2 | |
AlexStokoe | 0:2c6d81be69d8 | 3 | #define M_PI 3.14159265358979323846 |
AlexStokoe | 0:2c6d81be69d8 | 4 | |
intrinseca | 1:ab3dacbfcde6 | 5 | #define N_SAMPLES 500 |
intrinseca | 1:ab3dacbfcde6 | 6 | |
AlexStokoe | 0:2c6d81be69d8 | 7 | //mbed class def |
AlexStokoe | 0:2c6d81be69d8 | 8 | Serial pc(USBTX, USBRX); // tx, rx |
AlexStokoe | 0:2c6d81be69d8 | 9 | SPI spi(p5, p6, p7); // mosi, miso, sclk |
AlexStokoe | 0:2c6d81be69d8 | 10 | DigitalOut cs(p8); |
AlexStokoe | 0:2c6d81be69d8 | 11 | |
AlexStokoe | 0:2c6d81be69d8 | 12 | PwmOut motorOn(p26); |
AlexStokoe | 0:2c6d81be69d8 | 13 | |
AlexStokoe | 0:2c6d81be69d8 | 14 | Timer t; |
AlexStokoe | 0:2c6d81be69d8 | 15 | |
AlexStokoe | 0:2c6d81be69d8 | 16 | //variable instaniation |
AlexStokoe | 0:2c6d81be69d8 | 17 | unsigned short calData[6]; |
AlexStokoe | 0:2c6d81be69d8 | 18 | |
AlexStokoe | 0:2c6d81be69d8 | 19 | char buffer16[3]; |
intrinseca | 1:ab3dacbfcde6 | 20 | short int serbuffer[2]; |
AlexStokoe | 0:2c6d81be69d8 | 21 | |
AlexStokoe | 0:2c6d81be69d8 | 22 | char tempBuffer[4]; |
AlexStokoe | 0:2c6d81be69d8 | 23 | unsigned int temp = 0; |
AlexStokoe | 0:2c6d81be69d8 | 24 | char pressBuffer[4]; |
AlexStokoe | 0:2c6d81be69d8 | 25 | unsigned int press = 0; |
AlexStokoe | 0:2c6d81be69d8 | 26 | |
intrinseca | 1:ab3dacbfcde6 | 27 | unsigned int pData[N_SAMPLES]; |
intrinseca | 1:ab3dacbfcde6 | 28 | float spData[N_SAMPLES]; |
intrinseca | 1:ab3dacbfcde6 | 29 | unsigned int tData[N_SAMPLES]; |
AlexStokoe | 0:2c6d81be69d8 | 30 | |
AlexStokoe | 0:2c6d81be69d8 | 31 | const char cb1 = 0xA2; |
AlexStokoe | 0:2c6d81be69d8 | 32 | const char cb2 = 0xA4; |
AlexStokoe | 0:2c6d81be69d8 | 33 | const char cb3 = 0xA6; |
AlexStokoe | 0:2c6d81be69d8 | 34 | const char cb4 = 0xA8; |
AlexStokoe | 0:2c6d81be69d8 | 35 | const char cb5 = 0xAA; |
AlexStokoe | 0:2c6d81be69d8 | 36 | const char cb6 = 0xAC; |
AlexStokoe | 0:2c6d81be69d8 | 37 | |
AlexStokoe | 0:2c6d81be69d8 | 38 | const char * commarr[6] = {&cb1, &cb2, &cb3, &cb4, &cb5, &cb6}; |
AlexStokoe | 0:2c6d81be69d8 | 39 | |
AlexStokoe | 0:2c6d81be69d8 | 40 | const char D1conv256 = 0x40; |
AlexStokoe | 0:2c6d81be69d8 | 41 | const char D1conv512 = 0x42; |
AlexStokoe | 0:2c6d81be69d8 | 42 | const char D2conv4096 = 0x58; |
AlexStokoe | 0:2c6d81be69d8 | 43 | const char D2conv512 = 0x52; |
AlexStokoe | 0:2c6d81be69d8 | 44 | const char readADC = 0x00; |
AlexStokoe | 0:2c6d81be69d8 | 45 | |
AlexStokoe | 0:2c6d81be69d8 | 46 | float duty = 1; |
AlexStokoe | 0:2c6d81be69d8 | 47 | |
AlexStokoe | 0:2c6d81be69d8 | 48 | int round(float number) |
AlexStokoe | 0:2c6d81be69d8 | 49 | { |
AlexStokoe | 0:2c6d81be69d8 | 50 | return (number >= 0) ? (int)(number + 0.5) : (int)(number - 0.5); |
AlexStokoe | 0:2c6d81be69d8 | 51 | } |
AlexStokoe | 0:2c6d81be69d8 | 52 | |
AlexStokoe | 0:2c6d81be69d8 | 53 | //calculate temperature |
intrinseca | 1:ab3dacbfcde6 | 54 | int calcT(unsigned int Tval, unsigned short consts[6]) |
intrinseca | 1:ab3dacbfcde6 | 55 | { |
AlexStokoe | 0:2c6d81be69d8 | 56 | int dT = Tval - consts[4]*(2<<7); |
intrinseca | 1:ab3dacbfcde6 | 57 | |
AlexStokoe | 0:2c6d81be69d8 | 58 | int T = 2000 + dT*consts[5]/(2<<22); |
intrinseca | 1:ab3dacbfcde6 | 59 | printf("Temp: %d C\n", T); |
AlexStokoe | 0:2c6d81be69d8 | 60 | return T; |
intrinseca | 1:ab3dacbfcde6 | 61 | } |
AlexStokoe | 0:2c6d81be69d8 | 62 | |
AlexStokoe | 0:2c6d81be69d8 | 63 | //calculate 1st order temperature compensated pressure |
intrinseca | 1:ab3dacbfcde6 | 64 | int calcP(unsigned int Tval, unsigned int Pval, unsigned short consts[6]) |
intrinseca | 1:ab3dacbfcde6 | 65 | { |
AlexStokoe | 0:2c6d81be69d8 | 66 | int dT = Tval - consts[4]*(2<<7); |
intrinseca | 1:ab3dacbfcde6 | 67 | |
AlexStokoe | 0:2c6d81be69d8 | 68 | long long int off = (long long)consts[1]*(2<<16) + ((long long)consts[3] *(long long)dT)/(2<<5); |
intrinseca | 1:ab3dacbfcde6 | 69 | |
AlexStokoe | 0:2c6d81be69d8 | 70 | long long int sens = (long long)consts[0]*(2<<15) + ((long long)consts[2] *(long long)dT)/(2<<6); |
intrinseca | 1:ab3dacbfcde6 | 71 | |
AlexStokoe | 0:2c6d81be69d8 | 72 | int P = (Pval *(sens/(2<<20)) - off)/(2<<14); |
intrinseca | 1:ab3dacbfcde6 | 73 | //printf("Pressure %d Pa\n\r", P); |
AlexStokoe | 0:2c6d81be69d8 | 74 | return P; |
intrinseca | 1:ab3dacbfcde6 | 75 | } |
intrinseca | 1:ab3dacbfcde6 | 76 | |
intrinseca | 1:ab3dacbfcde6 | 77 | int main() |
intrinseca | 1:ab3dacbfcde6 | 78 | { |
intrinseca | 1:ab3dacbfcde6 | 79 | printf("Turrentine\n"); |
intrinseca | 1:ab3dacbfcde6 | 80 | |
AlexStokoe | 0:2c6d81be69d8 | 81 | pc.baud(115200); |
AlexStokoe | 0:2c6d81be69d8 | 82 | motorOn = 0; |
AlexStokoe | 0:2c6d81be69d8 | 83 | motorOn.period_ms(10); |
intrinseca | 1:ab3dacbfcde6 | 84 | |
AlexStokoe | 0:2c6d81be69d8 | 85 | // Chip must be deselected |
AlexStokoe | 0:2c6d81be69d8 | 86 | cs = 1; |
AlexStokoe | 0:2c6d81be69d8 | 87 | |
AlexStokoe | 0:2c6d81be69d8 | 88 | // Setup the spi for 8 bit data, high steady state clock, |
AlexStokoe | 0:2c6d81be69d8 | 89 | // second edge capture, with a 1MHz clock rate |
AlexStokoe | 0:2c6d81be69d8 | 90 | spi.format(8,3); |
AlexStokoe | 0:2c6d81be69d8 | 91 | spi.frequency(500000); |
AlexStokoe | 0:2c6d81be69d8 | 92 | spi.set_default_write_value(0x00); |
intrinseca | 1:ab3dacbfcde6 | 93 | |
AlexStokoe | 0:2c6d81be69d8 | 94 | // Select the device by seting chip select low |
AlexStokoe | 0:2c6d81be69d8 | 95 | cs = 0; |
intrinseca | 1:ab3dacbfcde6 | 96 | |
AlexStokoe | 0:2c6d81be69d8 | 97 | // Send 0x1E Command to reset the chip |
AlexStokoe | 0:2c6d81be69d8 | 98 | spi.write(0x1E); |
AlexStokoe | 0:2c6d81be69d8 | 99 | cs = 1; |
AlexStokoe | 0:2c6d81be69d8 | 100 | wait_ms(100); |
intrinseca | 1:ab3dacbfcde6 | 101 | cs = 1; |
AlexStokoe | 0:2c6d81be69d8 | 102 | |
intrinseca | 1:ab3dacbfcde6 | 103 | printf("Read cal data\n"); |
intrinseca | 1:ab3dacbfcde6 | 104 | |
AlexStokoe | 0:2c6d81be69d8 | 105 | //read cal data values from device into program |
intrinseca | 1:ab3dacbfcde6 | 106 | for (char i=0; i<6; i++) { |
AlexStokoe | 0:2c6d81be69d8 | 107 | //spi read sequence |
AlexStokoe | 0:2c6d81be69d8 | 108 | cs= 0; |
AlexStokoe | 0:2c6d81be69d8 | 109 | spi.write(commarr[i], 1, buffer16, 3); |
AlexStokoe | 0:2c6d81be69d8 | 110 | //time for SPI to write into data buffers |
AlexStokoe | 0:2c6d81be69d8 | 111 | wait_ms(10); |
AlexStokoe | 0:2c6d81be69d8 | 112 | cs=1; |
AlexStokoe | 0:2c6d81be69d8 | 113 | //Put data into 16bit unsigned int in calData array |
intrinseca | 1:ab3dacbfcde6 | 114 | calData[i] = buffer16[1]<<8 | buffer16[2]; |
intrinseca | 1:ab3dacbfcde6 | 115 | } |
intrinseca | 1:ab3dacbfcde6 | 116 | |
intrinseca | 1:ab3dacbfcde6 | 117 | printf("Start loop\n"); |
intrinseca | 1:ab3dacbfcde6 | 118 | |
AlexStokoe | 0:2c6d81be69d8 | 119 | //display calibration values to check against datasheet |
intrinseca | 1:ab3dacbfcde6 | 120 | |
AlexStokoe | 0:2c6d81be69d8 | 121 | //program loop |
intrinseca | 1:ab3dacbfcde6 | 122 | while(1) { |
AlexStokoe | 0:2c6d81be69d8 | 123 | //read temerature value |
AlexStokoe | 0:2c6d81be69d8 | 124 | cs = 0; |
AlexStokoe | 0:2c6d81be69d8 | 125 | spi.write(&D2conv4096, 1, buffer16, 1); |
AlexStokoe | 0:2c6d81be69d8 | 126 | wait_ms(10); |
intrinseca | 1:ab3dacbfcde6 | 127 | cs = 1; |
intrinseca | 1:ab3dacbfcde6 | 128 | cs = 0; |
intrinseca | 1:ab3dacbfcde6 | 129 | |
AlexStokoe | 0:2c6d81be69d8 | 130 | spi.write(&readADC, 1, tempBuffer, 4); |
AlexStokoe | 0:2c6d81be69d8 | 131 | cs = 1; |
intrinseca | 1:ab3dacbfcde6 | 132 | |
AlexStokoe | 0:2c6d81be69d8 | 133 | //read pressure value |
intrinseca | 1:ab3dacbfcde6 | 134 | /*cs = 0; |
AlexStokoe | 0:2c6d81be69d8 | 135 | spi.write(&D1conv512, 1, buffer16, 1); |
AlexStokoe | 0:2c6d81be69d8 | 136 | wait_ms(2); |
AlexStokoe | 0:2c6d81be69d8 | 137 | cs = 1; cs = 0; |
intrinseca | 1:ab3dacbfcde6 | 138 | |
AlexStokoe | 0:2c6d81be69d8 | 139 | spi.write(&readADC, 1, pressBuffer, 4); |
intrinseca | 1:ab3dacbfcde6 | 140 | cs = 1;*/ |
intrinseca | 1:ab3dacbfcde6 | 141 | |
AlexStokoe | 0:2c6d81be69d8 | 142 | //write values from buffers to program variables |
AlexStokoe | 0:2c6d81be69d8 | 143 | temp = tempBuffer[1]<<16 | tempBuffer[2]<<8 | tempBuffer[3]; |
intrinseca | 1:ab3dacbfcde6 | 144 | //press = pressBuffer[1]<<16 | pressBuffer[2]<<8 | pressBuffer[3]; |
intrinseca | 1:ab3dacbfcde6 | 145 | |
intrinseca | 1:ab3dacbfcde6 | 146 | printf("Pump On\n"); |
intrinseca | 1:ab3dacbfcde6 | 147 | |
AlexStokoe | 0:2c6d81be69d8 | 148 | //turn pump on |
AlexStokoe | 0:2c6d81be69d8 | 149 | motorOn.write(duty); |
intrinseca | 1:ab3dacbfcde6 | 150 | |
AlexStokoe | 0:2c6d81be69d8 | 151 | //dummy samples to wait for sensor response to stabilise |
AlexStokoe | 0:2c6d81be69d8 | 152 | int a =0; |
intrinseca | 1:ab3dacbfcde6 | 153 | while(a < 10000) { |
AlexStokoe | 0:2c6d81be69d8 | 154 | cs = 0; |
AlexStokoe | 0:2c6d81be69d8 | 155 | spi.write(&D1conv256, 1, buffer16, 1); |
AlexStokoe | 0:2c6d81be69d8 | 156 | wait_us(500); |
intrinseca | 1:ab3dacbfcde6 | 157 | cs = 1; |
intrinseca | 1:ab3dacbfcde6 | 158 | cs = 0; |
AlexStokoe | 0:2c6d81be69d8 | 159 | spi.write(&readADC, 1, pressBuffer, 4); |
AlexStokoe | 0:2c6d81be69d8 | 160 | cs = 1; |
AlexStokoe | 0:2c6d81be69d8 | 161 | a++; |
intrinseca | 1:ab3dacbfcde6 | 162 | } |
AlexStokoe | 0:2c6d81be69d8 | 163 | |
intrinseca | 1:ab3dacbfcde6 | 164 | printf("Start Measurement\n"); |
intrinseca | 1:ab3dacbfcde6 | 165 | |
intrinseca | 1:ab3dacbfcde6 | 166 | //double cumsum = 0; |
intrinseca | 1:ab3dacbfcde6 | 167 | |
AlexStokoe | 0:2c6d81be69d8 | 168 | t.reset(); |
AlexStokoe | 0:2c6d81be69d8 | 169 | t.start(); |
AlexStokoe | 0:2c6d81be69d8 | 170 | //loop values |
intrinseca | 1:ab3dacbfcde6 | 171 | for (int x = 0; x < N_SAMPLES; x++) { |
AlexStokoe | 0:2c6d81be69d8 | 172 | cs = 0; |
AlexStokoe | 0:2c6d81be69d8 | 173 | spi.write(&D1conv256, 1, buffer16, 1); |
AlexStokoe | 0:2c6d81be69d8 | 174 | wait_us(500); |
intrinseca | 1:ab3dacbfcde6 | 175 | cs = 1; |
intrinseca | 1:ab3dacbfcde6 | 176 | |
intrinseca | 1:ab3dacbfcde6 | 177 | cs = 0; |
intrinseca | 1:ab3dacbfcde6 | 178 | if (x > 0) { |
AlexStokoe | 0:2c6d81be69d8 | 179 | pData[x-1] = pressBuffer[1]<<16 | pressBuffer[2]<<8 | pressBuffer[3]; |
intrinseca | 1:ab3dacbfcde6 | 180 | //cumsum = cumsum + pData[x-1]; |
intrinseca | 1:ab3dacbfcde6 | 181 | } |
AlexStokoe | 0:2c6d81be69d8 | 182 | spi.write(&readADC, 1, pressBuffer, 4); |
AlexStokoe | 0:2c6d81be69d8 | 183 | tData[x] = t.read_us(); |
AlexStokoe | 0:2c6d81be69d8 | 184 | cs = 1; |
intrinseca | 1:ab3dacbfcde6 | 185 | } |
intrinseca | 1:ab3dacbfcde6 | 186 | |
intrinseca | 1:ab3dacbfcde6 | 187 | pData[N_SAMPLES - 1] = pressBuffer[1]<<16 | pressBuffer[2]<<8 | pressBuffer[3]; |
intrinseca | 1:ab3dacbfcde6 | 188 | |
AlexStokoe | 0:2c6d81be69d8 | 189 | //stop motor and timer |
AlexStokoe | 0:2c6d81be69d8 | 190 | t.stop(); |
AlexStokoe | 0:2c6d81be69d8 | 191 | motorOn.write(0); |
AlexStokoe | 0:2c6d81be69d8 | 192 | |
intrinseca | 1:ab3dacbfcde6 | 193 | printf("Stop Measurement\n"); |
intrinseca | 1:ab3dacbfcde6 | 194 | |
AlexStokoe | 0:2c6d81be69d8 | 195 | //calc temperature |
AlexStokoe | 0:2c6d81be69d8 | 196 | calcT(temp, calData); |
AlexStokoe | 0:2c6d81be69d8 | 197 | long long sum = 0; |
intrinseca | 1:ab3dacbfcde6 | 198 | |
intrinseca | 1:ab3dacbfcde6 | 199 | //float avg = calcP(temp, cumsum/(nsample-1), calData); |
intrinseca | 1:ab3dacbfcde6 | 200 | |
intrinseca | 1:ab3dacbfcde6 | 201 | //printf("avg %f\n\r", avg); |
intrinseca | 1:ab3dacbfcde6 | 202 | |
intrinseca | 1:ab3dacbfcde6 | 203 | //output date to PC |
intrinseca | 1:ab3dacbfcde6 | 204 | printf("C1: %hu\nC2: %hu\nC3: %hu\nC4: %hu\nC5: %hu\nC6: %hu\n", calData[0], calData[1], calData[2], calData[3], calData[4], calData[5]); |
intrinseca | 1:ab3dacbfcde6 | 205 | |
intrinseca | 1:ab3dacbfcde6 | 206 | for(int i = 0; i < N_SAMPLES; i++) { |
intrinseca | 1:ab3dacbfcde6 | 207 | printf("%04d: %d\n", i, pData[i]); |
intrinseca | 1:ab3dacbfcde6 | 208 | } |
intrinseca | 1:ab3dacbfcde6 | 209 | |
intrinseca | 1:ab3dacbfcde6 | 210 | /* |
AlexStokoe | 0:2c6d81be69d8 | 211 | //for crossing detection |
AlexStokoe | 0:2c6d81be69d8 | 212 | bool cflag1 = (avg > pData[0]); |
AlexStokoe | 0:2c6d81be69d8 | 213 | bool cflag2 = (avg > pData[1]); |
AlexStokoe | 0:2c6d81be69d8 | 214 | int numcross = 0; |
AlexStokoe | 0:2c6d81be69d8 | 215 | int lastcrosspoint = 0; |
AlexStokoe | 0:2c6d81be69d8 | 216 | unsigned int crosstart; |
AlexStokoe | 0:2c6d81be69d8 | 217 | unsigned int crossend; |
AlexStokoe | 0:2c6d81be69d8 | 218 | float freq = 0; |
AlexStokoe | 0:2c6d81be69d8 | 219 | |
AlexStokoe | 0:2c6d81be69d8 | 220 | //smooth data array 20 sample size |
intrinseca | 1:ab3dacbfcde6 | 221 | for (int y=0; y< nsample-1; y++) { |
intrinseca | 1:ab3dacbfcde6 | 222 | if (9< y && y <nsample-10) { |
intrinseca | 1:ab3dacbfcde6 | 223 | sum = 0; |
intrinseca | 1:ab3dacbfcde6 | 224 | for (int z=0; z<20; z++) { |
intrinseca | 1:ab3dacbfcde6 | 225 | sum = sum + pData[y-10+z]; |
intrinseca | 1:ab3dacbfcde6 | 226 | } |
intrinseca | 1:ab3dacbfcde6 | 227 | |
intrinseca | 1:ab3dacbfcde6 | 228 | spData[y] = (float) calcP(temp, sum/20, calData); |
intrinseca | 1:ab3dacbfcde6 | 229 | |
intrinseca | 1:ab3dacbfcde6 | 230 | //detect avg crossings for frequency calc |
intrinseca | 1:ab3dacbfcde6 | 231 | if (y>10) { |
intrinseca | 1:ab3dacbfcde6 | 232 | cflag2 = (avg > spData[y]); |
intrinseca | 1:ab3dacbfcde6 | 233 | cflag1 = (avg > spData[y-1]); |
intrinseca | 1:ab3dacbfcde6 | 234 | |
intrinseca | 1:ab3dacbfcde6 | 235 | if (cflag1 != cflag2) { |
intrinseca | 1:ab3dacbfcde6 | 236 | if(lastcrosspoint<=(y-10)) { |
intrinseca | 1:ab3dacbfcde6 | 237 | numcross++; |
intrinseca | 1:ab3dacbfcde6 | 238 | lastcrosspoint = y; |
intrinseca | 1:ab3dacbfcde6 | 239 | |
intrinseca | 1:ab3dacbfcde6 | 240 | if (numcross == 1) { |
intrinseca | 1:ab3dacbfcde6 | 241 | crosstart = tData[y]; |
intrinseca | 1:ab3dacbfcde6 | 242 | } |
intrinseca | 1:ab3dacbfcde6 | 243 | |
intrinseca | 1:ab3dacbfcde6 | 244 | crossend = tData[y]; |
intrinseca | 1:ab3dacbfcde6 | 245 | } |
intrinseca | 1:ab3dacbfcde6 | 246 | } |
intrinseca | 1:ab3dacbfcde6 | 247 | } |
intrinseca | 1:ab3dacbfcde6 | 248 | //calc pressure & display list |
intrinseca | 1:ab3dacbfcde6 | 249 | //printf("%d\t%d\t%d\n\r", tData[y], calcP(temp, spData[y], calData), calcP(temp, pData[y], calData)); |
intrinseca | 1:ab3dacbfcde6 | 250 | printf("%d\t%f\n\r", tData[y],spData[y]); |
intrinseca | 1:ab3dacbfcde6 | 251 | } else if (10> y || y >nsample-10) { |
intrinseca | 1:ab3dacbfcde6 | 252 | spData[y] = (float) calcP(temp, pData[y], calData); |
intrinseca | 1:ab3dacbfcde6 | 253 | } |
intrinseca | 1:ab3dacbfcde6 | 254 | |
intrinseca | 1:ab3dacbfcde6 | 255 | |
intrinseca | 1:ab3dacbfcde6 | 256 | } |
intrinseca | 1:ab3dacbfcde6 | 257 | |
AlexStokoe | 0:2c6d81be69d8 | 258 | printf("numcross = %d\n\r", numcross); |
intrinseca | 1:ab3dacbfcde6 | 259 | printf("crosstart = %d\n\r", crosstart); |
intrinseca | 1:ab3dacbfcde6 | 260 | printf("crossend = %d\n\r", crossend); |
intrinseca | 1:ab3dacbfcde6 | 261 | |
intrinseca | 1:ab3dacbfcde6 | 262 | freq = (1e6 *numcross)/(2*(crossend - crosstart)); |
intrinseca | 1:ab3dacbfcde6 | 263 | printf("frequency = %f\n\r", freq); |
intrinseca | 1:ab3dacbfcde6 | 264 | |
intrinseca | 1:ab3dacbfcde6 | 265 | for (int z=0; z< nsample-1; z++) { |
intrinseca | 1:ab3dacbfcde6 | 266 | |
intrinseca | 1:ab3dacbfcde6 | 267 | spData[z] = spData[z] -avg; |
intrinseca | 1:ab3dacbfcde6 | 268 | } |
intrinseca | 1:ab3dacbfcde6 | 269 | |
intrinseca | 1:ab3dacbfcde6 | 270 | printf("Repeat Blockage Test?\n\rPress Enter to continue\n\r"); |
intrinseca | 1:ab3dacbfcde6 | 271 | |
intrinseca | 1:ab3dacbfcde6 | 272 | while(1) { |
intrinseca | 1:ab3dacbfcde6 | 273 | if (pc.getc() != 0) { |
intrinseca | 1:ab3dacbfcde6 | 274 | break; |
intrinseca | 1:ab3dacbfcde6 | 275 | } |
intrinseca | 1:ab3dacbfcde6 | 276 | } |
intrinseca | 1:ab3dacbfcde6 | 277 | */ |
intrinseca | 1:ab3dacbfcde6 | 278 | } |
AlexStokoe | 0:2c6d81be69d8 | 279 | } |