Skip to content

Commit 378d33d

Browse files
committed
Merge branch 'feature/uart-updates-fix' of https://github.com/sparkfun/SparkFun_Toolkit into feature/uart-updates-fix
2 parents 63b52be + 8cbd3b1 commit 378d33d

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/sfTk/sfTkIUART.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ typedef enum _sfTkUARTDataBits
6868
kUARTDataBitsEight = 0x400ul,
6969
} sfTkUARTDataBits_t;
7070

71-
inline const uint8_t dataBitsToValue(sfTkUARTDataBits_t dataBits)
71+
inline uint8_t dataBitsToValue(sfTkUARTDataBits_t dataBits)
7272
{
7373
static const uint8_t dataBitsArray[] = {5, 6, 7, 8};
7474

src/sfTkArdUART.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ 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
51+
// issues here on some devices - $defineing out for now
52+
#ifdef _THIS_IS_BROKEN
5253
// if we don't have a port already, use the default Arduino Serial.
5354
if (!_hwSerial)
5455
return init(Serial, baudRate, bInit);
@@ -62,7 +63,8 @@ sfTkError_t sfTkArdUART::init(uint32_t baudRate, bool bInit)
6263

6364
sfTkError_t sfTkArdUART::init(sfTkIUART::UARTConfig_t config, bool bInit)
6465
{
65-
#ifdef _THIS__NOT_IS_BROKEN
66+
// issues here on some devices - $defineing out for now
67+
#ifdef _THIS_IS_BROKEN
6668
// if we don't have a port already, use the default Arduino Serial.
6769
if (!_hwSerial)
6870
return init(Serial, config, bInit);

0 commit comments

Comments
 (0)