|
41 | 41 | // |
42 | 42 | int MATCH (int measured, int desired) |
43 | 43 | { |
44 | | - DBG_PRINT("Testing: "); |
| 44 | + DBG_PRINT(F("Testing: ")); |
45 | 45 | DBG_PRINT(TICKS_LOW(desired), DEC); |
46 | | - DBG_PRINT(" <= "); |
| 46 | + DBG_PRINT(F(" <= ")); |
47 | 47 | DBG_PRINT(measured, DEC); |
48 | | - DBG_PRINT(" <= "); |
49 | | - DBG_PRINTLN(TICKS_HIGH(desired), DEC); |
| 48 | + DBG_PRINT(F(" <= ")); |
| 49 | + DBG_PRINT(TICKS_HIGH(desired), DEC); |
50 | 50 |
|
51 | | - return ((measured >= TICKS_LOW(desired)) && (measured <= TICKS_HIGH(desired))); |
| 51 | + bool passed = ((measured >= TICKS_LOW(desired)) && (measured <= TICKS_HIGH(desired))); |
| 52 | + if (passed) |
| 53 | + DBG_PRINTLN(F("?; passed")); |
| 54 | + else |
| 55 | + DBG_PRINTLN(F("?; FAILED")); |
| 56 | + return passed; |
52 | 57 | } |
53 | 58 |
|
54 | 59 | //+======================================================== |
55 | 60 | // Due to sensor lag, when received, Marks tend to be 100us too long |
56 | 61 | // |
57 | 62 | int MATCH_MARK (int measured_ticks, int desired_us) |
58 | 63 | { |
59 | | - DBG_PRINT("Testing mark "); |
| 64 | + DBG_PRINT(F("Testing mark (actual vs desired): ")); |
60 | 65 | DBG_PRINT(measured_ticks * USECPERTICK, DEC); |
61 | | - DBG_PRINT(" vs "); |
| 66 | + DBG_PRINT(F("us vs ")); |
62 | 67 | DBG_PRINT(desired_us, DEC); |
| 68 | + DBG_PRINT("us"); |
63 | 69 | DBG_PRINT(": "); |
64 | | - DBG_PRINT(TICKS_LOW(desired_us + MARK_EXCESS), DEC); |
65 | | - DBG_PRINT(" <= "); |
66 | | - DBG_PRINT(measured_ticks, DEC); |
67 | | - DBG_PRINT(" <= "); |
68 | | - DBG_PRINTLN(TICKS_HIGH(desired_us + MARK_EXCESS), DEC); |
| 70 | + DBG_PRINT(TICKS_LOW(desired_us + MARK_EXCESS) * USECPERTICK, DEC); |
| 71 | + DBG_PRINT(F(" <= ")); |
| 72 | + DBG_PRINT(measured_ticks * USECPERTICK, DEC); |
| 73 | + DBG_PRINT(F(" <= ")); |
| 74 | + DBG_PRINT(TICKS_HIGH(desired_us + MARK_EXCESS) * USECPERTICK, DEC); |
69 | 75 |
|
70 | | - return ((measured_ticks >= TICKS_LOW (desired_us + MARK_EXCESS)) |
71 | | - && (measured_ticks <= TICKS_HIGH(desired_us + MARK_EXCESS))); |
| 76 | + bool passed = ((measured_ticks >= TICKS_LOW (desired_us + MARK_EXCESS)) |
| 77 | + && (measured_ticks <= TICKS_HIGH(desired_us + MARK_EXCESS))); |
| 78 | + if (passed) |
| 79 | + DBG_PRINTLN(F("?; passed")); |
| 80 | + else |
| 81 | + DBG_PRINTLN(F("?; FAILED")); |
| 82 | + return passed; |
72 | 83 | } |
73 | 84 |
|
74 | 85 | //+======================================================== |
75 | 86 | // Due to sensor lag, when received, Spaces tend to be 100us too short |
76 | 87 | // |
77 | 88 | int MATCH_SPACE (int measured_ticks, int desired_us) |
78 | 89 | { |
79 | | - DBG_PRINT("Testing space "); |
| 90 | + DBG_PRINT(F("Testing space (actual vs desired): ")); |
80 | 91 | DBG_PRINT(measured_ticks * USECPERTICK, DEC); |
81 | | - DBG_PRINT(" vs "); |
| 92 | + DBG_PRINT(F("us vs ")); |
82 | 93 | DBG_PRINT(desired_us, DEC); |
| 94 | + DBG_PRINT("us"); |
83 | 95 | DBG_PRINT(": "); |
84 | | - DBG_PRINT(TICKS_LOW(desired_us - MARK_EXCESS), DEC); |
85 | | - DBG_PRINT(" <= "); |
86 | | - DBG_PRINT(measured_ticks, DEC); |
87 | | - DBG_PRINT(" <= "); |
88 | | - DBG_PRINTLN(TICKS_HIGH(desired_us - MARK_EXCESS), DEC); |
| 96 | + DBG_PRINT(TICKS_LOW(desired_us - MARK_EXCESS) * USECPERTICK, DEC); |
| 97 | + DBG_PRINT(F(" <= ")); |
| 98 | + DBG_PRINT(measured_ticks * USECPERTICK, DEC); |
| 99 | + DBG_PRINT(F(" <= ")); |
| 100 | + DBG_PRINT(TICKS_HIGH(desired_us - MARK_EXCESS) * USECPERTICK, DEC); |
89 | 101 |
|
90 | | - return ((measured_ticks >= TICKS_LOW (desired_us - MARK_EXCESS)) |
91 | | - && (measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS))); |
| 102 | + bool passed = ((measured_ticks >= TICKS_LOW (desired_us - MARK_EXCESS)) |
| 103 | + && (measured_ticks <= TICKS_HIGH(desired_us - MARK_EXCESS))); |
| 104 | + if (passed) |
| 105 | + DBG_PRINTLN(F("?; passed")); |
| 106 | + else |
| 107 | + DBG_PRINTLN(F("?; FAILED")); |
| 108 | + return passed; |
92 | 109 | } |
93 | 110 |
|
94 | 111 | //+============================================================================= |
|
0 commit comments