Skip to content

Commit 2821146

Browse files
committed
Removed requestFrom() overload to reduce ambiguity. Added wire test comments.
1 parent d6c3bb8 commit 2821146

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

SampleProjects/TestSomething/test/wire.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ unittest(begin_write_end) {
77
deque<uint8_t>* mosi = Wire.getMosi(14);
88
assertEqual(0, mosi->size());
99
Wire.begin();
10+
// write some random values to random slave
1011
Wire.beginTransmission(14);
1112
Wire.write(0x07);
1213
Wire.write(0x0E);
1314
Wire.endTransmission();
15+
// check values
1416
assertEqual(2, mosi->size());
1517
assertEqual(0x07, mosi->front());
1618
mosi->pop_front();
@@ -22,6 +24,7 @@ unittest(begin_write_end) {
2224
unittest(readTwo_writeOne) {
2325
Wire.begin();
2426
deque<uint8_t>* miso;
27+
// place some values on random slaves' read buffers
2528
miso = Wire.getMiso(19);
2629
miso->push_back(0x07);
2730
miso->push_back(0x0E);
@@ -46,11 +49,13 @@ unittest(readTwo_writeOne) {
4649
assertEqual(7, Wire.read());
4750
assertEqual(0, Wire.available());
4851

52+
// write some values to different random slave
4953
Wire.beginTransmission(47);
5054
for (int i = 1; i < 4; i++) {
5155
Wire.write(i * 2);
5256
}
5357
Wire.endTransmission();
58+
// check master write buffer
5459
deque<uint8_t>* mosi = Wire.getMosi(47);
5560

5661
assertEqual(3, mosi->size());

cpp/arduino/Wire.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,8 @@ class TwoWire : public ObservableDataStream {
131131
return 0;
132132
}
133133
}
134-
uint8_t requestFrom(uint8_t address, size_t quantity) {
135-
return requestFrom(address, quantity, true);
136-
}
137134
uint8_t requestFrom(int address, int quantity) {
138-
return requestFrom((uint8_t)address, (size_t)quantity);
135+
return requestFrom((uint8_t)address, (size_t)quantity, true);
139136
}
140137
uint8_t requestFrom(int address, int quantity, int stop) {
141138
return requestFrom((uint8_t)address, (size_t)quantity, (bool)stop);

0 commit comments

Comments
 (0)