Skip to content

Commit 295efb3

Browse files
committed
Fix linking issue - Squashed commit of adafruit#829
1 parent 9cb3d2f commit 295efb3

File tree

20 files changed

+17
-21
lines changed

20 files changed

+17
-21
lines changed

ci

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit da37d5d2371435fa73fd5a1f4da7d92b7aafea26

src/Wippersnapper.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@
3232
*/
3333

3434
#include "Wippersnapper.h"
35+
#include "Wippersnapper_Networking.h"
3536

36-
Wippersnapper WS;
37+
// Define the global WS instance as the platform-specific derived class
38+
// This ensures virtual methods like _connect() route to the correct implementation
39+
Wippersnapper_WiFi WS;
3740

3841
Wippersnapper::Wippersnapper() {
3942
_mqtt = 0; // MQTT Client object

src/Wippersnapper.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,11 @@ class Wippersnapper {
501501
wippersnapper_signal_v1_CreateSignalRequest
502502
_outgoingSignalMsg; /*!< Outgoing signal message from device */
503503
};
504-
extern Wippersnapper WS; ///< Global member variable for callbacks
504+
505+
// Include networking to get the platform-specific Wippersnapper_WiFi typedef
506+
#include "Wippersnapper_Networking.h"
507+
508+
// // Global WS instance - defined as platform-specific type in Wippersnapper.cpp
509+
// extern Wippersnapper_WiFi WS; ///< Global member variable for callbacks
505510

506511
#endif // ADAFRUIT_WIPPERSNAPPER_H

src/components/analogIO/Wippersnapper_AnalogIO.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,5 @@ class Wippersnapper_AnalogIO {
8181
int32_t _totalAnalogInputPins; /*!< Total number of analog input pins */
8282
analogInputPin *_analog_input_pins; /*!< Array of analog pin objects */
8383
};
84-
extern Wippersnapper WS; /*!< Wippersnapper variable. */
8584

8685
#endif // WIPPERSNAPPER_DIGITALGPIO_H

src/components/digitalIO/Wippersnapper_DigitalGPIO.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,5 @@ class Wippersnapper_DigitalGPIO {
5757
int32_t
5858
_totalDigitalInputPins; /*!< Total number of digital-input capable pins */
5959
};
60-
extern Wippersnapper WS;
6160

6261
#endif // WIPPERSNAPPER_DIGITALGPIO_H

src/components/display/controller.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ class DisplayController {
4343
_hw_instances; ///< Holds pointers to DisplayHardware instances
4444
unsigned long _last_bar_update; ///< Timestamp of last status bar update
4545
};
46-
extern Wippersnapper WS; ///< Global WS instance
46+
4747
#endif

src/components/ds18x20/ws_ds18x20.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,5 @@ class ws_ds18x20 {
6060
std::vector<ds18x20Obj *>
6161
_ds18xDrivers; ///< Vec. of ptrs. to ds18x driver objects
6262
};
63-
extern Wippersnapper WS;
6463

6564
#endif // WIPPERSNAPPER_DS18X20_H

src/components/i2c/WipperSnapper_I2C.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,5 @@ class WipperSnapper_Component_I2C {
232232
WipperSnapper_I2C_Driver_Out_SH1107 *_sh1107 = nullptr;
233233
WipperSnapper_I2C_Driver_Out_Ssd1306 *_ssd1306 = nullptr;
234234
};
235-
extern Wippersnapper WS;
236235

237236
#endif // WipperSnapper_Component_I2C_H

src/components/ledc/ws_ledc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,5 @@ class ws_ledc {
5555
bool analogWrite(uint8_t pin, int value);
5656
uint32_t tone(uint8_t pin, uint32_t freq);
5757
};
58-
extern Wippersnapper WS;
5958

6059
#endif // ws_ledc_H

src/components/pixels/ws_pixels.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@ class ws_pixels {
6868
void publishAddStrandResponse(bool is_success, char *pixels_pin_data);
6969
uint32_t getGammaCorrectedColor(uint32_t pixel_color, strand_s strand);
7070
};
71-
extern Wippersnapper WS;
71+
7272
#endif // WS_PIXELS

0 commit comments

Comments
 (0)