David's dead reckoning code for the LVBots competition on March 6th. Uses the mbed LPC1768, DRV8835, QTR-3RC, and two DC motors with encoders.
Dependencies: PololuEncoder Pacer mbed GeneralDebouncer
test.cpp@40:6fa672be85ec, 2019-07-25 (annotated)
- Committer:
- DavidEGrayson
- Date:
- Thu Jul 25 02:53:34 2019 +0000
- Revision:
- 40:6fa672be85ec
- Parent:
- 39:b19dfc5d4d4b
- Child:
- 41:3ead1dd2cc3a
Add TurnSensor and L3G code but I am not happy with how the Gyro drifts a degree every few seconds or so.
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
DavidEGrayson | 8:78b1ff957cba | 1 | // A file for testing routines that will not be used in the final firmware. |
DavidEGrayson | 8:78b1ff957cba | 2 | |
DavidEGrayson | 8:78b1ff957cba | 3 | #include <mbed.h> |
DavidEGrayson | 8:78b1ff957cba | 4 | #include "motors.h" |
DavidEGrayson | 9:9734347b5756 | 5 | #include <Pacer.h> |
DavidEGrayson | 9:9734347b5756 | 6 | |
DavidEGrayson | 21:c279c6a83671 | 7 | #include "main.h" |
DavidEGrayson | 9:9734347b5756 | 8 | #include "test.h" |
DavidEGrayson | 8:78b1ff957cba | 9 | #include "leds.h" |
DavidEGrayson | 9:9734347b5756 | 10 | #include "encoders.h" |
DavidEGrayson | 8:78b1ff957cba | 11 | #include "pc_serial.h" |
DavidEGrayson | 10:e4dd36148539 | 12 | #include "line_sensors.h" |
DavidEGrayson | 40:6fa672be85ec | 13 | #include "l3g.h" |
DavidEGrayson | 40:6fa672be85ec | 14 | #include "turn_sensor.h" |
DavidEGrayson | 12:835a4d24ae3b | 15 | #include "reckoner.h" |
DavidEGrayson | 16:8eaa5bc2bdb1 | 16 | #include "buttons.h" |
DavidEGrayson | 16:8eaa5bc2bdb1 | 17 | |
DavidEGrayson | 20:dbec34f0e76b | 18 | void __attribute__((noreturn)) infiniteReckonerReportLoop(); |
DavidEGrayson | 10:e4dd36148539 | 19 | void printBar(const char * name, uint16_t adcResult); |
DavidEGrayson | 10:e4dd36148539 | 20 | |
DavidEGrayson | 37:23000a47ed2b | 21 | void testLogger() |
DavidEGrayson | 37:23000a47ed2b | 22 | { |
DavidEGrayson | 37:23000a47ed2b | 23 | led1 = 1; |
DavidEGrayson | 37:23000a47ed2b | 24 | while(!button1DefinitelyPressed()) |
DavidEGrayson | 37:23000a47ed2b | 25 | { |
DavidEGrayson | 37:23000a47ed2b | 26 | led3 = logger.isFull(); |
DavidEGrayson | 37:23000a47ed2b | 27 | |
DavidEGrayson | 37:23000a47ed2b | 28 | updateReckonerFromEncoders(); |
DavidEGrayson | 37:23000a47ed2b | 29 | loggerService(); |
DavidEGrayson | 37:23000a47ed2b | 30 | } |
DavidEGrayson | 37:23000a47ed2b | 31 | led2 = 1; |
DavidEGrayson | 37:23000a47ed2b | 32 | loggerReportLoop(); |
DavidEGrayson | 37:23000a47ed2b | 33 | } |
DavidEGrayson | 37:23000a47ed2b | 34 | |
DavidEGrayson | 33:58a0ab6e9ad2 | 35 | void testCloseness() |
DavidEGrayson | 30:84be2d602dc0 | 36 | { |
DavidEGrayson | 33:58a0ab6e9ad2 | 37 | led1 = 1; |
DavidEGrayson | 33:58a0ab6e9ad2 | 38 | while(1) |
DavidEGrayson | 30:84be2d602dc0 | 39 | { |
DavidEGrayson | 33:58a0ab6e9ad2 | 40 | updateReckonerFromEncoders(); |
DavidEGrayson | 33:58a0ab6e9ad2 | 41 | float magn = magnitude(); |
DavidEGrayson | 33:58a0ab6e9ad2 | 42 | |
DavidEGrayson | 33:58a0ab6e9ad2 | 43 | led3 = (magn < (1<<(14+7))); |
DavidEGrayson | 33:58a0ab6e9ad2 | 44 | led4 = (magn < (1<<(14+9))); |
DavidEGrayson | 30:84be2d602dc0 | 45 | } |
DavidEGrayson | 33:58a0ab6e9ad2 | 46 | } |
DavidEGrayson | 33:58a0ab6e9ad2 | 47 | |
DavidEGrayson | 33:58a0ab6e9ad2 | 48 | void showOrientationWithLeds34() |
DavidEGrayson | 33:58a0ab6e9ad2 | 49 | { |
DavidEGrayson | 33:58a0ab6e9ad2 | 50 | led3 = reckoner.cos > 0; |
DavidEGrayson | 33:58a0ab6e9ad2 | 51 | led4 = reckoner.sin > 0; |
DavidEGrayson | 30:84be2d602dc0 | 52 | } |
DavidEGrayson | 30:84be2d602dc0 | 53 | |
DavidEGrayson | 33:58a0ab6e9ad2 | 54 | void testTurnInPlace() |
DavidEGrayson | 30:84be2d602dc0 | 55 | { |
DavidEGrayson | 33:58a0ab6e9ad2 | 56 | led1 = 1; |
DavidEGrayson | 33:58a0ab6e9ad2 | 57 | while(!button1DefinitelyPressed()) |
DavidEGrayson | 33:58a0ab6e9ad2 | 58 | { |
DavidEGrayson | 33:58a0ab6e9ad2 | 59 | updateReckonerFromEncoders(); |
DavidEGrayson | 33:58a0ab6e9ad2 | 60 | showOrientationWithLeds34(); |
DavidEGrayson | 33:58a0ab6e9ad2 | 61 | } |
DavidEGrayson | 33:58a0ab6e9ad2 | 62 | led2 = 1; |
DavidEGrayson | 33:58a0ab6e9ad2 | 63 | |
DavidEGrayson | 33:58a0ab6e9ad2 | 64 | Pacer motorUpdatePacer(10000); |
DavidEGrayson | 30:84be2d602dc0 | 65 | Timer timer; |
DavidEGrayson | 30:84be2d602dc0 | 66 | timer.start(); |
DavidEGrayson | 33:58a0ab6e9ad2 | 67 | motorsSpeedSet(-300, 300); |
DavidEGrayson | 33:58a0ab6e9ad2 | 68 | while(timer.read_ms() < 4000) |
DavidEGrayson | 33:58a0ab6e9ad2 | 69 | { |
DavidEGrayson | 33:58a0ab6e9ad2 | 70 | updateReckonerFromEncoders(); |
DavidEGrayson | 33:58a0ab6e9ad2 | 71 | showOrientationWithLeds34(); |
DavidEGrayson | 33:58a0ab6e9ad2 | 72 | } |
DavidEGrayson | 33:58a0ab6e9ad2 | 73 | timer.reset(); |
DavidEGrayson | 33:58a0ab6e9ad2 | 74 | |
DavidEGrayson | 33:58a0ab6e9ad2 | 75 | float integral = 0; |
DavidEGrayson | 33:58a0ab6e9ad2 | 76 | while (timer.read_ms() < 4000) |
DavidEGrayson | 30:84be2d602dc0 | 77 | { |
DavidEGrayson | 33:58a0ab6e9ad2 | 78 | if (motorUpdatePacer.pace()) |
DavidEGrayson | 30:84be2d602dc0 | 79 | { |
DavidEGrayson | 33:58a0ab6e9ad2 | 80 | int16_t rotationSpeed; |
DavidEGrayson | 33:58a0ab6e9ad2 | 81 | float s = (float)reckoner.sin / (1 << 30); |
DavidEGrayson | 33:58a0ab6e9ad2 | 82 | integral += s; |
DavidEGrayson | 33:58a0ab6e9ad2 | 83 | rotationSpeed = -(s * 2400 + integral * 20); |
DavidEGrayson | 33:58a0ab6e9ad2 | 84 | |
DavidEGrayson | 33:58a0ab6e9ad2 | 85 | if (rotationSpeed > 450) |
DavidEGrayson | 33:58a0ab6e9ad2 | 86 | { |
DavidEGrayson | 33:58a0ab6e9ad2 | 87 | rotationSpeed = 450; |
DavidEGrayson | 33:58a0ab6e9ad2 | 88 | } |
DavidEGrayson | 33:58a0ab6e9ad2 | 89 | if (rotationSpeed < -450) |
DavidEGrayson | 33:58a0ab6e9ad2 | 90 | { |
DavidEGrayson | 33:58a0ab6e9ad2 | 91 | rotationSpeed = -450; |
DavidEGrayson | 33:58a0ab6e9ad2 | 92 | } |
DavidEGrayson | 33:58a0ab6e9ad2 | 93 | |
DavidEGrayson | 33:58a0ab6e9ad2 | 94 | int16_t speedLeft = -rotationSpeed; |
DavidEGrayson | 33:58a0ab6e9ad2 | 95 | int16_t speedRight = rotationSpeed; |
DavidEGrayson | 33:58a0ab6e9ad2 | 96 | motorsSpeedSet(speedLeft, speedRight); |
DavidEGrayson | 30:84be2d602dc0 | 97 | } |
DavidEGrayson | 30:84be2d602dc0 | 98 | } |
DavidEGrayson | 33:58a0ab6e9ad2 | 99 | |
DavidEGrayson | 33:58a0ab6e9ad2 | 100 | infiniteReckonerReportLoop(); |
DavidEGrayson | 30:84be2d602dc0 | 101 | } |
DavidEGrayson | 30:84be2d602dc0 | 102 | |
DavidEGrayson | 33:58a0ab6e9ad2 | 103 | |
DavidEGrayson | 30:84be2d602dc0 | 104 | void testSensorGlitches() |
DavidEGrayson | 29:cfcf08d8ac79 | 105 | { |
DavidEGrayson | 29:cfcf08d8ac79 | 106 | AnalogIn testInput(p18); |
DavidEGrayson | 29:cfcf08d8ac79 | 107 | Pacer reportPacer(1000000); |
DavidEGrayson | 29:cfcf08d8ac79 | 108 | uint32_t badCount = 0, goodCount = 0; |
DavidEGrayson | 30:84be2d602dc0 | 109 | pc.printf("hi\r\n"); |
DavidEGrayson | 30:84be2d602dc0 | 110 | |
DavidEGrayson | 30:84be2d602dc0 | 111 | //uint16_t riseCount = 0; |
DavidEGrayson | 30:84be2d602dc0 | 112 | uint16_t reading = 0xFF; |
DavidEGrayson | 30:84be2d602dc0 | 113 | |
DavidEGrayson | 29:cfcf08d8ac79 | 114 | while(1) |
DavidEGrayson | 29:cfcf08d8ac79 | 115 | { |
DavidEGrayson | 30:84be2d602dc0 | 116 | /** This digital filtering did not work |
DavidEGrayson | 30:84be2d602dc0 | 117 | { |
DavidEGrayson | 30:84be2d602dc0 | 118 | wait(0.01); |
DavidEGrayson | 30:84be2d602dc0 | 119 | uint16_t raw = testInput.read_u16(); |
DavidEGrayson | 30:84be2d602dc0 | 120 | if (raw < reading) |
DavidEGrayson | 30:84be2d602dc0 | 121 | { |
DavidEGrayson | 30:84be2d602dc0 | 122 | riseCount = 0; |
DavidEGrayson | 30:84be2d602dc0 | 123 | reading = raw; |
DavidEGrayson | 30:84be2d602dc0 | 124 | } |
DavidEGrayson | 30:84be2d602dc0 | 125 | else |
DavidEGrayson | 30:84be2d602dc0 | 126 | { |
DavidEGrayson | 30:84be2d602dc0 | 127 | riseCount++; |
DavidEGrayson | 30:84be2d602dc0 | 128 | if (riseCount == 10) |
DavidEGrayson | 30:84be2d602dc0 | 129 | { |
DavidEGrayson | 30:84be2d602dc0 | 130 | riseCount = 0; |
DavidEGrayson | 30:84be2d602dc0 | 131 | reading = raw; |
DavidEGrayson | 30:84be2d602dc0 | 132 | } |
DavidEGrayson | 30:84be2d602dc0 | 133 | } |
DavidEGrayson | 30:84be2d602dc0 | 134 | } |
DavidEGrayson | 30:84be2d602dc0 | 135 | **/ |
DavidEGrayson | 33:58a0ab6e9ad2 | 136 | |
DavidEGrayson | 33:58a0ab6e9ad2 | 137 | uint16_t values[LINE_SENSOR_COUNT]; |
DavidEGrayson | 33:58a0ab6e9ad2 | 138 | readSensors(values); |
DavidEGrayson | 33:58a0ab6e9ad2 | 139 | reading = values[0]; |
DavidEGrayson | 30:84be2d602dc0 | 140 | |
DavidEGrayson | 29:cfcf08d8ac79 | 141 | if(reading > 100) |
DavidEGrayson | 29:cfcf08d8ac79 | 142 | { |
DavidEGrayson | 29:cfcf08d8ac79 | 143 | badCount += 1; |
DavidEGrayson | 30:84be2d602dc0 | 144 | //pc.printf("f %5d %11d %11d\r\n", reading, badCount, goodCount); |
DavidEGrayson | 29:cfcf08d8ac79 | 145 | } |
DavidEGrayson | 29:cfcf08d8ac79 | 146 | else |
DavidEGrayson | 29:cfcf08d8ac79 | 147 | { |
DavidEGrayson | 30:84be2d602dc0 | 148 | goodCount += 1; |
DavidEGrayson | 29:cfcf08d8ac79 | 149 | } |
DavidEGrayson | 29:cfcf08d8ac79 | 150 | |
DavidEGrayson | 29:cfcf08d8ac79 | 151 | if (reportPacer.pace()) |
DavidEGrayson | 29:cfcf08d8ac79 | 152 | { |
DavidEGrayson | 30:84be2d602dc0 | 153 | pc.printf("h %5d %11d %11d\r\n", reading, badCount, goodCount); |
DavidEGrayson | 29:cfcf08d8ac79 | 154 | } |
DavidEGrayson | 29:cfcf08d8ac79 | 155 | } |
DavidEGrayson | 29:cfcf08d8ac79 | 156 | } |
DavidEGrayson | 29:cfcf08d8ac79 | 157 | |
DavidEGrayson | 28:4374035df5e0 | 158 | void testAnalog() |
DavidEGrayson | 28:4374035df5e0 | 159 | { |
DavidEGrayson | 28:4374035df5e0 | 160 | AnalogIn testInput(p18); |
DavidEGrayson | 28:4374035df5e0 | 161 | |
DavidEGrayson | 29:cfcf08d8ac79 | 162 | DigitalOut pin20(p20); |
DavidEGrayson | 29:cfcf08d8ac79 | 163 | DigitalOut pin19(p19); |
DavidEGrayson | 29:cfcf08d8ac79 | 164 | //DigitalOut pin18(p18); |
DavidEGrayson | 29:cfcf08d8ac79 | 165 | DigitalOut pin17(p17); |
DavidEGrayson | 29:cfcf08d8ac79 | 166 | DigitalOut pin16(p16); |
DavidEGrayson | 29:cfcf08d8ac79 | 167 | DigitalOut pin15(p15); |
DavidEGrayson | 29:cfcf08d8ac79 | 168 | |
DavidEGrayson | 29:cfcf08d8ac79 | 169 | pin20 = 0; |
DavidEGrayson | 29:cfcf08d8ac79 | 170 | pin19 = 0; |
DavidEGrayson | 29:cfcf08d8ac79 | 171 | //pin18 = 0; |
DavidEGrayson | 29:cfcf08d8ac79 | 172 | pin17 = 0; |
DavidEGrayson | 29:cfcf08d8ac79 | 173 | pin16 = 0; |
DavidEGrayson | 29:cfcf08d8ac79 | 174 | pin15 = 0; |
DavidEGrayson | 29:cfcf08d8ac79 | 175 | |
DavidEGrayson | 28:4374035df5e0 | 176 | uint32_t badCount = 0, goodCount = 0; |
DavidEGrayson | 28:4374035df5e0 | 177 | |
DavidEGrayson | 28:4374035df5e0 | 178 | Pacer reportPacer(1000000); |
DavidEGrayson | 28:4374035df5e0 | 179 | while(1) |
DavidEGrayson | 28:4374035df5e0 | 180 | { |
DavidEGrayson | 28:4374035df5e0 | 181 | uint16_t reading = testInput.read_u16(); |
DavidEGrayson | 28:4374035df5e0 | 182 | if(reading > 100) |
DavidEGrayson | 28:4374035df5e0 | 183 | { |
DavidEGrayson | 28:4374035df5e0 | 184 | badCount += 1; |
DavidEGrayson | 28:4374035df5e0 | 185 | pc.printf("%5d %11d %11d\r\n", reading, badCount, goodCount); |
DavidEGrayson | 28:4374035df5e0 | 186 | } |
DavidEGrayson | 28:4374035df5e0 | 187 | else |
DavidEGrayson | 28:4374035df5e0 | 188 | { |
DavidEGrayson | 28:4374035df5e0 | 189 | goodCount += 1; |
DavidEGrayson | 28:4374035df5e0 | 190 | } |
DavidEGrayson | 28:4374035df5e0 | 191 | |
DavidEGrayson | 28:4374035df5e0 | 192 | if (reportPacer.pace()) |
DavidEGrayson | 28:4374035df5e0 | 193 | { |
DavidEGrayson | 28:4374035df5e0 | 194 | pc.printf("Hello\r\n"); |
DavidEGrayson | 28:4374035df5e0 | 195 | } |
DavidEGrayson | 28:4374035df5e0 | 196 | } |
DavidEGrayson | 28:4374035df5e0 | 197 | } |
DavidEGrayson | 28:4374035df5e0 | 198 | |
DavidEGrayson | 28:4374035df5e0 | 199 | // This also tests the LineTracker by printing out a lot of data from it. |
DavidEGrayson | 28:4374035df5e0 | 200 | void testLineFollowing() |
DavidEGrayson | 28:4374035df5e0 | 201 | { |
DavidEGrayson | 28:4374035df5e0 | 202 | led1 = 1; |
DavidEGrayson | 28:4374035df5e0 | 203 | while(!button1DefinitelyPressed()) |
DavidEGrayson | 28:4374035df5e0 | 204 | { |
DavidEGrayson | 28:4374035df5e0 | 205 | updateReckonerFromEncoders(); |
DavidEGrayson | 28:4374035df5e0 | 206 | } |
DavidEGrayson | 28:4374035df5e0 | 207 | led2 = 1; |
DavidEGrayson | 28:4374035df5e0 | 208 | |
DavidEGrayson | 28:4374035df5e0 | 209 | Pacer reportPacer(200000); |
DavidEGrayson | 28:4374035df5e0 | 210 | |
DavidEGrayson | 28:4374035df5e0 | 211 | loadCalibration(); |
DavidEGrayson | 28:4374035df5e0 | 212 | uint16_t loopCount = 0; |
DavidEGrayson | 28:4374035df5e0 | 213 | while(1) |
DavidEGrayson | 28:4374035df5e0 | 214 | { |
DavidEGrayson | 28:4374035df5e0 | 215 | updateReckonerFromEncoders(); |
DavidEGrayson | 28:4374035df5e0 | 216 | bool lineVisiblePrevious = lineTracker.getLineVisible(); |
DavidEGrayson | 28:4374035df5e0 | 217 | lineTracker.read(); |
DavidEGrayson | 28:4374035df5e0 | 218 | updateMotorsToFollowLine(); |
DavidEGrayson | 28:4374035df5e0 | 219 | |
DavidEGrayson | 28:4374035df5e0 | 220 | loopCount += 1; |
DavidEGrayson | 28:4374035df5e0 | 221 | |
DavidEGrayson | 28:4374035df5e0 | 222 | if (lineVisiblePrevious != lineTracker.getLineVisible()) |
DavidEGrayson | 28:4374035df5e0 | 223 | { |
DavidEGrayson | 32:83a13b06093c | 224 | pc.printf("%5d ! %1d %4d | %5d %5d | %4d %4d %4d\r\n", |
DavidEGrayson | 28:4374035df5e0 | 225 | loopCount, lineTracker.getLineVisible(), lineTracker.getLinePosition(), |
DavidEGrayson | 32:83a13b06093c | 226 | motorLeftSpeed, motorRightSpeed, |
DavidEGrayson | 32:83a13b06093c | 227 | lineTracker.calibratedValues[0], lineTracker.calibratedValues[1], lineTracker.calibratedValues[2] |
DavidEGrayson | 28:4374035df5e0 | 228 | ); |
DavidEGrayson | 28:4374035df5e0 | 229 | } |
DavidEGrayson | 28:4374035df5e0 | 230 | |
DavidEGrayson | 28:4374035df5e0 | 231 | if (reportPacer.pace()) |
DavidEGrayson | 28:4374035df5e0 | 232 | { |
DavidEGrayson | 32:83a13b06093c | 233 | pc.printf("%5d %1d %4d | %5d %5d | %4d %4d %4d\r\n", |
DavidEGrayson | 32:83a13b06093c | 234 | loopCount, lineTracker.getLineVisible(), lineTracker.getLinePosition(), |
DavidEGrayson | 32:83a13b06093c | 235 | motorLeftSpeed, motorRightSpeed, |
DavidEGrayson | 28:4374035df5e0 | 236 | lineTracker.calibratedValues[0], lineTracker.calibratedValues[1], lineTracker.calibratedValues[2] |
DavidEGrayson | 28:4374035df5e0 | 237 | ); |
DavidEGrayson | 28:4374035df5e0 | 238 | } |
DavidEGrayson | 28:4374035df5e0 | 239 | } |
DavidEGrayson | 28:4374035df5e0 | 240 | } |
DavidEGrayson | 28:4374035df5e0 | 241 | |
DavidEGrayson | 17:2df9861f53ee | 242 | void testDriveHome() |
DavidEGrayson | 16:8eaa5bc2bdb1 | 243 | { |
DavidEGrayson | 17:2df9861f53ee | 244 | led1 = 1; |
DavidEGrayson | 18:b65fbb795396 | 245 | while(!button1DefinitelyPressed()) |
DavidEGrayson | 17:2df9861f53ee | 246 | { |
DavidEGrayson | 17:2df9861f53ee | 247 | updateReckonerFromEncoders(); |
DavidEGrayson | 21:c279c6a83671 | 248 | } |
DavidEGrayson | 33:58a0ab6e9ad2 | 249 | |
DavidEGrayson | 33:58a0ab6e9ad2 | 250 | setLeds(1, 0, 1, 0); |
DavidEGrayson | 21:c279c6a83671 | 251 | driveHomeAlmost(); |
DavidEGrayson | 33:58a0ab6e9ad2 | 252 | |
DavidEGrayson | 33:58a0ab6e9ad2 | 253 | //setLeds(0, 1, 1, 0); |
DavidEGrayson | 33:58a0ab6e9ad2 | 254 | //finalSettleIn(); |
DavidEGrayson | 33:58a0ab6e9ad2 | 255 | |
DavidEGrayson | 33:58a0ab6e9ad2 | 256 | setLeds(1, 1, 1, 1); |
DavidEGrayson | 20:dbec34f0e76b | 257 | infiniteReckonerReportLoop(); |
DavidEGrayson | 20:dbec34f0e76b | 258 | } |
DavidEGrayson | 20:dbec34f0e76b | 259 | |
DavidEGrayson | 20:dbec34f0e76b | 260 | void testFinalSettleIn() |
DavidEGrayson | 20:dbec34f0e76b | 261 | { |
DavidEGrayson | 20:dbec34f0e76b | 262 | led1 = 1; |
DavidEGrayson | 20:dbec34f0e76b | 263 | while(!button1DefinitelyPressed()) |
DavidEGrayson | 20:dbec34f0e76b | 264 | { |
DavidEGrayson | 20:dbec34f0e76b | 265 | updateReckonerFromEncoders(); |
DavidEGrayson | 20:dbec34f0e76b | 266 | } |
DavidEGrayson | 20:dbec34f0e76b | 267 | finalSettleIn(); |
DavidEGrayson | 20:dbec34f0e76b | 268 | infiniteReckonerReportLoop(); |
DavidEGrayson | 16:8eaa5bc2bdb1 | 269 | } |
DavidEGrayson | 16:8eaa5bc2bdb1 | 270 | |
DavidEGrayson | 17:2df9861f53ee | 271 | |
DavidEGrayson | 16:8eaa5bc2bdb1 | 272 | void testButtons() |
DavidEGrayson | 16:8eaa5bc2bdb1 | 273 | { |
DavidEGrayson | 16:8eaa5bc2bdb1 | 274 | led1 = 1; |
DavidEGrayson | 16:8eaa5bc2bdb1 | 275 | |
DavidEGrayson | 17:2df9861f53ee | 276 | while(!button1DefinitelyReleased()); |
DavidEGrayson | 17:2df9861f53ee | 277 | while(!button1DefinitelyPressed()); |
DavidEGrayson | 16:8eaa5bc2bdb1 | 278 | led2 = 1; |
DavidEGrayson | 16:8eaa5bc2bdb1 | 279 | |
DavidEGrayson | 16:8eaa5bc2bdb1 | 280 | while(!button1DefinitelyReleased()); |
DavidEGrayson | 16:8eaa5bc2bdb1 | 281 | while(!button1DefinitelyPressed()); |
DavidEGrayson | 16:8eaa5bc2bdb1 | 282 | led3 = 1; |
DavidEGrayson | 16:8eaa5bc2bdb1 | 283 | |
DavidEGrayson | 16:8eaa5bc2bdb1 | 284 | while(!button1DefinitelyReleased()); |
DavidEGrayson | 16:8eaa5bc2bdb1 | 285 | while(!button1DefinitelyPressed()); |
DavidEGrayson | 16:8eaa5bc2bdb1 | 286 | led4 = 1; |
DavidEGrayson | 16:8eaa5bc2bdb1 | 287 | |
DavidEGrayson | 16:8eaa5bc2bdb1 | 288 | while(1){}; |
DavidEGrayson | 16:8eaa5bc2bdb1 | 289 | } |
DavidEGrayson | 16:8eaa5bc2bdb1 | 290 | |
DavidEGrayson | 12:835a4d24ae3b | 291 | void testReckoner() |
DavidEGrayson | 12:835a4d24ae3b | 292 | { |
DavidEGrayson | 13:bba5b3abd13f | 293 | Pacer reportPacer(100000); |
DavidEGrayson | 12:835a4d24ae3b | 294 | while(1) |
DavidEGrayson | 12:835a4d24ae3b | 295 | { |
DavidEGrayson | 12:835a4d24ae3b | 296 | updateReckonerFromEncoders(); |
DavidEGrayson | 33:58a0ab6e9ad2 | 297 | |
DavidEGrayson | 33:58a0ab6e9ad2 | 298 | led1 = (reckoner.x > 0); |
DavidEGrayson | 33:58a0ab6e9ad2 | 299 | led2 = (reckoner.y > 0); |
DavidEGrayson | 33:58a0ab6e9ad2 | 300 | showOrientationWithLeds34(); |
DavidEGrayson | 12:835a4d24ae3b | 301 | |
DavidEGrayson | 13:bba5b3abd13f | 302 | if (reportPacer.pace()) |
DavidEGrayson | 13:bba5b3abd13f | 303 | { |
DavidEGrayson | 19:a11ffc903774 | 304 | pc.printf("%11d %11d %11d %11d | %8d %8d %10f\r\n", |
DavidEGrayson | 13:bba5b3abd13f | 305 | reckoner.cos, reckoner.sin, reckoner.x, reckoner.y, |
DavidEGrayson | 19:a11ffc903774 | 306 | encoderLeft.getCount(), encoderRight.getCount(), determinant()); |
DavidEGrayson | 13:bba5b3abd13f | 307 | } |
DavidEGrayson | 12:835a4d24ae3b | 308 | } |
DavidEGrayson | 12:835a4d24ae3b | 309 | } |
DavidEGrayson | 12:835a4d24ae3b | 310 | |
DavidEGrayson | 40:6fa672be85ec | 311 | void testTurnSensor() |
DavidEGrayson | 40:6fa672be85ec | 312 | { |
DavidEGrayson | 40:6fa672be85ec | 313 | pc.printf("Test turn sensor\r\n"); |
DavidEGrayson | 40:6fa672be85ec | 314 | Pacer reportPacer(200000); |
DavidEGrayson | 40:6fa672be85ec | 315 | TurnSensor turnSensor; |
DavidEGrayson | 40:6fa672be85ec | 316 | turnSensor.start(); |
DavidEGrayson | 40:6fa672be85ec | 317 | while(1) |
DavidEGrayson | 40:6fa672be85ec | 318 | { |
DavidEGrayson | 40:6fa672be85ec | 319 | turnSensor.update(); |
DavidEGrayson | 40:6fa672be85ec | 320 | if (reportPacer.pace()) |
DavidEGrayson | 40:6fa672be85ec | 321 | { |
DavidEGrayson | 40:6fa672be85ec | 322 | pc.printf("%d\r\n", turnSensor.getAngleDegrees()); |
DavidEGrayson | 40:6fa672be85ec | 323 | } |
DavidEGrayson | 40:6fa672be85ec | 324 | } |
DavidEGrayson | 40:6fa672be85ec | 325 | } |
DavidEGrayson | 40:6fa672be85ec | 326 | |
DavidEGrayson | 40:6fa672be85ec | 327 | void testL3g() |
DavidEGrayson | 40:6fa672be85ec | 328 | { |
DavidEGrayson | 40:6fa672be85ec | 329 | Pacer reportPacer(750000); |
DavidEGrayson | 40:6fa672be85ec | 330 | Timer timer; |
DavidEGrayson | 40:6fa672be85ec | 331 | timer.start(); |
DavidEGrayson | 40:6fa672be85ec | 332 | int32_t gz = 0; |
DavidEGrayson | 40:6fa672be85ec | 333 | bool reportedReading = false; |
DavidEGrayson | 40:6fa672be85ec | 334 | while(1) |
DavidEGrayson | 40:6fa672be85ec | 335 | { |
DavidEGrayson | 40:6fa672be85ec | 336 | int32_t result = l3gZAvailable(); |
DavidEGrayson | 40:6fa672be85ec | 337 | if (result == 1) |
DavidEGrayson | 40:6fa672be85ec | 338 | { |
DavidEGrayson | 40:6fa672be85ec | 339 | gz = l3gZRead(); |
DavidEGrayson | 40:6fa672be85ec | 340 | reportedReading = false; |
DavidEGrayson | 40:6fa672be85ec | 341 | if (gz > 100 || gz < -100) |
DavidEGrayson | 40:6fa672be85ec | 342 | { |
DavidEGrayson | 40:6fa672be85ec | 343 | pc.printf("%d, %d\r\n", timer.read_us(), gz); |
DavidEGrayson | 40:6fa672be85ec | 344 | reportedReading = true; |
DavidEGrayson | 40:6fa672be85ec | 345 | } |
DavidEGrayson | 40:6fa672be85ec | 346 | } |
DavidEGrayson | 40:6fa672be85ec | 347 | else if (result != 0) |
DavidEGrayson | 40:6fa672be85ec | 348 | { |
DavidEGrayson | 40:6fa672be85ec | 349 | pc.printf("l3gZAvailable error: %d\n", result); |
DavidEGrayson | 40:6fa672be85ec | 350 | } |
DavidEGrayson | 40:6fa672be85ec | 351 | |
DavidEGrayson | 40:6fa672be85ec | 352 | if (reportPacer.pace() && !reportedReading) |
DavidEGrayson | 40:6fa672be85ec | 353 | { |
DavidEGrayson | 40:6fa672be85ec | 354 | pc.printf("%d, %d\r\n", timer.read_us(), gz); |
DavidEGrayson | 40:6fa672be85ec | 355 | reportedReading = true; |
DavidEGrayson | 40:6fa672be85ec | 356 | } |
DavidEGrayson | 40:6fa672be85ec | 357 | } |
DavidEGrayson | 40:6fa672be85ec | 358 | } |
DavidEGrayson | 40:6fa672be85ec | 359 | |
DavidEGrayson | 10:e4dd36148539 | 360 | void testLineSensors() |
DavidEGrayson | 10:e4dd36148539 | 361 | { |
DavidEGrayson | 10:e4dd36148539 | 362 | led1 = 1; |
DavidEGrayson | 10:e4dd36148539 | 363 | Pacer reportPacer(100000); |
DavidEGrayson | 31:739b91331f31 | 364 | Pacer clearStatsPacer(2000000); |
DavidEGrayson | 31:739b91331f31 | 365 | |
DavidEGrayson | 31:739b91331f31 | 366 | uint16_t min[LINE_SENSOR_COUNT]; |
DavidEGrayson | 31:739b91331f31 | 367 | uint16_t max[LINE_SENSOR_COUNT]; |
DavidEGrayson | 31:739b91331f31 | 368 | |
DavidEGrayson | 10:e4dd36148539 | 369 | bool const printBarGraph = true; |
DavidEGrayson | 10:e4dd36148539 | 370 | while (1) |
DavidEGrayson | 10:e4dd36148539 | 371 | { |
DavidEGrayson | 31:739b91331f31 | 372 | if (clearStatsPacer.pace()) |
DavidEGrayson | 31:739b91331f31 | 373 | { |
DavidEGrayson | 31:739b91331f31 | 374 | for(uint8_t i = 0; i < LINE_SENSOR_COUNT; i++) |
DavidEGrayson | 31:739b91331f31 | 375 | { |
DavidEGrayson | 31:739b91331f31 | 376 | min[i] = 0xFFFF; |
DavidEGrayson | 31:739b91331f31 | 377 | max[i] = 0; |
DavidEGrayson | 31:739b91331f31 | 378 | } |
DavidEGrayson | 31:739b91331f31 | 379 | } |
DavidEGrayson | 31:739b91331f31 | 380 | |
DavidEGrayson | 31:739b91331f31 | 381 | //values[0] = lineSensorsAnalog[0].read_u16(); |
DavidEGrayson | 31:739b91331f31 | 382 | //values[1] = lineSensorsAnalog[1].read_u16(); |
DavidEGrayson | 31:739b91331f31 | 383 | //values[2] = lineSensorsAnalog[2].read_u16(); |
DavidEGrayson | 31:739b91331f31 | 384 | |
DavidEGrayson | 31:739b91331f31 | 385 | uint16_t values[3]; |
DavidEGrayson | 31:739b91331f31 | 386 | readSensors(values); |
DavidEGrayson | 31:739b91331f31 | 387 | |
DavidEGrayson | 31:739b91331f31 | 388 | for(uint8_t i = 0; i < LINE_SENSOR_COUNT; i++) |
DavidEGrayson | 31:739b91331f31 | 389 | { |
DavidEGrayson | 31:739b91331f31 | 390 | if (values[i] > max[i]){ max[i] = values[i]; } |
DavidEGrayson | 31:739b91331f31 | 391 | if (values[i] < min[i]){ min[i] = values[i]; } |
DavidEGrayson | 31:739b91331f31 | 392 | } |
DavidEGrayson | 31:739b91331f31 | 393 | |
DavidEGrayson | 10:e4dd36148539 | 394 | if (reportPacer.pace()) |
DavidEGrayson | 10:e4dd36148539 | 395 | { |
DavidEGrayson | 10:e4dd36148539 | 396 | if (printBarGraph) |
DavidEGrayson | 10:e4dd36148539 | 397 | { |
DavidEGrayson | 10:e4dd36148539 | 398 | pc.printf("\x1B[0;0H"); // VT100 command for "go to 0,0" |
DavidEGrayson | 31:739b91331f31 | 399 | printBar("L", values[0]); |
DavidEGrayson | 31:739b91331f31 | 400 | printBar("M", values[1]); |
DavidEGrayson | 31:739b91331f31 | 401 | printBar("R", values[2]); |
DavidEGrayson | 31:739b91331f31 | 402 | pc.printf("%4d %4d \r\n", min[0], max[0]); |
DavidEGrayson | 31:739b91331f31 | 403 | pc.printf("%4d %4d \r\n", min[1], max[1]); |
DavidEGrayson | 31:739b91331f31 | 404 | pc.printf("%4d %4d \r\n", min[2], max[2]); |
DavidEGrayson | 10:e4dd36148539 | 405 | } |
DavidEGrayson | 10:e4dd36148539 | 406 | else |
DavidEGrayson | 10:e4dd36148539 | 407 | { |
DavidEGrayson | 31:739b91331f31 | 408 | pc.printf("%8d %8d %8d\r\n", values[0], values[1], values[2]); |
DavidEGrayson | 10:e4dd36148539 | 409 | } |
DavidEGrayson | 10:e4dd36148539 | 410 | } |
DavidEGrayson | 10:e4dd36148539 | 411 | } |
DavidEGrayson | 10:e4dd36148539 | 412 | } |
DavidEGrayson | 8:78b1ff957cba | 413 | |
DavidEGrayson | 24:fc01d9125d3b | 414 | // Values from David's office Values from dev lab, |
DavidEGrayson | 24:fc01d9125d3b | 415 | // in the day time, 2014-02-27: 2014-02-27: |
DavidEGrayson | 22:44c032e59ff5 | 416 | // # calmin calmax |
DavidEGrayson | 24:fc01d9125d3b | 417 | // 0 34872 59726 0 40617 60222 |
DavidEGrayson | 24:fc01d9125d3b | 418 | // 1 29335 60110 1 36937 61198 |
DavidEGrayson | 24:fc01d9125d3b | 419 | // 2 23845 58446 2 33848 58862 |
DavidEGrayson | 22:44c032e59ff5 | 420 | void testCalibrate() |
DavidEGrayson | 22:44c032e59ff5 | 421 | { |
DavidEGrayson | 22:44c032e59ff5 | 422 | Timer timer; |
DavidEGrayson | 22:44c032e59ff5 | 423 | timer.start(); |
DavidEGrayson | 22:44c032e59ff5 | 424 | |
DavidEGrayson | 22:44c032e59ff5 | 425 | Pacer reportPacer(200000); |
DavidEGrayson | 22:44c032e59ff5 | 426 | |
DavidEGrayson | 24:fc01d9125d3b | 427 | bool doneCalibrating = false; |
DavidEGrayson | 24:fc01d9125d3b | 428 | |
DavidEGrayson | 24:fc01d9125d3b | 429 | led1 = 1; |
DavidEGrayson | 24:fc01d9125d3b | 430 | |
DavidEGrayson | 22:44c032e59ff5 | 431 | while(1) |
DavidEGrayson | 22:44c032e59ff5 | 432 | { |
DavidEGrayson | 22:44c032e59ff5 | 433 | lineTracker.read(); |
DavidEGrayson | 24:fc01d9125d3b | 434 | if(!doneCalibrating) |
DavidEGrayson | 24:fc01d9125d3b | 435 | { |
DavidEGrayson | 24:fc01d9125d3b | 436 | lineTracker.updateCalibration(); |
DavidEGrayson | 24:fc01d9125d3b | 437 | } |
DavidEGrayson | 24:fc01d9125d3b | 438 | |
DavidEGrayson | 24:fc01d9125d3b | 439 | led3 = doneCalibrating; |
DavidEGrayson | 24:fc01d9125d3b | 440 | led4 = lineTracker.getLineVisible(); |
DavidEGrayson | 24:fc01d9125d3b | 441 | |
DavidEGrayson | 24:fc01d9125d3b | 442 | if (button1DefinitelyPressed()) |
DavidEGrayson | 24:fc01d9125d3b | 443 | { |
DavidEGrayson | 24:fc01d9125d3b | 444 | doneCalibrating = true; |
DavidEGrayson | 24:fc01d9125d3b | 445 | } |
DavidEGrayson | 22:44c032e59ff5 | 446 | |
DavidEGrayson | 22:44c032e59ff5 | 447 | if (reportPacer.pace()) |
DavidEGrayson | 22:44c032e59ff5 | 448 | { |
DavidEGrayson | 22:44c032e59ff5 | 449 | pc.printf("\x1B[0;0H"); // VT100 command for "go to 0,0" |
DavidEGrayson | 22:44c032e59ff5 | 450 | for(uint8_t s = 0; s < LINE_SENSOR_COUNT; s++) |
DavidEGrayson | 22:44c032e59ff5 | 451 | { |
DavidEGrayson | 22:44c032e59ff5 | 452 | pc.printf("%-2d %5d %5d %5d\r\n", s, lineTracker.calibratedMinimum[s], lineTracker.rawValues[s], lineTracker.calibratedMaximum[s]); |
DavidEGrayson | 22:44c032e59ff5 | 453 | } |
DavidEGrayson | 22:44c032e59ff5 | 454 | } |
DavidEGrayson | 22:44c032e59ff5 | 455 | } |
DavidEGrayson | 22:44c032e59ff5 | 456 | } |
DavidEGrayson | 22:44c032e59ff5 | 457 | |
DavidEGrayson | 39:b19dfc5d4d4b | 458 | void testMotorSpeed() |
DavidEGrayson | 39:b19dfc5d4d4b | 459 | { |
DavidEGrayson | 39:b19dfc5d4d4b | 460 | led1 = 1; |
DavidEGrayson | 39:b19dfc5d4d4b | 461 | motorsSpeedSet(400, 400); |
DavidEGrayson | 39:b19dfc5d4d4b | 462 | wait_ms(4000); |
DavidEGrayson | 39:b19dfc5d4d4b | 463 | uint32_t left = encoderLeft.getCount(); |
DavidEGrayson | 39:b19dfc5d4d4b | 464 | uint32_t right = encoderRight.getCount(); |
DavidEGrayson | 39:b19dfc5d4d4b | 465 | motorsSpeedSet(0, 0); |
DavidEGrayson | 39:b19dfc5d4d4b | 466 | Pacer reportPacer(500000); |
DavidEGrayson | 39:b19dfc5d4d4b | 467 | while (1) |
DavidEGrayson | 39:b19dfc5d4d4b | 468 | { |
DavidEGrayson | 39:b19dfc5d4d4b | 469 | if (reportPacer.pace()) |
DavidEGrayson | 39:b19dfc5d4d4b | 470 | { |
DavidEGrayson | 39:b19dfc5d4d4b | 471 | led2 = 1; |
DavidEGrayson | 39:b19dfc5d4d4b | 472 | pc.printf("%8d %8d\r\n", left, right); |
DavidEGrayson | 39:b19dfc5d4d4b | 473 | led2 = 0; |
DavidEGrayson | 39:b19dfc5d4d4b | 474 | } |
DavidEGrayson | 39:b19dfc5d4d4b | 475 | } |
DavidEGrayson | 39:b19dfc5d4d4b | 476 | } |
DavidEGrayson | 39:b19dfc5d4d4b | 477 | |
DavidEGrayson | 9:9734347b5756 | 478 | void testEncoders() |
DavidEGrayson | 9:9734347b5756 | 479 | { |
DavidEGrayson | 9:9734347b5756 | 480 | Pacer reportPacer(500000); |
DavidEGrayson | 10:e4dd36148539 | 481 | led1 = 1; |
DavidEGrayson | 9:9734347b5756 | 482 | while(1) |
DavidEGrayson | 9:9734347b5756 | 483 | { |
DavidEGrayson | 9:9734347b5756 | 484 | while(encoderBuffer.hasEvents()) |
DavidEGrayson | 9:9734347b5756 | 485 | { |
DavidEGrayson | 9:9734347b5756 | 486 | PololuEncoderEvent event = encoderBuffer.readEvent(); |
DavidEGrayson | 9:9734347b5756 | 487 | } |
DavidEGrayson | 9:9734347b5756 | 488 | |
DavidEGrayson | 9:9734347b5756 | 489 | if(reportPacer.pace()) |
DavidEGrayson | 9:9734347b5756 | 490 | { |
DavidEGrayson | 9:9734347b5756 | 491 | led2 = 1; |
DavidEGrayson | 31:739b91331f31 | 492 | pc.printf("%8d %8d\r\n", encoderLeft.getCount(), encoderRight.getCount()); |
DavidEGrayson | 9:9734347b5756 | 493 | led2 = 0; |
DavidEGrayson | 10:e4dd36148539 | 494 | } |
DavidEGrayson | 9:9734347b5756 | 495 | } |
DavidEGrayson | 9:9734347b5756 | 496 | } |
DavidEGrayson | 9:9734347b5756 | 497 | |
DavidEGrayson | 8:78b1ff957cba | 498 | void testMotors() |
DavidEGrayson | 8:78b1ff957cba | 499 | { |
DavidEGrayson | 8:78b1ff957cba | 500 | led1 = 1; |
DavidEGrayson | 8:78b1ff957cba | 501 | led2 = 0; |
DavidEGrayson | 8:78b1ff957cba | 502 | led3 = 0; |
DavidEGrayson | 8:78b1ff957cba | 503 | while(1) |
DavidEGrayson | 8:78b1ff957cba | 504 | { |
DavidEGrayson | 9:9734347b5756 | 505 | motorsSpeedSet(0, 0); |
DavidEGrayson | 8:78b1ff957cba | 506 | led2 = 0; |
DavidEGrayson | 8:78b1ff957cba | 507 | led3 = 0; |
DavidEGrayson | 8:78b1ff957cba | 508 | wait(2); |
DavidEGrayson | 8:78b1ff957cba | 509 | |
DavidEGrayson | 9:9734347b5756 | 510 | motorsSpeedSet(300, 300); |
DavidEGrayson | 8:78b1ff957cba | 511 | wait(2); |
DavidEGrayson | 8:78b1ff957cba | 512 | |
DavidEGrayson | 9:9734347b5756 | 513 | motorsSpeedSet(-300, 300); |
DavidEGrayson | 8:78b1ff957cba | 514 | wait(2); |
DavidEGrayson | 8:78b1ff957cba | 515 | |
DavidEGrayson | 9:9734347b5756 | 516 | motorsSpeedSet(0, 0); |
DavidEGrayson | 8:78b1ff957cba | 517 | led2 = 1; |
DavidEGrayson | 8:78b1ff957cba | 518 | wait(2); |
DavidEGrayson | 8:78b1ff957cba | 519 | |
DavidEGrayson | 9:9734347b5756 | 520 | motorsSpeedSet(600, 600); |
DavidEGrayson | 8:78b1ff957cba | 521 | wait(2); |
DavidEGrayson | 8:78b1ff957cba | 522 | |
DavidEGrayson | 9:9734347b5756 | 523 | motorsSpeedSet(0, 0); |
DavidEGrayson | 8:78b1ff957cba | 524 | led3 = 1; |
DavidEGrayson | 8:78b1ff957cba | 525 | wait(2); |
DavidEGrayson | 8:78b1ff957cba | 526 | |
DavidEGrayson | 9:9734347b5756 | 527 | motorsSpeedSet(1200, 1200); |
DavidEGrayson | 8:78b1ff957cba | 528 | wait(2); |
DavidEGrayson | 8:78b1ff957cba | 529 | } |
DavidEGrayson | 10:e4dd36148539 | 530 | } |
DavidEGrayson | 10:e4dd36148539 | 531 | |
DavidEGrayson | 20:dbec34f0e76b | 532 | void infiniteReckonerReportLoop() |
DavidEGrayson | 20:dbec34f0e76b | 533 | { |
DavidEGrayson | 20:dbec34f0e76b | 534 | Pacer reportPacer(200000); |
DavidEGrayson | 20:dbec34f0e76b | 535 | while(1) |
DavidEGrayson | 20:dbec34f0e76b | 536 | { |
DavidEGrayson | 33:58a0ab6e9ad2 | 537 | showOrientationWithLeds34(); |
DavidEGrayson | 20:dbec34f0e76b | 538 | if(reportPacer.pace()) |
DavidEGrayson | 20:dbec34f0e76b | 539 | { |
DavidEGrayson | 20:dbec34f0e76b | 540 | pc.printf("%11d %11d %11d %11d | %11f %11f\r\n", |
DavidEGrayson | 20:dbec34f0e76b | 541 | reckoner.cos, reckoner.sin, reckoner.x, reckoner.y, |
DavidEGrayson | 20:dbec34f0e76b | 542 | determinant(), dotProduct()); |
DavidEGrayson | 20:dbec34f0e76b | 543 | } |
DavidEGrayson | 20:dbec34f0e76b | 544 | } |
DavidEGrayson | 20:dbec34f0e76b | 545 | } |
DavidEGrayson | 20:dbec34f0e76b | 546 | |
DavidEGrayson | 31:739b91331f31 | 547 | // with should be between 0 and 63 |
DavidEGrayson | 31:739b91331f31 | 548 | void printBar(const char * name, uint16_t result) |
DavidEGrayson | 10:e4dd36148539 | 549 | { |
DavidEGrayson | 31:739b91331f31 | 550 | pc.printf("%-2s %5d |", name, result); |
DavidEGrayson | 31:739b91331f31 | 551 | uint16_t width = result >> 4; |
DavidEGrayson | 31:739b91331f31 | 552 | if (width > 63) { width = 63; } |
DavidEGrayson | 10:e4dd36148539 | 553 | uint8_t i; |
DavidEGrayson | 10:e4dd36148539 | 554 | for(i = 0; i < width; i++){ pc.putc('#'); } |
DavidEGrayson | 10:e4dd36148539 | 555 | for(; i < 63; i++){ pc.putc(' '); } |
DavidEGrayson | 10:e4dd36148539 | 556 | pc.putc('|'); |
DavidEGrayson | 31:739b91331f31 | 557 | pc.putc('\r'); |
DavidEGrayson | 10:e4dd36148539 | 558 | pc.putc('\n'); |
DavidEGrayson | 8:78b1ff957cba | 559 | } |