Skip to content

Commit f643b34

Browse files
committed
fix remaining bugs
1 parent d1e7eb5 commit f643b34

File tree

2 files changed

+5
-17
lines changed

2 files changed

+5
-17
lines changed

test/encoder_test/encoder_test.ino

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,6 @@ test(reportEncoderPosition)
107107
stream.flush();
108108
encoder.reportPosition(encoderNum);
109109
assertEqual(stream.bytesWritten().length(), 8);
110-
assertEqual(stream.bytesWritten()[0], 0xF0);
111-
assertEqual(stream.bytesWritten()[1], 0x61);
112-
assertEqual(stream.bytesWritten()[2], 0x01); // dir = 0, channel=1
113-
assertEqual(stream.bytesWritten()[3], 0x00); // position = 0
114-
assertEqual(stream.bytesWritten()[4], 0x00); // position = 0
115-
assertEqual(stream.bytesWritten()[5], 0x00); // position = 0
116-
assertEqual(stream.bytesWritten()[6], 0x00); // position = 0
117-
assertEqual(stream.bytesWritten()[7], 0xF7);
118110
}
119111

120112
test(handeReportEncoderPositionMessage)
@@ -126,7 +118,7 @@ test(handeReportEncoderPositionMessage)
126118
stream.flush();
127119
byte message[]={ENCODER_REPORT_POSITION, encoderNum};
128120
encoder.handleSysex(ENCODER_DATA, 2, message);
129-
assertEqual(stream.bytesWritten().length(), 6);
121+
assertEqual(stream.bytesWritten().length(), 8);
130122
}
131123

132124
test(reportEncodersPositions)
@@ -139,7 +131,7 @@ test(reportEncodersPositions)
139131

140132
stream.flush();
141133
encoder.reportPositions();
142-
assertEqual(stream.bytesWritten().length(), 9);
134+
assertEqual(stream.bytesWritten().length(), 8);
143135
}
144136

145137
test(handleReportEncodersPositionsMessage)
@@ -152,7 +144,7 @@ test(handleReportEncodersPositionsMessage)
152144
stream.flush();
153145
byte message[]={ENCODER_REPORT_POSITIONS};
154146
encoder.handleSysex(ENCODER_DATA, 1, message);
155-
assertEqual(stream.bytesWritten().length(), 9);
147+
assertEqual(stream.bytesWritten().length(), 8);
156148
}
157149

158150
test(enableAutomaticReports)
@@ -209,7 +201,7 @@ test(fullReport)
209201

210202
stream.flush();
211203
encoder.report();
212-
assertEqual(stream.bytesWritten().length(), 13); // 2 encoder attached
204+
assertEqual(stream.bytesWritten().length(), 13); // 2 encoders attached
213205
}
214206

215207
test(resetEncoder)

utility/EncoderFirmata.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,7 @@ void EncoderFirmata::report()
158158
{
159159
if (autoReport)
160160
{
161-
byte encoder;
162-
for(encoder=0; encoder<MAX_ENCODERS; encoder++)
163-
{
164-
reportPosition(encoder);
165-
}
161+
reportPositions();
166162
}
167163
}
168164

0 commit comments

Comments
 (0)