Skip to content

Commit f9c2d3f

Browse files
author
brentru
committed
moving pin definitions outside of the main AdafruitIO, into airlift
1 parent 1d349ca commit f9c2d3f

File tree

3 files changed

+24
-9
lines changed

3 files changed

+24
-9
lines changed

src/AdafruitIO.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@ void errorCallback(char *err, uint16_t len)
3535
AIO_ERROR_PRINTLN();
3636
}
3737

38-
void AdafruitIO::airliftPins(uint16_t ss, uint16_t ack, uint16_t rst)
38+
void AdafruitIO::airLiftPins(uint16_t ss, uint16_t ack, uint16_t rst)
3939
{
40-
_airlift_ss = ss;
41-
_airlift_ack = ack;
42-
_airlift_rst = rst;
40+
airLiftPins(ss, ack, rst);
4341
}
4442

4543
void AdafruitIO::connect()

src/AdafruitIO.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class AdafruitIO {
4545
virtual ~AdafruitIO();
4646

4747
void connect();
48-
void airliftPins(uint16_t ss, uint16_t ack, uint16_t rst);
48+
//void airliftPins(uint16_t ss, uint16_t ack, uint16_t rst);
4949

5050

5151
void run(uint16_t busywait_ms = 0);
@@ -69,8 +69,9 @@ class AdafruitIO {
6969
virtual const char* connectionType() = 0;
7070

7171
protected:
72-
uint16_t _airlift_ss, _airlift_ack, _airlift_rst;
72+
//uint16_t _airlift_ss, _airlift_ack, _airlift_rst;
7373
virtual void _connect() = 0;
74+
virtual void airLiftPins(uint16_t ss, uint16_t ack, uint16_t rst) = 0;
7475
aio_status_t _status = AIO_IDLE;
7576
uint32_t _last_ping = 0;
7677

src/AdafruitIO_AIRLIFT.h

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#if !defined(SPIWIFI_SS) // if the wifi definition isnt in the board variant
2424
#define BOARDEF 1
2525
#define SPIWIFI SPI
26-
#define SPIWIFI_SS _airlift_ss // Chip select pin
27-
#define SPIWIFI_ACK _airlift_ack // a.k.a BUSY or READY pin
28-
#define ESP32_RESETN _airlift_rst // Reset pin
26+
#define SPIWIFI_SS airlift_ss // Chip select pin
27+
#define SPIWIFI_ACK airlift_ack // a.k.a BUSY or READY pin
28+
#define ESP32_RESETN airlift_rst // Reset pin
2929
#define ESP32_GPIO0 -1 // Not connected
3030
#endif
3131

@@ -109,13 +109,29 @@ class AdafruitIO_AIRLIFT : public AdafruitIO {
109109
return "AIRLIFT";
110110
}
111111

112+
void airLiftPins(uint16_t ss, uint16_t ack, uint16_t rst)
113+
{
114+
airlift_ss = ss;
115+
airlift_ack = ack;
116+
airlift_rst = rst;
117+
Serial.print("\nPins: ");
118+
Serial.print(airlift_ss);
119+
Serial.print(airlift_ack);
120+
Serial.print(airlift_rst);
121+
Serial.println("");
122+
}
123+
124+
uint16_t airlift_ss, airlift_ack, airlift_rst;
125+
112126
protected:
113127
const char *_ssid;
114128
const char *_pass;
115129

116130
WiFiSSLClient *_http_client;
117131
WiFiSSLClient *_mqtt_client;
118132

133+
134+
119135
/**************************************************************************/
120136
/*!
121137
@brief Attempts to establish a WiFi connection with the wireless network,

0 commit comments

Comments
 (0)