Skip to content

Commit 9517f67

Browse files
authored
Merge pull request #427 from sparkfun/v2.2.0_final_changes
V2.2.0 final changes
2 parents 78b9f5b + 92d8a27 commit 9517f67

File tree

14 files changed

+15
-8
lines changed

14 files changed

+15
-8
lines changed

libraries/SPI/src/SPI.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define _APOLLO3_LIBRARIES_SPI_H_
88

99
#include "Arduino.h"
10-
10+
#include "core-api/api/HardwareSPI.h"
1111
#include "drivers/SPI.h"
1212

1313
// SPI_HAS_TRANSACTION means SPI has beginTransaction(), endTransaction(),

libraries/Wire/src/Wire.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ uint8_t arduino::MbedI2C::endTransmission(bool stopBit) {
6666
return 2;
6767
}
6868

69-
uint8_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len, bool stopBit) {
69+
size_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len, bool stopBit) {
7070
char buf[256];
7171
int ret = master->read(address << 1, buf, len, !stopBit);
7272
if (ret != 0) {
@@ -78,7 +78,7 @@ uint8_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len, bool stopBit)
7878
return len;
7979
}
8080

81-
uint8_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len) {
81+
size_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len) {
8282
return requestFrom(address, len, true);
8383
}
8484

libraries/Wire/src/Wire.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#define _APOLLO3_LIBRARIES_WIRE_H_
88

99
#include "Arduino.h"
10+
#include "core-api/api/HardwareI2C.h"
1011
#include "drivers/I2C.h"
1112
#include "drivers/I2CSlave.h"
1213
#include "rtos.h"
@@ -32,8 +33,8 @@ class MbedI2C : public HardwareI2C
3233
virtual uint8_t endTransmission(bool stopBit);
3334
virtual uint8_t endTransmission(void);
3435

35-
virtual uint8_t requestFrom(uint8_t address, size_t len, bool stopBit);
36-
virtual uint8_t requestFrom(uint8_t address, size_t len);
36+
virtual size_t requestFrom(uint8_t address, size_t len, bool stopBit);
37+
virtual size_t requestFrom(uint8_t address, size_t len);
3738

3839
virtual void onReceive(void(*)(int));
3940
virtual void onRequest(void(*)(void));

variants/SFE_ARTEMIS_MODULE/variant.h

+8-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@
1010

1111
#include "config/pins.h"
1212

13-
#define VARIANT_SPI_INTFCS 0
14-
#define VARIANT_WIRE_INTFCS 0
13+
#define VARIANT_SPI_INTFCS 0
14+
#define VARIANT_WIRE_INTFCS 1
15+
16+
// Add a default wire pin so that Wire is available to libraries and sketches
17+
// Since this is just a module no pins are labeled I2C/Wire/Qwiic by default
18+
// 2 pins have been chosen here arbitrarily
19+
#define VARIANT_Wire_SDA 9
20+
#define VARIANT_Wire_SCL 8
1521

1622
#endif // _VARIANT_H_

0 commit comments

Comments
 (0)