Skip to content

Commit 94a2df0

Browse files
committed
Fix compilation errors in busIO code
1 parent fe4c689 commit 94a2df0

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

SampleProjects/BusIO/src/BusIO.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ class BusIO {
66
BusIO() {}
77
~BusIO() {}
88
int answer() { return 42; }
9-
}
9+
};

SampleProjects/BusIO/test/test.cpp renamed to SampleProjects/BusIO/test/busio.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ bundle exec arduino_ci.rb --skip-examples-compilation
88
#include <ArduinoUnitTests.h>
99
#include <BusIO.h>
1010

11-
unittest(loop) {
11+
unittest(busio_answer) {
1212
// token test
1313
BusIO busIO;
14-
assertEqual(42, busIO.answer()));
14+
assertEqual(42, busIO.answer());
1515
}
1616

1717
unittest_main()

cpp/arduino/Wire.h

+12-3
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class TwoWire : public ObservableDataStream {
116116
// https://www.arduino.cc/en/Reference/WireRequestFrom
117117
// Used by the master to request bytes from a slave device. The bytes may then
118118
// be retrieved with the available() and read() functions.
119-
uint8_t requestFrom(uint8_t address, size_t quantity, bool stop) {
119+
uint8_t requestFrom(uint8_t address, uint8_t quantity, uint32_t _iaddress, uint8_t _isize, uint8_t stop) {
120120
assert(_didBegin);
121121
assert(address > 0 && address < SLAVE_COUNT);
122122
assert(quantity <= BUFFER_LENGTH);
@@ -131,11 +131,20 @@ class TwoWire : public ObservableDataStream {
131131
return 0;
132132
}
133133
}
134+
135+
uint8_t requestFrom(uint8_t address, uint8_t quantity, uint8_t stop) {
136+
return requestFrom((uint8_t)address, (uint8_t)quantity, (uint32_t)0, (uint8_t)0, (uint8_t)stop);
137+
}
138+
139+
uint8_t requestFrom(uint8_t address, uint8_t quantity) {
140+
return requestFrom((uint8_t)address, (uint8_t)quantity, (uint8_t)true);
141+
}
142+
134143
uint8_t requestFrom(int address, int quantity) {
135-
return requestFrom((uint8_t)address, (size_t)quantity, true);
144+
return requestFrom((uint8_t)address, (uint8_t)quantity, (uint8_t)true);
136145
}
137146
uint8_t requestFrom(int address, int quantity, int stop) {
138-
return requestFrom((uint8_t)address, (size_t)quantity, (bool)stop);
147+
return requestFrom((uint8_t)address, (uint8_t)quantity, (uint8_t)stop);
139148
}
140149

141150
// https://www.arduino.cc/en/Reference/WireWrite

0 commit comments

Comments
 (0)