From b2a67926108232926651538bd99dd9258f46d573 Mon Sep 17 00:00:00 2001 From: Morgan Allen Date: Mon, 3 Sep 2018 20:31:32 -0700 Subject: [PATCH] use defines for event states this was causing some wonky linking issue I could not figure esp32-on-air/build/esp32-wifi-manager/libesp32-wifi-manager.a(esp32-wifi-manager.o):(.rodata.AP_AVAILABLE+0x0): multiple definition of `AP_AVAILABLE' esp32-on-air/build/main/libmain.a(main.o):(.rodata.AP_AVAILABLE+0x0): first defined here esp32-on-air/build/esp32-wifi-manager/libesp32-wifi-manager.a(esp32-wifi-manager.o):(.rodata.WIFI_CONNECTING+0x0): multiple definition of `WIFI_CONNECTING' esp32-on-air/build/main/libmain.a(main.o):(.rodata.WIFI_CONNECTING+0x0): first defined here esp32-on-air/build/esp32-wifi-manager/libesp32-wifi-manager.a(esp32-wifi-manager.o):(.rodata.WIFI_CONNECTED+0x0): multiple definition of `WIFI_CONNECTED' esp32-on-air/build/main/libmain.a(main.o):(.rodata.WIFI_CONNECTED+0x0): first defined here --- include/esp32-wifi-manager.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/esp32-wifi-manager.h b/include/esp32-wifi-manager.h index 77b7097..d98dae2 100644 --- a/include/esp32-wifi-manager.h +++ b/include/esp32-wifi-manager.h @@ -7,9 +7,9 @@ void wifi_manager_save_config(); void wifi_manager_load_config(); void wifi_manager_reset_store(); -const int WIFI_CONNECTED = BIT0; -const int WIFI_CONNECTING = BIT1; -const int AP_AVAILABLE = BIT2; +#define WIFI_CONNECTED (BIT0) +#define WIFI_CONNECTING (BIT1) +#define AP_AVAILABLE (BIT2) uint8_t wifi_manager_ap_count(); uint8_t wifi_manager_add_ap(char *essid, char *password);