Skip to content

Commit 888a81d

Browse files
jpasquavshymanskyy
jpasqua
and
vshymanskyy
authored
Fixes #439 (#551)
Co-authored-by: Volodymyr Shymanskyy <[email protected]>
1 parent e5bc9bc commit 888a81d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+293
-113
lines changed

‎src/BlynkSimpleCC3000.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,12 @@
1818
Adafruit_CC3000 cc3000 = Adafruit_CC3000(ADAFRUIT_CC3000_CS, ADAFRUIT_CC3000_IRQ, ADAFRUIT_CC3000_VBAT,
1919
SPI_CLOCK_DIVIDER); // you can change this clock speed
2020

21-
static BlynkTransportCC3000 _blynkTransport(cc3000);
22-
BlynkCC3000 Blynk(cc3000, _blynkTransport);
21+
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_BLYNK)
22+
static BlynkTransportCC3000 _blynkTransport(cc3000);
23+
BlynkCC3000 Blynk(cc3000, _blynkTransport);
24+
#else
25+
extern BlynkCC3000 Blynk;
26+
#endif
2327

2428
#include <BlynkWidgets.h>
2529

‎src/BlynkSimpleCurieBLE.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,12 @@ class BlynkCurieBLE
153153

154154
BlynkTransportCurieBLE* BlynkTransportCurieBLE::instance = NULL;
155155

156-
static BlynkTransportCurieBLE _blynkTransport;
157-
BlynkCurieBLE Blynk(_blynkTransport);
156+
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_BLYNK)
157+
static BlynkTransportCurieBLE _blynkTransport;
158+
BlynkCurieBLE Blynk(_blynkTransport);
159+
#else
160+
extern BlynkCurieBLE Blynk;
161+
#endif
158162

159163
inline
160164
void BlynkTransportCurieBLE::txCharSubscribed(BLECentral& central, BLECharacteristic& ch) {

‎src/BlynkSimpleEnergiaEthernet.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@
1515
#include <EthernetClient.h>
1616
#include <Adapters/BlynkEthernet.h>
1717

18-
static EthernetClient _blynkEthernetClient;
19-
static BlynkArduinoClient _blynkTransport(_blynkEthernetClient);
20-
BlynkEthernet Blynk(_blynkTransport);
18+
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_BLYNK)
19+
static EthernetClient _blynkEthernetClient;
20+
static BlynkArduinoClient _blynkTransport(_blynkEthernetClient);
21+
BlynkEthernet Blynk(_blynkTransport);
22+
#else
23+
extern BlynkEthernet Blynk;
24+
#endif
2125

2226
#include <BlynkWidgets.h>
2327

‎src/BlynkSimpleEnergiaWiFi.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@
1414
#include <WiFi.h>
1515
#include <Adapters/BlynkWiFiCommon.h>
1616

17-
static WiFiClient _blynkWifiClient;
18-
static BlynkArduinoClient _blynkTransport(_blynkWifiClient);
19-
BlynkWifiCommon Blynk(_blynkTransport);
17+
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_BLYNK)
18+
static WiFiClient _blynkWifiClient;
19+
static BlynkArduinoClient _blynkTransport(_blynkWifiClient);
20+
BlynkWifiCommon Blynk(_blynkTransport);
21+
#else
22+
extern BlynkWifiCommon Blynk;
23+
#endif
2024

2125
#include <BlynkWidgets.h>
2226

‎src/BlynkSimpleEsp32.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,13 @@ class BlynkWifi
9292

9393
};
9494

95-
static WiFiClient _blynkWifiClient;
96-
static BlynkEsp32Client _blynkTransport(_blynkWifiClient);
97-
BlynkWifi Blynk(_blynkTransport);
95+
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_BLYNK)
96+
static WiFiClient _blynkWifiClient;
97+
static BlynkEsp32Client _blynkTransport(_blynkWifiClient);
98+
BlynkWifi Blynk(_blynkTransport);
99+
#else
100+
extern BlynkWifi Blynk;
101+
#endif
98102

99103
#include <BlynkWidgets.h>
100104

‎src/BlynkSimpleEsp32_BLE.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,12 @@ class BlynkEsp32_BLE
174174
};
175175

176176

177-
static BlynkTransportEsp32_BLE _blynkTransportBLE;
178-
BlynkEsp32_BLE Blynk(_blynkTransportBLE);
177+
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_BLYNK)
178+
static BlynkTransportEsp32_BLE _blynkTransportBLE;
179+
BlynkEsp32_BLE Blynk(_blynkTransportBLE);
180+
#else
181+
extern BlynkEsp32_BLE Blynk;
182+
#endif
179183

180184
inline
181185
void BlynkTransportEsp32_BLE::onConnect(BLEServer* pServer) {

‎src/BlynkSimpleEsp32_BT.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,12 @@ class BlynkEsp32_BT
216216
BlynkTransportEsp32_BT* BlynkTransportEsp32_BT::instance = NULL;
217217
uint32_t BlynkTransportEsp32_BT::spp_handle = 0;
218218

219-
static BlynkTransportEsp32_BT _blynkTransport;
220-
BlynkEsp32_BT Blynk(_blynkTransport);
219+
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_BLYNK)
220+
static BlynkTransportEsp32_BT _blynkTransport;
221+
BlynkEsp32_BT Blynk(_blynkTransport);
222+
#else
223+
extern BlynkEsp32_BT Blynk;
224+
#endif
221225

222226
void BlynkTransportEsp32_BT::onConnect() {
223227
BLYNK_LOG1(BLYNK_F("BT connect"));

‎src/BlynkSimpleEsp32_NimBLE.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,12 @@ class BlynkEsp32_NimBLE
176176
};
177177

178178

179-
static BlynkTransportEsp32_NimBLE _blynkTransportBLE;
180-
BlynkEsp32_NimBLE Blynk(_blynkTransportBLE);
179+
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_BLYNK)
180+
static BlynkTransportEsp32_NimBLE _blynkTransportBLE;
181+
BlynkEsp32_NimBLE Blynk(_blynkTransportBLE);
182+
#else
183+
extern BlynkEsp32_NimBLE Blynk;
184+
#endif
181185

182186
inline
183187
void BlynkTransportEsp32_NimBLE::onConnect(NimBLEServer* pServer) {

‎src/BlynkSimpleEsp32_SSL.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,13 @@ class BlynkWifi
126126

127127
};
128128

129-
static WiFiClientSecure _blynkWifiClient;
130-
static BlynkArduinoClientSecure<WiFiClientSecure> _blynkTransport(_blynkWifiClient);
131-
BlynkWifi<BlynkArduinoClientSecure<WiFiClientSecure> > Blynk(_blynkTransport);
129+
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_BLYNK)
130+
static WiFiClientSecure _blynkWifiClient;
131+
static BlynkArduinoClientSecure<WiFiClientSecure> _blynkTransport(_blynkWifiClient);
132+
BlynkWifi<BlynkArduinoClientSecure<WiFiClientSecure> > Blynk(_blynkTransport);
133+
#else
134+
extern BlynkWifi<BlynkArduinoClientSecure<WiFiClientSecure> > Blynk;
135+
#endif
132136

133137
#include <BlynkWidgets.h>
134138

‎src/BlynkSimpleEsp8266.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,13 @@ class BlynkWifi
9696

9797
};
9898

99-
static WiFiClient _blynkWifiClient;
100-
static BlynkArduinoClient _blynkTransport(_blynkWifiClient);
101-
BlynkWifi Blynk(_blynkTransport);
99+
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_BLYNK)
100+
static WiFiClient _blynkWifiClient;
101+
static BlynkArduinoClient _blynkTransport(_blynkWifiClient);
102+
BlynkWifi Blynk(_blynkTransport);
103+
#else
104+
extern BlynkWifi Blynk;
105+
#endif
102106

103107
#include <BlynkWidgets.h>
104108

0 commit comments

Comments
 (0)