Skip to content

Commit 68749d4

Browse files
committed
quick fix for the toolkit UART compile/builds issues on some platforms
1 parent 84f7333 commit 68749d4

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

library.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=SparkFun Toolkit
2-
version=1.1.0
2+
version=1.1.1
33
author=SparkFun Electronics
44
maintainer=SparkFun Electronics
55
sentence=A utility library that other SparkFun libraries can take advantage of.

src/sfTkArdUART.cpp

+14-5
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,21 @@ sfTkError_t sfTkArdUART::init(HardwareSerial &hwSerial, uint32_t baudRate, bool
4848

4949
sfTkError_t sfTkArdUART::init(uint32_t baudRate, bool bInit)
5050
{
51+
#ifdef _THIS__NOT_IS_BROKEN
5152
// if we don't have a port already, use the default Arduino Serial.
5253
if (!_hwSerial)
5354
return init(Serial, baudRate, bInit);
5455

5556
// We already have a UART setup, so it's already initialized. Change the baud rate.
5657
return setBaudRate(baudRate); // set the baud rate
58+
#else
59+
return ksfTkErrFail;
60+
#endif
5761
}
5862

5963
sfTkError_t sfTkArdUART::init(sfTkIUART::UARTConfig_t config, bool bInit)
6064
{
65+
#ifdef _THIS__NOT_IS_BROKEN
6166
// if we don't have a port already, use the default Arduino Serial.
6267
if (!_hwSerial)
6368
return init(Serial, config, bInit);
@@ -67,6 +72,9 @@ sfTkError_t sfTkArdUART::init(sfTkIUART::UARTConfig_t config, bool bInit)
6772

6873
// We already have a UART setup, so it's already initialized.
6974
return ksfTkErrOk;
75+
#else
76+
return ksfTkErrFail;
77+
#endif
7078
}
7179

7280
sfTkError_t sfTkArdUART::init()
@@ -103,11 +111,11 @@ sfTkError_t sfTkArdUART::read(uint8_t *data, size_t length, size_t &bytesRead)
103111

104112
bytesRead = 0; // zero out value
105113

106-
// #ifdef ARDUINO_ARCH_AVR
114+
// #ifdef ARDUINO_ARCH_AVR
107115
bytesRead = _hwSerial->readBytes(data, length);
108-
// #else
109-
// bytesRead = readBytes(data, length);
110-
// #endif
116+
// #else
117+
// bytesRead = readBytes(data, length);
118+
// #endif
111119

112120
if (bytesRead == 0)
113121
return ksfTkErrFail;
@@ -187,7 +195,8 @@ sfTkError_t sfTkArdUART::_start(void)
187195
// ESP8266 does not support setting stop bits, parity, and data bits in a stanard manner.
188196
_hwSerial->begin(_config.baudRate);
189197
#else
190-
_hwSerial->begin(_config.baudRate, _config.stopBits | _config.parity | _config.dataBits);
198+
_hwSerial->begin(_config.baudRate,
199+
(uint32_t)_config.stopBits | (uint32_t)_config.parity | (uint32_t)_config.dataBits);
191200
#endif
192201
if (!availableForWrite())
193202
return ksfTkErrSerialNotInit; // check if the port is available

0 commit comments

Comments
 (0)