diff --git a/.travis.yml b/.travis.yml index 268bacc2..07d17f5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,5 +63,7 @@ script: notifications: email: + recipients: + - luc@tech-hunters.com on_success: always on_failure: always diff --git a/esp3d/configuration.h b/esp3d/configuration.h index fdff3564..d6083a17 100644 --- a/esp3d/configuration.h +++ b/esp3d/configuration.h @@ -40,7 +40,7 @@ //COMMUNICATION_PROTOCOL: to communicate with printer or TFT //RAW_SERIAL standard serial //MKS_SERIAL Mks protocol -#define COMMUNICATION_PROTOCOL MKS_SERIAL +#define COMMUNICATION_PROTOCOL RAW_SERIAL //AUTHENTICATION_FEATURE: protect pages by login password //#define AUTHENTICATION_FEATURE diff --git a/esp3d/esp3d.ino.generic.bin b/esp3d/esp3d.ino.generic.bin deleted file mode 100644 index be8d73cc..00000000 Binary files a/esp3d/esp3d.ino.generic.bin and /dev/null differ diff --git a/esp3d/src/include/version.h b/esp3d/src/include/version.h index 4da5a463..96e31e71 100644 --- a/esp3d/src/include/version.h +++ b/esp3d/src/include/version.h @@ -22,7 +22,7 @@ #define _VERSION_ESP3D_H //version and sources location -#define FW_VERSION "3.0.0.a76" +#define FW_VERSION "3.0.0.a77" #define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0" #endif //_VERSION_ESP3D_H diff --git a/esp3d/src/modules/network/netconfig.cpp b/esp3d/src/modules/network/netconfig.cpp index a059abb8..33a608dd 100644 --- a/esp3d/src/modules/network/netconfig.cpp +++ b/esp3d/src/modules/network/netconfig.cpp @@ -113,7 +113,7 @@ bool NetConfig::isHostnameValid (const char * hostname) */ IPAddress NetConfig::localIPAddress() { - IPAddress current_ip = 0; + IPAddress current_ip = IPAddress(0,0,0,0); #if defined( WIFI_FEATURE) if (WiFi.getMode() == WIFI_STA) { current_ip = WiFi.localIP(); diff --git a/esp3d/src/modules/network/netservices.cpp b/esp3d/src/modules/network/netservices.cpp index d3072bab..d9bc9a15 100644 --- a/esp3d/src/modules/network/netservices.cpp +++ b/esp3d/src/modules/network/netservices.cpp @@ -265,9 +265,7 @@ bool NetServices::begin() if(WiFi.getMode() != WIFI_AP) { // Add service to MDNS-SD log_esp3d("Add mdns service http / tcp port %d", HTTP_Server::port()); - if (!MDNS.addService("http", "tcp", HTTP_Server::port())) { - log_esp3d("failed"); - } + MDNS.addService("http", "tcp", HTTP_Server::port()); //Add TXT records MDNS.addServiceTxt("http", "tcp", "ESP3D", FW_VERSION); } diff --git a/esp3d/src/modules/notifications/notifications_service.cpp b/esp3d/src/modules/notifications/notifications_service.cpp index d07096fb..57a6b99a 100644 --- a/esp3d/src/modules/notifications/notifications_service.cpp +++ b/esp3d/src/modules/notifications/notifications_service.cpp @@ -56,6 +56,9 @@ typedef WiFiClientSecure TSecureClient; typedef WiFiClientSecure TSecureClient; #include #include +extern "C" { +#include "libb64/cdecode.h" +} #endif //ARDUINO_ARCH_ESP32 #include @@ -472,15 +475,10 @@ bool NotificationsService::getEmailFromSettings() bool NotificationsService::decode64(const char* encodedURL, char *decodedURL) { size_t out_len = 0; -#if defined( ARDUINO_ARCH_ESP8266) out_len = base64_decode_chars(encodedURL, strlen(encodedURL), decodedURL); -#endif //ARDUINO_ARCH_ESP8266 -#if defined( ARDUINO_ARCH_ESP32) - strcpy(base64_decode(encodedURL, strlen(encodedURL),&out_len); -#endif //ARDUINO_ARCH_ESP32 - log_esp3d("URLE: %s", encodedURL); - log_esp3d("URLD: %s", decodedURL); - return (out_len>0); + log_esp3d("URLE: %s", encodedURL); + log_esp3d("URLD: %s", decodedURL); + return (out_len>0); } bool NotificationsService::GET(const char * URL64)