Skip to content

Commit 7d5eae1

Browse files
committed
Moved Wire api functions that do just type cast from .cpp file to .h
file.
1 parent cb707b8 commit 7d5eae1

File tree

2 files changed

+17
-29
lines changed

2 files changed

+17
-29
lines changed

Diff for: libraries/Wire/src/Wire.cpp

-24
Original file line numberDiff line numberDiff line change
@@ -165,25 +165,6 @@ uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint32_t iaddres
165165
return read;
166166
}
167167

168-
uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint8_t sendStop) {
169-
return requestFrom((uint8_t)address, (uint8_t)quantity, (uint32_t)0, (uint8_t)0, (uint8_t)sendStop);
170-
}
171-
172-
uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity)
173-
{
174-
return requestFrom((uint8_t)address, (uint8_t)quantity, (uint8_t)true);
175-
}
176-
177-
uint8_t TwoWire::requestFrom(int address, int quantity)
178-
{
179-
return requestFrom((uint8_t)address, (uint8_t)quantity, (uint8_t)true);
180-
}
181-
182-
uint8_t TwoWire::requestFrom(int address, int quantity, int sendStop)
183-
{
184-
return requestFrom((uint8_t)address, (uint8_t)quantity, (uint8_t)sendStop);
185-
}
186-
187168
void TwoWire::beginTransmission(uint8_t address)
188169
{
189170
// indicate that we are transmitting
@@ -195,11 +176,6 @@ void TwoWire::beginTransmission(uint8_t address)
195176
txBufferLength = 0;
196177
}
197178

198-
void TwoWire::beginTransmission(int address)
199-
{
200-
beginTransmission((uint8_t)address);
201-
}
202-
203179
//
204180
// Originally, 'endTransmission' was an f(void) function.
205181
// It has been modified to take one parameter indicating

Diff for: libraries/Wire/src/Wire.h

+17-5
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,26 @@ class TwoWire : public Stream
5757
bool getWireTimeoutFlag(void);
5858
void clearWireTimeoutFlag(void);
5959
void beginTransmission(uint8_t);
60-
void beginTransmission(int);
60+
void beginTransmission(int address) {beginTransmission((uint8_t) (address));}
6161
uint8_t endTransmission(void);
6262
uint8_t endTransmission(uint8_t);
63-
uint8_t requestFrom(uint8_t, uint8_t);
64-
uint8_t requestFrom(uint8_t, uint8_t, uint8_t);
6563
uint8_t requestFrom(uint8_t, uint8_t, uint32_t, uint8_t, uint8_t);
66-
uint8_t requestFrom(int, int);
67-
uint8_t requestFrom(int, int, int);
64+
uint8_t requestFrom(uint8_t address, uint8_t quantity) {
65+
return requestFrom((uint8_t) (address), (uint8_t) (quantity),
66+
(uint8_t) (true));
67+
}
68+
uint8_t requestFrom(uint8_t address, uint8_t quantity, uint8_t sendStop) {
69+
return requestFrom((uint8_t) (address), (uint8_t) (quantity),
70+
(uint32_t) (0), (uint8_t) (0), (uint8_t) (sendStop));
71+
}
72+
uint8_t requestFrom(int address, int quantity) {
73+
return requestFrom((uint8_t) (address), (uint8_t) (quantity),
74+
(uint8_t) (true));
75+
}
76+
uint8_t requestFrom(int address, int quantity, int sendStop) {
77+
return requestFrom((uint8_t) (address), (uint8_t) (quantity),
78+
(uint8_t) (sendStop));
79+
}
6880
virtual size_t write(uint8_t);
6981
virtual size_t write(const uint8_t *, size_t);
7082
virtual int available(void);

0 commit comments

Comments
 (0)